Avoid variable length lookbehind

dotnet · Sep 6, 2021 · db92540 · db92540
1 parent 11731b4
commit db92540
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 To **build and test** install Node.js do the following:
 
 * Run `npm install` to install any dependencies.
-* Run `gulp` to build and run tests.
+* Run `npm run compile` to build and run tests.
 
 Output grammars are output in the `grammars\` directory.
 

diff --git a/grammars/csharp.tmLanguage b/grammars/csharp.tmLanguage
@@ -5207,7 +5207,7 @@
       <key>conditional-operator</key>
       <dict>
         <key>begin</key>
-        <string>(?&lt;!\?\s*)\?(?!\?|\.|\[)</string>
+        <string>\?(?!\?|\.|\[)|(?&lt;!\?)\s+\?(?!\?|\.|\[)</string>
         <key>beginCaptures</key>
         <dict>
           <key>0</key>

diff --git a/grammars/csharp.tmLanguage.cson b/grammars/csharp.tmLanguage.cson
@@ -3159,7 +3159,7 @@ repository:
       }
     ]
   "conditional-operator":
-    begin: "(?<!\\?\\s*)\\?(?!\\?|\\.|\\[)"
+    begin: "\\?(?!\\?|\\.|\\[)|(?<!\\?)\\s+\\?(?!\\?|\\.|\\[)"
     beginCaptures:
       "0":
         name: "keyword.operator.conditional.question-mark.cs"

diff --git a/src/csharp.tmLanguage.yml b/src/csharp.tmLanguage.yml
@@ -2035,7 +2035,7 @@ repository:
     # Only match ? if:
     # 1. There isn't a preceding or trailing ? (null-coalescing operator)
     # 2. There isn't a trailing . or [ (null-conditional operator)
-    begin: (?<!\?\s*)\?(?!\?|\.|\[)
+    begin: \?(?!\?|\.|\[)|(?<!\?)\s+\?(?!\?|\.|\[)
     beginCaptures:
       '0': { name: keyword.operator.conditional.question-mark.cs }
     end: ':'