VSCode merge (microsoft#4610)

* Merge from vscode e388c73 * fix yarn lcoks * remove small issue
alexhass · Mar 20, 2019 · c814b92 · c814b92
1 parent 87765e8
commit c814b92
Show file tree

Hide file tree

Showing 310 changed files with 6,590 additions and 2,113 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -6,4 +6,5 @@ ThirdPartyNotices.txt eol=crlf
 *.bat eol=crlf
 *.cmd eol=crlf
 *.ps1 eol=lf
-*.sh eol=lf
+*.sh eol=lf
+*.rtf -text
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-8
+10
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -211,6 +211,13 @@
 				"Launch azuredatastudio",
 				"Attach to Extension Host"
 			]
-		}
+		},
+		{
+			"name": "Debug Unit Tests",
+			"configurations": [
+				"Attach to VS Code",
+				"Run Unit Tests"
+			]
+		},
 	]
 }
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -28,23 +28,6 @@
 				}
 			}
 		},
-		{
-			"type": "npm",
-			"script": "strict-null-check-watch",
-			"label": "TS - Strict Null Checks",
-			"isBackground": true,
-			"presentation": {
-				"reveal": "never"
-			},
-			"problemMatcher": {
-				"base": "$tsc-watch",
-				"owner": "typescript-strict-null",
-				"applyTo": "allDocuments"
-			},
-			"runOptions": {
-				"runOn": "folderOpen"
-			}
-		},
 		{
 			"type": "gulp",
 			"task": "tslint",
@@ -86,4 +69,4 @@
 			"problemMatcher": []
 		}
 	]
-}
+}
diff --git a/build/azure-pipelines/darwin/continuous-build-darwin.yml b/build/azure-pipelines/darwin/continuous-build-darwin.yml
@@ -2,24 +2,25 @@ steps:
 - task: NodeTool@0
   inputs:
     versionSpec: "10.15.1"
-- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
-  inputs:
-    keyfile: '**/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
-    targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
-    vstsFeed: '$(ArtifactFeed)'
 - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
   inputs:
     versionSpec: "1.10.1"
+# - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
+#   inputs:
+#     keyfile: '**/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
+#     targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
+#     vstsFeed: '$(ArtifactFeed)'
+#   condition: eq(variables['System.PullRequest.PullRequestId'], '')
 - script: |
     yarn
   displayName: Install Dependencies
-  condition: ne(variables['CacheRestored'], 'true')
-- task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
-  inputs:
-    keyfile: '**/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
-    targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
-    vstsFeed: '$(ArtifactFeed)'
-  condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
+#   condition: or(ne(variables['System.PullRequest.PullRequestId'], ''), ne(variables['CacheRestored'], 'true'))
+# - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
+#   inputs:
+#     keyfile: '**/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
+#     targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
+#     vstsFeed: '$(ArtifactFeed)'
+#   condition: and(succeeded(), eq(variables['System.PullRequest.PullRequestId'], ''), ne(variables['CacheRestored'], 'true'))
 - script: |
     yarn gulp electron-x64
   displayName: Download Electron
@@ -29,9 +30,6 @@ steps:
 - script: |
     yarn monaco-compile-check
   displayName: Run Monaco Editor Checks
-- script: |
-    yarn strict-null-check
-  displayName: Run Strict Null Checks
 - script: |
     yarn compile
   displayName: Compile Sources
@@ -49,4 +47,4 @@ steps:
   inputs:
     testResultsFiles: '*-results.xml'
     searchFolder: '$(Build.ArtifactStagingDirectory)/test-results'
-  condition: succeededOrFailed()
+  condition: succeededOrFailed()
diff --git a/build/azure-pipelines/darwin/product-build-darwin.yml b/build/azure-pipelines/darwin/product-build-darwin.yml
@@ -9,12 +9,19 @@ steps:
 
 - script: |
     set -e
-    echo "machine monacotools.visualstudio.com password $(VSO_PAT)" > ~/.netrc
+
+    cat << EOF > ~/.netrc
+    machine monacotools.visualstudio.com
+    password $(VSO_PAT)
+    machine github.com
+    login vscode
+    password $(VSCODE_MIXIN_PASSWORD)
+    EOF
+
     yarn
+    VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)" yarn gulp -- mixin
     yarn gulp -- hygiene
     yarn monaco-compile-check
-    yarn strict-null-check
-    VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)" yarn gulp -- mixin
     node build/azure-pipelines/common/installDistro.js
     node build/lib/builtInExtensions.js
   displayName: Prepare build

diff --git a/build/azure-pipelines/linux/continuous-build-linux.yml b/build/azure-pipelines/linux/continuous-build-linux.yml
@@ -10,24 +10,25 @@ steps:
 - task: NodeTool@0
   inputs:
     versionSpec: "10.15.1"
-- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
-  inputs:
-    keyfile: '**/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
-    targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
-    vstsFeed: '$(ArtifactFeed)'
 - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
   inputs:
     versionSpec: "1.10.1"
+# - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
+#   inputs:
+#     keyfile: '**/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
+#     targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
+#     vstsFeed: '$(ArtifactFeed)'
+#   condition: eq(variables['System.PullRequest.PullRequestId'], '')
 - script: |
     yarn
   displayName: Install Dependencies
-  condition: ne(variables['CacheRestored'], 'true')
-- task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
-  inputs:
-    keyfile: '**/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
-    targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
-    vstsFeed: '$(ArtifactFeed)'
-  condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
+  # condition: or(ne(variables['System.PullRequest.PullRequestId'], ''), ne(variables['CacheRestored'], 'true'))
+# - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
+#   inputs:
+#     keyfile: '**/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
+#     targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
+#     vstsFeed: '$(ArtifactFeed)'
+#   condition: and(succeeded(), eq(variables['System.PullRequest.PullRequestId'], ''), ne(variables['CacheRestored'], 'true'))
 - script: |
     yarn gulp electron-x64
   displayName: Download Electron
@@ -37,9 +38,6 @@ steps:
 - script: |
     yarn monaco-compile-check
   displayName: Run Monaco Editor Checks
-- script: |
-    yarn strict-null-check
-  displayName: Run Strict Null Checks
 - script: |
     yarn compile
   displayName: Compile Sources
@@ -54,4 +52,4 @@ steps:
   inputs:
     testResultsFiles: '*-results.xml'
     searchFolder: '$(Build.ArtifactStagingDirectory)/test-results'
-  condition: succeededOrFailed()
+  condition: succeededOrFailed()
diff --git a/build/azure-pipelines/linux/product-build-linux.yml b/build/azure-pipelines/linux/product-build-linux.yml
@@ -14,12 +14,18 @@ steps:
       export PKG_CONFIG_PATH="/usr/lib/i386-linux-gnu/pkgconfig"
     fi
 
-    echo "machine monacotools.visualstudio.com password $(VSO_PAT)" > ~/.netrc
+    cat << EOF > ~/.netrc
+    machine monacotools.visualstudio.com
+    password $(VSO_PAT)
+    machine github.com
+    login vscode
+    password $(VSCODE_MIXIN_PASSWORD)
+    EOF
+
     CHILD_CONCURRENCY=1 yarn
+    VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)" npm run gulp -- mixin
     npm run gulp -- hygiene
     npm run monaco-compile-check
-    npm run strict-null-check
-    VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)" npm run gulp -- mixin
     node build/azure-pipelines/common/installDistro.js
     node build/lib/builtInExtensions.js
 

diff --git a/build/azure-pipelines/win32/continuous-build-win32.yml b/build/azure-pipelines/win32/continuous-build-win32.yml
@@ -9,21 +9,22 @@ steps:
   inputs:
     versionSpec: '2.x'
     addToPath: true
-- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
-  inputs:
-    keyfile: '**/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
-    targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
-    vstsFeed: '$(ArtifactFeed)'
+# - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
+#   inputs:
+#     keyfile: '**/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
+#     targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
+#     vstsFeed: '$(ArtifactFeed)'
+#   condition: eq(variables['System.PullRequest.PullRequestId'], '')
 - powershell: |
     yarn
   displayName: Install Dependencies
-  condition: ne(variables['CacheRestored'], 'true')
-- task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
-  inputs:
-    keyfile: '**/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
-    targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
-    vstsFeed: '$(ArtifactFeed)'
-  condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
+  # condition: or(ne(variables['System.PullRequest.PullRequestId'], ''), ne(variables['CacheRestored'], 'true'))
+# - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
+#   inputs:
+#     keyfile: '**/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
+#     targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
+#     vstsFeed: '$(ArtifactFeed)'
+#   condition: and(succeeded(), eq(variables['System.PullRequest.PullRequestId'], ''), ne(variables['CacheRestored'], 'true'))
 - powershell: |
     yarn gulp electron
   displayName: Download Electron
@@ -33,9 +34,6 @@ steps:
 - powershell: |
     yarn monaco-compile-check
   displayName: Run Monaco Editor Checks
-- script: |
-    yarn strict-null-check
-  displayName: Run Strict Null Checks
 - powershell: |
     yarn compile
   displayName: Compile Sources

