Improve workspace text search with notebook editors

Fixes #148068

.eslintignore

@@ -13,6 +13,9 @@
 **/extensions/notebook-renderers/renderer-out/index.js
 **/extensions/simple-browser/media/index.js
 **/extensions/typescript-language-features/test-workspace/**
+**/extensions/typescript-language-features/extension.webpack.config.js
+**/extensions/typescript-language-features/extension-browser.webpack.config.js
+**/extensions/typescript-language-features/web/**
 **/extensions/vscode-api-tests/testWorkspace/**
 **/extensions/vscode-api-tests/testWorkspace2/**
 **/fixtures/**

.github/classifier.json

@@ -78,13 +78,13 @@
 		"file-watcher": {"assign": ["bpasero"]},
 		"font-rendering": {"assign": []},
 		"formatting": {"assign": []},
+		"getting-started": {"assign": ["bhavyaus"]},
 		"ghost-text": {"assign": ["hediet"]},
 		"git": {"assign": ["lszomoru"]},
 		"gpu": {"assign": ["deepak1556"]},
 		"grammar": {"assign": ["mjbvz"]},
 		"grid-view": {"assign": ["joaomoreno"]},
 		"html": {"assign": ["aeschli"]},
-		"i18n": {"assign": []},
 		"icon-brand": {"assign": []},
 		"icons-product": {"assign": ["daviddossett"]},
 		"inlay-hints": {"assign": ["jrieken", "hediet"]},
@@ -133,7 +133,7 @@
 		"rename": {"assign": ["jrieken"]},
 		"scm": {"assign": ["lszomoru"]},
 		"screencast-mode": {"assign": ["lszomoru"]},
-		"search": {"assign": ["roblourens", "andreamah"]},
+		"search": {"assign": ["andreamah"]},
 		"search-editor": {"assign": ["roblourens"]},
 		"search-replace": {"assign": ["sandy081"]},
 		"semantic-tokens": {"assign": ["alexdima", "aeschli"]},

.vscode/settings.json

@@ -12,7 +12,8 @@
 		}
 	},
 	"files.associations": {
-		"cglicenses.json": "jsonc"
+		"cglicenses.json": "jsonc",
+		"*.tst": "typescript"
 	},
 	"search.exclude": {
 		"**/node_modules": true,
@@ -27,7 +28,8 @@
 		"test/automation/out/**": true,
 		"test/integration/browser/out/**": true,
 		"src/vs/base/test/node/uri.test.data.txt": true,
