Skip to content

Commit

Permalink
[Scala] Return to string.quoted.triple
Browse files Browse the repository at this point in the history
  • Loading branch information
deathaxe committed Jan 7, 2025
1 parent dec9e57 commit 3483873
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
6 changes: 3 additions & 3 deletions Scala/Scala.sublime-syntax
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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: '(""")(?!")'
Expand Down
14 changes: 7 additions & 7 deletions Scala/syntax_test_scala.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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 <foo/> =>
// ^^^^^^ text.xml
Expand Down
2 changes: 1 addition & 1 deletion Scala/syntax_test_scala3.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 3483873

Please sign in to comment.