Merge pull request #185 from nicolasstucki/fix-#182

Identify bounds of `&&`, `||` and `!` operators

Author: nicolasstucki

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'
         },
         {

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