Fix bug with // inside of a block comment

scala · Jun 26, 2019 · eef0470 · eef0470
1 parent efc7ab1
commit eef0470
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 24 deletions.
diff --git a/src/typescript/Scala.tmLanguage.ts b/src/typescript/Scala.tmLanguage.ts
@@ -651,6 +651,34 @@ export const scalaTmLanguage: TmLanguage = {
       name: 'meta.bounds.scala'
     },
     comments: {
+      patterns: [
+        {
+          "include": "#block-comments"
+        },
+        {
+          end: '(?!\\G)',
+          begin: '(^[ \\t]+)?(?=//)',
+          beginCaptures: {
+            '1': {
+              name: 'punctuation.whitespace.comment.leading.scala'
+            }
+          },
+          patterns: [
+            {
+              end: '\\n',
+              begin: '//',
+              beginCaptures: {
+                '0': {
+                  name: 'punctuation.definition.comment.scala'
+                }
+              },
+              name: 'comment.line.double-slash.scala'
+            }
+          ]
+        }
+      ]
+    },
+    'block-comments': {
       patterns: [
         {
           match: '/\\*\\*/',
@@ -711,7 +739,7 @@ export const scalaTmLanguage: TmLanguage = {
               }
             },
             {
-              "include": "#comments"
+              "include": "#block-comments"
             }
           ],
           endCaptures: {
@@ -731,32 +759,11 @@ export const scalaTmLanguage: TmLanguage = {
           },
           patterns: [
             {
-              "include": "#comments"
+              "include": "#block-comments"
             }
           ],
           name: 'comment.block.scala'
         },
-        {
-          end: '(?!\\G)',
-          begin: '(^[ \\t]+)?(?=//)',
-          beginCaptures: {
-            '1': {
-              name: 'punctuation.whitespace.comment.leading.scala'
-            }
-          },
-          patterns: [
-            {
-              end: '\\n',
-              begin: '//',
-              beginCaptures: {
-                '0': {
-                  name: 'punctuation.definition.comment.scala'
-                }
-              },
-              name: 'comment.line.double-slash.scala'
-            }
-          ]
-        }
       ]
     },
     'xml-embedded-content': {