[pull] main from microsoft:main

extensions/extension-editing/src/extensionEditingBrowserMain.ts

@@ -5,11 +5,14 @@
 
 import * as vscode from 'vscode';
 import { PackageDocument } from './packageDocumentHelper';
+import { PackageDocumentL10nSupport } from './packageDocumentL10nSupport';
 
 export function activate(context: vscode.ExtensionContext) {
 	//package.json suggestions
 	context.subscriptions.push(registerPackageDocumentCompletions());
 
+	//package.json go to definition for NLS strings
+	context.subscriptions.push(new PackageDocumentL10nSupport());
 }
 
 function registerPackageDocumentCompletions(): vscode.Disposable {
@@ -18,5 +21,4 @@ function registerPackageDocumentCompletions(): vscode.Disposable {
 			return new PackageDocument(document).provideCompletionItems(position, token);
 		}
 	});
-
 }

extensions/extension-editing/src/extensionEditingMain.ts

@@ -5,6 +5,7 @@
 
 import * as vscode from 'vscode';
 import { PackageDocument } from './packageDocumentHelper';
+import { PackageDocumentL10nSupport } from './packageDocumentL10nSupport';
 import { ExtensionLinter } from './extensionLinter';
 
 export function activate(context: vscode.ExtensionContext) {
@@ -15,6 +16,9 @@ export function activate(context: vscode.ExtensionContext) {
 	//package.json code actions for lint warnings
 	context.subscriptions.push(registerCodeActionsProvider());
 
+	// package.json l10n support
+	context.subscriptions.push(new PackageDocumentL10nSupport());
+
 	context.subscriptions.push(new ExtensionLinter());
 }
 

extensions/extension-editing/src/packageDocumentL10nSupport.ts

@@ -0,0 +1,204 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as vscode from 'vscode';
+import { getLocation, getNodeValue, parseTree, findNodeAtLocation, visit } from 'jsonc-parser';
+
+
+const packageJsonSelector: vscode.DocumentSelector = { language: 'json', pattern: '**/package.json' };
+const packageNlsJsonSelector: vscode.DocumentSelector = { language: 'json', pattern: '**/package.nls.json' };
+
+export class PackageDocumentL10nSupport implements vscode.DefinitionProvider, vscode.ReferenceProvider, vscode.Disposable {
+
+	private readonly _disposables: vscode.Disposable[] = [];
+
+	constructor() {
+		this._disposables.push(vscode.languages.registerDefinitionProvider(packageJsonSelector, this));
+		this._disposables.push(vscode.languages.registerDefinitionProvider(packageNlsJsonSelector, this));
+
+		this._disposables.push(vscode.languages.registerReferenceProvider(packageNlsJsonSelector, this));
+		this._disposables.push(vscode.languages.registerReferenceProvider(packageJsonSelector, this));
+	}
+
+	dispose(): void {
+		for (const d of this._disposables) {
+			d.dispose();
+		}
+	}
+
+	public async provideDefinition(document: vscode.TextDocument, position: vscode.Position, _token: vscode.CancellationToken): Promise<vscode.DefinitionLink[] | undefined> {
+		const basename = document.uri.path.split('/').pop()?.toLowerCase();
+		if (basename === 'package.json') {
+			return this.provideNlsValueDefinition(document, position);
+		}
+
+		if (basename === 'package.nls.json') {
+			return this.provideNlsKeyDefinition(document, position);
+		}
+
+		return undefined;
+	}
+
+	private async provideNlsValueDefinition(packageJsonDoc: vscode.TextDocument, position: vscode.Position): Promise<vscode.DefinitionLink[] | undefined> {
+		const nlsRef = this.getNlsReferenceAtPosition(packageJsonDoc, position);
+		if (!nlsRef) {
+			return undefined;
+		}
+
+		const nlsUri = vscode.Uri.joinPath(packageJsonDoc.uri, '..', 'package.nls.json');
+		return this.resolveNlsDefinition(nlsRef, nlsUri);
+	}
+
+	private async provideNlsKeyDefinition(nlsDoc: vscode.TextDocument, position: vscode.Position): Promise<vscode.DefinitionLink[] | undefined> {
+		const nlsKey = this.getNlsKeyDefinitionAtPosition(nlsDoc, position);
+		if (!nlsKey) {
+			return undefined;
+		}
+		return this.resolveNlsDefinition(nlsKey, nlsDoc.uri);
+	}
+
+	private async resolveNlsDefinition(origin: { key: string; range: vscode.Range }, nlsUri: vscode.Uri): Promise<vscode.DefinitionLink[] | undefined> {
+		const target = await this.findNlsKeyDeclaration(origin.key, nlsUri);
+		if (!target) {
+			return undefined;
+		}
+
+		return [{
+			originSelectionRange: origin.range,
+			targetUri: target.uri,
+			targetRange: target.range,
+		}];
+	}
+
+	private getNlsReferenceAtPosition(packageJsonDoc: vscode.TextDocument, position: vscode.Position): { key: string; range: vscode.Range } | undefined {
+		const location = getLocation(packageJsonDoc.getText(), packageJsonDoc.offsetAt(position));
+		if (!location.previousNode || location.previousNode.type !== 'string') {
+			return undefined;
+		}
+
+		const value = getNodeValue(location.previousNode);
+		if (typeof value !== 'string') {
+			return undefined;
+		}
+
+		const match = value.match(/^%(.+)%$/);
+		if (!match) {
+			return undefined;
+		}
+
+		const nodeStart = packageJsonDoc.positionAt(location.previousNode.offset);
+		const nodeEnd = packageJsonDoc.positionAt(location.previousNode.offset + location.previousNode.length);
+		return { key: match[1], range: new vscode.Range(nodeStart, nodeEnd) };
+	}
+
+	public async provideReferences(document: vscode.TextDocument, position: vscode.Position, context: vscode.ReferenceContext, _token: vscode.CancellationToken): Promise<vscode.Location[] | undefined> {
+		const basename = document.uri.path.split('/').pop()?.toLowerCase();
+		if (basename === 'package.nls.json') {
+			return this.provideNlsKeyReferences(document, position, context);
+		}
+		if (basename === 'package.json') {
+			return this.provideNlsValueReferences(document, position, context);
+		}
+		return undefined;
+	}
+
+	private async provideNlsKeyReferences(nlsDoc: vscode.TextDocument, position: vscode.Position, context: vscode.ReferenceContext): Promise<vscode.Location[] | undefined> {
+		const nlsKey = this.getNlsKeyDefinitionAtPosition(nlsDoc, position);
+		if (!nlsKey) {
+			return undefined;
+		}
+
+		const packageJsonUri = vscode.Uri.joinPath(nlsDoc.uri, '..', 'package.json');
+		return this.findAllNlsReferences(nlsKey.key, packageJsonUri, nlsDoc.uri, context);
+	}
+
+	private async provideNlsValueReferences(packageJsonDoc: vscode.TextDocument, position: vscode.Position, context: vscode.ReferenceContext): Promise<vscode.Location[] | undefined> {
+		const nlsRef = this.getNlsReferenceAtPosition(packageJsonDoc, position);
+		if (!nlsRef) {
+			return undefined;
+		}
+
+		const nlsUri = vscode.Uri.joinPath(packageJsonDoc.uri, '..', 'package.nls.json');
+		return this.findAllNlsReferences(nlsRef.key, packageJsonDoc.uri, nlsUri, context);
+	}
+
+	private async findAllNlsReferences(nlsKey: string, packageJsonUri: vscode.Uri, nlsUri: vscode.Uri, context: vscode.ReferenceContext): Promise<vscode.Location[]> {
+		const locations = await this.findNlsReferencesInPackageJson(nlsKey, packageJsonUri);
+
+		if (context.includeDeclaration) {
+			const decl = await this.findNlsKeyDeclaration(nlsKey, nlsUri);
+			if (decl) {
+				locations.push(decl);
+			}
+		}
+
+		return locations;
+	}
+
+	private async findNlsKeyDeclaration(nlsKey: string, nlsUri: vscode.Uri): Promise<vscode.Location | undefined> {
+		try {
+			const nlsDoc = await vscode.workspace.openTextDocument(nlsUri);
+			const nlsTree = parseTree(nlsDoc.getText());
+			if (!nlsTree) {
+				return undefined;
+			}
+
+			const node = findNodeAtLocation(nlsTree, [nlsKey]);
+			if (!node?.parent) {
+				return undefined;
+			}
+
+			const keyNode = node.parent.children?.[0];
+			if (!keyNode) {
+				return undefined;
+			}
+
+			const start = nlsDoc.positionAt(keyNode.offset);
+			const end = nlsDoc.positionAt(keyNode.offset + keyNode.length);
+			return new vscode.Location(nlsUri, new vscode.Range(start, end));
+		} catch {
+			return undefined;
+		}
+	}
+
+	private async findNlsReferencesInPackageJson(nlsKey: string, packageJsonUri: vscode.Uri): Promise<vscode.Location[]> {
+		let packageJsonDoc: vscode.TextDocument;
+		try {
+			packageJsonDoc = await vscode.workspace.openTextDocument(packageJsonUri);
+		} catch {
+			return [];
+		}
+
+		const text = packageJsonDoc.getText();
+		const needle = `%${nlsKey}%`;
+		const locations: vscode.Location[] = [];
+
+		visit(text, {
+			onLiteralValue(value, offset, length) {
+				if (value === needle) {
+					const start = packageJsonDoc.positionAt(offset);
+					const end = packageJsonDoc.positionAt(offset + length);
+					locations.push(new vscode.Location(packageJsonUri, new vscode.Range(start, end)));
+				}
+			}
+		});
+
+		return locations;
+	}
+
+	private getNlsKeyDefinitionAtPosition(nlsDoc: vscode.TextDocument, position: vscode.Position): { key: string; range: vscode.Range } | undefined {
+		const location = getLocation(nlsDoc.getText(), nlsDoc.offsetAt(position));
+
+		// Must be on a top-level property key
+		if (location.path.length !== 1 || !location.isAtPropertyKey || !location.previousNode) {
+			return undefined;
+		}
+
+		const key = location.path[0] as string;
+		const start = nlsDoc.positionAt(location.previousNode.offset);
+		const end = nlsDoc.positionAt(location.previousNode.offset + location.previousNode.length);
+		return { key, range: new vscode.Range(start, end) };
+	}
+}

extensions/theme-2026/themes/2026-dark.json

@@ -227,7 +227,7 @@
 		"quickInputList.focusBackground": "#3994BC26",
 		"quickInputList.focusForeground": "#bfbfbf",
 		"quickInputList.focusIconForeground": "#bfbfbf",
-		"quickInputList.hoverBackground": "#515253",
+		"quickInputList.hoverBackground": "#262728",
 		"terminal.selectionBackground": "#3994BC33",
 		"terminal.background": "#191A1B",
 		"terminal.border": "#2A2B2CFF",

extensions/theme-2026/themes/2026-light.json

@@ -208,7 +208,7 @@
 		"breadcrumb.background": "#FFFFFF",
 		"breadcrumb.focusForeground": "#202020",
 		"breadcrumb.activeSelectionForeground": "#202020",
-		"breadcrumbPicker.background": "#F0F0F3",
+		"breadcrumbPicker.background": "#FAFAFD",
 		"notificationCenter.border": "#F0F1F2FF",
 		"notificationCenterHeader.foreground": "#202020",
 		"notificationCenterHeader.background": "#FAFAFD",
@@ -229,7 +229,7 @@
 		"extensionButton.prominentHoverBackground": "#0064CC",
 		"pickerGroup.border": "#EEEEF1",
 		"pickerGroup.foreground": "#202020",
-		"quickInput.background": "#F0F0F3",
+		"quickInput.background": "#FAFAFD",
 		"quickInput.foreground": "#202020",
 		"quickInputList.focusBackground": "#0069CC1A",
 		"quickInputList.focusForeground": "#202020",
@@ -256,7 +256,7 @@
 		"gauge.errorForeground": "#ad0707",
 		"gauge.errorBackground": "#ad070740",
 		"statusBarItem.prominentHoverForeground": "#FFFFFF",
-		"quickInputTitle.background": "#F0F0F3",
+		"quickInputTitle.background": "#FAFAFD",
 		"chat.requestBubbleBackground": "#EEF4FB",
 		"chat.requestBubbleHoverBackground": "#E6EDFA",
 		"chat.thinkingShimmer": "#999999",