Merge remote-tracking branch 'origin/master'

a1279d33 · Joao Moreno · 507a3508 · 272c6827 · a1279d33
隐藏空白更改
内联并排

Showing with 6 addition and 1 deletion

extensions/gulp/src/main.ts extensions/gulp/src/main.ts +6 -1

未找到文件。
--- a/extensions/gulp/src/main.ts
+++ b/extensions/gulp/src/main.ts
@@ -120,7 +120,12 @@ class FolderDetector {
 		let gulpCommand: string;
 		let platform = process.platform;
 		if (platform === 'win32' && await exists(path.join(rootPath!, 'node_modules', '.bin', 'gulp.cmd'))) {
-			gulpCommand = path.join('.', 'node_modules', '.bin', 'gulp.cmd');
+			const globalGulp = path.join(process.env.APPDATA ? process.env.APPDATA : '', 'npm', 'gulp.cmd');
+			if (await exists(globalGulp)) {
+				gulpCommand = globalGulp;
+			} else {
+				gulpCommand = path.join('.', 'node_modules', '.bin', 'gulp.cmd');
+			}
 		} else if ((platform === 'linux' || platform === 'darwin') && await exists(path.join(rootPath!, 'node_modules', '.bin', 'gulp'))) {
 			gulpCommand = path.join('.', 'node_modules', '.bin', 'gulp');
 		} else {