From 1bcf8af279f6074824beb4320c8351824a52f109 Mon Sep 17 00:00:00 2001
From: Nicolas Stucki <nicolas.stucki@gmail.com>
Date: Tue, 19 Jan 2021 11:29:04 +0100
Subject: [PATCH] Identify bounds of `&&`, `||` and `!` operators

Fixes #182
---
 src/typescript/Scala.tmLanguage.ts |  2 +-
 tests/unit/#182.test.scala         | 39 ++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 tests/unit/#182.test.scala

diff --git a/src/typescript/Scala.tmLanguage.ts b/src/typescript/Scala.tmLanguage.ts
index 084c952..ee44463 100644
--- a/src/typescript/Scala.tmLanguage.ts
+++ b/src/typescript/Scala.tmLanguage.ts
@@ -621,7 +621,7 @@ export const scalaTmLanguage: TmLanguage = {
           name: 'keyword.operator.arithmetic.scala'
         },
         {
-          match: '(!|&&|\\|\\|)',
+          match: `(?<!${opchar})(!|&&|\\|\\|)(?!${opchar})`,
           name: 'keyword.operator.logical.scala'
         },
         {
diff --git a/tests/unit/#182.test.scala b/tests/unit/#182.test.scala
new file mode 100644
index 0000000..2d0efbd
--- /dev/null
+++ b/tests/unit/#182.test.scala
@@ -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
\ No newline at end of file