[WIP]: Split analysis into several assemblies

build/Common.Build.Core.settings

@@ -16,18 +16,10 @@
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSTarget Condition="$(VSTarget)=='' and '$(VisualStudioVersion)'=='16.0'">16.0</VSTarget>
     <VSTarget Condition="$(VSTarget)=='' and '$(VisualStudioVersion)'=='15.0'">15.0</VSTarget>
-    <VSTarget Condition="$(VSTarget)=='' and '$(VisualStudioVersion)'=='14.0'">14.0</VSTarget>
-    <VSTarget Condition="$(VSTarget)=='' and '$(VisualStudioVersion)'=='12.0'">12.0</VSTarget>
-    <VSTarget Condition="$(VSTarget)=='' and '$(VisualStudioVersion)'=='11.0'">11.0</VSTarget>
-    <VSTarget Condition="$(VSTarget)==''">10.0</VSTarget>
-
+
     <VSTargetName Condition="'$(VSTarget)' == '16.0'">2019</VSTargetName>
     <VSTargetName Condition="'$(VSTarget)' == '15.0'">2017</VSTargetName>
-    <VSTargetName Condition="'$(VSTarget)' == '14.0'">2015</VSTargetName>
-    <VSTargetName Condition="'$(VSTarget)' == '12.0'">2013</VSTargetName>
-    <VSTargetName Condition="'$(VSTarget)' == '11.0'">2012</VSTargetName>
-    <VSTargetName Condition="'$(VSTarget)' == '10.0'">2010</VSTargetName>
-
+
     <BuildNumber Condition="'$(BuildNumber)' == ''">$(BUILD_BUILDNUMBER)</BuildNumber>
     <BuildNumber Condition="'$(BuildNumber)' == ''">1000.00</BuildNumber>
     <!--

src/Analysis/Engine/Impl/AnalysisExtensions.cs

@@ -15,7 +15,7 @@
 // permissions and limitations under the License.
 
 using System;
