Merge pull request #755 from Microsoft/misidentifiedIdentifier

Fix issue where comments are incorrectly identified as identifiers

Author: DanielRosenwasser

src/compiler/parser.ts

@@ -648,6 +648,10 @@ module ts {
         return SyntaxKind.FirstKeyword <= token && token <= SyntaxKind.LastKeyword;
     }
 
+    export function isTrivia(token: SyntaxKind) {
+        return SyntaxKind.FirstTriviaToken <= token && token <= SyntaxKind.LastTriviaToken;
+    }
+
     export function isModifier(token: SyntaxKind): boolean {
         switch (token) {
             case SyntaxKind.PublicKeyword:

src/services/services.ts

@@ -4538,17 +4538,16 @@ module ts {
             do {
                 token = scanner.scan();
 
-                if ((token === SyntaxKind.SlashToken || token === SyntaxKind.SlashEqualsToken) && !noRegexTable[lastNonTriviaToken]) {
-                    if (scanner.reScanSlashToken() === SyntaxKind.RegularExpressionLiteral) {
-                        token = SyntaxKind.RegularExpressionLiteral;
+                if (!isTrivia(token)) {
+                    if ((token === SyntaxKind.SlashToken || token === SyntaxKind.SlashEqualsToken) && !noRegexTable[lastNonTriviaToken]) {
+                        if (scanner.reScanSlashToken() === SyntaxKind.RegularExpressionLiteral) {
+                            token = SyntaxKind.RegularExpressionLiteral;
+                        }
+                    }
+                    else if (lastNonTriviaToken === SyntaxKind.DotToken && isKeyword(token)) {
+                        token = SyntaxKind.Identifier;
                     }
-                }
-                else if (lastNonTriviaToken === SyntaxKind.DotToken) {
-                    token = SyntaxKind.Identifier;
-                }
 
-                // Only recall the token if it was *not* trivia.
-                if (!(SyntaxKind.FirstTriviaToken <= token && token <= SyntaxKind.LastTriviaToken)) {
                     lastNonTriviaToken = token;
                 }
 

tests/cases/unittests/services/colorization.ts

@@ -189,6 +189,21 @@ describe('Colorization', function () {
                 identifier("var"));
         });
 
+        it("correctly classifies a string literal after a dot", function () {
+            test("a.\"var\"",
+                ts.EndOfLineState.Start,
+                stringLiteral("\"var\""));
+        });
+
+        it("correctly classifies a keyword after a dot separated by comment trivia", function () {
+            test("a./*hello world*/ var",
+                ts.EndOfLineState.Start,
+                identifier("a"),
+                punctuation("."),
+                comment("/*hello world*/"),
+                identifier("var"));
+        });
+
         it("classifies a property access with whitespace around the dot", function () {
             test("   x  .\tfoo ()",
                 ts.EndOfLineState.Start,