Last port

Author: AlexanderSher

src/Analysis/Engine/Impl/Interpreter/Definitions/PythonMemberType.cs

@@ -64,7 +64,6 @@ public enum PythonMemberType {
         /// An instance of a namespace object that was imported from .NET.
         /// </summary>
         Namespace,
-
         /// <summary>
         /// A constant defined in source code.
         /// </summary>

src/Analysis/Engine/Impl/ModuleAnalysis.cs

@@ -857,17 +857,6 @@ private IEnumerable<IMemberResult> GetKeywordMembers(GetMemberOptions options, I
 
         #endregion
 
-        /// <summary>
-        /// Gets the available names at the given location.  This includes
-        /// global variables and locals, but not built-in variables.
-        /// </summary>
-        /// <param name="index">
-        /// The 0-based absolute index into the file where the available members
-        /// should be looked up.
-        /// </param>
-        /// <remarks>TODO: Remove; this is only used for tests</remarks>
-        internal IEnumerable<string> GetVariablesNoBuiltinsByIndex(int index) => GetVariablesNoBuiltins(_unit.Tree.IndexToLocation(index));
-
         /// <summary>
         /// Gets the available names at the given location.  This includes
         /// global variables and locals, but not built-in variables.

src/Analysis/Engine/Test/AnalysisTest.cs

@@ -29,6 +29,7 @@
 using Microsoft.PythonTools.Analysis.Analyzer;
 using Microsoft.PythonTools.Analysis.FluentAssertions;
 using Microsoft.PythonTools.Analysis.Values;
+using Microsoft.PythonTools.Intellisense;
 using Microsoft.PythonTools.Interpreter;
 using Microsoft.PythonTools.Interpreter.Ast;
 using Microsoft.PythonTools.Parsing;
@@ -5576,6 +5577,52 @@ def f(s = 123) -> s:
                     .And.HaveReturnValue().OfTypes(BuiltinTypeId.Int, BuiltinTypeId.NoneType, BuiltinTypeId.Unknown);
             }
         }