-using Microsoft.PythonTools.Parsing;
+using Microsoft.Python.Parsing;
 
 namespace Microsoft.PythonTools.Interpreter {
     public static class AnalysisExtensions {

src/Analysis/Engine/Impl/AnalysisLogWriter.cs

@@ -9,7 +9,7 @@
 // THIS CODE IS PROVIDED ON AN  *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS
 // OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY
 // IMPLIED WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
-// MERCHANTABLITY OR NON-INFRINGEMENT.
+// MERCHANTABILITY OR NON-INFRINGEMENT.
 //
 // See the Apache Version 2.0 License for specific language governing
 // permissions and limitations under the License.
@@ -22,7 +22,8 @@
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.PythonTools.Analysis.Infrastructure;
+using Microsoft.Python.Core;
+using Microsoft.Python.Core.IO;
 
 namespace Microsoft.PythonTools.Analysis {
     public class AnalysisLogWriter : IDisposable {

src/Analysis/Engine/Impl/AnalysisSet.cs

@@ -9,7 +9,7 @@
 // THIS CODE IS PROVIDED ON AN  *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS
 // OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY
 // IMPLIED WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
-// MERCHANTABLITY OR NON-INFRINGEMENT.
+// MERCHANTABILITY OR NON-INFRINGEMENT.
 //
 // See the Apache Version 2.0 License for specific language governing
 // permissions and limitations under the License.
@@ -18,7 +18,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using Microsoft.PythonTools.Analysis.Infrastructure;
+using Microsoft.Python.Core;
 
 namespace Microsoft.PythonTools.Analysis {
     /// <summary>

src/Analysis/Engine/Impl/AnalysisUnit.cs

@@ -9,7 +9,7 @@
 // THIS CODE IS PROVIDED ON AN  *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS
 // OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY
 // IMPLIED WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
-// MERCHANTABLITY OR NON-INFRINGEMENT.
+// MERCHANTABILITY OR NON-INFRINGEMENT.
 //
 // See the Apache Version 2.0 License for specific language governing
 // permissions and limitations under the License.
@@ -19,12 +19,12 @@
 using System.Diagnostics;
 using System.Linq;
 using System.Threading;
+using Microsoft.Python.Core;
 using Microsoft.PythonTools.Analysis.Analyzer;
-using Microsoft.PythonTools.Analysis.Infrastructure;
 using Microsoft.PythonTools.Analysis.Values;
 using Microsoft.PythonTools.Interpreter;
-using Microsoft.PythonTools.Parsing;
-using Microsoft.PythonTools.Parsing.Ast;
+using Microsoft.Python.Parsing;
+using Microsoft.Python.Parsing.Ast;
 
 namespace Microsoft.PythonTools.Analysis {
     /// <summary>

src/Analysis/Engine/Impl/AnalysisValue.cs

@@ -22,8 +22,8 @@
 using Microsoft.PythonTools.Analysis.Analyzer;
 using Microsoft.PythonTools.Analysis.Values;
 using Microsoft.PythonTools.Interpreter;
-using Microsoft.PythonTools.Parsing;
-using Microsoft.PythonTools.Parsing.Ast;
+using Microsoft.Python.Parsing;
+using Microsoft.Python.Parsing.Ast;
 
 namespace Microsoft.PythonTools.Analysis {
     /// <summary>

src/Analysis/Engine/Impl/AnalysisValueSetExtensions.cs

@@ -20,8 +20,8 @@
 using System.Linq;
 using Microsoft.PythonTools.Analysis.Values;
 using Microsoft.PythonTools.Interpreter;
-using Microsoft.PythonTools.Parsing;
-using Microsoft.PythonTools.Parsing.Ast;
+using Microsoft.Python.Parsing;
+using Microsoft.Python.Parsing.Ast;
 
 namespace Microsoft.PythonTools.Analysis {
     /// <summary>
@@ -218,7 +218,7 @@ internal static AnalysisValue GetUnionType(this IAnalysisSet types) {
         /// Gets instance representations of all members of the set.
         /// </summary>
         public static IAnalysisSet GetInstanceType(this IAnalysisSet types)
-            => AnalysisSet.Create(types.SelectMany(ns => (ns.PythonType as IPythonType2)?.IsClass == true ? ns : ns.GetInstanceType()));
+            => AnalysisSet.Create(types.SelectMany(ns => ns.PythonType?.IsTypeFactory == true ? ns : ns.GetInstanceType()));
 
         public static bool IsUnknown(this IAnalysisSet res) {
             return res == null ||

src/Analysis/Engine/Impl/Analyzer/ClassScope.cs

@@ -15,7 +15,7 @@
 // permissions and limitations under the License.
 
 using Microsoft.PythonTools.Analysis.Values;
-using Microsoft.PythonTools.Parsing.Ast;
+using Microsoft.Python.Parsing.Ast;
 
 namespace Microsoft.PythonTools.Analysis.Analyzer {
     sealed class ClassScope : InterpreterScope, IClassScope {

src/Analysis/Engine/Impl/Analyzer/ComprehensionScope.cs

@@ -14,7 +14,7 @@
 // See the Apache Version 2.0 License for specific language governing
 // permissions and limitations under the License.
 
-using Microsoft.PythonTools.Parsing.Ast;
+using Microsoft.Python.Parsing.Ast;
 
 namespace Microsoft.PythonTools.Analysis.Analyzer {
     sealed class ComprehensionScope : InterpreterScope {

src/Analysis/Engine/Impl/Analyzer/DDG.cs

@@ -9,7 +9,7 @@
 // THIS CODE IS PROVIDED ON AN  *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS
 // OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY
 // IMPLIED WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
-// MERCHANTABLITY OR NON-INFRINGEMENT.
+// MERCHANTABILITY OR NON-INFRINGEMENT.
 //
 // See the Apache Version 2.0 License for specific language governing
 // permissions and limitations under the License.
@@ -19,9 +19,10 @@
 using System.Diagnostics;
 using System.Linq;
 using System.Threading;
-using Microsoft.PythonTools.Analysis.Infrastructure;
+using Microsoft.Python.Core;
+using Microsoft.Python.Core.Interpreter;
+using Microsoft.Python.Parsing.Ast;
 using Microsoft.PythonTools.Analysis.Values;
-using Microsoft.PythonTools.Parsing.Ast;
 
 namespace Microsoft.PythonTools.Analysis.Analyzer {
     internal class DDG : PythonWalker {
@@ -512,7 +513,7 @@ internal void WalkBody(Node node, AnalysisUnit unit) {
         }
 
         public override bool Walk(IfStatement node) {
-            foreach (var test in node.TestsInternal) {
+            foreach (var test in node.Tests) {
                 _eval.Evaluate(test.Test);
 
                 var prevScope = Scope;

src/Analysis/Engine/Impl/Analyzer/ErrorMessages.cs

@@ -9,12 +9,12 @@
 // THIS CODE IS PROVIDED ON AN  *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS
 // OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY
 // IMPLIED WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
-// MERCHANTABLITY OR NON-INFRINGEMENT.
+// MERCHANTABILITY OR NON-INFRINGEMENT.
 //
 // See the Apache Version 2.0 License for specific language governing
 // permissions and limitations under the License.
 
-using Microsoft.PythonTools.Analysis.Infrastructure;
+using Microsoft.Python.Core;
 
 namespace Microsoft.PythonTools.Analysis.Analyzer {
     static class ErrorMessages {

src/Analysis/Engine/Impl/Analyzer/ExpressionEvaluator.cs

@@ -20,8 +20,8 @@
 using System.Linq;
 using Microsoft.PythonTools.Analysis.Values;
 using Microsoft.PythonTools.Interpreter;
-using Microsoft.PythonTools.Parsing;
-using Microsoft.PythonTools.Parsing.Ast;
+using Microsoft.Python.Parsing;
+using Microsoft.Python.Parsing.Ast;
 
 namespace Microsoft.PythonTools.Analysis.Analyzer {
     internal class ExpressionEvaluator {

src/Analysis/Engine/Impl/Analyzer/ExpressionEvaluatorAnnotationConverter.cs

@@ -19,7 +19,7 @@
 using System.Linq;
 using Microsoft.PythonTools.Analysis.Values;
 using Microsoft.PythonTools.Interpreter;
-using Microsoft.PythonTools.Parsing.Ast;
+using Microsoft.Python.Parsing.Ast;
 
 namespace Microsoft.PythonTools.Analysis.Analyzer {
     class ExpressionEvaluatorAnnotationConverter : TypeAnnotationConverter<IAnalysisSet> {

src/Analysis/Engine/Impl/Analyzer/FunctionAnalysisUnit.cs

@@ -17,10 +17,10 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
-using Microsoft.PythonTools.Analysis.Infrastructure;
+using Microsoft.Python.Core;
 using Microsoft.PythonTools.Analysis.Values;
 using Microsoft.PythonTools.Interpreter;
-using Microsoft.PythonTools.Parsing.Ast;
+using Microsoft.Python.Parsing.Ast;
 
 namespace Microsoft.PythonTools.Analysis.Analyzer {
     class FunctionAnalysisUnit : AnalysisUnit {

src/Analysis/Engine/Impl/Analyzer/FunctionScope.cs

@@ -18,7 +18,7 @@
 using System.Diagnostics;
 using System.Linq;
 using Microsoft.PythonTools.Analysis.Values;
-using Microsoft.PythonTools.Parsing.Ast;
+using Microsoft.Python.Parsing.Ast;
 
 namespace Microsoft.PythonTools.Analysis.Analyzer {
     sealed class FunctionScope : InterpreterScope, IFunctionScope {

src/Analysis/Engine/Impl/Analyzer/ImportSource.cs

@@ -15,7 +15,7 @@
 // permissions and limitations under the License.
 
 using System;
-using Microsoft.PythonTools.Parsing.Ast;
+using Microsoft.Python.Parsing.Ast;
 
 namespace Microsoft.PythonTools.Analysis.Analyzer {
     public interface IImportSource {

src/Analysis/Engine/Impl/Analyzer/ImportStatementWalker.cs

@@ -16,7 +16,7 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.PythonTools.Parsing.Ast;
+using Microsoft.Python.Parsing.Ast;
 
 namespace Microsoft.PythonTools.Analysis.Analyzer {
     internal class ImportStatementWalker : PythonWalker {

src/Analysis/Engine/Impl/Analyzer/InterpreterScope.cs

@@ -18,7 +18,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using Microsoft.PythonTools.Parsing.Ast;
+using Microsoft.Python.Parsing.Ast;
 
 namespace Microsoft.PythonTools.Analysis.Analyzer {
     abstract class InterpreterScope: IScope {

src/Analysis/Engine/Impl/Analyzer/IsInstanceScope.cs

@@ -17,7 +17,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.PythonTools.Analysis.Values;
-using Microsoft.PythonTools.Parsing.Ast;
+using Microsoft.Python.Parsing.Ast;
 
 namespace Microsoft.PythonTools.Analysis.Analyzer {
     sealed class IsInstanceScope : InterpreterScope {

src/Analysis/Engine/Impl/Analyzer/ModuleScope.cs

@@ -9,11 +9,12 @@
 // THIS CODE IS PROVIDED ON AN  *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS
 // OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY
 // IMPLIED WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
-// MERCHANTABLITY OR NON-INFRINGEMENT.
+// MERCHANTABILITY OR NON-INFRINGEMENT.
 //
 // See the Apache Version 2.0 License for specific language governing
 // permissions and limitations under the License.
 
+using Microsoft.Python.Parsing.Ast;
 using Microsoft.PythonTools.Analysis.Values;
 
 namespace Microsoft.PythonTools.Analysis.Analyzer {
@@ -34,7 +35,7 @@ internal void SetModuleVariable(string name, IAnalysisSet value)
 
         public override string Name => Module.Name;
 
-        public override bool AssignVariable(string name, Parsing.Ast.Node location, AnalysisUnit unit, IAnalysisSet values) {
+        public override bool AssignVariable(string name, Node location, AnalysisUnit unit, IAnalysisSet values) {
             if (base.AssignVariable(name, location, unit, values)) {
                 Module.ModuleDefinition.EnqueueDependents();
                 return true;

src/Analysis/Engine/Impl/Analyzer/OverviewWalker.cs

@@ -19,8 +19,8 @@
 using System.Diagnostics;
 using System.Linq;
 using Microsoft.PythonTools.Analysis.Values;
-using Microsoft.PythonTools.Parsing;
-using Microsoft.PythonTools.Parsing.Ast;
+using Microsoft.Python.Parsing;
+using Microsoft.Python.Parsing.Ast;
 
 namespace Microsoft.PythonTools.Analysis.Analyzer {
     /// <summary>
@@ -453,8 +453,8 @@ public override bool Walk(FromImportStatement node) {
 
         public override bool Walk(IfStatement node) {
             UpdateChildRanges(node);
-            if (node.TestsInternal != null) {
-                foreach (var test in node.TestsInternal) {
+            if (node.Tests != null) {
+                foreach (var test in node.Tests) {
                     var isInstanceNames = GetIsInstanceNamesAndExpressions(test.Test);
                     if (isInstanceNames != null) {
                         if (test.Test != null) {
@@ -558,11 +558,13 @@ public override bool Walk(SuiteStatement node) {
                 var lineNo = _tree.IndexToLocation(node.EndIndex).Line;
 
                 int offset;
-                if (_tree._lineLocations.Length == 0) {
+                if (_tree.NewLineLocations.Length == 0) {
                     // single line input
                     offset = 0;
                 } else {
-                    offset = lineNo < _tree._lineLocations.Length ? _tree._lineLocations[lineNo].EndIndex : _tree._lineLocations[_tree._lineLocations.Length - 1].EndIndex;
+                    offset = lineNo < _tree.NewLineLocations.Length 
+                        ? _tree.NewLineLocations[lineNo].EndIndex 
+                        : _tree.NewLineLocations[_tree.NewLineLocations.Length - 1].EndIndex;
                 }
                 var closingScope = new StatementScope(offset, _scope);
                 _scope.Children.Add(closingScope);

src/Analysis/Engine/Impl/Analyzer/StatementScope.cs

@@ -14,7 +14,7 @@
 // See the Apache Version 2.0 License for specific language governing
 // permissions and limitations under the License.
 
-using Microsoft.PythonTools.Parsing.Ast;
+using Microsoft.Python.Parsing.Ast;
 
 namespace Microsoft.PythonTools.Analysis.Analyzer {
     class StatementScope : InterpreterScope {

src/Analysis/Engine/Impl/Definitions/Diagnostic.cs

@@ -9,12 +9,12 @@
 // THIS CODE IS PROVIDED ON AN  *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS
 // OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY
 // IMPLIED WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
-// MERCHANTABLITY OR NON-INFRINGEMENT.
+// MERCHANTABILITY OR NON-INFRINGEMENT.
 //
 // See the Apache Version 2.0 License for specific language governing
 // permissions and limitations under the License.
 
-using System;
+using Microsoft.Python.Core.Text;
 
 namespace Microsoft.PythonTools.Analysis {
     public class Diagnostic {

src/Analysis/Engine/Impl/Definitions/IAnalysisCookie.cs

@@ -14,7 +14,7 @@
 // See the Apache Version 2.0 License for specific language governing
 // permissions and limitations under the License.
 
-using Microsoft.PythonTools.Parsing.Ast;
+using Microsoft.Python.Parsing.Ast;
 
 namespace Microsoft.PythonTools.Analysis {
     /// <summary>

src/Analysis/Engine/Impl/Definitions/IAnalysisUnit.cs

@@ -14,7 +14,7 @@
 // See the Apache Version 2.0 License for specific language governing
 // permissions and limitations under the License.
 
-using Microsoft.PythonTools.Parsing.Ast;
+using Microsoft.Python.Parsing.Ast;
 
 namespace Microsoft.PythonTools.Analysis {
     public interface IAnalysisUnit : ILocationResolver, ICanExpire {

src/Analysis/Engine/Impl/Definitions/ILocationInfo.cs

@@ -15,6 +15,7 @@
 // permissions and limitations under the License.
 
 using System;
+using Microsoft.Python.Core.Text;
 
 namespace Microsoft.PythonTools.Analysis {
     public interface ILocationInfo: IEquatable<ILocationInfo>, ILocationResolver {

src/Analysis/Engine/Impl/Definitions/IModule.cs

@@ -17,7 +17,7 @@
 using System.Collections.Generic;
 using Microsoft.PythonTools.Analysis.Values;
 using Microsoft.PythonTools.Interpreter;
-using Microsoft.PythonTools.Parsing.Ast;
+using Microsoft.Python.Parsing.Ast;
 
 namespace Microsoft.PythonTools.Analysis {
     public interface IModule : IAnalysisValue {