Add better support for .jsx

Author: Paul van Brenk

Nodejs/Product/Nodejs/NodejsConstants.cs

@@ -8,6 +8,7 @@ namespace Microsoft.NodejsTools
     internal static class NodejsConstants
     {
         internal const string JavaScriptExtension = ".js";
+        internal const string JavaScriptJsxExtension = ".jsx";
         internal const string TypeScriptExtension = ".ts";
         internal const string TypeScriptJsxExtension = ".tsx";
         internal const string TypeScriptDeclarationExtension = ".d.ts";

Nodejs/Product/Nodejs/Project/NodejsProjectNode.cs

@@ -198,7 +198,8 @@ internal static bool IsNodejsFile(string strFileName)
         {
             var ext = Path.GetExtension(strFileName);
 
-            return StringComparer.OrdinalIgnoreCase.Equals(ext, NodejsConstants.JavaScriptExtension);
+            return StringComparer.OrdinalIgnoreCase.Equals(ext, NodejsConstants.JavaScriptExtension) ||
+                StringComparer.OrdinalIgnoreCase.Equals(ext, NodejsConstants.JavaScriptJsxExtension);
         }
 
         internal override string GetItemType(string filename)
@@ -209,7 +210,7 @@ internal override string GetItemType(string filename)
                 Path.Combine(this.ProjectHome, filename);
 
             var node = this.FindNodeByFullPath(absFileName) as NodejsFileNode;
-            if (node != null && node.ItemNode.ItemTypeName != null)
+            if (node?.ItemNode?.ItemTypeName != null)
             {
                 return node.ItemNode.ItemTypeName;
             }
@@ -271,7 +272,14 @@ protected override bool DisableCmdInCurrentMode(Guid commandGroup, uint command)
             return false;
         }
 
-        public override string[] CodeFileExtensions => new[] { NodejsConstants.JavaScriptExtension };
+        private static readonly string[] codeFileExtensions = new[] {
+            NodejsConstants.JavaScriptExtension,
+            NodejsConstants.JavaScriptJsxExtension,
+            NodejsConstants.TypeScriptExtension,
+            NodejsConstants.TypeScriptJsxExtension
+        };
+
+        public override string[] CodeFileExtensions => codeFileExtensions;
 
         protected internal override FolderNode CreateFolderNode(ProjectElement element)
         {
@@ -359,7 +367,8 @@ protected override NodeProperties CreatePropertiesObject()
         public override bool IsCodeFile(string fileName)
         {
             var ext = Path.GetExtension(fileName);
-            return StringComparer.OrdinalIgnoreCase.Equals(NodejsConstants.JavaScriptExtension) ||
+            return StringComparer.OrdinalIgnoreCase.Equals(ext, NodejsConstants.JavaScriptExtension) ||
+                StringComparer.OrdinalIgnoreCase.Equals(ext, NodejsConstants.JavaScriptJsxExtension) ||
                 TypeScriptHelpers.IsTypeScriptFile(fileName);
         }
 

Nodejs/Product/TestAdapter/TestContainerDiscoverer.cs

@@ -177,7 +177,7 @@ internal bool IsTestFile(string pathToFile)
         {
             var testCaseFile = pathToFile;
             var project = GetTestProjectFromFile(pathToFile);
-            if (null == project)
+            if (project == null)
             {
                 //The file is not included in the project.  
                 //Don't look for tests in it.
@@ -198,7 +198,7 @@ internal bool IsTestFile(string pathToFile)
                     return false;
                 }
             }
-            else if (!NodejsConstants.JavaScriptExtension.Equals(Path.GetExtension(pathToFile), StringComparison.OrdinalIgnoreCase))
+            else if (!StringComparer.OrdinalIgnoreCase.Equals(Path.GetExtension(pathToFile), NodejsConstants.JavaScriptExtension))
             {
                 return false;
             }
@@ -620,6 +620,18 @@ private IVsProject GetTestProjectFromFile(string filename)
         /// <param name="project">The project which the event is being raised for</param>
         private bool OnTestContainersChanged(IVsProject project)
         {
+            // https://pytools.codeplex.com/workitem/1271 
+            // When test explorer kicks off a run it kicks off a test discovery 
+            // phase, which kicks off a build, which results in us saving files. 
+            // If we raise the files changed event then test explorer immediately turns 
+            // around and queries us for the changed files.  Then it continues 
+            // along with the test discovery phase it was already initiating, and  
+            // discovers that no changes have occured - because it already updated 
+            // to the latest changes when we informed it our containers had changed.   
+            // Therefore if we are both building and detecting changes then we  
+            // don't want to raise the event, instead it'll query us in a little  
+            // bit and get the most recent changes. 
+
             if (project != null &&
                 project.TryGetProjectPath(out var projectPath) &&
                 this.knownProjects.TryGetValue(projectPath, out var projectInfo) &&