From 3483873157ee534165bdf6d1562ef5b8cdffc7be Mon Sep 17 00:00:00 2001 From: deathaxe Date: Tue, 7 Jan 2025 20:26:16 +0100 Subject: [PATCH] [Scala] Return to `string.quoted.triple` --- Scala/Scala.sublime-syntax | 6 +++--- Scala/syntax_test_scala.scala | 14 +++++++------- Scala/syntax_test_scala3.scala | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Scala/Scala.sublime-syntax b/Scala/Scala.sublime-syntax index 579abe400e..3c9963f57a 100644 --- a/Scala/Scala.sublime-syntax +++ b/Scala/Scala.sublime-syntax @@ -1402,7 +1402,7 @@ contexts: scope: punctuation.definition.string.begin.scala push: - meta_include_prototype: false - - meta_scope: meta.string.scala string.quoted.double.block.scala + - meta_scope: meta.string.scala string.quoted.triple.scala - match: '(""")(?!")' scope: punctuation.definition.string.end.scala pop: true @@ -1428,7 +1428,7 @@ contexts: 2: punctuation.definition.string.begin.scala push: - meta_include_prototype: false - - meta_scope: meta.string.interpolated.scala string.quoted.double.block.scala + - meta_scope: meta.string.interpolated.scala string.quoted.triple.scala - match: '"""' scope: punctuation.definition.string.end.scala pop: true @@ -1439,7 +1439,7 @@ contexts: 2: punctuation.definition.string.begin.scala push: - meta_include_prototype: false - - meta_scope: meta.string.interpolated.scala string.quoted.double.block.scala + - meta_scope: meta.string.interpolated.scala string.quoted.triple.scala - match: '{{unicode_char}}' scope: constant.character.escape.scala - match: '(""")(?!")' diff --git a/Scala/syntax_test_scala.scala b/Scala/syntax_test_scala.scala index 67c35008db..dde555ec96 100644 --- a/Scala/syntax_test_scala.scala +++ b/Scala/syntax_test_scala.scala @@ -375,7 +375,7 @@ type Foo = Bar[A] forSome { type A } // ^^^ punctuation.definition.string.end.scala """testing""" -// ^^^^^^^^^^^^^ meta.string.scala string.quoted.double.block.scala +// ^^^^^^^^^^^^^ meta.string.scala string.quoted.triple.scala s"testing $a ${42}" // ^^^^^^^^^^ meta.string.interpolated.scala string.quoted.double.scala - meta.interpolation @@ -393,11 +393,11 @@ type Foo = Bar[A] forSome { type A } // ^ punctuation.definition.string.end.scala s"""testing $a ${42}""" -// ^^^^^^^^^^^^ meta.string.interpolated.scala string.quoted.double.block.scala - meta.interpolation +// ^^^^^^^^^^^^ meta.string.interpolated.scala string.quoted.triple.scala - meta.interpolation // ^^ meta.string.interpolated.scala meta.interpolation.scala - string -// ^ meta.string.interpolated.scala string.quoted.double.block.scala - meta.interpolation +// ^ meta.string.interpolated.scala string.quoted.triple.scala - meta.interpolation // ^^^^^ meta.string.interpolated.scala meta.interpolation.scala - string -// ^^^ meta.string.interpolated.scala string.quoted.double.block.scala - meta.interpolation +// ^^^ meta.string.interpolated.scala string.quoted.triple.scala - meta.interpolation // ^ support.function // ^^ variable.other // ^ punctuation.definition.variable.scala @@ -629,12 +629,12 @@ type Foo = Bar[A] forSome { type A } // ^^^^^ meta.string.scala string.quoted.double.scala case """foo""" => -// ^^^^^^^^^ meta.string.scala string.quoted.double.block.scala +// ^^^^^^^^^ meta.string.scala string.quoted.triple.scala case q"""..$foo""" => -// ^^^^^^ meta.string.interpolated.scala string.quoted.double.block.scala +// ^^^^^^ meta.string.interpolated.scala string.quoted.triple.scala // ^^^^ meta.string.interpolated.scala meta.interpolation.scala variable.other.scala - string -// ^^^ meta.string.interpolated.scala string.quoted.double.block.scala punctuation.definition.string.end.scala +// ^^^ meta.string.interpolated.scala string.quoted.triple.scala punctuation.definition.string.end.scala case => // ^^^^^^ text.xml diff --git a/Scala/syntax_test_scala3.scala b/Scala/syntax_test_scala3.scala index 05a00c2827..4b4a8abe53 100644 --- a/Scala/syntax_test_scala3.scala +++ b/Scala/syntax_test_scala3.scala @@ -494,7 +494,7 @@ val str: "hi" = "hi" // ^^^ string.quoted.double.scala val str: """hi""" = """hi""" -// ^^^^^^^^ meta.string.scala string.quoted.double.block.scala +// ^^^^^^^^ meta.string.scala string.quoted.triple.scala val i: 0x01 = 0x01 // ^^ constant.numeric.base.scala