Merge remote-tracking branch 'upstream/master' into liveshare

microsoft · Nov 1, 2018 · 584f2cd · 584f2cd
2 parents 1287b6a + a9e67a5
commit 584f2cd
Show file tree

Hide file tree

Showing 108 changed files with 6,988 additions and 3,446 deletions.
diff --git a/Common/Product/TestAdapter/ServiceProviderExtension.cs b/Common/Product/TestAdapter/ServiceProviderExtension.cs
@@ -27,8 +27,13 @@ public static T GetService<T>(this IServiceProvider serviceProvider)
 
         public static T GetService<T>(this IServiceProvider serviceProvider, Type serviceType)
             where T : class {
-            ValidateArg.NotNull(serviceProvider, "serviceProvider");
-            ValidateArg.NotNull(serviceType, "serviceType");
+            if (serviceProvider == null) {
+                throw new ArgumentNullException(nameof(serviceProvider));
+            }
+
+            if (serviceType == null) {
+                throw new ArgumentNullException(nameof(serviceType));
+            }
 
             var serviceInstance = serviceProvider.GetService(serviceType) as T;
             if (serviceInstance == null) {

diff --git a/Python/Product/Common/Strings.Designer.cs b/Python/Product/Common/Strings.Designer.cs
diff --git a/Python/Product/Common/Strings.resx b/Python/Product/Common/Strings.resx
@@ -2260,16 +2260,22 @@ Expand selection to the full expression?</value>
     <value>Python installation</value>
   </data>
   <data name="AddInstalledEnvironmentInstallationLabel" xml:space="preserve">
-    <value>Python installation</value>
+    <value>Python</value>
   </data>
   <data name="AddInstalledEnvironmentDescription" xml:space="preserve">
-    <value>To install a new Python interpreter, open Visual Studio Installer and install it from there.</value>
+    <value>The Visual Studio Installer supports the following versions of Python. Select one or more to install:</value>
   </data>
   <data name="AddInstalledEnvironmentLabel" xml:space="preserve">
     <value>Python installation</value>
   </data>
   <data name="AddInstalledEnvironmentLaunch" xml:space="preserve">
-    <value>Open Visual Studio Installer</value>
+    <value>Install</value>
+  </data>
+  <data name="AddInstalledEnvironmentInstalledLabel" xml:space="preserve">
+    <value>Already installed</value>
+  </data>
+  <data name="AddInstalledEnvironmentNone" xml:space="preserve">
+    <value>(none)</value>
   </data>
   <data name="AddCondaEnvironmentTabHeader" xml:space="preserve">
     <value>Conda environment</value>
@@ -2473,9 +2479,6 @@ Please specify at least one package.</value>
   <data name="AddExistingEnvironmentVersionEmpty" xml:space="preserve">
     <value>Version is not specified.</value>
   </data>
-  <data name="WaitForEnvTimeout" xml:space="preserve">
-    <value>Timed out waiting for environment '{0}' to be detected. The environment may have failed to be created or the environment may not include a Python package.</value>
-  </data>
   <data name="CondaExecutableFilter" xml:space="preserve">
     <value>Executable Files (*.exe)|*.exe|All Files (*.*)|*.*</value>
   </data>

diff --git a/Python/Product/Debugger/Debugger.csproj b/Python/Product/Debugger/Debugger.csproj
@@ -193,7 +193,7 @@
   </ItemGroup>
   <Import Project="..\ProjectAfter.settings" />
   <PropertyGroup>
-    <BundledPTVSDVersion>4.1.3</BundledPTVSDVersion>
+    <BundledPTVSDVersion>4.1.4</BundledPTVSDVersion>
   </PropertyGroup>
   <Target Name="_GatherPtvsd" BeforeTargets="_IncludePtvsd" Condition="!Exists('$(IntermediateOutputPath)Packages\ptvsd\__init__.py')">
     <PropertyGroup>

diff --git a/Python/Product/Django/Django.csproj b/Python/Product/Django/Django.csproj
@@ -264,12 +264,17 @@
   <Choose>
     <When Condition="$(IncludeDjangoHtmlExtensions) == 'true'">
       <ItemGroup>
-        <Reference Include="Microsoft.Web.Core" />
-        <Reference Include="Microsoft.Web.Editor" />
-        <Reference Include="Microsoft.Html.Core" />
-        <Reference Include="Microsoft.Html.Editor" />
-        <Reference Include="Microsoft.VisualStudio.Html.Package" />
         <Reference Include="Microsoft.VisualStudio.Web.HTML" />
+        <Reference Include="Microsoft.Web.Core" Condition=" '$(VSTarget)' == '15.0' " />
+        <Reference Include="Microsoft.Web.Editor" Condition=" '$(VSTarget)' == '15.0' " />
+        <Reference Include="Microsoft.Html.Core" Condition=" '$(VSTarget)' == '15.0' " />
+        <Reference Include="Microsoft.Html.Editor" Condition=" '$(VSTarget)' == '15.0' " />
+        <Reference Include="Microsoft.VisualStudio.Html.Package" Condition=" '$(VSTarget)' == '15.0' " />
+        <Reference Include="Microsoft.WebTools.Languages.dll" Condition=" '$(VSTarget)' == '16.0' " />
+        <Reference Include="Microsoft.WebTools.Languages.Editor.dll" Condition=" '$(VSTarget)' == '16.0' " />
+        <Reference Include="Microsoft.WebTools.Languages.Html.dll" Condition=" '$(VSTarget)' == '16.0' " />
+        <Reference Include="Microsoft.WebTools.Languages.Html.Editor.dll" Condition=" '$(VSTarget)' == '16.0' " />
+        <Reference Include="Microsoft.WebTools.Languages.Html.VS.dll" Condition=" '$(VSTarget)' == '16.0' " />
       </ItemGroup>
       <ItemGroup>
         <Compile Include="DjangoEditorFactory.cs" />

diff --git a/Python/Product/Django/DjangoEditorFactory.cs b/Python/Product/Django/DjangoEditorFactory.cs
@@ -16,7 +16,11 @@
 
 using System;
 using System.Runtime.InteropServices;
+#if DEV16_OR_LATER
+using Microsoft.WebTools.Languages.Html.VS.Package.Common;
+#else
 using Microsoft.VisualStudio.Html.Package.Package.Common;
+#endif
 
 namespace Microsoft.PythonTools.Django {
     [Guid(GuidList.guidDjangoEditorFactoryString)]

diff --git a/Python/Product/Django/Formatting/TemplateEditorFormatterProvider.cs b/Python/Product/Django/Formatting/TemplateEditorFormatterProvider.cs
@@ -16,7 +16,11 @@
 
 using System.ComponentModel.Composition;
 using Microsoft.VisualStudio.Utilities;
+#if DEV16_OR_LATER
+using Microsoft.WebTools.Languages.Editor.Formatting;
+#else
 using Microsoft.Web.Editor.Formatting;
+#endif
 
 namespace Microsoft.PythonTools.Django.Formatting {
     [Export(typeof(IEditorFormatterProvider))]

diff --git a/Python/Product/Django/Formatting/TemplateFormatDocumentCommandHandler.cs b/Python/Product/Django/Formatting/TemplateFormatDocumentCommandHandler.cs
@@ -18,7 +18,11 @@
 using Microsoft.VisualStudio;
 using Microsoft.VisualStudio.Text.Editor;
 using Microsoft.Web.Editor;
+#if DEV16_OR_LATER
+using Microsoft.WebTools.Languages.Editor.Controller.Command;
+#else
 using Microsoft.Web.Editor.Controller.Command;
+#endif
 
 namespace Microsoft.PythonTools.Django.Formatting {
     internal class TemplateFormatDocumentCommandHandler : EditingCommand {

diff --git a/Python/Product/Django/Formatting/TemplateFormatSelectionCommandHandler.cs b/Python/Product/Django/Formatting/TemplateFormatSelectionCommandHandler.cs
@@ -18,7 +18,11 @@
 using Microsoft.VisualStudio;
 using Microsoft.VisualStudio.Text.Editor;
 using Microsoft.Web.Editor;
+#if DEV16_OR_LATER
+using Microsoft.WebTools.Languages.Editor.Controller.Command;
+#else
 using Microsoft.Web.Editor.Controller.Command;
+#endif
 
 namespace Microsoft.PythonTools.Django.Formatting {
     internal class TemplateFormatSelectionCommandHandler : EditingCommand {

diff --git a/Python/Product/Django/Formatting/TemplateHtmlCommandFactory.cs b/Python/Product/Django/Formatting/TemplateHtmlCommandFactory.cs
@@ -19,7 +19,11 @@
 using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Text.Editor;
 using Microsoft.VisualStudio.Utilities;
+#if DEV16_OR_LATER
+using Microsoft.WebTools.Languages.Editor.Controller;
+#else
 using Microsoft.Web.Editor.Controller;
+#endif
 
 namespace Microsoft.PythonTools.Django.Formatting {
     [Export(typeof(ICommandFactory))]

diff --git a/Python/Product/Django/Intellisense/DjangoCompletionSource.cs b/Python/Product/Django/Intellisense/DjangoCompletionSource.cs
@@ -17,12 +17,17 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.Html.Editor.Document;
 using Microsoft.PythonTools.Django.TemplateParsing;
 using Microsoft.PythonTools.Intellisense;
 using Microsoft.VisualStudio.Language.Intellisense;
 using Microsoft.VisualStudio.Text;
+#if DEV16_OR_LATER
+using Microsoft.WebTools.Languages.Html.Editor.Document;
+using Microsoft.WebTools.Languages.Text;
+#else
+using Microsoft.Html.Editor.Document;
 using Microsoft.Web.Core.Text;
+#endif
 
 namespace Microsoft.PythonTools.Django.Intellisense {
     internal class DjangoCompletionSource : DjangoCompletionSourceBase {

diff --git a/Python/Product/Django/Intellisense/ProjectBlockCompletionContext.cs b/Python/Product/Django/Intellisense/ProjectBlockCompletionContext.cs
@@ -15,10 +15,14 @@
 // permissions and limitations under the License.
 
 using System.Linq;
-using Microsoft.Html.Editor.Document;
 using Microsoft.PythonTools.Django.TemplateParsing;
 using Microsoft.PythonTools.Intellisense;
 using Microsoft.VisualStudio.Text;
+#if DEV16_OR_LATER
+using Microsoft.WebTools.Languages.Html.Editor.Document;
+#else
+using Microsoft.Html.Editor.Document;
+#endif
 
 namespace Microsoft.PythonTools.Django.Intellisense {
     internal class ProjectBlockCompletionContext : ProjectBlockCompletionContextBase {

diff --git a/Python/Product/Django/Intellisense/TemplateCommandFactory.cs b/Python/Product/Django/Intellisense/TemplateCommandFactory.cs
@@ -20,7 +20,11 @@
 using Microsoft.VisualStudio.Text.Editor;
 using Microsoft.VisualStudio.Text.Operations;
 using Microsoft.VisualStudio.Utilities;
+#if DEV16_OR_LATER
+using Microsoft.WebTools.Languages.Editor.Controller;
+#else
 using Microsoft.Web.Editor.Controller;
+#endif
 
 namespace Microsoft.PythonTools.Django.Intellisense {
     [Export(typeof(ICommandFactory))]

diff --git a/Python/Product/Django/Intellisense/TemplateCompletionCommandHandler.cs b/Python/Product/Django/Intellisense/TemplateCompletionCommandHandler.cs
@@ -15,8 +15,13 @@
 // permissions and limitations under the License.
 
 using Microsoft.VisualStudio.Text.Editor;
+#if DEV16_OR_LATER
+using Microsoft.WebTools.Languages.Editor.Completion;
+using Microsoft.WebTools.Languages.Editor.Services;
+#else
 using Microsoft.Web.Editor.Completion;
 using Microsoft.Web.Editor.Services;
+#endif
 
 namespace Microsoft.PythonTools.Django.Intellisense {
     internal class TemplateCompletionCommandHandler : CompletionCommandHandler {

diff --git a/Python/Product/Django/Intellisense/TemplateCompletionController.cs b/Python/Product/Django/Intellisense/TemplateCompletionController.cs
@@ -18,7 +18,11 @@
 using Microsoft.VisualStudio.Language.Intellisense;
 using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Text.Editor;
+#if DEV16_OR_LATER
+using Microsoft.WebTools.Languages.Editor.Completion;
+#else
 using Microsoft.Web.Editor.Completion;
+#endif
 
 namespace Microsoft.PythonTools.Django.Intellisense {
     internal class TemplateCompletionController : CompletionController {

diff --git a/Python/Product/Django/Intellisense/TemplateCompletionControllerProvider.cs b/Python/Product/Django/Intellisense/TemplateCompletionControllerProvider.cs
@@ -22,7 +22,11 @@
 using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Text.Editor;
 using Microsoft.VisualStudio.Utilities;
+#if DEV16_OR_LATER
+using Microsoft.WebTools.Languages.Editor.Services;
+#else
 using Microsoft.Web.Editor.Services;
+#endif
 
 namespace Microsoft.PythonTools.Django.Intellisense {
     [Export(typeof(IIntellisenseControllerProvider)), ContentType(TemplateTagContentType.ContentTypeName), Order]

diff --git a/Python/Product/Django/Intellisense/TemplateMainController.cs b/Python/Product/Django/Intellisense/TemplateMainController.cs
@@ -16,8 +16,13 @@
 
 using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Text.Editor;
+#if DEV16_OR_LATER
+using Microsoft.WebTools.Languages.Editor.Controller;
+using Microsoft.WebTools.Languages.Editor.Services;
+#else
 using Microsoft.Web.Editor.Controller;
 using Microsoft.Web.Editor.Services;
+#endif
 
 namespace Microsoft.PythonTools.Django.Intellisense {
     internal class TemplateMainController : ViewController {

diff --git a/Python/Product/Django/Intellisense/TemplateTextViewConnectionListener.cs b/Python/Product/Django/Intellisense/TemplateTextViewConnectionListener.cs
@@ -19,10 +19,17 @@
 using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Text.Editor;
 using Microsoft.VisualStudio.Utilities;
+#if DEV16_OR_LATER
+using Microsoft.WebTools.Languages.Editor.ContainedLanguage;
+using Microsoft.WebTools.Languages.Editor.Controller;
+using Microsoft.WebTools.Languages.Editor.Host;
+using Microsoft.WebTools.Languages.Editor.Services;
+#else
 using Microsoft.Web.Editor.ContainedLanguage;
 using Microsoft.Web.Editor.Controller;
 using Microsoft.Web.Editor.Host;
 using Microsoft.Web.Editor.Services;
+#endif
 using ITextViewCreationListener = Microsoft.VisualStudio.Text.Editor.ITextViewCreationListener;
 
 namespace Microsoft.PythonTools.Django.Intellisense {

diff --git a/Python/Product/Django/Intellisense/TemplateTypingCommandHandler.cs b/Python/Product/Django/Intellisense/TemplateTypingCommandHandler.cs
@@ -17,8 +17,13 @@
 using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Text.Editor;
 using Microsoft.VisualStudio.Text.Operations;
+#if DEV16_OR_LATER
+using Microsoft.WebTools.Languages.Editor.Completion;
+using Microsoft.WebTools.Languages.Editor.Services;
+#else
 using Microsoft.Web.Editor.Completion;
 using Microsoft.Web.Editor.Services;
+#endif
 
 namespace Microsoft.PythonTools.Django.Intellisense {
     internal class TemplateTypingCommandHandler : TypingCommandHandler {

diff --git a/Python/Product/Django/TemplateContentType.cs b/Python/Product/Django/TemplateContentType.cs
@@ -16,7 +16,11 @@
 
 using System.ComponentModel.Composition;
 using Microsoft.VisualStudio.Utilities;
+#if DEV16_OR_LATER
+using Microsoft.WebTools.Languages.ContentTypes;
+#else
 using Microsoft.Web.Core.ContentTypes;
+#endif
 
 namespace Microsoft.PythonTools.Django {
     /// <summary>

diff --git a/Python/Product/Django/TemplateParsing/TemplateArtifact.cs b/Python/Product/Django/TemplateParsing/TemplateArtifact.cs
@@ -17,9 +17,14 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.Html.Core.Artifacts;
 using Microsoft.PythonTools.Django.Intellisense;
+#if DEV16_OR_LATER
+using Microsoft.WebTools.Languages.Html.Artifacts;
+using Microsoft.WebTools.Languages.Text;
+#else
+using Microsoft.Html.Core.Artifacts;
 using Microsoft.Web.Core.Text;
+#endif
 
 namespace Microsoft.PythonTools.Django.TemplateParsing {
     /// <summary>