Fix opening paren matches with closing paren in character literal

scala · Jun 29, 2019 · b3bbdf0 · b3bbdf0
1 parent fbce6dd
commit b3bbdf0
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 14 deletions.
diff --git a/src/typescript/Scala.tmLanguage.ts b/src/typescript/Scala.tmLanguage.ts
@@ -583,7 +583,7 @@ export const scalaTmLanguage: TmLanguage = {
           name: 'punctuation.definition.character.end.scala'
         }
       },
-      name: 'constant.character.literal.scala'
+      name: 'string.quoted.other constant.character.literal.scala'
     },
     initialization: {
       match: '\\b(new)\\s+([^\\s,\\{\\}\\(\\)\\[\\]]+)',

diff --git a/syntaxes/Scala.tmLanguage.json b/syntaxes/Scala.tmLanguage.json
diff --git a/tests/snap/lexical.test.scala.snap b/tests/snap/lexical.test.scala.snap
@@ -193,21 +193,21 @@
 >    ('a',    '\u0041',    '\n',    '\t')
 #^^^^ source.scala
 #    ^ source.scala meta.bracket.scala
-#     ^ source.scala constant.character.literal.scala punctuation.definition.character.begin.scala
-#      ^ source.scala constant.character.literal.scala
-#       ^ source.scala constant.character.literal.scala punctuation.definition.character.end.scala
+#     ^ source.scala string.quoted.other constant.character.literal.scala punctuation.definition.character.begin.scala
+#      ^ source.scala string.quoted.other constant.character.literal.scala
+#       ^ source.scala string.quoted.other constant.character.literal.scala punctuation.definition.character.end.scala
 #        ^^^^^ source.scala
-#             ^ source.scala constant.character.literal.scala punctuation.definition.character.begin.scala
-#              ^^^^^^ source.scala constant.character.literal.scala constant.character.escape.scala
-#                    ^ source.scala constant.character.literal.scala punctuation.definition.character.end.scala
+#             ^ source.scala string.quoted.other constant.character.literal.scala punctuation.definition.character.begin.scala
+#              ^^^^^^ source.scala string.quoted.other constant.character.literal.scala constant.character.escape.scala
+#                    ^ source.scala string.quoted.other constant.character.literal.scala punctuation.definition.character.end.scala
 #                     ^^^^^ source.scala
-#                          ^ source.scala constant.character.literal.scala punctuation.definition.character.begin.scala
-#                           ^^ source.scala constant.character.literal.scala constant.character.escape.scala
-#                             ^ source.scala constant.character.literal.scala punctuation.definition.character.end.scala
+#                          ^ source.scala string.quoted.other constant.character.literal.scala punctuation.definition.character.begin.scala
+#                           ^^ source.scala string.quoted.other constant.character.literal.scala constant.character.escape.scala
+#                             ^ source.scala string.quoted.other constant.character.literal.scala punctuation.definition.character.end.scala
 #                              ^^^^^ source.scala
-#                                   ^ source.scala constant.character.literal.scala punctuation.definition.character.begin.scala
-#                                    ^^ source.scala constant.character.literal.scala constant.character.escape.scala
-#                                      ^ source.scala constant.character.literal.scala punctuation.definition.character.end.scala
+#                                   ^ source.scala string.quoted.other constant.character.literal.scala punctuation.definition.character.begin.scala
+#                                    ^^ source.scala string.quoted.other constant.character.literal.scala constant.character.escape.scala
+#                                      ^ source.scala string.quoted.other constant.character.literal.scala punctuation.definition.character.end.scala
 #                                       ^ source.scala meta.bracket.scala
 >}
 #^ source.scala punctuation.section.block.end.scala

diff --git a/tests/unit/lexical.test.scala b/tests/unit/lexical.test.scala
@@ -170,3 +170,9 @@ object Xml {
           <authors>{scalaBook.authors.mkList("", ", ", "")}</authors>
         </book>
 }
+
+class Parens {
+  capture("layout(" ~ oneOrMore(CharPredicate.All -- ")" -- ')') ~ ")")
+//                                                           ^ string.quoted.other constant.character.literal.scala
+  capture("layout(" ~ oneOrMore(CharPredicate.All -- ")" -- `)`) ~ ")")
+}