Merge remote-tracking branch 'origin/main' into alex/main-process-ext…

…ension-host
benoitf · Nov 9, 2021 · 54f23ce · 54f23ce
2 parents c30ffc4 + e08e4d3
commit 54f23ce
Show file tree

Hide file tree

Showing 139 changed files with 2,348 additions and 2,021 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -85,6 +85,7 @@
 		"grid",
 		"splitview",
 		"table",
-		"list"
+		"list",
+		"git"
 	]
 }
diff --git a/.yarnrc b/.yarnrc
@@ -1,4 +1,4 @@
 disturl "https://electronjs.org/headers"
-target "13.5.1"
+target "13.5.2"
 runtime "electron"
 build_from_source "true"
diff --git a/build/monaco/package.json b/build/monaco/package.json
@@ -1,7 +1,7 @@
 {
   "name": "monaco-editor-core",
   "private": true,
-  "version": "0.29.2",
+  "version": "0.30.0",
   "description": "A browser based code editor",
   "author": "Microsoft Corporation",
   "license": "MIT",

diff --git a/extensions/git/package.json b/extensions/git/package.json
@@ -515,6 +515,21 @@
         "command": "git.rebaseAbort",
         "title": "%command.rebaseAbort%",
         "category": "Git"
+      },
+      {
+        "command": "git.api.getRepositories",
+        "title": "%command.api.getRepositories%",
+        "category": "Git API"
+      },
+      {
+        "command": "git.api.getRepositoryState",
+        "title": "%command.api.getRepositoryState%",
+        "category": "Git API"
+      },
+      {
+        "command": "git.api.getRemoteSources",
+        "title": "%command.api.getRemoteSources%",
+        "category": "Git API"
       }
     ],
     "keybindings": [
@@ -898,6 +913,18 @@
         {
           "command": "git.timeline.compareWithSelected",
           "when": "false"
+        },
+        {
+          "command": "git.api.getRepositories",
+          "when": "false"
+        },
+        {
+          "command": "git.api.getRepositoryState",
+          "when": "false"
+        },
+        {
+          "command": "git.api.getRemoteSources",
+          "when": "false"
         }
       ],
       "scm/title": [

diff --git a/extensions/git/package.nls.json b/extensions/git/package.nls.json
@@ -92,6 +92,9 @@
 	"command.timelineCopyCommitMessage": "Copy Commit Message",
 	"command.timelineSelectForCompare": "Select for Compare",
 	"command.timelineCompareWithSelected": "Compare with Selected",
+	"command.api.getRepositories": "Get Repositories",
+	"command.api.getRepositoryState": "Get Repository State",
+	"command.api.getRemoteSources": "Get Remote Sources",
 	"config.enabled": "Whether git is enabled.",
 	"config.path": "Path and filename of the git executable, e.g. `C:\\Program Files\\Git\\bin\\git.exe` (Windows). This can also be an array of string values containing multiple paths to look up.",
 	"config.autoRepositoryDetection": "Configures when repositories should be automatically detected.",

diff --git a/extensions/git/src/askpass.sh b/extensions/git/src/askpass.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 VSCODE_GIT_ASKPASS_PIPE=`mktemp`
-ELECTRON_RUN_AS_NODE="1" VSCODE_GIT_ASKPASS_PIPE="$VSCODE_GIT_ASKPASS_PIPE" "$VSCODE_GIT_ASKPASS_NODE" "$VSCODE_GIT_ASKPASS_MAIN" $*
+ELECTRON_RUN_AS_NODE="1" VSCODE_GIT_ASKPASS_PIPE="$VSCODE_GIT_ASKPASS_PIPE" "$VSCODE_GIT_ASKPASS_NODE" "$VSCODE_GIT_ASKPASS_EXTRA_ARGS" "$VSCODE_GIT_ASKPASS_MAIN" $*
 cat $VSCODE_GIT_ASKPASS_PIPE
 rm $VSCODE_GIT_ASKPASS_PIPE
diff --git a/extensions/git/src/askpass.ts b/extensions/git/src/askpass.ts
@@ -83,6 +83,7 @@ export class Askpass implements IIPCHandler {
 			...this.ipc.getEnv(),
 			GIT_ASKPASS: path.join(__dirname, 'askpass.sh'),
 			VSCODE_GIT_ASKPASS_NODE: process.execPath,
+			VSCODE_GIT_ASKPASS_EXTRA_ARGS: (process.versions['electron'] && process.versions['microsoft-build']) ? '--ms-enable-electron-run-as-node' : '',
 			VSCODE_GIT_ASKPASS_MAIN: path.join(__dirname, 'askpass-main.js')
 		};
 	}

