[draft] fix syntax highlighting for nullish coalescing

.all-contributorsrc

@@ -1634,6 +1634,15 @@
         "content",
         "maintenance"
       ]
+    },
+    {
+      "login": "stevenhao",
+      "name": "Steven Hao",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1988030?v=4",
+      "profile": "https://github.com/stevenhao",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,

README.md

@@ -263,6 +263,7 @@ Thanks goes to these wonderful people
     <td align="center"><a href="https://github.com/ryanpwaldon"><img src="https://avatars0.githubusercontent.com/u/12480362?v=4" width="100px;" alt="Ryan Waldon"/><br /><sub><b>Ryan Waldon</b></sub></a><br /><a href="https://github.com/codesandbox/codesandbox-client/commits?author=ryanpwaldon" title="Code">💻</a></td>
     <td align="center"><a href="http://cherniavskii.com"><img src="https://avatars.githubusercontent.com/u/13808724?v=4" width="100px;" alt="Andrew Cherniavskii"/><br /><sub><b>Andrew Cherniavskii</b></sub></a><br /><a href="https://github.com/codesandbox/codesandbox-client/commits?author=cherniavskii" title="Code">💻</a></td>
     <td align="center"><a href="http://nullvoxpopuli.com"><img src="https://avatars.githubusercontent.com/u/199018?v=4" width="100px;" alt="NullVoxPopuli"/><br /><sub><b>NullVoxPopuli</b></sub></a><br /><a href="https://github.com/codesandbox/codesandbox-client/commits?author=NullVoxPopuli" title="Code">💻</a> <a href="#content-NullVoxPopuli" title="Content">🖋</a> <a href="#maintenance-NullVoxPopuli" title="Maintenance">🚧</a></td>
+    <td align="center"><a href="https://github.com/stevenhao"><img src="https://avatars.githubusercontent.com/u/1988030?v=4" width="100px;" alt="Steven Hao"/><br /><sub><b>Steven Hao</b></sub></a><br /><a href="https://github.com/codesandbox/codesandbox-client/commits?author=stevenhao" title="Code">💻</a></td>
   </tr>
 </table>
 

packages/app/config/build.js

@@ -3,11 +3,11 @@ const { SANDBOX_ONLY } = process.env;
 const staticAssets = [
   !SANDBOX_ONLY && {
     from: 'standalone-packages/vscode-editor/release/min/vs',
-    to: 'public/vscode31/vs',
+    to: 'public/vscode32/vs',
   },
   !SANDBOX_ONLY && {
     from: 'standalone-packages/vscode-extensions/out',
-    to: 'public/vscode-extensions/v17',
+    to: 'public/vscode-extensions/v18',
   },
   !SANDBOX_ONLY && {
     from: 'node_modules/vscode-oniguruma/release/onig.wasm',

packages/app/config/webpack.prod.js

@@ -184,7 +184,7 @@ module.exports = merge(commonConfig, {
           },
         },
         {
-          urlPattern: /\/vscode31/,
+          urlPattern: /\/vscode32/,
           handler: 'cacheFirst',
           options: {
             cache: {

packages/app/scripts/copy-assets.js

@@ -22,7 +22,7 @@ const assets = [
   },
   !SANDBOX_ONLY && {
     from: 'standalone-packages/vscode-editor/release/min/vs',
-    to: 'public/vscode31/vs',
+    to: 'public/vscode32/vs',
   },
   {
     from: 'packages/app/public',

packages/app/src/app/index.html

@@ -76,10 +76,10 @@
     }
   </script>
 
-  <link data-name="/public/vscode31/vs/editor/editor.main" rel="preload" as="style"
-    href="/public/vscode31/vs/editor/codesandbox.editor.main.css">
+  <link data-name="/public/vscode32/vs/editor/editor.main" rel="preload" as="style"
+    href="/public/vscode32/vs/editor/codesandbox.editor.main.css">
   </link>
-  <link rel="preload" as="script" href="/public/vscode31/vs/editor/codesandbox.editor.main.js">
+  <link rel="preload" as="script" href="/public/vscode32/vs/editor/codesandbox.editor.main.js">
   </link>
   </link>
 </head>

packages/app/src/app/overmind/effects/vscode/constants.ts

@@ -1,6 +1,6 @@
 export const EXTENSIONS_LOCATION = process.env.VSCODE
   ? '/vscode/extensions-bundle'
-  : '/public/vscode-extensions/v17';
+  : '/public/vscode-extensions/v18';
 
 export const VIM_EXTENSION_ID = 'vscodevim.vim';
 

packages/app/src/app/overmind/effects/vscode/metadata.ts

@@ -1,7 +1,7 @@
 const VSCODE_METADATA = {
   CORE: {
     paths: {
-      src: process.env.VSCODE ? '/vscode/out/vs' : '/public/vscode31/vs',
+      src: process.env.VSCODE ? '/vscode/out/vs' : '/public/vscode32/vs',
       'npm/dev': 'node_modules/monaco-editor-core/dev/vs',
       'npm/min': 'node_modules/monaco-editor-core/min/vs',
       built: '/vscode/out-monaco-editor-core/min/vs',

packages/app/src/embed/components/Content/Monaco/grammars/tmGrammars/TypeScriptReact.tmLanguage

@@ -3837,7 +3837,7 @@
       <key>ternary-expression</key>
       <dict>
         <key>begin</key>
-        <string>(?!\?\.\s*[^[:digit:]])(\?)</string>
+        <string>(?!\?\.\s*[^[:digit:]])(\?)(?!\?)</string>
         <key>beginCaptures</key>
         <dict>
           <key>1</key>
@@ -4295,7 +4295,7 @@
             <key>name</key>
             <string>keyword.operator.logical.tsx</string>
             <key>match</key>
-            <string>\!|&amp;&amp;|\|\|</string>
+            <string>\!|&amp;&amp;|\|\||\?\?</string>
           </dict>
           <dict>
             <key>name</key>

standalone-packages/vscode-extensions/out/extensions/javascript/syntaxes/JavaScript.tmLanguage.json

@@ -2684,7 +2684,7 @@
 			]
 		},
 		"ternary-expression": {
-			"begin": "(?!\\?\\.\\s*[^[:digit:]])(\\?)",
+			"begin": "(?!\\?\\.\\s*[^[:digit:]])(\\?)(?!\\?)",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.operator.ternary.js"
@@ -3067,7 +3067,7 @@
 				},
 				{
 					"name": "keyword.operator.logical.js",
-					"match": "\\!|&&|\\|\\|"
+					"match": "\\!|&&|\\|\\||\\?\\?"
 				},
 				{
 					"name": "keyword.operator.bitwise.js",

standalone-packages/vscode-extensions/out/extensions/javascript/syntaxes/JavaScriptReact.tmLanguage.json

@@ -2684,7 +2684,7 @@
 			]
 		},
 		"ternary-expression": {
-			"begin": "(?!\\?\\.\\s*[^[:digit:]])(\\?)",
+			"begin": "(?!\\?\\.\\s*[^[:digit:]])(\\?)(?!\\?)",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.operator.ternary.js.jsx"
@@ -3067,7 +3067,7 @@
 				},
 				{
 					"name": "keyword.operator.logical.js.jsx",
-					"match": "\\!|&&|\\|\\|"
+					"match": "\\!|&&|\\|\\||\\?\\?"
 				},
 				{
 					"name": "keyword.operator.bitwise.js.jsx",

standalone-packages/vscode-extensions/out/extensions/typescript-basics/syntaxes/TypeScript.tmLanguage.json

@@ -2760,7 +2760,7 @@
 			]
 		},
 		"ternary-expression": {
-			"begin": "(?!\\?\\.\\s*[^[:digit:]])(\\?)",
+			"begin": "(?!\\?\\.\\s*[^[:digit:]])(\\?)(?!\\?)",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.operator.ternary.ts"
@@ -3202,7 +3202,7 @@
 				},
 				{
 					"name": "keyword.operator.logical.ts",
-					"match": "\\!|&&|\\|\\|"
+					"match": "\\!|&&|\\|\\||\\?\\?"
 				},
 				{
 					"name": "keyword.operator.bitwise.ts",

standalone-packages/vscode-extensions/out/extensions/typescript-basics/syntaxes/TypeScriptReact.tmLanguage.json

@@ -2763,7 +2763,7 @@
 			]
 		},
 		"ternary-expression": {
-			"begin": "(?!\\?\\.\\s*[^[:digit:]])(\\?)",
+			"begin": "(?!\\?\\.\\s*[^[:digit:]])(\\?)(?!\\?)",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.operator.ternary.tsx"
@@ -3153,7 +3153,7 @@
 				},
 				{
 					"name": "keyword.operator.logical.tsx",
-					"match": "\\!|&&|\\|\\|"
+					"match": "\\!|&&|\\|\\||\\?\\?"
 				},
 				{
 					"name": "keyword.operator.bitwise.tsx",