Add regression test for issue dotnet#731

DustinCampbell · Jan 7, 2017 · ff5455a · ff5455a
1 parent 212e5b7
commit ff5455a
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 2 deletions.
diff --git a/syntaxes/csharp.tmLanguage.yml b/syntaxes/csharp.tmLanguage.yml
@@ -1694,6 +1694,7 @@ repository:
     match: \.
 
   preprocessor:
+    name: meta.preprocessor.cs
     begin: ^\s*(\#)\s*
     beginCaptures:
       '1': { name: punctuation.separator.hash.cs }
@@ -1738,11 +1739,13 @@ repository:
     captures:
       '1': { name: keyword.preprocessor.warning.cs }
       '2': { name: keyword.preprocessor.error.cs }
+      '3': { name: string.unquoted.preprocessor.message.cs }
 
   preprocessor-region:
     match: \b(region)\b\s*(.*)(?=$)
     captures:
       '1': { name: keyword.preprocessor.region.cs }
+      '2': { name: string.unquoted.preprocessor.message.cs }
 
   preprocessor-endregion:
     match: \b(endregion)\b

diff --git a/test/syntaxes/preprocessor.test.syntax.ts b/test/syntaxes/preprocessor.test.syntax.ts
@@ -463,6 +463,7 @@ describe("Grammar", () => {
             tokens.should.deep.equal([
                 Token.Punctuation.Hash,
                 Token.Keywords.Preprocessor.Warning,
+                Token.PreprocessorMessage("This is a warning")
             ]);
         });
 
@@ -473,6 +474,7 @@ describe("Grammar", () => {
             tokens.should.deep.equal([
                 Token.Punctuation.Hash,
                 Token.Keywords.Preprocessor.Error,
+                Token.PreprocessorMessage("This is an error")
             ]);
         });
 
@@ -483,6 +485,7 @@ describe("Grammar", () => {
             tokens.should.deep.equal([
                 Token.Punctuation.Hash,
                 Token.Keywords.Preprocessor.Region,
+                Token.PreprocessorMessage("My Region")
             ]);
         });
 
@@ -493,6 +496,7 @@ describe("Grammar", () => {
             tokens.should.deep.equal([
                 Token.Punctuation.Hash,
                 Token.Keywords.Preprocessor.Region,
+                Token.PreprocessorMessage("\"My Region\"")
             ]);
         });
 
@@ -502,7 +506,7 @@ describe("Grammar", () => {
 
             tokens.should.deep.equal([
                 Token.Punctuation.Hash,
-                Token.Keywords.Preprocessor.EndRegion,
+                Token.Keywords.Preprocessor.EndRegion
             ]);
         });
 
@@ -529,5 +533,56 @@ describe("Grammar", () => {
                 Token.Comment.SingleLine.Text("Foo")
             ]);
         });
+
+        it("region name with double-quotes should be highlighted properly (issue #731)", () => {
+            const input = Input.InClass(`
+#region  " Register / Create New  "
+// GET: /Account/Register
+[Authorize(Roles = UserRoles.SuperUser)]
+public ActionResult Register()
+{
+    RedirectToAction("Application");
+    return View();
+}
+`);
+            const tokens = tokenize(input);
+
+            tokens.should.deep.equal([
+                Token.Punctuation.Hash,
+                Token.Keywords.Preprocessor.Region,
+                Token.PreprocessorMessage("\" Register / Create New  \""),
+                Token.Comment.SingleLine.Start,
+                Token.Comment.SingleLine.Text(" GET: /Account/Register"),
+                Token.Punctuation.OpenBracket,
+                Token.Type("Authorize"),
+                Token.Punctuation.OpenParen,
+                Token.Identifiers.PropertyName("Roles"),
+                Token.Operators.Assignment,
+                Token.Variables.Object("UserRoles"),
+                Token.Punctuation.Accessor,
+                Token.Variables.Property("SuperUser"),
+                Token.Punctuation.CloseParen,
+                Token.Punctuation.CloseBracket,
+                Token.Keywords.Modifiers.Public,
+                Token.Type("ActionResult"),
+                Token.Identifiers.MethodName("Register"),
+                Token.Punctuation.OpenParen,
+                Token.Punctuation.CloseParen,
+                Token.Punctuation.OpenBrace,
+                Token.Identifiers.MethodName("RedirectToAction"),
+                Token.Punctuation.OpenParen,
+                Token.Punctuation.String.Begin,
+                Token.Literals.String("Application"),
+                Token.Punctuation.String.End,
+                Token.Punctuation.CloseParen,
+                Token.Punctuation.Semicolon,
+                Token.Keywords.Return,
+                Token.Identifiers.MethodName("View"),
+                Token.Punctuation.OpenParen,
+                Token.Punctuation.CloseParen,
+                Token.Punctuation.Semicolon,
+                Token.Punctuation.CloseBrace
+            ]);
+        });
     });
 });
diff --git a/test/syntaxes/utils/tokenize.ts b/test/syntaxes/utils/tokenize.ts
@@ -7,7 +7,7 @@ import { ITokenizeLineResult, Registry, StackElement } from 'vscode-textmate';
 
 const registry = new Registry();
 const grammar = registry.loadGrammarFromPathSync('syntaxes/csharp.tmLanguage');
-const excludedTypes = ['source.cs', 'meta.interpolation.cs', 'meta.type.parameters.cs']
+const excludedTypes = ['source.cs', 'meta.interpolation.cs', 'meta.preprocessor.cs', 'meta.type.parameters.cs']
 
 export function tokenize(input: string | Input, excludeTypes: boolean = true): Token[] {
     if (typeof input === "string") {
@@ -390,5 +390,6 @@ export namespace Token {
     }
 
     export const IllegalNewLine = (text: string) => createToken(text, 'invalid.illegal.newline.cs');
+    export const PreprocessorMessage = (text: string) => createToken(text, 'string.unquoted.preprocessor.message.cs');
     export const Type = (text: string) => createToken(text, 'storage.type.cs');
 }