From 4bda5f82af06a0055ad36d9ec5626f2cd55f74ed Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Fri, 31 Jul 2020 10:38:31 -0700
Subject: [PATCH] launch: check prerequisites in a pre-launch task

Fixes https://github.com/microsoft/vscode/issues/103708
---
 code-cli.bat | 14 ++------------
 code-cli.sh  | 15 ++++-----------
 code.bat     | 13 ++-----------
 code.sh      | 15 ++++-----------
 4 files changed, 12 insertions(+), 45 deletions(-)

diff --git a/code-cli.bat b/code-cli.bat
index a07ccc96bf6d6..2e4e34ff32e7d 100644
--- a/code-cli.bat
+++ b/code-cli.bat
@@ -5,27 +5,17 @@ title VSCode Dev
 
 pushd %~dp0\..
 
-:: Node modules
-if not exist node_modules call yarn
+:: Get electron, compile, built-in extensions
+if "%VSCODE_SKIP_PRELAUNCH%"=="" node build/lib/preLaunch.js
 
 for /f "tokens=2 delims=:," %%a in ('findstr /R /C:"\"nameShort\":.*" product.json') do set NAMESHORT=%%~a
 set NAMESHORT=%NAMESHORT: "=%
 set NAMESHORT=%NAMESHORT:"=%.exe
 set CODE=".build\electron\%NAMESHORT%"
 
-:: Download Electron if needed
-node build\lib\electron.js
-if %errorlevel% neq 0 node .\node_modules\gulp\bin\gulp.js electron
-
 :: Manage built-in extensions
 if "%1"=="--builtin" goto builtin
 
-:: Sync built-in extensions
-node build\lib\builtInExtensions.js
-
-:: Build
-if not exist out yarn compile
-
 :: Configuration
 set ELECTRON_RUN_AS_NODE=1
 set NODE_ENV=development
diff --git a/code-cli.sh b/code-cli.sh
index e4fa552e64259..a792c08532ee6 100755
--- a/code-cli.sh
+++ b/code-cli.sh
@@ -18,11 +18,10 @@ function code() {
 		CODE=".build/electron/$NAME"
 	fi
 
-	# Node modules
-	test -d node_modules || yarn
-
-	# Get electron
-	yarn electron
+	# Get electron, compile, built-in extensions
+	if [[ -z "${VSCODE_SKIP_PRELAUNCH}" ]]; then
+		node build/lib/preLaunch.js
+	fi
 
 	# Manage built-in extensions
 	if [[ "$1" == "--builtin" ]]; then
@@ -30,12 +29,6 @@ function code() {
 		return
 	fi
 
-	# Sync built-in extensions
-	node build/lib/builtInExtensions.js
-
-	# Build
-	test -d out || yarn compile
-
 	ELECTRON_RUN_AS_NODE=1 \
 	NODE_ENV=development \
 	VSCODE_DEV=1 \
diff --git a/code.bat b/code.bat
index c4c1cc7c05799..7ef1fd33fe000 100644
--- a/code.bat
+++ b/code.bat
@@ -5,26 +5,17 @@ title VSCode Dev
 
 pushd %~dp0\..
 
-:: Node modules
-if not exist node_modules call yarn
+:: Get electron, compile, built-in extensions
+if "%VSCODE_SKIP_PRELAUNCH%"=="" node build/lib/preLaunch.js
 
 for /f "tokens=2 delims=:," %%a in ('findstr /R /C:"\"nameShort\":.*" product.json') do set NAMESHORT=%%~a
 set NAMESHORT=%NAMESHORT: "=%
 set NAMESHORT=%NAMESHORT:"=%.exe
 set CODE=".build\electron\%NAMESHORT%"
 
-:: Get electron
-call yarn electron
-
 :: Manage built-in extensions
 if "%1"=="--builtin" goto builtin
 
-:: Sync built-in extensions
-node build\lib\builtInExtensions.js
-
-:: Build
-if not exist out yarn compile
-
 :: Configuration
 set NODE_ENV=development
 set VSCODE_DEV=1
diff --git a/code.sh b/code.sh
index 390aa4b201d22..b19cc0df9ff43 100755
--- a/code.sh
+++ b/code.sh
@@ -24,11 +24,10 @@ function code() {
 		CODE=".build/electron/$NAME"
 	fi
 
-	# Node modules
-	test -d node_modules || yarn
-
-	# Get electron
-	yarn electron
+	# Get electron, compile, built-in extensions
+	if [[ -z "${VSCODE_SKIP_PRELAUNCH}" ]]; then
+		node build/lib/preLaunch.js
+	fi
 
 	# Manage built-in extensions
 	if [[ "$1" == "--builtin" ]]; then
@@ -36,12 +35,6 @@ function code() {
 		return
 	fi
 
-	# Sync built-in extensions
-	node build/lib/builtInExtensions.js
-
-	# Build
-	test -d out || yarn compile
-
 	# Configuration
 	export NODE_ENV=development
 	export VSCODE_DEV=1