Fix #68 and fix #77: End names on open brackets

scala · Jun 29, 2020 · 05a24a6 · 05a24a6
1 parent 1342458
commit 05a24a6
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/src/typescript/Scala.tmLanguage.ts b/src/typescript/Scala.tmLanguage.ts
@@ -568,7 +568,7 @@ export const scalaTmLanguage: TmLanguage = {
           }
         },
         {
-          match: '\\b(?:(case|open)\\s+)?(class|object)\\s+([^\\s\\{\\(\\[]+)',
+          match: '\\b(?:(case|open)\\s+)?(class|object)\\s+([^\\s\\{\\(\\[;]+)',
           captures: {
             '1': {
               name: 'keyword.declaration.scala'
@@ -935,7 +935,7 @@ export const scalaTmLanguage: TmLanguage = {
     inheritance: {
       patterns: [
         {
-          match: '(extends|with|derives)\\s+([^\\s\\(\\{\\[\\]]+|(?=\\([^\\)]+=>))',
+          match: '(extends|with|derives)\\s+([^\\s\\(\\{\\[\\]\\)\\};]+|(?=\\([^\\)]+=>))',
           captures: {
             '1': {
               name: 'keyword.declaration.scala'

diff --git a/tests/unit/#77.test.scala b/tests/unit/#77.test.scala
@@ -0,0 +1,15 @@
+// SYNTAX TEST "source.scala"
+
+
+class A extends B with NoStackTrace)
+//                ^^^^ keyword.declaration.scala
+//                     ^^^^^^^^^^^^ entity.other.inherited-class.scala
+//                                 ^ meta.bracket.scala
+class A extends B with NoStackTrace}
+//                ^^^^ keyword.declaration.scala
+//                     ^^^^^^^^^^^^ entity.other.inherited-class.scala
+//                                 ^ punctuation.section.block.end.scala
+class A extends B with NoStackTrace]
+//                ^^^^ keyword.declaration.scala
+//                     ^^^^^^^^^^^^ entity.other.inherited-class.scala
+//                                 ^ meta.bracket.scala