Skip to content

Commit

Permalink
Identify bounds of &&, || and ! operators
Browse files Browse the repository at this point in the history
Fixes #182
  • Loading branch information
nicolasstucki committed Jan 19, 2021
1 parent a45260e commit 1bcf8af
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/typescript/Scala.tmLanguage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -621,7 +621,7 @@ export const scalaTmLanguage: TmLanguage = {
name: 'keyword.operator.arithmetic.scala'
},
{
match: '(!|&&|\\|\\|)',
match: `(?<!${opchar})(!|&&|\\|\\|)(?!${opchar})`,
name: 'keyword.operator.logical.scala'
},
{
Expand Down
39 changes: 39 additions & 0 deletions tests/unit/#182.test.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
// SYNTAX TEST "source.scala"

true&&false
// ^^^^ constant.language.scala
// ^^ keyword.operator.logical.scala
// ^^^^^ constant.language.scala
b&&false
// ^^ keyword.operator.logical.scala
// ^^^^^ constant.language.scala

b&&b
// ^^ keyword.operator.logical.scala
b||b
// ^^ keyword.operator.logical.scala
!b
// ^ keyword.operator.logical.scala

b&&&b
// ^^^ - keyword.operator.logical.scala
b&&?b
// ^^^ - keyword.operator.logical.scala
b&&!b
// ^^^ - keyword.operator.logical.scala
b!&&b
// ^^^ - keyword.operator.logical.scala
b&&+b
// ^^^ - keyword.operator.logical.scala
b&&^b
// ^^^ - keyword.operator.logical.scala
b&&~b
// ^^^ - keyword.operator.logical.scala
b&&#b
// ^^^ - keyword.operator.logical.scala
b&&%b
// ^^^ - keyword.operator.logical.scala
b&&@b
// ^^^ - keyword.operator.logical.scala
b@&&b
// ^^^ - keyword.operator.logical.scala

0 comments on commit 1bcf8af

Please sign in to comment.