diff --git a/build/azure-pipelines/win32/product-build-win32.yml b/build/azure-pipelines/win32/product-build-win32.yml
@@ -15,15 +15,14 @@ steps:
 - powershell: |
     . build/azure-pipelines/win32/exec.ps1
     $ErrorActionPreference = "Stop"
-    "machine monacotools.visualstudio.com password $(VSO_PAT)" | Out-File "$env:USERPROFILE\_netrc" -Encoding ASCII
+    "machine monacotools.visualstudio.com`npassword $(VSO_PAT)`nmachine github.com`nlogin vscode`npassword $(VSCODE_MIXIN_PASSWORD)" | Out-File "$env:USERPROFILE\_netrc" -Encoding ASCII
     $env:npm_config_arch="$(VSCODE_ARCH)"
     $env:CHILD_CONCURRENCY="1"
     $env:VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)"
     exec { yarn }
+    exec { npm run gulp -- mixin }
     exec { npm run gulp -- hygiene }
     exec { npm run monaco-compile-check }
-    exec { npm run strict-null-check }
-    exec { npm run gulp -- mixin }
     exec { node build/azure-pipelines/common/installDistro.js }
     exec { node build/lib/builtInExtensions.js }
 

diff --git a/build/gulpfile.hygiene.js b/build/gulpfile.hygiene.js
@@ -42,7 +42,8 @@ const indentationFilter = [
 
 	// except specific files
 	'!ThirdPartyNotices.txt',
-	'!LICENSE.txt',
+	'!LICENSE.{txt,rtf}',
+	'!LICENSES.chromium.html',
 	'!**/LICENSE',
 	'!src/vs/nls.js',
 	'!src/vs/nls.build.js',

diff --git a/build/gulpfile.mixin.js b/build/gulpfile.mixin.js
@@ -10,15 +10,15 @@ const json = require('gulp-json-editor');
 const buffer = require('gulp-buffer');
 const filter = require('gulp-filter');
 const es = require('event-stream');
-const util = require('./lib/util');
-const remote = require('gulp-remote-src');
-const zip = require('gulp-vinyl-zip');
+const vfs = require('vinyl-fs');
+const pkg = require('../package.json');
+const cp = require('child_process');
+const fancyLog = require('fancy-log');
+const ansiColors = require('ansi-colors');
 
 // {{SQL CARBON EDIT}}
 const jeditor = require('gulp-json-editor');
 
-const pkg = require('../package.json');
-
 gulp.task('mixin', function () {
   // {{SQL CARBON EDIT}}
 	const updateUrl = process.env['SQLOPS_UPDATEURL'];

diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
@@ -321,7 +321,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
 		const productJsonStream = gulp.src(['product.json'], { base: '.' })
 			.pipe(json(productJsonUpdate));
 
-		const license = gulp.src(['LICENSES.chromium.html', 'LICENSE.txt', 'ThirdPartyNotices.txt', 'licenses/**'], { base: '.', allowEmpty: true });
+		const license = gulp.src(['LICENSES.chromium.html', product.licenseFileName, 'ThirdPartyNotices.txt', 'licenses/**'], { base: '.', allowEmpty: true });
 
 		// TODO the API should be copied to `out` during compile, not here
 		const api = gulp.src('src/vs/vscode.d.ts').pipe(rename('out/vs/vscode.d.ts'));

diff --git a/build/lib/i18n.resources.json b/build/lib/i18n.resources.json
@@ -42,6 +42,10 @@
 			"name": "vs/workbench/contrib/codeinset",
 			"project": "vscode-workbench"
 		},
+		{
+			"name": "vs/workbench/contrib/callHierarchy",
+			"project": "vscode-workbench"
+		},
 		{
 			"name": "vs/workbench/contrib/comments",
 			"project": "vscode-workbench"
@@ -218,6 +222,10 @@
 			"name": "vs/workbench/services/files",
 			"project": "vscode-workbench"
 		},
+		{
+			"name": "vs/workbench/services/files2",
+			"project": "vscode-workbench"
+		},
 		{
 			"name": "vs/workbench/services/integrity",
 			"project": "vscode-workbench"

diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js
@@ -17,8 +17,17 @@ function yarnInstall(location, opts) {
 	opts.cwd = location;
 	opts.stdio = 'inherit';
 
+	const raw = process.env['npm_config_argv'] || '{}';
+	const argv = JSON.parse(raw);
+	const original = argv.original || [];
+	const args = ['install'];
+
+	if (original.indexOf('--ignore-optional') > -1) {
+		args.push('--ignore-optional');
+	}
+
 	console.log('Installing dependencies in \'%s\'.', location);
-	const result = cp.spawnSync(yarn, ['install'], opts);
+	const result = cp.spawnSync(yarn, args, opts);
 
 	if (result.error || result.status !== 0) {
 		process.exit(1);