Merge branch 'master' into UnitTestJavaScriptPhase1

Paul van Brenk · Paul van Brenk · commit 53ebde8a4530 · 2018-05-11T13:43:03.000-07:00
# Conflicts:
#	Nodejs/Product/Nodejs/Nodejs.cs
diff --git a/Build/Common.Build.settings b/Build/Common.Build.settings
@@ -29,7 +29,7 @@
     <VSTarget Condition="$(VSTarget)==''">15.0</VSTarget>
     <BuildingInsideVisualStudio Condition="'$(BuildingInsideVisualStudio)' == ''">false</BuildingInsideVisualStudio>
 
-    <TargetFrameworkVersion Condition="'$(TargetFrameworkVersion)' == ''">v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion Condition="'$(TargetFrameworkVersion)' == ''">v4.6.1</TargetFrameworkVersion>
     <TargetFrameworkMoniker>.NETFramework,Version=$(TargetFrameworkVersion)</TargetFrameworkMoniker>
 
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
diff --git a/Nodejs/Product/Nodejs/Nodejs.cs b/Nodejs/Product/Nodejs/Nodejs.cs
@@ -5,10 +5,15 @@
 using System.IO;
 #if !NO_WINDOWS
 using System.Windows.Forms;
-using Microsoft.NodejsTools.Project;
 #endif
 using Microsoft.Win32;
+
+#if !NO_WINDOWS
+using Microsoft.NodejsTools.Project;
+#endif
 using Microsoft.VisualStudioTools;
+//using Microsoft.VisualStudio.Shell;
+//using Microsoft.VisualStudio.Shell.Interop;
 
 namespace Microsoft.NodejsTools
 {
@@ -133,6 +138,32 @@ public static string GetPathToNodeExecutableFromEnvironment(string executable =
                 }
             }
 
+            // TODO: this doesn't work in the NPM assembly figure out how to make that work.
+            //const string nodeJsPackageRegistryKey = "Microsoft.VisualStudio.Package.NodeJs";
+            //const string node32Value = "NodeExecutablePath32";
+            //const string node64Value = "NodeExecutablePath64";
+            //const string npmValue = "NpmExecutablePath";
+
+            //// Attempt to find Node.js/NPM from the VS package
+            //using (var nodeJsPackageKey = VSRegistry.RegistryRoot(__VsLocalRegistryType.RegType_Configuration, writable: false).CreateSubKey(nodeJsPackageRegistryKey))
+            //{
+            //    if (executable == "node.exe")
+            //    {
+            //        if (Environment.Is64BitOperatingSystem)
+            //        {
+            //            return nodeJsPackageKey.GetValue(node64Value) as string;
+            //        }
+            //        else
+            //        {
+            //            return nodeJsPackageKey.GetValue(node32Value) as string;
+            //        }
+            //    }
+            //    else if (executable == "npm.cmd")
+            //    {
+            //        return nodeJsPackageKey.GetValue(npmValue) as string;
+            //    }
+            //}
+
             // we didn't find the path.
             return null;
         }
@@ -158,5 +189,5 @@ public static void ShowNodejsPathNotFound(string path)
             );
         }
 #endif
-   }
+    }
 }
diff --git a/Nodejs/Product/Nodejs/Nodejs.csproj b/Nodejs/Product/Nodejs/Nodejs.csproj
@@ -190,6 +190,7 @@
     <Compile Include="Commands\ImportWizardCommand.cs" />
     <Compile Include="Commands\OpenReplWindowCommand.cs" />
     <Compile Include="Debugger\DebugEngine\AD7EvalErrorProperty.cs" />
+    <Compile Include="Repl\InteractiveWindowContentType.cs" />
     <Compile Include="TypeScriptHelpers\TsConfigJson.cs" />
     <Compile Include="TypeScriptHelpers\TsConfigJsonFactory.cs" />
     <Compile Include="TypeScriptHelpers\TypeScriptCompile.cs" />
@@ -958,7 +959,7 @@
     <Content Include="visualstudio_nodejs_repl.js">
       <IncludeInVSIX>true</IncludeInVSIX>
       <VSIXSubpath>.</VSIXSubpath>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
     <ZipProject Include="ProjectTemplates\NodejsWebApp\NodejsWebApp.vstemplate">
       <SubType>Designer</SubType>
