Merge from vscode 52dcb723a39ae75bee1bd56b3312d7fcdc87aeed (#6719)

2026-02-17 02:51:36 -05:00 · 2019-08-12 21:31:51 -07:00
parent 00250839fc
commit 7eba8c4c03
616 changed files with 9472 additions and 7087 deletions
--- a/build/azure-pipelines/darwin/product-build-darwin.yml
+++ b/build/azure-pipelines/darwin/product-build-darwin.yml
@@ -2,11 +2,12 @@ steps:
 - script: |
    mkdir -p .build
    echo -n $BUILD_SOURCEVERSION > .build/commit
+    echo -n $VSCODE_QUALITY > .build/quality
  displayName: Prepare cache flag

 - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
  inputs:
-    keyfile: 'build/.cachesalt, .build/commit'
+    keyfile: 'build/.cachesalt, .build/commit, .build/quality'
    targetfolder: '.build, out-build, out-vscode-min, out-vscode-reh-min, out-vscode-reh-web-min'
    vstsFeed: 'npm-vscode'
    platformIndependent: true
--- a/build/azure-pipelines/linux/multiarch/arm64/build.sh
+++ b/build/azure-pipelines/linux/multiarch/arm64/build.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+set -e
+echo 'noop'
--- a/build/azure-pipelines/linux/multiarch/arm64/prebuild.sh
+++ b/build/azure-pipelines/linux/multiarch/arm64/prebuild.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+set -e
+echo 'noop'
--- a/build/azure-pipelines/linux/multiarch/arm64/publish.sh
+++ b/build/azure-pipelines/linux/multiarch/arm64/publish.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+set -e
+echo 'noop'
--- a/build/azure-pipelines/linux/product-build-linux-multiarch.yml
+++ b/build/azure-pipelines/linux/product-build-linux-multiarch.yml
@@ -2,11 +2,12 @@ steps:
 - script: |
    mkdir -p .build
    echo -n $BUILD_SOURCEVERSION > .build/commit
+    echo -n $VSCODE_QUALITY > .build/quality
  displayName: Prepare cache flag

 - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
  inputs:
-    keyfile: 'build/.cachesalt, .build/commit'
+    keyfile: 'build/.cachesalt, .build/commit, .build/quality'
    targetfolder: '.build, out-build, out-vscode-min, out-vscode-reh-min, out-vscode-reh-web-min'
    vstsFeed: 'npm-vscode'
    platformIndependent: true
@@ -112,4 +113,4 @@ steps:

 - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
  displayName: 'Component Detection'
-  continueOnError: true
+  continueOnError: true
--- a/build/azure-pipelines/linux/product-build-linux.yml
+++ b/build/azure-pipelines/linux/product-build-linux.yml
@@ -2,11 +2,12 @@ steps:
 - script: |
    mkdir -p .build
    echo -n $BUILD_SOURCEVERSION > .build/commit
+    echo -n $VSCODE_QUALITY > .build/quality
  displayName: Prepare cache flag

 - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
  inputs:
-    keyfile: 'build/.cachesalt, .build/commit'
+    keyfile: 'build/.cachesalt, .build/commit, .build/quality'
    targetfolder: '.build, out-build, out-vscode-min, out-vscode-reh-min, out-vscode-reh-web-min'
    vstsFeed: 'npm-vscode'
    platformIndependent: true
--- a/build/azure-pipelines/product-build.yml
+++ b/build/azure-pipelines/product-build.yml
@@ -66,6 +66,17 @@ jobs:
  steps:
  - template: linux/product-build-linux-multiarch.yml

+- job: LinuxArm64
+  condition: and(succeeded(), eq(variables['VSCODE_COMPILE_ONLY'], 'false'), eq(variables['VSCODE_BUILD_LINUX_ARM64'], 'true'), ne(variables['VSCODE_QUALITY'], 'stable'))
+  pool:
+    vmImage: 'Ubuntu-16.04'
+  variables:
+    VSCODE_ARCH: arm64
+  dependsOn:
+  - Compile
+  steps:
+  - template: linux/product-build-linux-multiarch.yml
+
 - job: LinuxAlpine
  condition: and(succeeded(), eq(variables['VSCODE_COMPILE_ONLY'], 'false'), eq(variables['VSCODE_BUILD_LINUX_ALPINE'], 'true'), ne(variables['VSCODE_QUALITY'], 'stable'))
  pool:
@@ -128,6 +139,9 @@ jobs:
  steps:
  - template: sync-mooncake.yml

+trigger: none
+pr: none
+
 schedules:
 - cron: "0 5 * * Mon-Fri"
  displayName: Mon-Fri at 7:00
--- a/build/azure-pipelines/product-compile.yml
+++ b/build/azure-pipelines/product-compile.yml
@@ -2,11 +2,12 @@ steps:
 - script: |
    mkdir -p .build
    echo -n $BUILD_SOURCEVERSION > .build/commit
+    echo -n $VSCODE_QUALITY > .build/quality
  displayName: Prepare cache flag

 - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
  inputs:
-    keyfile: 'build/.cachesalt, .build/commit'
+    keyfile: 'build/.cachesalt, .build/commit, .build/quality'
    targetfolder: '.build, out-build, out-vscode-min, out-vscode-reh-min, out-vscode-reh-web-min'
    vstsFeed: 'npm-vscode'
    platformIndependent: true
@@ -116,9 +117,9 @@ steps:

 - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
  inputs:
-    keyfile: 'build/.cachesalt, .build/commit'
+    keyfile: 'build/.cachesalt, .build/commit, .build/quality'
    targetfolder: '.build, out-build, out-vscode-min, out-vscode-reh-min, out-vscode-reh-web-min'
    vstsFeed: 'npm-vscode'
    platformIndependent: true
    alias: 'Compilation'
-  condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
+  condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
--- a/build/azure-pipelines/upload-sourcemaps.js
+++ b/build/azure-pipelines/upload-sourcemaps.js
@@ -13,19 +13,37 @@ const util = require('../lib/util');
 const root = path.dirname(path.dirname(__dirname));
 const commit = util.getVersion(root);

-function main() {
-	const vs = vfs.src('out-vscode-min/**/*.map', { base: 'out-vscode-min' }) // client source-maps only
+// optionally allow to pass in explicit base/maps to upload
+const [, , base, maps] = process.argv;
+
+const fetch = function (base, maps = `${base}/**/*.map`) {
+	return vfs.src(maps, { base })
 		.pipe(es.mapSync(f => {
 			f.path = `${f.base}/core/${f.relative}`;
 			return f;
 		}));
+};

-	const extensionsOut = vfs.src(['.build/extensions/**/*.js.map', '!**/node_modules/**'], { base: '.build' });
+function main() {
+	const sources = [];

-	return es.merge(vs, extensionsOut)
+	// vscode client maps (default)
+	if (!base) {
+		const vs = fetch('out-vscode-min'); // client source-maps only
+		sources.push(vs);
+
+		const extensionsOut = vfs.src(['.build/extensions/**/*.js.map', '!**/node_modules/**'], { base: '.build' });
+		sources.push(extensionsOut);
+	}
+
+	// specific client base/maps
+	else {
+		sources.push(fetch(base, maps));
+	}
+
+	return es.merge(...sources)
 		.pipe(es.through(function (data) {
-			// debug
-			console.log('Uploading Sourcemap', data.relative);
+			console.log('Uploading Sourcemap', data.relative); // debug
 			this.emit('data', data);
 		}))
 		.pipe(azure.upload({
@@ -36,4 +54,4 @@ function main() {
 		}));
 }

-main();
+main();
--- a/build/azure-pipelines/web/product-build-web.yml
+++ b/build/azure-pipelines/web/product-build-web.yml
@@ -2,11 +2,12 @@ steps:
 - script: |
    mkdir -p .build
    echo -n $BUILD_SOURCEVERSION > .build/commit
+    echo -n $VSCODE_QUALITY > .build/quality
  displayName: Prepare cache flag

 - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
  inputs:
-    keyfile: 'build/.cachesalt, .build/commit'
+    keyfile: 'build/.cachesalt, .build/commit, .build/quality'
    targetfolder: '.build, out-build, out-vscode-min, out-vscode-reh-min, out-vscode-reh-web-min'
    vstsFeed: 'npm-vscode'
    platformIndependent: true
@@ -87,6 +88,15 @@ steps:
      yarn gulp vscode-web-min-ci
  displayName: Build

+  # upload only the workbench.web.api.js source maps because
+  # we just compiled these bits in the previous step and the
+  # general task to upload source maps has already been run
+- script: |
+    set -e
+    AZURE_STORAGE_ACCESS_KEY="$(ticino-storage-key)" \
+      node build/azure-pipelines/upload-sourcemaps out-vscode-web-min out-vscode-web-min/vs/workbench/workbench.web.api.js.map
+  displayName: Upload sourcemaps (Web)
+
 - script: |
    set -e
    AZURE_DOCUMENTDB_MASTERKEY="$(builds-docdb-key-readwrite)" \
--- a/build/azure-pipelines/win32/product-build-win32.yml
+++ b/build/azure-pipelines/win32/product-build-win32.yml
@@ -2,11 +2,12 @@ steps:
 - powershell: |
    mkdir .build -ea 0
    "$env:BUILD_SOURCEVERSION" | Out-File -Encoding ascii -NoNewLine .build\commit
+    "$env:VSCODE_QUALITY" | Out-File -Encoding ascii -NoNewLine .build\quality
  displayName: Prepare cache flag

 - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
  inputs:
-    keyfile: 'build/.cachesalt, .build/commit'
+    keyfile: 'build/.cachesalt, .build/commit, .build/quality'
    targetfolder: '.build, out-build, out-vscode-min, out-vscode-reh-min, out-vscode-reh-web-min'
    vstsFeed: 'npm-vscode'
    platformIndependent: true
--- a/build/gulpfile.reh.js
+++ b/build/gulpfile.reh.js
@@ -31,6 +31,7 @@ const BUILD_TARGETS = [
 	{ platform: 'linux', arch: 'ia32', pkgTarget: 'node8-linux-x86' },
 	{ platform: 'linux', arch: 'x64', pkgTarget: 'node8-linux-x64' },
 	{ platform: 'linux', arch: 'armhf', pkgTarget: 'node8-linux-armv7' },
+	{ platform: 'linux', arch: 'arm64', pkgTarget: 'node8-linux-arm64' },
 	{ platform: 'linux', arch: 'alpine', pkgTarget: 'node8-linux-alpine' },
 ];

@@ -41,6 +42,7 @@ gulp.task('vscode-reh-win32-x64-min', noop);
 gulp.task('vscode-reh-darwin-min', noop);
 gulp.task('vscode-reh-linux-x64-min', noop);
 gulp.task('vscode-reh-linux-armhf-min', noop);
+gulp.task('vscode-reh-linux-arm64-min', noop);
 gulp.task('vscode-reh-linux-alpine-min', noop);

 gulp.task('vscode-reh-web-win32-ia32-min', noop);
--- a/build/gulpfile.vscode.js
+++ b/build/gulpfile.vscode.js
@@ -58,7 +58,7 @@ const nodeModules = [

 // Build
 const vscodeEntryPoints = _.flatten([
-	buildfile.entrypoint('vs/workbench/workbench.main'),
+	buildfile.entrypoint('vs/workbench/workbench.desktop.main'),
 	buildfile.base,
 	buildfile.serviceWorker,
 	buildfile.workbench,
@@ -255,8 +255,8 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
 		const out = sourceFolderName;

 		const checksums = computeChecksums(out, [
-			'vs/workbench/workbench.main.js',
-			'vs/workbench/workbench.main.css',
+			'vs/workbench/workbench.desktop.main.js',
+			'vs/workbench/workbench.desktop.main.css',
 			'vs/code/electron-browser/workbench/workbench.html',
 			'vs/code/electron-browser/workbench/workbench.js'
 		]);
@@ -353,7 +353,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
 			.pipe(electron(_.extend({}, config, { platform, arch, ffmpegChromium: true })))
 			.pipe(filter(['**', '!LICENSE', '!LICENSES.chromium.html', '!version'], { dot: true }));

-		// result = es.merge(result, gulp.src('resources/completions/**', { base: '.' }));
+		if (platform === 'linux') {
+			result = es.merge(result, gulp.src('resources/completions/bash/code', { base: '.' })
+				.pipe(replace('@@APPNAME@@', product.applicationName))
+				.pipe(rename(function (f) { f.basename = product.applicationName; })));
+
+			result = es.merge(result, gulp.src('resources/completions/zsh/_code', { base: '.' })
+				.pipe(replace('@@APPNAME@@', product.applicationName))
+				.pipe(rename(function (f) { f.basename = '_' + product.applicationName; })));
+		}

 		if (platform === 'win32') {
 			result = es.merge(result, gulp.src('resources/win32/bin/code.js', { base: 'resources/win32', allowEmpty: true }));
--- a/build/gulpfile.vscode.linux.js
+++ b/build/gulpfile.vscode.linux.js
@@ -55,11 +55,13 @@ function prepareDebPackage(arch) {
 		const icon = gulp.src('resources/linux/code.png', { base: '.' })
 			.pipe(rename('usr/share/pixmaps/' + product.linuxIconName + '.png'));

-		// const bash_completion = gulp.src('resources/completions/bash/code')
-		// 	.pipe(rename('usr/share/bash-completion/completions/code'));
+		const bash_completion = gulp.src('resources/completions/bash/code')
+			.pipe(replace('@@APPNAME@@', product.applicationName))
+			.pipe(rename('usr/share/bash-completion/completions/' + product.applicationName));

-		// const zsh_completion = gulp.src('resources/completions/zsh/_code')
-		// 	.pipe(rename('usr/share/zsh/vendor-completions/_code'));
+		const zsh_completion = gulp.src('resources/completions/zsh/_code')
+			.pipe(replace('@@APPNAME@@', product.applicationName))
+			.pipe(rename('usr/share/zsh/vendor-completions/_' + product.applicationName));

 		const code = gulp.src(binaryDir + '/**/*', { base: binaryDir })
 			.pipe(rename(function (p) { p.dirname = 'usr/share/' + product.applicationName + '/' + p.dirname; }));
@@ -95,7 +97,7 @@ function prepareDebPackage(arch) {
 			.pipe(replace('@@UPDATEURL@@', product.updateUrl || '@@UPDATEURL@@'))
 			.pipe(rename('DEBIAN/postinst'));

-		const all = es.merge(control, postinst, postrm, prerm, desktops, appdata, icon, /* bash_completion, zsh_completion, */ code);
+		const all = es.merge(control, postinst, postrm, prerm, desktops, appdata, icon, bash_completion, zsh_completion, code);

 		return all.pipe(vfs.dest(destination));
 	};
@@ -146,11 +148,13 @@ function prepareRpmPackage(arch) {
 		const icon = gulp.src('resources/linux/code.png', { base: '.' })
 			.pipe(rename('BUILD/usr/share/pixmaps/' + product.linuxIconName + '.png'));

-		// const bash_completion = gulp.src('resources/completions/bash/code')
-		// 	.pipe(rename('BUILD/usr/share/bash-completion/completions/code'));
+		const bash_completion = gulp.src('resources/completions/bash/code')
+			.pipe(replace('@@APPNAME@@', product.applicationName))
+			.pipe(rename('BUILD/usr/share/bash-completion/completions/' + product.applicationName));

-		// const zsh_completion = gulp.src('resources/completions/zsh/_code')
-		// 	.pipe(rename('BUILD/usr/share/zsh/site-functions/_code'));
+		const zsh_completion = gulp.src('resources/completions/zsh/_code')
+			.pipe(replace('@@APPNAME@@', product.applicationName))
+			.pipe(rename('BUILD/usr/share/zsh/site-functions/_' + product.applicationName));

 		const code = gulp.src(binaryDir + '/**/*', { base: binaryDir })
 			.pipe(rename(function (p) { p.dirname = 'BUILD/usr/share/' + product.applicationName + '/' + p.dirname; }));
@@ -173,7 +177,7 @@ function prepareRpmPackage(arch) {
 		const specIcon = gulp.src('resources/linux/rpm/code.xpm', { base: '.' })
 			.pipe(rename('SOURCES/' + product.applicationName + '.xpm'));

-		const all = es.merge(code, desktops, appdata, icon, /* bash_completion, zsh_completion, */ spec, specIcon);
+		const all = es.merge(code, desktops, appdata, icon, bash_completion, zsh_completion, spec, specIcon);

 		return all.pipe(vfs.dest(getRpmBuildPath(rpmArch)));
 	};
--- a/build/lib/extensions.js
+++ b/build/lib/extensions.js
@@ -29,12 +29,18 @@ const commit = util.getVersion(root);
 const sourceMappingURLBase = `https://ticino.blob.core.windows.net/sourcemaps/${commit}`;
 function fromLocal(extensionPath) {
    const webpackFilename = path.join(extensionPath, 'extension.webpack.config.js');
-    if (fs.existsSync(webpackFilename)) {
-        return fromLocalWebpack(extensionPath);
-    }
-    else {
-        return fromLocalNormal(extensionPath);
-    }
+    const input = fs.existsSync(webpackFilename)
+        ? fromLocalWebpack(extensionPath)
+        : fromLocalNormal(extensionPath);
+    const tmLanguageJsonFilter = filter('**/*.tmLanguage.json', { restore: true });
+    return input
+        .pipe(tmLanguageJsonFilter)
+        .pipe(buffer())
+        .pipe(es.mapSync((f) => {
+        f.contents = Buffer.from(JSON.stringify(JSON.parse(f.contents.toString('utf8'))));
+        return f;
+    }))
+        .pipe(tmLanguageJsonFilter.restore);
 }
 function fromLocalWebpack(extensionPath) {
    const result = es.through();
--- a/build/lib/extensions.ts
+++ b/build/lib/extensions.ts
@@ -30,11 +30,20 @@ const sourceMappingURLBase = `https://ticino.blob.core.windows.net/sourcemaps/${

 function fromLocal(extensionPath: string): Stream {
 	const webpackFilename = path.join(extensionPath, 'extension.webpack.config.js');
-	if (fs.existsSync(webpackFilename)) {
-		return fromLocalWebpack(extensionPath);
-	} else {
-		return fromLocalNormal(extensionPath);
-	}
+	const input = fs.existsSync(webpackFilename)
+		? fromLocalWebpack(extensionPath)
+		: fromLocalNormal(extensionPath);
+
+	const tmLanguageJsonFilter = filter('**/*.tmLanguage.json', { restore: true });
+
+	return input
+		.pipe(tmLanguageJsonFilter)
+		.pipe(buffer())
+		.pipe(es.mapSync((f: File) => {
+			f.contents = Buffer.from(JSON.stringify(JSON.parse(f.contents.toString('utf8'))));
+			return f;
+		}))
+		.pipe(tmLanguageJsonFilter.restore);
 }

 function fromLocalWebpack(extensionPath: string): Stream {
--- a/build/lib/i18n.resources.json
+++ b/build/lib/i18n.resources.json
@@ -269,6 +269,10 @@
 		{
 			"name": "vs/workbench/services/preferences",
 			"project": "vscode-preferences"
+		},
+		{
+			"name": "vs/workbench/services/notification",
+			"project": "vscode-workbench"
 		}
 	]
 }
--- a/build/npm/postinstall.js
+++ b/build/npm/postinstall.js
@@ -78,4 +78,42 @@ const processTreeDts = path.join('node_modules', 'windows-process-tree', 'typing
 if (fs.existsSync(processTreeDts)) {
 	console.log('Removing windows-process-tree.d.ts');
 	fs.unlinkSync(processTreeDts);
-}
+}
+
+function getInstalledVersion(packageName, cwd) {
+	const opts = {};
+	if (cwd) {
+		opts.cwd = cwd;
+	}
+
+	const result = cp.spawnSync(yarn, ['list', '--pattern', packageName], opts);
+	const stdout = result.stdout.toString();
+	const match = stdout.match(new RegExp(packageName + '@(\\S+)'));
+	if (!match || !match[1]) {
+		throw new Error('Unexpected output from yarn list: ' + stdout);
+	}
+
+	return match[1];
+}
+
+function assertSameVersionsBetweenFolders(packageName, otherFolder) {
+	const baseVersion = getInstalledVersion(packageName);
+	const otherVersion = getInstalledVersion(packageName, otherFolder);
+
+	if (baseVersion !== otherVersion) {
+		throw new Error(`Mismatched versions installed for ${packageName}: root has ${baseVersion}, ./${otherFolder} has ${otherVersion}. These should be the same!`);
+	}
+}
+
+// Check that modules in both the base package.json and remote/ have the same version installed
+const requireSameVersionsInRemote = [
+	'xterm',
+	'xterm-addon-search',
+	'xterm-addon-web-links',
+	'node-pty',
+	'vscode-ripgrep'
+];
+
+requireSameVersionsInRemote.forEach(packageName => {
+	assertSameVersionsBetweenFolders(packageName, 'remote');
+});
--- a/build/npm/update-grammar.js
+++ b/build/npm/update-grammar.js
@@ -132,7 +132,7 @@ exports.update = function (repoId, repoPath, dest, modifyGrammar, version = 'mas
 					if (packageJsonPathOverride) {
 						packageJsonPath += packageJsonPathOverride;
 					}
-					packageJsonPath += '/package.json';
+					packageJsonPath += 'package.json';
 					for (let i = 0; i < cgmanifestRead.registrations.length; i++) {
 						if (cgmanifestRead.registrations[i].component.git.repositoryUrl.substr(cgmanifestRead.registrations[i].component.git.repositoryUrl.length - repoId.length, repoId.length) === repoId) {
 							cgmanifestRead.registrations[i].component.git.commitHash = info.commitSha;
--- a/build/package.json
+++ b/build/package.json
@@ -44,7 +44,7 @@
    "service-downloader": "github:anthonydresser/service-downloader#0.1.5",
    "typescript": "3.5.2",
    "vsce": "1.48.0",
-    "vscode-telemetry-extractor": "1.5.3",
+    "vscode-telemetry-extractor": "^1.5.4",
    "xml2js": "^0.4.17"
  },
  "scripts": {
--- a/build/yarn.lock
+++ b/build/yarn.lock
@@ -3618,19 +3618,19 @@ vsce@1.48.0:
    yauzl "^2.3.1"
    yazl "^2.2.2"

-vscode-ripgrep@^1.5.5:
-  version "1.5.5"
-  resolved "https://registry.yarnpkg.com/vscode-ripgrep/-/vscode-ripgrep-1.5.5.tgz#24c0e9cb356cf889c98e15ecb58f9cf654a1d961"
-  integrity sha512-OrPrAmcun4+uZAuNcQvE6CCPskh+5AsjANod/Q3zRcJcGNxgoOSGlQN9RPtatkUNmkN8Nn8mZBnS1jMylu/dKg==
+vscode-ripgrep@^1.5.6:
+  version "1.5.6"
+  resolved "https://registry.yarnpkg.com/vscode-ripgrep/-/vscode-ripgrep-1.5.6.tgz#93bf5c99ca5f8248950a305e224f6ca153c30af4"
+  integrity sha512-WRIM9XpUj6dsfdAmuI3ANbmT1ysPUVsYy/2uCLDHJa9kbiB4T7uGvFnnc0Rgx2qQnyRAwL7PeWaFgUljPPxf2g==

-vscode-telemetry-extractor@1.5.3:
-  version "1.5.3"
-  resolved "https://registry.yarnpkg.com/vscode-telemetry-extractor/-/vscode-telemetry-extractor-1.5.3.tgz#c17f9065a47425edafd23ea161e80c23274e009d"
-  integrity sha512-feioJ1e1KyMa9rzblnLbSOduo+Ny0l62H3/bSDgfgCSnU/km+tTSYxPBvZHVr7iQfQGC95J61yC/ObqS9EbaQg==
+vscode-telemetry-extractor@^1.5.4:
+  version "1.5.4"
+  resolved "https://registry.yarnpkg.com/vscode-telemetry-extractor/-/vscode-telemetry-extractor-1.5.4.tgz#bcb0d17667fa1b77715e3a3bf372ade18f846782"
+  integrity sha512-MN9LNPo0Rc6cy3sIWTAG97PTWkEKdRnP0VeYoS8vjKSNtG9CAsrUxHgFfYoHm2vNK/ijd0a4NzETyVGO2kT6hw==
  dependencies:
    command-line-args "^5.1.1"
    ts-morph "^3.1.3"
-    vscode-ripgrep "^1.5.5"
+    vscode-ripgrep "^1.5.6"

 vso-node-api@6.1.2-preview:
  version "6.1.2-preview"