Merge pull request #272 from wise0704/comment

Allow comment in switch statement
dotnet · Aug 8, 2023 · 3d5703b · 3d5703b
2 parents a99ed13 + 6189489
commit 3d5703b
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 0 deletions.
diff --git a/grammars/csharp.tmLanguage b/grammars/csharp.tmLanguage
@@ -3039,6 +3039,10 @@
         <string>(?&lt;=\})</string>
         <key>patterns</key>
         <array>
+          <dict>
+            <key>include</key>
+            <string>#comment</string>
+          </dict>
           <dict>
             <key>begin</key>
             <string>\(</string>

diff --git a/grammars/csharp.tmLanguage.cson b/grammars/csharp.tmLanguage.cson
@@ -1891,6 +1891,9 @@ repository:
         name: "keyword.control.switch.cs"
     end: "(?<=\\})"
     patterns: [
+      {
+        include: "#comment"
+      }
       {
         begin: "\\("
         beginCaptures:

diff --git a/src/csharp.tmLanguage.yml b/src/csharp.tmLanguage.yml
@@ -1129,6 +1129,7 @@ repository:
       '1': { name: keyword.control.switch.cs }
     end: (?<=\})
     patterns:
+    - include: '#comment'
     - begin: \(
       beginCaptures:
         '0': { name: punctuation.parenthesis.open.cs }

diff --git a/test/statements.tests.ts b/test/statements.tests.ts
@@ -657,6 +657,31 @@ switch (i) {
                     Token.Punctuation.CloseBrace
                 ]);
             });
+
+            it("switch statement with comment (issue #145)", async () => {
+                const input = Input.InMethod(`
+switch (i) /* comment */ {
+default:
+    break;
+}`);
+                const tokens = await tokenize(input);
+
+                tokens.should.deep.equal([
+                    Token.Keywords.Control.Switch,
+                    Token.Punctuation.OpenParen,
+                    Token.Variables.ReadWrite("i"),
+                    Token.Punctuation.CloseParen,
+                    Token.Comment.MultiLine.Start,
+                    Token.Comment.MultiLine.Text(" comment "),
+                    Token.Comment.MultiLine.End,
+                    Token.Punctuation.OpenBrace,
+                    Token.Keywords.Control.Default,
+                    Token.Punctuation.Colon,
+                    Token.Keywords.Control.Break,
+                    Token.Punctuation.Semicolon,
+                    Token.Punctuation.CloseBrace
+                ]);
+            });
         });
 
         describe("Try", () => {