+
+
+        [TestMethod, Priority(0)]
+        public async Task SysModulesSetSpecialization() {
+            var code = @"import sys
+modules = sys.modules
+
+modules['name_in_modules'] = None
+";
+            code += string.Join(
+                Environment.NewLine,
+                Enumerable.Range(0, 100).Select(i => $"sys.modules['name{i}'] = None")
+            );
+
+            using (var server = await CreateServerAsync(PythonVersions.LatestAvailable2X)) {
+                var analysis = await server.OpenDefaultDocumentAndGetAnalysisAsync(code);
+                analysis.Should().HaveVariable("sys").WithValue<SysModuleInfo>()
+                    .And.HaveVariable("modules").WithValue<SysModuleInfo.SysModulesDictionaryInfo>();
+            }
+
+        }
+
+
+        [DataRow("import abc", 7, "abc", "")]
+        [DataRow("import abc", 8, "abc", "")]
+        [DataRow("import abc", 9, "abc", "")]
+        [DataRow("import abc", 10, "abc", "")]
+        [DataRow("import deg, abc as A",12, "abc", "")]
+        [DataRow("from abc import A", 6, "abc", "")]
+        [DataRow("from .deg import A", 9, "deg", "abc")]
+        [DataRow("from .hij import A", 9, "abc.hij", "abc.deg")]
+        [DataRow("from ..hij import A", 10, "hij", "abc.deg")]
+        [DataRow("from ..hij import A", 10, "abc.hij", "abc.deg.HIJ")]
+        [DataTestMethod, Priority(0)]
+        public async Task ModuleNameWalker(string code, int index, string expected, string baseCode) {
+            using (var server = await CreateServerAsync(PythonVersions.LatestAvailable3X)) {
+                var analysis = await server.OpenDefaultDocumentAndGetAnalysisAsync(code);
+                var entry = (IPythonProjectEntry)server.GetEntry(analysis.DocumentUri);
+                var walker = new ImportedModuleNameWalker(baseCode, string.Empty, index, null);
+                entry.Tree.Walk(walker);
+                walker.ImportedModules.Should().NotBeEmpty()
+                    .And.NotContainNulls()
+                    .And.Subject.First().Name.Should().Be(expected);
+            }
+        }
+
 /*
         [TestMethod, Priority(0)]
         public async Task Super() {
@@ -5842,32 +5889,6 @@ def fn(self):
             );
         }
 
-        [TestMethod, Priority(0)]
-        public async Task SysModulesSetSpecialization() {
-            var code = @"import sys
-modules = sys.modules
-
-modules['name_in_modules'] = None
-";
-            code += string.Join(
-                Environment.NewLine,
-                Enumerable.Range(0, 100).Select(i => string.Format("sys.modules['name{0}'] = None", i))
-            );
-
-            var entry = ProcessTextV2(code);
-
-            var sys = entry.GetValue<SysModuleInfo>("sys");
-
-            var modules = entry.GetValue<SysModuleInfo.SysModulesDictionaryInfo>("modules");
-            Assert.IsInstanceOfType(modules, typeof(SysModuleInfo.SysModulesDictionaryInfo));
-
-            AssertUtil.ContainsExactly(
-                sys.Modules.Keys,
-                Enumerable.Range(0, 100).Select(i => string.Format("name{0}", i))
-                    .Concat(new[] { "name_in_modules" })
-            );
-        }
-
         [TestMethod, Priority(0)]
         public async Task SysModulesGetSpecialization() {
             var code = @"import sys
@@ -6030,28 +6051,6 @@ public void NullNamedArgument() {
             }
         }
 
-        [TestMethod, Priority(0)]
-        public void ModuleNameWalker() {
-            foreach (var item in new[] {
-                new { Code="import abc", Index=7, Expected="abc", Base="" },
-                new { Code="import abc", Index=8, Expected="abc", Base="" },
-                new { Code="import abc", Index=9, Expected="abc", Base="" },
-                new { Code="import abc", Index=10, Expected="abc", Base="" },
-                new { Code="import deg, abc as A", Index=12, Expected="abc", Base="" },
-                new { Code="from abc import A", Index=6, Expected="abc", Base="" },
-                new { Code="from .deg import A", Index=9, Expected="deg", Base="abc" },
-                new { Code="from .hij import A", Index=9, Expected="abc.hij", Base="abc.deg" },
-                new { Code="from ..hij import A", Index=10, Expected="hij", Base="abc.deg" },
-                new { Code="from ..hij import A", Index=10, Expected="abc.hij", Base="abc.deg.HIJ" },
-            }) {
-                var entry = ProcessTextV3(item.Code);
-                var walker = new ImportedModuleNameWalker(item.Base, string.Empty, item.Index, null);
-                entry.Modules[entry.DefaultModule].Tree.Walk(walker);
-
-                Assert.AreEqual(item.Expected, walker.ImportedModules.FirstOrDefault()?.Name);
-            }
-        }
-
         [TestMethod, Priority(0)]
         public void CrossModuleFunctionCallMemLeak() {
             var modA = @"from B import h

src/LanguageServer/Impl/Program.cs

@@ -29,7 +29,6 @@ namespace Microsoft.Python.LanguageServer.Server {
     internal static class Program {
         public static void Main(string[] args) {
             CheckDebugMode();
-            Debugger.Launch();
             using (CoreShell.Create()) {
                 var services = CoreShell.Current.ServiceManager;
 

src/PLS.sln

@@ -15,9 +15,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Python.Analysis.E
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Python.Analysis.Engine.Tests", "Analysis\Engine\Test\Microsoft.Python.Analysis.Engine.Tests.csproj", "{1CFA416B-6932-432F-8C75-34B5615D7664}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.PythonTools.Analyzer", "PTVS\Microsoft.PythonTools.Analyzer\Microsoft.PythonTools.Analyzer.csproj", "{467679B2-D043-4C7D-855C-5A833B635EEE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.PythonTools.Analyzer", "PTVS\Microsoft.PythonTools.Analyzer\Impl\Microsoft.PythonTools.Analyzer.csproj", "{467679B2-D043-4C7D-855C-5A833B635EEE}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.PythonTools.Ipc.Json", "PTVS\Microsoft.PythonTools.Ipc.Json\Microsoft.PythonTools.Ipc.Json.csproj", "{A5E04CC1-F600-45BA-B493-F7DCBA8C7E1A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.PythonTools.Ipc.Json", "PTVS\Microsoft.PythonTools.Ipc.Json\Impl\Microsoft.PythonTools.Ipc.Json.csproj", "{A5E04CC1-F600-45BA-B493-F7DCBA8C7E1A}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Python.LanguageServer.Core", "LanguageServer\Core\Impl\Microsoft.Python.LanguageServer.Core.csproj", "{0EA1F1C3-2733-423C-BEC5-059BD77F0A3F}"
 EndProject

src/PTVS/Microsoft.PythonTools.Analyzer/Analyzer.csproj

@@ -17,7 +17,6 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-[assembly: AssemblyTitle("Visual Studio - Python background analyzer")]
 [assembly: AssemblyDescription("Performs analysis of the Python standard library and installed site packages.")]
 
-[assembly: ComVisible(false)]
+[assembly: ComVisible(false)]

src/PTVS/Microsoft.PythonTools.Analyzer/AnalyzerScrapers.pyproj renamed to src/PTVS/Microsoft.PythonTools.Analyzer/Impl/AnalyzerScrapers.pyproj

@@ -1558,7 +1558,7 @@ private Response SetAnalysisOptions(AP.SetAnalysisOptionsRequest request) {
             Project.Limits = AnalysisLimitsConverter.FromDictionary(Options.analysisLimits);
             _server.ParseQueue.InconsistentIndentation = DiagnosticsErrorSink.GetSeverity(Options.indentationInconsistencySeverity);
             _server.ParseQueue.TaskCommentMap = Options.commentTokens;
-            _server.Analyzer.SetTypeStubPaths(Options.typeStubPaths);
+            _server.Analyzer.SetTypeStubPaths(Options.typeStubPaths ?? Enumerable.Empty<string>());
 
             return new Response();
         }

src/PTVS/Microsoft.PythonTools.Analyzer/AnalyzerScrapers.sln renamed to src/PTVS/Microsoft.PythonTools.Analyzer/Impl/AnalyzerScrapers.sln

@@ -2,20 +2,21 @@
     <PropertyGroup>
       <TargetFramework>net472</TargetFramework>
       <RootNamespace>Microsoft.PythonTools.Analysis</RootNamespace>
+      <AssemblyTitle>Visual Studio - Python background analyzer</AssemblyTitle>
       <AssemblyName>Microsoft.PythonTools.Analyzer</AssemblyName>
     </PropertyGroup>
-    <Import Project="..\..\..\build\NetStandard.settings" />
+    <Import Project="..\..\..\..\build\NetStandard.settings" />
     <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
     <PropertyGroup>
         <OutputType>Exe</OutputType>
         <DebugType>portable</DebugType>
         <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-      <CodeAnalysisRuleSet>..\..\PLS.ruleset</CodeAnalysisRuleSet>
+      <CodeAnalysisRuleSet>..\..\..\PLS.ruleset</CodeAnalysisRuleSet>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-      <CodeAnalysisRuleSet>..\..\PLS.ruleset</CodeAnalysisRuleSet>
+      <CodeAnalysisRuleSet>..\..\..\PLS.ruleset</CodeAnalysisRuleSet>
     </PropertyGroup>
     <ItemGroup>
       <Compile Remove="obj\**" />
@@ -61,13 +62,13 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\Analysis\Engine\Impl\Microsoft.Python.Analysis.Engine.csproj" />
-    <ProjectReference Include="..\..\LanguageServer\Core\Impl\Microsoft.Python.LanguageServer.Core.csproj" />
-    <ProjectReference Include="..\Microsoft.PythonTools.Ipc.Json\Microsoft.PythonTools.Ipc.Json.csproj" />
+    <ProjectReference Include="..\..\..\Analysis\Engine\Impl\Microsoft.Python.Analysis.Engine.csproj" />
+    <ProjectReference Include="..\..\..\LanguageServer\Core\Impl\Microsoft.Python.LanguageServer.Core.csproj" />
+    <ProjectReference Include="..\..\Microsoft.PythonTools.Ipc.Json\Impl\Microsoft.PythonTools.Ipc.Json.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="NewtonSoft.Json" Version="11.0.2" />
+    <PackageReference Include="NewtonSoft.Json" Version="9.0.1" />
   </ItemGroup>
   <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
-    <Import Project="..\..\..\build\NetStandard.targets" />
+    <Import Project="..\..\..\..\build\NetStandard.targets" />
 </Project>

src/PTVS/Microsoft.PythonTools.Analyzer/App.config renamed to src/PTVS/Microsoft.PythonTools.Analyzer/Impl/App.config

@@ -5,11 +5,11 @@
     <AssemblyName>Microsoft.PythonTools.Ipc.Json</AssemblyName>
     <AssemblyTitle></AssemblyTitle>
   </PropertyGroup>
-  <Import Project="..\..\..\build\NetStandard.settings" />
+  <Import Project="..\..\..\..\build\NetStandard.settings" />
   <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
   <ItemGroup>
-    <PackageReference Include="NewtonSoft.Json" Version="11.0.2" />
+    <PackageReference Include="NewtonSoft.Json" Version="9.0.1" />
   </ItemGroup>
   <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
-  <Import Project="..\..\..\build\NetStandard.targets" />
+  <Import Project="..\..\..\..\build\NetStandard.targets" />
 </Project>