Merge pull request #1624 from paulvanbrenk/ctiIssues

Cti issues

Author: paulvanbrenk

Nodejs/Product/Nodejs/Debugger/DebugEngine/AD7Engine.cs

@@ -13,6 +13,7 @@
 using Microsoft.NodejsTools.Debugger.Remote;
 using Microsoft.NodejsTools.Logging;
 using Microsoft.NodejsTools.Project;
+using Microsoft.NodejsTools.TypeScript;
 using Microsoft.VisualStudio;
 using Microsoft.VisualStudio.Debugger.Interop;
 using Microsoft.VisualStudio.Shell;
@@ -1370,7 +1371,7 @@ private void OnDocumentSaved(Document document)
             }
 
             // For .ts files, we need to build the project to regenerate .js code.
-            if (StringComparer.OrdinalIgnoreCase.Equals(Path.GetExtension(module.FileName), NodejsConstants.TypeScriptExtension))
+            if (TypeScriptHelpers.IsTypeScriptFile(module.FileName))
             {
                 if (document.ProjectItem.ContainingProject.GetNodeProject().Build(null, null) != MSBuildResult.Successful)
                 {
@@ -1395,7 +1396,7 @@ private void OnDocumentSaved(Document document)
 
         internal static void MapLanguageInfo(string filename, out string pbstrLanguage, out Guid pguidLanguage)
         {
-            if (StringComparer.OrdinalIgnoreCase.Equals(Path.GetExtension(filename), NodejsConstants.TypeScriptExtension))
+            if (TypeScriptHelpers.IsTypeScriptFile(filename))
             {
                 pbstrLanguage = NodejsConstants.TypeScript;
                 pguidLanguage = Guids.TypeScriptDebugLanguage;

Nodejs/Product/Nodejs/NodejsConstants.cs

@@ -8,7 +8,9 @@ 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";
         internal const string MapExtension = ".map";
         internal const string NodejsProjectExtension = ".njsproj";

Nodejs/Product/Nodejs/Project/NodejsProjectNode.cs

@@ -13,6 +13,7 @@
 using System.Threading.Tasks;
 using Microsoft.NodejsTools.Npm;
 using Microsoft.NodejsTools.ProjectWizard;
+using Microsoft.NodejsTools.TypeScript;
 using Microsoft.VisualStudio;
 using Microsoft.VisualStudio.Imaging;
 using Microsoft.VisualStudio.Imaging.Interop;
@@ -188,7 +189,7 @@ protected override void AddNewFileNodeToHierarchy(HierarchyNode parentNode, stri
 
         private static bool IsProjectTypeScriptSourceFile(string path)
         {
-            return StringComparer.OrdinalIgnoreCase.Equals(Path.GetExtension(path), NodejsConstants.TypeScriptExtension)
+            return TypeScriptHelpers.IsTypeScriptFile(path)
                 && !StringComparer.OrdinalIgnoreCase.Equals(Path.GetExtension(path), NodejsConstants.TypeScriptDeclarationExtension)
                 && !NodejsConstants.ContainsNodeModulesOrBowerComponentsFolder(path);
         }
@@ -197,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)
@@ -208,13 +210,12 @@ 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;
             }
 
-            // TODO: make sure this also works for .tsx
-            if (StringComparer.OrdinalIgnoreCase.Equals(Path.GetExtension(filename), NodejsConstants.TypeScriptExtension))
+            if (TypeScriptHelpers.IsTypeScriptFile(filename))
             {
                 return NodejsConstants.TypeScriptCompileItemType;
             }
@@ -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)
         {
@@ -281,13 +289,11 @@ protected internal override FolderNode CreateFolderNode(ProjectElement element)
         public override CommonFileNode CreateCodeFileNode(ProjectElement item)
         {
             var fileName = item.Url;
-            if (!string.IsNullOrWhiteSpace(fileName)
-                && Path.GetExtension(fileName).Equals(NodejsConstants.TypeScriptExtension, StringComparison.OrdinalIgnoreCase))
+            if (!string.IsNullOrWhiteSpace(fileName) && TypeScriptHelpers.IsTypeScriptFile(fileName))
             {
                 return new NodejsTypeScriptFileNode(this, item);
             }
-            var res = new NodejsFileNode(this, item);
-            return res;
+            return new NodejsFileNode(this, item);
         }
 
         public override string GetProjectName()
@@ -361,8 +367,9 @@ protected override NodeProperties CreatePropertiesObject()
         public override bool IsCodeFile(string fileName)
         {
             var ext = Path.GetExtension(fileName);
-            return ext.Equals(NodejsConstants.JavaScriptExtension, StringComparison.OrdinalIgnoreCase) ||
-                   ext.Equals(NodejsConstants.TypeScriptExtension, StringComparison.OrdinalIgnoreCase);
+            return StringComparer.OrdinalIgnoreCase.Equals(ext, NodejsConstants.JavaScriptExtension) ||
+                StringComparer.OrdinalIgnoreCase.Equals(ext, NodejsConstants.JavaScriptJsxExtension) ||
+                TypeScriptHelpers.IsTypeScriptFile(fileName);
         }
 
         protected override void Reload()

Nodejs/Product/TestAdapter/RunFromContextFileExtensions.cs

@@ -11,13 +11,9 @@ internal class RunFromContextFileExtensions : IRunFromContextFileExtensions
     {
         #region IRunFromContextFileExtensions Members
 
-        public IEnumerable<string> FileTypes
-        {
-            get
-            {
-                return new[] { NodejsConstants.JavaScriptExtension };
-            }
-        }
+        private static readonly string[] fileTypes = new[] { NodejsConstants.JavaScriptExtension };
+
+        public IEnumerable<string> FileTypes => fileTypes;
 
         #endregion
     }