Skip to content

Commit 64b11df

Browse files
committed
Fix handling of \ as an operator
1 parent 2a4b6b5 commit 64b11df

File tree

5 files changed

+32
-4
lines changed

5 files changed

+32
-4
lines changed

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -677,11 +677,11 @@ export const scalaTmLanguage: TmLanguage = {
677677
}
678678
},
679679
{ // Operators with three or more characters
680-
match: `(${opchar}${opchar}${opchar}+)`,
680+
match: `(${opchar}|[\\\\]){3,}`,
681681
name: 'keyword.operator.scala'
682682
},
683683
{ // Operators with two characters
684-
match: `(${opchar}${opchar}|\\\\${opchar})`,
684+
match: `((?:${opchar}|[\\\\]){2,})`,
685685
captures: {
686686
'1': {
687687
patterns: [
@@ -702,7 +702,7 @@ export const scalaTmLanguage: TmLanguage = {
702702
}
703703
},
704704
{ // Operators with one character
705-
match: `(?<!${letter}_)(${opchar})`,
705+
match: `(?<!${letter}_)(${opchar}|\\\\)`,
706706
captures: {
707707
'1': {
708708
patterns: [

Diff for: syntaxes/Scala.tmLanguage.json

+1-1
Large diffs are not rendered by default.

Diff for: tests/snap/#191.test.scala

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
a \\\ b
2+
3+
a \+\ b

Diff for: tests/snap/#191.test.scala.snap

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
>a \\\ b
2+
#^^ source.scala
3+
# ^^^ source.scala keyword.operator.scala
4+
# ^^^ source.scala
5+
>
6+
>a \+\ b
7+
#^^ source.scala
8+
# ^^^ source.scala keyword.operator.scala
9+
# ^^^ source.scala
10+
>

Diff for: tests/unit/#191.test.scala

+15
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,18 @@
3434
// ^^^ keyword.operator.scala
3535
a &= b
3636
// ^^ keyword.operator.scala
37+
38+
a \ b
39+
// ^ keyword.operator.scala
40+
41+
a \\ b
42+
// ^^ keyword.operator.scala
43+
44+
a \/ b
45+
// ^^ keyword.operator.scala
46+
47+
a /\ b
48+
// ^^ keyword.operator.scala
49+
50+
a \\\ b
51+
// ^^^ keyword.operator.scala

0 commit comments

Comments
 (0)