Merge pull request #38 from PanAeon/feature/backticks

Add top level rule for identifiers inside the backticks

Author: PanAeon

Diff for: src/typescript/Scala.tmLanguage.ts

@@ -181,6 +181,9 @@ export const scalaTmLanguage: TmLanguage = {
         {
           include: '#qualifiedClassName'
         },
+        {
+          include: '#backQuotedVariable'
+        },
         {
           include: '#meta-brackets'
         },
@@ -624,6 +627,12 @@ export const scalaTmLanguage: TmLanguage = {
         }
       }
     },
+    backQuotedVariable: {
+      // capture back quoted variables in code so special symbols inside them do not
+      // interfere with the rest of the rules. But don't assign any extra scope, to make them
+      // consistent with the rest of variables
+      match: `${backQuotedId}` 
+    },
     'storage-modifiers': {
       patterns: [
         {

Diff for: syntaxes/Scala.tmLanguage.json

@@ -0,0 +1,14 @@
+
+object `Backtics test` {
+    val x = MediaRange.`*/*`
+ 
+    val y = `MediaRange`.`*/*`
+
+    val z = `Media Range`
+    
+    def `*/*`(`a b`: `C D`): `e f` = ???
+
+    
+    
+    val `*/*` = 5
+ }

Diff for: tests/snap/backticks.test.scala

@@ -0,0 +1,74 @@
+>
+>object `Backtics test` {
+#^^^^^^ source.scala keyword.declaration.scala
+#      ^ source.scala
+#       ^^^^^^^^^ source.scala entity.name.class.declaration
+#                ^^^^^^^ source.scala
+#                       ^ source.scala punctuation.section.block.begin.scala
+>    val x = MediaRange.`*/*`
+#^^^^ source.scala
+#    ^^^ source.scala keyword.declaration.stable.scala
+#       ^ source.scala
+#        ^ source.scala variable.other.declaration.scala
+#         ^ source.scala
+#          ^ source.scala keyword.operator.comparison.scala
+#           ^ source.scala
+#            ^^^^^^^^^^ source.scala entity.name.class
+#                      ^ source.scala
+#                       ^^^^^ source.scala
+> 
+>    val y = `MediaRange`.`*/*`
+#^^^^ source.scala
+#    ^^^ source.scala keyword.declaration.stable.scala
+#       ^ source.scala
+#        ^ source.scala variable.other.declaration.scala
+#         ^ source.scala
+#          ^ source.scala keyword.operator.comparison.scala
+#           ^ source.scala
+#            ^^^^^^^^^^^^ source.scala
+#                        ^ source.scala
+#                         ^^^^^ source.scala
+>
+>    val z = `Media Range`
+#^^^^ source.scala
+#    ^^^ source.scala keyword.declaration.stable.scala
+#       ^ source.scala
+#        ^ source.scala variable.other.declaration.scala
+#         ^ source.scala
+#          ^ source.scala keyword.operator.comparison.scala
+#           ^ source.scala
+#            ^^^^^^^^^^^^^ source.scala
+>    
+>    def `*/*`(`a b`: `C D`): `e f` = ???
+#^^^^ source.scala
+#    ^^^ source.scala keyword.declaration.scala
+#       ^ source.scala
+#        ^^^^^ source.scala entity.name.function.declaration
+#             ^ source.scala meta.bracket.scala
+#              ^^^^^ source.scala variable.parameter.scala
+#                   ^ source.scala meta.colon.scala
+#                    ^ source.scala
+#                     ^^^^^ source.scala
+#                          ^ source.scala meta.bracket.scala
+#                           ^ source.scala keyword.operator.scala
+#                            ^ source.scala
+#                             ^^^^^ source.scala
+#                                  ^ source.scala
+#                                   ^ source.scala keyword.operator.comparison.scala
+#                                    ^ source.scala
+#                                     ^^^ source.scala keyword.operator.scala
+>
+>    
+>    
+>    val `*/*` = 5
+#^^^^ source.scala
+#    ^^^ source.scala keyword.declaration.stable.scala
+#       ^ source.scala
+#        ^^^^^ source.scala variable.other.declaration.scala
+#             ^ source.scala
+#              ^ source.scala keyword.operator.comparison.scala
+#               ^ source.scala
+#                ^ source.scala constant.numeric.scala
+> }
+#^ source.scala
+# ^ source.scala punctuation.section.block.end.scala

Diff for: tests/snap/backticks.test.scala.snap

@@ -2166,7 +2166,9 @@
 >        case `y` => 
 #^^^^^^^^ source.scala
 #        ^^^^ source.scala keyword.control.flow.scala
-#            ^^^^^ source.scala
+#            ^ source.scala
+#             ^^^ source.scala
+#                ^ source.scala
 #                 ^ source.scala keyword.operator.comparison.scala
 #                  ^ source.scala keyword.operator.comparison.scala
 #                   ^^ source.scala