diff --git a/Nodejs/Product/Nodejs/NodejsPackage.cs b/Nodejs/Product/Nodejs/NodejsPackage.cs
@@ -171,7 +171,7 @@ protected override int CreateToolWindow(ref Guid toolWindowType, int id)
             {
                 var replProvider = this.GetInteractiveWindowProvider();
 
-                replProvider.CreateReplWindow(id);
+                replProvider.OpenOrCreateWindow(id);
                 return VSConstants.S_OK;
             }
 
@@ -182,7 +182,7 @@ internal void OpenReplWindow(bool focus = true)
         {
             var replProvider = this.GetInteractiveWindowProvider();
 
-            replProvider.OpenOrCreateWindow().Show(focus);
+            replProvider.OpenOrCreateWindow(-1).Show(focus);
         }
 
         private InteractiveWindowProvider GetInteractiveWindowProvider()
diff --git a/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/package.json b/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/package.json
@@ -20,9 +20,9 @@
     "@types/express-serve-static-core": "^4.0.50",
     "@types/mime": "^1.3.1",
     "@types/serve-static": "^1.7.32",
-    "@types/node": "^6.0.87"
+    "@types/node": "^8.0.14"
   },
   "engines": {
-    "node": "~6.10.x"
+    "node": "^8.0.0"
   }
 }
diff --git a/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/tsconfig.json b/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/tsconfig.json
@@ -1,8 +1,8 @@
 {
   "compilerOptions": {
     "module": "commonjs",
-    "target": "es5",
-    "lib": ["es5"],
+    "target": "es6",
+    "lib": ["es6"],
     "sourceMap": true
   },
   "exclude": [
diff --git a/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureNodejsWorker/package.json b/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureNodejsWorker/package.json
@@ -9,9 +9,9 @@
     "name": ""
   },
   "devDependencies": {
-    "@types/node": "^6.0.87"
+    "@types/node": "^8.0.14"
   },
   "engines": {
-    "node": "~6.10.x"
+    "node": "^8.0.x"
   }
 }
diff --git a/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureWebApp/package.json b/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureWebApp/package.json
@@ -9,9 +9,9 @@
     "name": ""
   },
   "devDependencies": {
-    "@types/node": "^6.0.87"
+    "@types/node": "^8.0.14"
   },
   "engines": {
-    "node": "~6.10.x"
+    "node": "^8.0.0"
   }
 }
diff --git a/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureWebApp/tsconfig.json b/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureWebApp/tsconfig.json
@@ -1,8 +1,8 @@
 {
   "compilerOptions": {
     "module": "commonjs",
-    "target": "es5",
-    "lib": ["es5"],
+    "target": "es6",
+    "lib": ["es6"],
     "sourceMap": true
   },
   "exclude": [
diff --git a/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureWebRole/package.json b/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureWebRole/package.json
@@ -9,9 +9,9 @@
     "name": ""
   },
   "devDependencies": {
-    "@types/node": "^6.0.87"
+    "@types/node": "^8.0.14"
   },
   "engines": {
-    "node": "~6.10.x"
+    "node": "^8.0.0"
   }
 }
diff --git a/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptConsoleApp/package.json b/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptConsoleApp/package.json
@@ -7,6 +7,6 @@
     "name": ""
   },
   "devDependencies": {
-    "@types/node": "^6.0.87"
+    "@types/node": "^8.0.14"
   }
 }
diff --git a/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptConsoleApp/tsconfig.json b/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptConsoleApp/tsconfig.json
@@ -1,8 +1,8 @@
 {
   "compilerOptions": {
     "module": "commonjs",
-    "target": "es5",
-    "lib": ["es5"],
+    "target": "es6",
+    "lib": ["es6"],
     "sourceMap": true
   },
   "exclude": [
diff --git a/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptExpressApp/package.json b/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptExpressApp/package.json
@@ -21,6 +21,6 @@
     "@types/express-serve-static-core": "^4.0.50",
     "@types/mime": "^1.3.1",
     "@types/serve-static": "^1.7.32",
-    "@types/node": "^6.0.87"
+    "@types/node": "^8.0.14"
   }
 }
