Fix #107: Identify highlighting of identifier after an end

Author: nicolasstucki

src/typescript/Scala.tmLanguage.ts

@@ -486,8 +486,21 @@ export const scalaTmLanguage: TmLanguage = {
           name: 'keyword.control.flow.scala'
         },
         {
-          match: `^\\s*end(?=\\s+(if|while|for|match|${plainid})\\s*(//.*|/\\*(?!.*\\*/\\s*\\S.*).*)?$)`,
-          name: 'keyword.control.flow.end.scala'
+          match: `^\\s*(end)\\s+(?:(if|while|for|match|new)|(${upperLetter}${plainid}?)|(${backQuotedId}|${plainid}))?(?=\\s*(//.*|/\\*(?!.*\\*/\\s*\\S.*).*)?$)`,
+          captures: {
+            '1': {
+              name: 'keyword.control.flow.end.scala'
+            },
+            '2': {
+              name: 'keyword.control.flow.end.scala'
+            },
+            '3': {
+              name: 'entity.name.type.declaration'
+            },
+            '4': {
+              name: 'entity.name.declaration'
+            }
+          }
         },
         {
           match: '\\b(catch|finally|try)\\b',

tests/unit/#107.test.scala

@@ -0,0 +1,39 @@
+// SYNTAX TEST "source.scala"
+
+    new Foo:
+      ...
+    end new
+//  ^^^ keyword.control.flow.end.scala
+//      ^^^ keyword.control.flow.end.scala
+
+    end if
+//  ^^^ keyword.control.flow.end.scala
+//      ^^ keyword.control.flow.end.scala
+
+    end while
+//  ^^^ keyword.control.flow.end.scala
+//      ^^^^^ keyword.control.flow.end.scala
+    
+    end for
+//  ^^^ keyword.control.flow.end.scala
+//      ^^^ keyword.control.flow.end.scala
+
+    end match
+//  ^^^ keyword.control.flow.end.scala
+//      ^^^^^ keyword.control.flow.end.scala
+
+  class Foo
+//      ^^^ entity.name.class.declaration
+    end Foo
+//  ^^^ keyword.control.flow.end.scala
+//      ^^^ entity.name.type.declaration
+
+    def foo
+//      ^^^ entity.name.function.declaration
+    end bar
+//  ^^^ keyword.control.flow.end.scala
+//      ^^^ entity.name.declaration
+
+    end `bar`
+//  ^^^ keyword.control.flow.end.scala
+//      ^^^ entity.name.declaration