diff --git a/extensions/git/src/model.ts b/extensions/git/src/model.ts
@@ -300,7 +300,7 @@ export class Model implements IRemoteSourceProviderRegistry, IPushErrorHandlerRe
 			const repository = new Repository(this.git.open(repositoryRoot, dotGit), this, this, this.globalState, this.outputChannel);
 
 			this.open(repository);
-			await repository.status();
+			repository.status(); // do not await this, we want SCM to know about the repo asap
 		} catch (ex) {
 			// noop
 			this.outputChannel.appendLine(`Opening repository for path='${repoPath}' failed; ex=${ex}`);

diff --git a/extensions/markdown-language-features/notebook/index.ts b/extensions/markdown-language-features/notebook/index.ts
@@ -29,10 +29,6 @@ export const activate: ActivationFunction<void> = (ctx) => {
 
 	const style = document.createElement('style');
 	style.textContent = `
-		#preview {
-			font-size: 1.1em;
-		}
-
 		.emptyMarkdownCell::before {
 			content: "${document.documentElement.style.getPropertyValue('--notebook-cell-markup-empty-content')}";
 			font-style: italic;

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
   "version": "1.63.0",
-  "distro": "f4a21145f5ec390f681f48c7140bf4f60d2987ac",
+  "distro": "cc8976e5470edb06e4b3abd29841ffe7bf5042d2",
   "author": {
     "name": "Microsoft Corporation"
   },
@@ -84,12 +84,12 @@
     "vscode-regexpp": "^3.1.0",
     "vscode-ripgrep": "^1.12.1",
     "vscode-textmate": "5.4.1",
-    "xterm": "4.15.0-beta.10",
-    "xterm-addon-search": "0.9.0-beta.5",
-    "xterm-addon-serialize": "0.7.0-beta.2",
-    "xterm-addon-unicode11": "0.3.0",
-    "xterm-addon-webgl": "0.12.0-beta.15",
-    "xterm-headless": "4.15.0-beta.10",
+    "xterm": "4.16.0-beta.2",
+    "xterm-addon-search": "0.9.0-beta.6",
+    "xterm-addon-serialize": "0.7.0-beta.3",
+    "xterm-addon-unicode11": "0.4.0-beta.1",
+    "xterm-addon-webgl": "0.12.0-beta.16",
+    "xterm-headless": "4.16.0-beta.2",
     "yauzl": "^2.9.2",
     "yazl": "^2.4.3"
   },

diff --git a/remote/package.json b/remote/package.json
@@ -24,12 +24,12 @@
     "vscode-regexpp": "^3.1.0",
     "vscode-ripgrep": "^1.12.1",
     "vscode-textmate": "5.4.1",
-    "xterm": "4.15.0-beta.10",
-    "xterm-addon-search": "0.9.0-beta.5",
-    "xterm-addon-serialize": "0.7.0-beta.2",
-    "xterm-addon-unicode11": "0.3.0",
-    "xterm-addon-webgl": "0.12.0-beta.15",
-    "xterm-headless": "4.15.0-beta.10",
+    "xterm": "4.16.0-beta.2",
+    "xterm-addon-search": "0.9.0-beta.6",
+    "xterm-addon-serialize": "0.7.0-beta.3",
+    "xterm-addon-unicode11": "0.4.0-beta.1",
+    "xterm-addon-webgl": "0.12.0-beta.16",
+    "xterm-headless": "4.16.0-beta.2",
     "yauzl": "^2.9.2",
     "yazl": "^2.4.3"
   },

diff --git a/remote/web/package.json b/remote/web/package.json
@@ -10,9 +10,9 @@
 		"tas-client-umd": "0.1.4",
 		"vscode-oniguruma": "1.5.1",
 		"vscode-textmate": "5.4.1",
-		"xterm": "4.15.0-beta.10",
-		"xterm-addon-search": "0.9.0-beta.5",
-		"xterm-addon-unicode11": "0.3.0",
-		"xterm-addon-webgl": "0.12.0-beta.15"
+		"xterm": "4.16.0-beta.2",
+		"xterm-addon-search": "0.9.0-beta.6",
+		"xterm-addon-unicode11": "0.4.0-beta.1",
+		"xterm-addon-webgl": "0.12.0-beta.16"
 	}
 }
diff --git a/remote/web/yarn.lock b/remote/web/yarn.lock
@@ -113,22 +113,22 @@ [email protected]:
   resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-5.4.1.tgz#09d566724fc76b60b3ad9791eebf1f0b50f29e5a"
   integrity sha512-4CvPHmfuZQaXrcCpathdh6jo7myuR+MU8BvscgQADuponpbqfmu2rwTOtCXhGwwEgStvJF8V4s9FwMKRVLNmKQ==
 
-[email protected].5:
-  version "0.9.0-beta.5"
-  resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.9.0-beta.5.tgz#e0e60a203d1c9d6c8af933648a46865dba299302"
-  integrity sha512-ylfqim0ISBvuuX83LQwgu/06p5GC545QsAo9SssXw03TPpIrcd0zwaVMEnhOftSIzM9EKRRsyx3GbBjgUdiF5w==
-
-xterm-addon-unicode11@0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/xterm-addon-unicode11/-/xterm-addon-unicode11-0.3.0.tgz#e4435c3c91a5294a7eb8b79c380acbb28a659463"
-  integrity sha512-x5fHDZT2j9tlTlHnzPHt++9uKZ2kJ/lYQOj3L6xJA22xoJsS8UQRw/5YIFg2FUHqEAbV77Z1fZij/9NycMSH/A==
-
-[email protected].15:
-  version "0.12.0-beta.15"
-  resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.12.0-beta.15.tgz#9ae82127f2a39b3cb7f5ae45a6af223810c933d4"
-  integrity sha512-LWZ3iLspQOCc26OoT8qa+SuyuIcn2cAMRbBkinOuQCk4aW5kjovIrGovj9yVAcXNvOBnPm3sUqmnwGlN579kDA==
-
-xterm@4.15.0-beta.10:
-  version "4.15.0-beta.10"
-  resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.15.0-beta.10.tgz#8cda3d7885e8345f2fc6cf9275a43f3833d29acf"
-  integrity sha512-valoh5ZcY/y7Pe+ffgcSAEFeuZfjzVeUUXcthdxTTsrGEiU1s4QR2EOg4U5jn5wye/Nc6mSfLW3s79R6Ac186w==
+[email protected].6:
+  version "0.9.0-beta.6"
+  resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.9.0-beta.6.tgz#8b016baac5580dc0ba93bb52610bc4f5776d3b17"
+  integrity sha512-UAEzas4O+NrF7BSGf0C9N5ngAkmbtr/hSTFvLAM/Rw7EfLUatf8aLMqAWZTggRGMwDjuqR0GXJI4+e5QrJhQfw==
+
+xterm-addon-unicode11@0.4.0-beta.1:
+  version "0.4.0-beta.1"
+  resolved "https://registry.yarnpkg.com/xterm-addon-unicode11/-/xterm-addon-unicode11-0.4.0-beta.1.tgz#aeefd26e87bad15d8dfd8a1e0b804fe408c9b882"
+  integrity sha512-pG8mpxnqpYDry0e20vuEFKhd4kKIcLLNwdNftNvfo+R/EjYRnTYnF+H8L+7eQHq6hqDH61xCEP4H4qR2CyT4pg==
+
+[email protected].16:
+  version "0.12.0-beta.16"
+  resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.12.0-beta.16.tgz#63a0f1f5be9e66286e035448e2011e3065769ad5"
+  integrity sha512-g6v3RegOhSsD9Zt8ArWBMNT30QyPUlIWEIvP/xLHAluUZ1S5sDjFyZDB0nJAyn9MwQozJpwb0ylYO1nznN/TzA==
+
+xterm@4.16.0-beta.2:
+  version "4.16.0-beta.2"
+  resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.16.0-beta.2.tgz#251beef21a232143f272da74c7005bc4d832ca79"
+  integrity sha512-PD0agueJ7qvbn1/QhZriAQXf+ykaoPKgQN9qiIGf88VMxHs8T47MYHW/+qPsrXagTmbrENtncughTIzOzv8Q5Q==
diff --git a/remote/yarn.lock b/remote/yarn.lock
@@ -541,35 +541,35 @@ [email protected]:
   resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-2.0.0.tgz#52a63e56ca0b84a7f3a5f3d61872f126ad7a5943"
   integrity sha1-UqY+VsoLhKfzpfPWGHLxJq16WUM=
 
-[email protected].5:
-  version "0.9.0-beta.5"
-  resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.9.0-beta.5.tgz#e0e60a203d1c9d6c8af933648a46865dba299302"
-  integrity sha512-ylfqim0ISBvuuX83LQwgu/06p5GC545QsAo9SssXw03TPpIrcd0zwaVMEnhOftSIzM9EKRRsyx3GbBjgUdiF5w==
-
-[email protected].2:
-  version "0.7.0-beta.2"
-  resolved "https://registry.yarnpkg.com/xterm-addon-serialize/-/xterm-addon-serialize-0.7.0-beta.2.tgz#ced9f664c74ab88448e7b63850721bc272aa6806"
-  integrity sha512-KuSwdx2AAliUv7SvjKYUKHrB7vscbHLv8QsmwSDI3pgL1BpjyLJ8LR99iFFfuNpPW9CG4TX6adKPIJXtqiN3Vg==
-
-xterm-addon-unicode11@0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/xterm-addon-unicode11/-/xterm-addon-unicode11-0.3.0.tgz#e4435c3c91a5294a7eb8b79c380acbb28a659463"
-  integrity sha512-x5fHDZT2j9tlTlHnzPHt++9uKZ2kJ/lYQOj3L6xJA22xoJsS8UQRw/5YIFg2FUHqEAbV77Z1fZij/9NycMSH/A==
-
-[email protected].15:
-  version "0.12.0-beta.15"
-  resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.12.0-beta.15.tgz#9ae82127f2a39b3cb7f5ae45a6af223810c933d4"
-  integrity sha512-LWZ3iLspQOCc26OoT8qa+SuyuIcn2cAMRbBkinOuQCk4aW5kjovIrGovj9yVAcXNvOBnPm3sUqmnwGlN579kDA==
-
-xterm-headless@4.15.0-beta.10:
-  version "4.15.0-beta.10"
-  resolved "https://registry.yarnpkg.com/xterm-headless/-/xterm-headless-4.15.0-beta.10.tgz#2dbcb40dfda7ecfdacc7b63889c80da965480ce7"
-  integrity sha512-kDAzmaeFX8hAJvbPUJc4dW4SoVBSg4onCVOPyi8QTmxZz1o7I9mX4U7DX1v3PceyfrU27A9k6zXjuTuPjxCCSQ==
-
-xterm@4.15.0-beta.10:
-  version "4.15.0-beta.10"
-  resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.15.0-beta.10.tgz#8cda3d7885e8345f2fc6cf9275a43f3833d29acf"
-  integrity sha512-valoh5ZcY/y7Pe+ffgcSAEFeuZfjzVeUUXcthdxTTsrGEiU1s4QR2EOg4U5jn5wye/Nc6mSfLW3s79R6Ac186w==
+[email protected].6:
+  version "0.9.0-beta.6"
+  resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.9.0-beta.6.tgz#8b016baac5580dc0ba93bb52610bc4f5776d3b17"
+  integrity sha512-UAEzas4O+NrF7BSGf0C9N5ngAkmbtr/hSTFvLAM/Rw7EfLUatf8aLMqAWZTggRGMwDjuqR0GXJI4+e5QrJhQfw==
+
+[email protected].3:
+  version "0.7.0-beta.3"
+  resolved "https://registry.yarnpkg.com/xterm-addon-serialize/-/xterm-addon-serialize-0.7.0-beta.3.tgz#a8ce52a59685041bd3b6d6a2a77a3df8bc3daf29"
+  integrity sha512-fgB0h8JiSN1cOMh3slenysprnGfFwbDZ/D38WA0Pdjxf3YDy4j2SwoUajlvXpkFWR7sHjVHmgpw/nHggO731KA==
+
+xterm-addon-unicode11@0.4.0-beta.1:
+  version "0.4.0-beta.1"
+  resolved "https://registry.yarnpkg.com/xterm-addon-unicode11/-/xterm-addon-unicode11-0.4.0-beta.1.tgz#aeefd26e87bad15d8dfd8a1e0b804fe408c9b882"
+  integrity sha512-pG8mpxnqpYDry0e20vuEFKhd4kKIcLLNwdNftNvfo+R/EjYRnTYnF+H8L+7eQHq6hqDH61xCEP4H4qR2CyT4pg==
+
+[email protected].16:
+  version "0.12.0-beta.16"
+  resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.12.0-beta.16.tgz#63a0f1f5be9e66286e035448e2011e3065769ad5"
+  integrity sha512-g6v3RegOhSsD9Zt8ArWBMNT30QyPUlIWEIvP/xLHAluUZ1S5sDjFyZDB0nJAyn9MwQozJpwb0ylYO1nznN/TzA==
+
+xterm-headless@4.16.0-beta.2:
+  version "4.16.0-beta.2"
+  resolved "https://registry.yarnpkg.com/xterm-headless/-/xterm-headless-4.16.0-beta.2.tgz#62e66a655a30c814e3a311f3542d42c87446cecd"
+  integrity sha512-g92HDaIZcu1TQFlrjq2CHtt7A2qAwSD6s8RwncU/7u1kaq2e7rc9O3OKfu5v3QzgaRSKuugtquMr0OTKjkmLUg==
+
+xterm@4.16.0-beta.2:
+  version "4.16.0-beta.2"
+  resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.16.0-beta.2.tgz#251beef21a232143f272da74c7005bc4d832ca79"
+  integrity sha512-PD0agueJ7qvbn1/QhZriAQXf+ykaoPKgQN9qiIGf88VMxHs8T47MYHW/+qPsrXagTmbrENtncughTIzOzv8Q5Q==
 
 yauzl@^2.9.2:
   version "2.10.0"

diff --git a/resources/darwin/bin/code.sh b/resources/darwin/bin/code.sh
@@ -7,5 +7,5 @@ function realpath() { python -c "import os,sys; print(os.path.realpath(sys.argv[
 CONTENTS="$(dirname "$(dirname "$(dirname "$(dirname "$(realpath "$0")")")")")"
 ELECTRON="$CONTENTS/MacOS/Electron"
 CLI="$CONTENTS/Resources/app/out/cli.js"
-ELECTRON_RUN_AS_NODE=1 "$ELECTRON" "$CLI" "$@"
+ELECTRON_RUN_AS_NODE=1 "$ELECTRON" "$CLI" --ms-enable-electron-run-as-node "$@"
 exit $?
diff --git a/resources/linux/bin/code.sh b/resources/linux/bin/code.sh
@@ -50,5 +50,5 @@ fi
 
 ELECTRON="$VSCODE_PATH/@@NAME@@"
 CLI="$VSCODE_PATH/resources/app/out/cli.js"
-ELECTRON_RUN_AS_NODE=1 "$ELECTRON" "$CLI" "$@"
+ELECTRON_RUN_AS_NODE=1 "$ELECTRON" "$CLI" --ms-enable-electron-run-as-node "$@"
 exit $?
diff --git a/resources/win32/bin/code.cmd b/resources/win32/bin/code.cmd
@@ -2,5 +2,5 @@
 setlocal
 set VSCODE_DEV=
 set ELECTRON_RUN_AS_NODE=1
-"%~dp0..\@@NAME@@.exe" "%~dp0..\resources\app\out\cli.js" %*
-endlocal
+"%~dp0..\@@NAME@@.exe" "%~dp0..\resources\app\out\cli.js" --ms-enable-electron-run-as-node %*
+endlocal
diff --git a/resources/win32/bin/code.sh b/resources/win32/bin/code.sh
@@ -43,7 +43,7 @@ if [ $IN_WSL = true ]; then
 	# use the Remote WSL extension if installed
 	WSL_EXT_ID="ms-vscode-remote.remote-wsl"
 
-	ELECTRON_RUN_AS_NODE=1 "$ELECTRON" "$CLI" --locate-extension $WSL_EXT_ID >/tmp/remote-wsl-loc.txt 2>/dev/null </dev/null
+	ELECTRON_RUN_AS_NODE=1 "$ELECTRON" "$CLI" --ms-enable-electron-run-as-node --locate-extension $WSL_EXT_ID >/tmp/remote-wsl-loc.txt 2>/dev/null </dev/null
 	WSL_EXT_WLOC=$(cat /tmp/remote-wsl-loc.txt)
 
 	if [ -n "$WSL_EXT_WLOC" ]; then
@@ -58,5 +58,5 @@ elif [ -x "$(command -v cygpath)" ]; then
 else
 	CLI="$VSCODE_PATH/resources/app/out/cli.js"
 fi
-ELECTRON_RUN_AS_NODE=1 "$ELECTRON" "$CLI" "$@"
+ELECTRON_RUN_AS_NODE=1 "$ELECTRON" "$CLI" --ms-enable-electron-run-as-node "$@"
 exit $?
diff --git a/scripts/code-cli.bat b/scripts/code-cli.bat
@@ -24,7 +24,7 @@ set ELECTRON_ENABLE_LOGGING=1
 set ELECTRON_ENABLE_STACK_DUMPING=1
 
 :: Launch Code
-%CODE% --inspect=5874 out\cli.js %~dp0.. %*
+%CODE% --inspect=5874 out\cli.js --ms-enable-electron-run-as-node %~dp0.. %*
 goto end
 
 :builtin

diff --git a/scripts/code-cli.sh b/scripts/code-cli.sh
@@ -34,7 +34,7 @@ function code() {
 	VSCODE_DEV=1 \
 	ELECTRON_ENABLE_LOGGING=1 \
 	ELECTRON_ENABLE_STACK_DUMPING=1 \
-	"$CODE" --inspect=5874 "$ROOT/out/cli.js" . "$@"
+	"$CODE" --inspect=5874 "$ROOT/out/cli.js" --ms-enable-electron-run-as-node . "$@"
 }
 
 code "$@"
diff --git a/scripts/code.sh b/scripts/code.sh
@@ -58,7 +58,7 @@ function code-wsl()
 		cd $ROOT
 		export WSLENV=ELECTRON_RUN_AS_NODE/w:VSCODE_DEV/w:$WSLENV
 		local WSL_EXT_ID="ms-vscode-remote.remote-wsl"
-		local WSL_EXT_WLOC=$(echo "" | VSCODE_DEV=1 ELECTRON_RUN_AS_NODE=1 "$ROOT/.build/electron/Code - OSS.exe" "out/cli.js" --locate-extension $WSL_EXT_ID)
+		local WSL_EXT_WLOC=$(echo "" | VSCODE_DEV=1 ELECTRON_RUN_AS_NODE=1 "$ROOT/.build/electron/Code - OSS.exe" "out/cli.js" --ms-enable-electron-run-as-node --locate-extension $WSL_EXT_ID)
 		cd $CWD
 		if [ -n "$WSL_EXT_WLOC" ]; then
 			# replace \r\n with \n in WSL_EXT_WLOC

diff --git a/scripts/node-electron.bat b/scripts/node-electron.bat
@@ -10,9 +10,9 @@ set NAMESHORT=%NAMESHORT: "=%
 set NAMESHORT=%NAMESHORT:"=%.exe
 set CODE=".build\electron\%NAMESHORT%"
 
-%CODE% %*
+%CODE% %* --ms-enable-electron-run-as-node
 
 popd
 
 endlocal
-exit /b %errorlevel%
+exit /b %errorlevel%
diff --git a/scripts/node-electron.sh b/scripts/node-electron.sh
@@ -26,9 +26,11 @@ export VSCODE_DEV=1
 if [[ "$OSTYPE" == "darwin"* ]]; then
 	ulimit -n 4096 ; ELECTRON_RUN_AS_NODE=1 \
 		"$CODE" \
-		"$@"
+		"$@" \
+		--ms-enable-electron-run-as-node
 else
 	ELECTRON_RUN_AS_NODE=1 \
 		"$CODE" \
-		"$@"
+		"$@" \
+		--ms-enable-electron-run-as-node
 fi
-Original file line number
+Diff line change
@@ Expand Up / @@ -85,6 +85,7 @@ @@
     		"grid",
     		"splitview",
     		"table",
-    		"list"
+    		"list",
+    		"git"
     	]
     }