diff --git a/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptExpressApp/tsconfig.json b/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptExpressApp/tsconfig.json
@@ -1,8 +1,8 @@
 {
   "compilerOptions": {
     "module": "commonjs",
-    "target": "es5",
-    "lib": ["es5"],
+    "target": "es6",
+    "lib": ["es6"],
     "sourceMap": true
   },
   "exclude": [
diff --git a/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptWebApp/package.json b/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptWebApp/package.json
@@ -7,6 +7,6 @@
     "name": ""
   },
   "devDependencies": {
-    "@types/node": "^6.0.87"
+    "@types/node": "^8.0.14"
   }
 }
diff --git a/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptWebApp/tsconfig.json b/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptWebApp/tsconfig.json
@@ -1,8 +1,8 @@
 {
   "compilerOptions": {
     "module": "commonjs",
-    "target": "es5",
-    "lib": ["es5"],
+    "target": "es6",
+    "lib": ["es6"],
     "sourceMap": true
   },
   "exclude": [
diff --git a/Nodejs/Product/Nodejs/Repl/InfoReplCommand.cs b/Nodejs/Product/Nodejs/Repl/InfoReplCommand.cs
@@ -12,7 +12,7 @@
 namespace Microsoft.NodejsTools.Repl
 {
     [Export(typeof(IInteractiveWindowCommand))]
-    [ContentType(NodejsConstants.TypeScript)]
+    [ContentType(InteractiveWindowContentType.ContentType)]
     internal sealed class InfoReplCommand : InteractiveWindowCommand
     {
         public override Task<ExecutionResult> Execute(IInteractiveWindow window, string arguments)
diff --git a/Nodejs/Product/Nodejs/Repl/InteractiveWindowContentType.cs b/Nodejs/Product/Nodejs/Repl/InteractiveWindowContentType.cs
@@ -0,0 +1,20 @@
+﻿// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.ComponentModel.Composition;
+using Microsoft.VisualStudio.InteractiveWindow.Commands;
+using Microsoft.VisualStudio.Utilities;
+
+namespace Microsoft.NodejsTools.Repl
+{
+    internal static class InteractiveWindowContentType
+    {
+        /// <summary>
+        /// Used for binding the commands to the interactive window.
+        /// Note: we use the TypeScript content type for colorization.
+        /// </summary>
+        public const string ContentType = "NodeInteractiveWindow";
+
+        [Export, Name(ContentType), BaseDefinition(PredefinedInteractiveCommandsContentTypes.InteractiveCommandContentTypeName)]
+        internal static ContentTypeDefinition ContentTypeDefinition = null;
+    }
+}
diff --git a/Nodejs/Product/Nodejs/Repl/InteractiveWindowProvider.cs b/Nodejs/Product/Nodejs/Repl/InteractiveWindowProvider.cs
@@ -21,7 +21,8 @@ internal sealed class InteractiveWindowProvider
 
         private readonly IServiceProvider serviceProvider;
         private readonly IVsInteractiveWindowFactory windowFactory;
-        private readonly IContentType contentType;
+        private readonly IContentType typeScriptContentType;
+        private readonly IContentType nodeInteractiveContentType;
 
         [ImportingConstructor]
         public InteractiveWindowProvider(
@@ -32,20 +33,21 @@ public InteractiveWindowProvider(
             this.serviceProvider = serviceProvider;
             this.windowFactory = factory;
 
-            this.contentType = contentTypeService.GetContentType(NodejsConstants.TypeScript);
+            this.typeScriptContentType = contentTypeService.GetContentType(NodejsConstants.TypeScript);
+            this.nodeInteractiveContentType = contentTypeService.GetContentType(InteractiveWindowContentType.ContentType);
         }
 
-        public IVsInteractiveWindow OpenOrCreateWindow()
+        public IVsInteractiveWindow OpenOrCreateWindow(int id)
         {
             if (this.window == null)
             {
-                this.window = CreateReplWindow();
+                this.window = CreateReplWindow(id);
             }
 
             return this.window;
         }
 
-        public IVsInteractiveWindow CreateReplWindow(int replId = -1)
+        private IVsInteractiveWindow CreateReplWindow(int replId)
         {
             if (replId < 0)
             {
@@ -68,7 +70,7 @@ public IVsInteractiveWindow CreateReplWindow(int replId = -1)
 
         private IInteractiveEvaluator GetReplEvaluator()
         {
-            return new NodejsReplEvaluator(this.serviceProvider, this.contentType);
+            return new NodejsReplEvaluator(this.serviceProvider, this.nodeInteractiveContentType);
         }
 
         private IVsInteractiveWindow CreateReplWindowInternal(IInteractiveEvaluator evaluator, int id, string title, Guid languageServiceGuid)
@@ -89,7 +91,7 @@ private IVsInteractiveWindow CreateReplWindowInternal(IInteractiveEvaluator eval
             {
                 toolwindow.BitmapImageMoniker = KnownMonikers.JSInteractiveWindow;
             }
-            replWindow.SetLanguage(languageServiceGuid, this.contentType);
+            replWindow.SetLanguage(languageServiceGuid, this.typeScriptContentType);
             replWindow.InteractiveWindow.InitializeAsync();
 
             return replWindow;
diff --git a/Nodejs/Product/Nodejs/Repl/NpmReplCommand.cs b/Nodejs/Product/Nodejs/Repl/NpmReplCommand.cs
@@ -23,7 +23,7 @@
 namespace Microsoft.NodejsTools.Repl
 {
     [Export(typeof(IInteractiveWindowCommand))]
-    [ContentType(NodejsConstants.TypeScript)]
+    [ContentType(InteractiveWindowContentType.ContentType)]
     internal class NpmReplCommand : InteractiveWindowCommand
     {
         public override async Task<ExecutionResult> Execute(IInteractiveWindow window, string arguments)
diff --git a/Nodejs/Product/Nodejs/Repl/SaveReplCommand.cs b/Nodejs/Product/Nodejs/Repl/SaveReplCommand.cs
@@ -15,7 +15,7 @@
 namespace Microsoft.NodejsTools.Repl
 {
     [Export(typeof(IInteractiveWindowCommand))]
-    [ContentType(NodejsConstants.TypeScript)]
+    [ContentType(InteractiveWindowContentType.ContentType)]
     internal class SaveReplCommand : InteractiveWindowCommand
     {
         public override Task<ExecutionResult> Execute(IInteractiveWindow window, string arguments)
diff --git a/Nodejs/Product/Nodejs/visualstudio_nodejs_repl.js b/Nodejs/Product/Nodejs/visualstudio_nodejs_repl.js
@@ -26,7 +26,7 @@ for (; ;) {
 
 function send_response(socket, data) {
     var str = JSON.stringify(data);
-    var buf = Buffer(str);
+    var buf = Buffer.from(str);
     socket.write('Content-length: ' + buf.length + '\r\n\r\n');
     socket.write(buf);
 }
@@ -126,7 +126,7 @@ function processRequest(command) {
     }
 }
 
-var reader_state = { 'prevData': Buffer(0), 'state': 'header' }
+var reader_state = { 'prevData': Buffer.allocUnsafe(0), 'state': 'header' }
 
 client.on('data', function (data) {
     try {
@@ -153,7 +153,7 @@ client.on('data', function (data) {
                         throw 'expected Content-Length header, got ' + header;
                     }
 
-                    data = Buffer(0);
+                    data = Buffer.allocUnsafe(0);
                     reader_state['prevData'] = incoming.slice(endOfHeaders + 4, incoming.length);
                     reader_state['state'] = 'body';
                     reader_state['contentLength'] = contentLength;
diff --git a/Nodejs/Product/TestAdapterImpl/TestContainerDiscoverer.cs b/Nodejs/Product/TestAdapterImpl/TestContainerDiscoverer.cs
@@ -374,7 +374,7 @@ private bool ShouldDiscover(string pathToItem)
             }
 
             //Setting/updating "TestFramework" property on a file item will cause metedata change in the project file,
-            //so we need to re-discover when file change happens. Since we support all project files, this is a save check
+            //so we need to re-discover when file change happens. Since we support all project files, this is a safe check
             if (pathToItem.EndsWith("proj", StringComparison.OrdinalIgnoreCase))
             {
                 return true;
diff --git a/README.md b/README.md
@@ -1,13 +1,12 @@
 # Node.js tools for Visual Studio
 
-Node.js tools for [Visual Studio 2017](http://aka.ms/explorentvs) is developed and managed here.
+Node.js tools for Visual Studio 2017 is developed and managed here.
 
 ![Build status for master branch](https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/4492/badge)
 [![Join the chat at https://gitter.im/Microsoft/nodejstools](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/Microsoft/nodejstools?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 
-Visit our page on [VisualStudio.com](https://aka.ms/explorentvs) for an overview and download links, 
-and check out our documentation on [the NTVS wiki](https://github.com/Microsoft/nodejstools/wiki) 
+Check out our documentation on [the NTVS wiki](https://github.com/Microsoft/nodejstools/wiki) 
 and our (old) [feature overview](https://channel9.msdn.com/events/Visual-Studio/Connect-event-2015/801) video on Channel 9.
 
 Feel free to file issues or ask questions on our [issue tracker](http://github.com/Microsoft/nodejstools/issues), 
@@ -16,7 +15,7 @@ and we welcome code contributions - see
 
 ## Visual Studio 2017 installation
 
-The Node.js development workload is available as part of [Visual Studio 2017](https://aka.ms/explorentvs) Community, Professional 
+The Node.js development workload is available as part of Visual Studio 2017 Community, Professional 
 and Enterprise. 
 To install, run the [normal VS installer](https://visualstudio.com/vs/downloads?wt.mc_id=github_microsoft_com) 
 and select the **Node.js development workload**.
@@ -41,4 +40,4 @@ contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additio
 ## License
 [Apache License 2.0 (Apache)](https://github.com/Microsoft/nodejstools/blob/master/LICENSE)
 
-Thank you for using and supporting the Node.js Tools for Visual Studio.
+Thank you for using and supporting the Node.js Tools for Visual Studio.

Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,7 @@ protected override int CreateToolWindow(ref Guid toolWindowType, int id)`
`171`	`171`	`{`
`172`	`172`	`var replProvider = this.GetInteractiveWindowProvider();`
`173`	`173`
`174`		`- replProvider.CreateReplWindow(id);`
	`174`	`+ replProvider.OpenOrCreateWindow(id);`
`175`	`175`	`return VSConstants.S_OK;`
`176`	`176`	`}`
`177`	`177`
`@@ -182,7 +182,7 @@ internal void OpenReplWindow(bool focus = true)`
`182`	`182`	`{`
`183`	`183`	`var replProvider = this.GetInteractiveWindowProvider();`
`184`	`184`
`185`		`- replProvider.OpenOrCreateWindow().Show(focus);`
	`185`	`+ replProvider.OpenOrCreateWindow(-1).Show(focus);`
`186`	`186`	`}`
`187`	`187`
`188`	`188`	`private InteractiveWindowProvider GetInteractiveWindowProvider()`
Original file line number	Diff line number	Diff line change
`@@ -20,9 +20,9 @@`
`20`	`20`	`"@types/express-serve-static-core": "^4.0.50",`
`21`	`21`	`"@types/mime": "^1.3.1",`
`22`	`22`	`"@types/serve-static": "^1.7.32",`
`23`		`- "@types/node": "^6.0.87"`
	`23`	`+ "@types/node": "^8.0.14"`
`24`	`24`	`},`
`25`	`25`	`"engines": {`
`26`		`- "node": "~6.10.x"`
	`26`	`+ "node": "^8.0.0"`
`27`	`27`	`}`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,9 @@`
`9`	`9`	`"name": ""`
`10`	`10`	`},`
`11`	`11`	`"devDependencies": {`
`12`		`- "@types/node": "^6.0.87"`
	`12`	`+ "@types/node": "^8.0.14"`
`13`	`13`	`},`
`14`	`14`	`"engines": {`
`15`		`- "node": "~6.10.x"`
	`15`	`+ "node": "^8.0.x"`
`16`	`16`	`}`
`17`	`17`	`}`