-		"src/vs/workbench/api/test/browser/extHostDocumentData.test.perf-data.ts": true
+		"src/vs/workbench/api/test/browser/extHostDocumentData.test.perf-data.ts": true,
+		"src/vs/editor/test/node/diffing/fixtures/**": true,
 	},
 	"lcov.path": [
 		"./.build/coverage/lcov.info",

build/.moduleignore

@@ -147,6 +147,11 @@ prebuild-install/**/*
 **/*.ts
 !typescript/**/*.d.ts
 
+# Exclude TS files that aren't needed by TS extension
+typescript/lib/tsc.js
+typescript/lib/typescriptServices.js
+typescript/lib/tsserverlibrary.js
+
 jschardet/index.js
 jschardet/src/**
 jschardet/dist/jschardet.js
@@ -167,5 +172,3 @@ xterm-addon-*/src/**
 xterm-addon-*/fixtures/**
 xterm-addon-*/out/**
 xterm-addon-*/out-test/**
-
-

build/azure-pipelines/cli/cli-win32-sign.yml

@@ -8,7 +8,7 @@ steps:
     displayName: "Azure Key Vault: Get Secrets"
     inputs:
       azureSubscription: "vscode-builds-subscription"
-      KeyVaultName: vscode
+      KeyVaultName: vscode-build-secrets
       SecretsFilter: "ESRP-PKI,esrp-aad-username,esrp-aad-password"
 
   - task: UseDotNet@2
@@ -20,16 +20,16 @@ steps:
     displayName: "Use ESRP client"
 
   - ${{ each target in parameters.VSCODE_CLI_ARTIFACTS }}:
-    - task: DownloadPipelineArtifact@2
-      displayName: Download artifacts
-      inputs:
-        artifact: ${{ target }}
-        path: $(Build.ArtifactStagingDirectory)/pkg/${{ target }}
+      - task: DownloadPipelineArtifact@2
+        displayName: Download artifacts
+        inputs:
+          artifact: ${{ target }}
+          path: $(Build.ArtifactStagingDirectory)/pkg/${{ target }}
 
-    - task: ExtractFiles@1
-      inputs:
-        archiveFilePatterns: $(Build.ArtifactStagingDirectory)/pkg/${{ target }}/*.zip
-        destinationFolder: $(Build.ArtifactStagingDirectory)/sign/${{ target }}
+      - task: ExtractFiles@1
+        inputs:
+          archiveFilePatterns: $(Build.ArtifactStagingDirectory)/pkg/${{ target }}/*.zip
+          destinationFolder: $(Build.ArtifactStagingDirectory)/sign/${{ target }}
 
   - powershell: |
       . build/azure-pipelines/win32/exec.ps1
@@ -49,17 +49,17 @@ steps:
     displayName: "Code sign"
 
   - ${{ each target in parameters.VSCODE_CLI_ARTIFACTS }}:
-    - powershell: |
-        $ASSET_ID = "${{ target }}".replace("unsigned_", "");
-        echo "##vso[task.setvariable variable=ASSET_ID]$ASSET_ID"
-      displayName: Set asset id variable
+      - powershell: |
+          $ASSET_ID = "${{ target }}".replace("unsigned_", "");
+          echo "##vso[task.setvariable variable=ASSET_ID]$ASSET_ID"
+        displayName: Set asset id variable
 
-    - task: ArchiveFiles@2
-      inputs:
-        rootFolderOrFile: $(Build.ArtifactStagingDirectory)/sign/${{ target }}/code.exe
-        includeRootFolder: false
-        archiveType: zip
-        archiveFile: $(Build.ArtifactStagingDirectory)/$(ASSET_ID).zip
+      - task: ArchiveFiles@2
+        inputs:
+          rootFolderOrFile: $(Build.ArtifactStagingDirectory)/sign/${{ target }}/code.exe
+          includeRootFolder: false
+          archiveType: zip
+          archiveFile: $(Build.ArtifactStagingDirectory)/$(ASSET_ID).zip
 
-    - publish: $(Build.ArtifactStagingDirectory)/$(ASSET_ID).zip
-      artifact: $(ASSET_ID)
+      - publish: $(Build.ArtifactStagingDirectory)/$(ASSET_ID).zip
+        artifact: $(ASSET_ID)

build/azure-pipelines/cli/install-rust-posix.yml

@@ -1,7 +1,7 @@
 parameters:
   - name: channel
     type: string
-    default: stable
+    default: 1.65.0
   - name: targets
     default: []
     type: object

build/azure-pipelines/cli/install-rust-win32.yml

@@ -1,7 +1,7 @@
 parameters:
   - name: channel
     type: string
-    default: stable
+    default: 1.65.0
   - name: targets
     default: []
     type: object

build/azure-pipelines/cli/prepare.ts

@@ -8,7 +8,7 @@ import * as fs from 'fs';
 import * as path from 'path';
 import * as packageJson from '../../../package.json';
 
-const root = path.dirname(path.dirname(path.dirname(__dirname)));
+const root = process.env.VSCODE_CLI_PREPARE_ROOT || path.dirname(path.dirname(path.dirname(__dirname)));
 const readJSON = (path: string) => JSON.parse(fs.readFileSync(path, 'utf8'));
 
 let productJsonPath: string;
@@ -19,8 +19,7 @@ if (isOSS) {
 	productJsonPath = path.join(root, 'quality', process.env.VSCODE_QUALITY!, 'product.json');
 }
 
-
-console.log('Loading product.json from', productJsonPath);
+console.error('Loading product.json from', productJsonPath);
 const product = readJSON(productJsonPath);
 const allProductsAndQualities = isOSS ? [product] : fs.readdirSync(path.join(root, 'quality'))
 	.map(quality => ({ quality, json: readJSON(path.join(root, 'quality', quality, 'product.json')) }));
@@ -46,6 +45,11 @@ const setLauncherEnvironmentVars = () => {
 		['VSCODE_CLI_VERSION', packageJson.version],
 		['VSCODE_CLI_UPDATE_ENDPOINT', product.updateUrl],
 		['VSCODE_CLI_QUALITY', product.quality],
+		['VSCODE_CLI_NAME_SHORT', product.nameShort],
+		['VSCODE_CLI_NAME_LONG', product.nameLong],
+		['VSCODE_CLI_QUALITYLESS_PRODUCT_NAME', product.nameLong.replace(/ - [a-z]+$/i, '')],
+		['VSCODE_CLI_APPLICATION_NAME', product.applicationName],
+		['VSCODE_CLI_EDITOR_WEB_URL', product.tunnelApplicationConfig?.editorWebUrl],
 		['VSCODE_CLI_COMMIT', commit],
 		[
 			'VSCODE_CLI_WIN32_APP_IDS',
@@ -55,19 +59,34 @@ const setLauncherEnvironmentVars = () => {
 					.map(([, value]) => String(value).replace(/[{}]/g, ''))),
 			),
 		],
+		[
+			'VSCODE_CLI_NAME_LONG_MAP',
+			!isOSS && JSON.stringify(makeQualityMap(json => json.nameLong)),
+		],
+		[
+			'VSCODE_CLI_APPLICATION_NAME_MAP',
+			!isOSS && JSON.stringify(makeQualityMap(json => json.applicationName)),
+		],
+		[
+			'VSCODE_CLI_SERVER_NAME_MAP',
+			!isOSS && JSON.stringify(makeQualityMap(json => json.serverApplicationName)),
+		],
 		[
 			'VSCODE_CLI_QUALITY_DOWNLOAD_URIS',
 			!isOSS && JSON.stringify(makeQualityMap(json => json.downloadUrl)),
 		],
 	]);
 
-	console.log(JSON.stringify([...vars].reduce((obj, kv) => ({...obj, [kv[0]]: kv[1]}), {})));
-
-	for (const [key, value] of vars) {
-		if (value) {
-			console.log(`##vso[task.setvariable variable=${key}]${value}`);
+	if (process.env.VSCODE_CLI_PREPARE_OUTPUT === 'json') {
+		console.log(JSON.stringify([...vars].filter(([, v]) => !!v)));
+	} else {
+		for (const [key, value] of vars) {
+			if (value) {
+				console.log(`##vso[task.setvariable variable=${key}]${value}`);
+			}
 		}
 	}
+
 };
 
 if (require.main === module) {

build/azure-pipelines/cli/test.yml

@@ -1,16 +1,5 @@
-parameters:
-  - name: VSCODE_CLI_TARGETS
-    default: []
-    type: object
-  - name: VSCODE_CLI_RUST_CHANNEL
-    type: string
-    default: stable
-
 steps:
   - template: ./install-rust-posix.yml
-    parameters:
-      targets: []
-      channel: ${{ parameters.VSCODE_CLI_RUST_CHANNEL }}
 
   - script: rustup component add clippy && cargo clippy -- -D warnings
     workingDirectory: cli