From ba9be48390636fd8f38ae706b4f87e0f79ba9d9f Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Wed, 2 Nov 2022 16:21:33 +0100 Subject: [PATCH] adopt `vscode.l10n` in references view (#165245) https://github.com/microsoft/vscode/issues/164438 --- extensions/references-view/package.json | 3 --- extensions/references-view/src/calls/model.ts | 10 ++++------ extensions/references-view/src/references/index.ts | 4 +--- extensions/references-view/src/references/model.ts | 14 ++++++-------- extensions/references-view/src/tree.ts | 12 +++++------- extensions/references-view/src/types/model.ts | 10 ++++------ 6 files changed, 20 insertions(+), 33 deletions(-) diff --git a/extensions/references-view/package.json b/extensions/references-view/package.json index d3fcadcbffd..f78334afb28 100644 --- a/extensions/references-view/package.json +++ b/extensions/references-view/package.json @@ -406,9 +406,6 @@ "compile": "npx gulp compile-extension:references-view", "watch": "npx gulp watch-extension:references-view" }, - "dependencies": { - "vscode-nls": "^5.2.0" - }, "devDependencies": { "@types/node": "16.x" } diff --git a/extensions/references-view/src/calls/model.ts b/extensions/references-view/src/calls/model.ts index 0efa35f4e02..ce8cbbcf973 100644 --- a/extensions/references-view/src/calls/model.ts +++ b/extensions/references-view/src/calls/model.ts @@ -6,8 +6,6 @@ import * as vscode from 'vscode'; import { SymbolItemDragAndDrop, SymbolItemEditorHighlights, SymbolItemNavigation, SymbolTreeInput } from '../references-view'; import { asResourceUrl, del, getThemeIcon, tail } from '../utils'; -import * as nls from 'vscode-nls'; -const localize = nls.loadMessageBundle(); export class CallsTreeInput implements SymbolTreeInput { @@ -19,8 +17,8 @@ export class CallsTreeInput implements SymbolTreeInput { readonly direction: CallsDirection, ) { this.title = direction === CallsDirection.Incoming - ? localize('title.callers', 'Callers Of') - : localize('title.calls', 'Calls From'); + ? vscode.l10n.t('Callers Of') + : vscode.l10n.t('Calls From'); } async resolve() { @@ -35,7 +33,7 @@ export class CallsTreeInput implements SymbolTreeInput { return { provider, - get message() { return model.roots.length === 0 ? localize('noresult', 'No results.') : undefined; }, + get message() { return model.roots.length === 0 ? vscode.l10n.t('No results.') : undefined; }, navigation: model, highlights: model, dnd: model, @@ -184,7 +182,7 @@ class CallItemDataProvider implements vscode.TreeDataProvider { item.iconPath = getThemeIcon(element.item.kind); item.command = { command: 'vscode.open', - title: localize('open', 'Open Call'), + title: vscode.l10n.t('Open Call'), arguments: [ element.item.uri, { selection: element.item.selectionRange.with({ end: element.item.selectionRange.start }) } diff --git a/extensions/references-view/src/references/index.ts b/extensions/references-view/src/references/index.ts index e54740dc66a..c4942f125b7 100644 --- a/extensions/references-view/src/references/index.ts +++ b/extensions/references-view/src/references/index.ts @@ -6,8 +6,6 @@ import * as vscode from 'vscode'; import { SymbolsTree } from '../tree'; import { FileItem, ReferenceItem, ReferencesModel, ReferencesTreeInput } from './model'; -import * as nls from 'vscode-nls'; -const localize = nls.loadMessageBundle(); export function register(tree: SymbolsTree, context: vscode.ExtensionContext): void { @@ -45,7 +43,7 @@ export function register(tree: SymbolsTree, context: vscode.ExtensionContext): v if (value === 'view') { showReferencesDisposable = vscode.commands.registerCommand('editor.action.showReferences', async (uri: vscode.Uri, position: vscode.Position, locations: vscode.Location[]) => { - const input = new ReferencesTreeInput(localize('title', 'References'), new vscode.Location(uri, position), 'vscode.executeReferenceProvider', locations); + const input = new ReferencesTreeInput(vscode.l10n.t('References'), new vscode.Location(uri, position), 'vscode.executeReferenceProvider', locations); tree.setInput(input); }); } diff --git a/extensions/references-view/src/references/model.ts b/extensions/references-view/src/references/model.ts index d9716d72dd6..83978565f20 100644 --- a/extensions/references-view/src/references/model.ts +++ b/extensions/references-view/src/references/model.ts @@ -6,8 +6,6 @@ import * as vscode from 'vscode'; import { SymbolItemDragAndDrop, SymbolItemEditorHighlights, SymbolItemNavigation, SymbolTreeInput, SymbolTreeModel } from '../references-view'; import { asResourceUrl, del, getPreviewChunks, tail } from '../utils'; -import * as nls from 'vscode-nls'; -const localize = nls.loadMessageBundle(); export class ReferencesTreeInput implements SymbolTreeInput { @@ -112,18 +110,18 @@ export class ReferencesModel implements SymbolItemNavigation prev + cur.references.length, 0); const files = this.items.length; if (total === 1 && files === 1) { - return localize('result.1', '{0} result in {1} file', total, files); + return vscode.l10n.t('{0} result in {1} file', total, files); } else if (total === 1) { - return localize('result.1n', '{0} result in {1} files', total, files); + return vscode.l10n.t('{0} result in {1} files', total, files); } else if (files === 1) { - return localize('result.n1', '{0} results in {1} file', total, files); + return vscode.l10n.t('{0} results in {1} file', total, files); } else { - return localize('result.nm', '{0} results in {1} files', total, files); + return vscode.l10n.t('{0} results in {1} files', total, files); } } @@ -299,7 +297,7 @@ class ReferencesTreeDataProvider implements vscode.TreeDataProvider{ selection: range.with({ end: range.start }) } diff --git a/extensions/references-view/src/tree.ts b/extensions/references-view/src/tree.ts index b46db07c9ba..0c005237d45 100644 --- a/extensions/references-view/src/tree.ts +++ b/extensions/references-view/src/tree.ts @@ -8,8 +8,6 @@ import { EditorHighlights } from './highlights'; import { Navigation } from './navigation'; import { SymbolItemDragAndDrop, SymbolTreeInput } from './references-view'; import { ContextKey, isValidRequestPosition, WordAnchor } from './utils'; -import * as nls from 'vscode-nls'; -const localize = nls.loadMessageBundle(); export class SymbolsTree { @@ -123,10 +121,10 @@ export class SymbolsTree { this._input = undefined; this._ctxHasResult.set(false); this._ctxInputSource.reset(); - this._tree.title = localize('title', 'References'); + this._tree.title = vscode.l10n.t('References'); this._tree.message = this._history.size === 0 - ? localize('noresult', 'No results.') - : localize('noresult2', 'No results. Try running a previous search again:'); + ? vscode.l10n.t('No results.') + : vscode.l10n.t('No results. Try running a previous search again:'); this._provider.update(Promise.resolve(this._history)); } } @@ -283,7 +281,7 @@ class TreeInputHistory implements vscode.TreeDataProvider{ description: item.description, item }); - const pick = await vscode.window.showQuickPick(picks, { placeHolder: localize('placeholder', 'Select previous reference search') }); + const pick = await vscode.window.showQuickPick(picks, { placeHolder: vscode.l10n.t('Select previous reference search') }); if (pick) { this._reRunHistoryItem(pick.item); } @@ -338,7 +336,7 @@ class TreeInputHistory implements vscode.TreeDataProvider{ getTreeItem(item: HistoryItem): vscode.TreeItem { const result = new vscode.TreeItem(item.word); result.description = item.description; - result.command = { command: '_references-view.showHistoryItem', arguments: [item], title: localize('title.rerun', 'Rerun') }; + result.command = { command: '_references-view.showHistoryItem', arguments: [item], title: vscode.l10n.t('Rerun') }; result.collapsibleState = vscode.TreeItemCollapsibleState.None; result.contextValue = 'history-item'; return result; diff --git a/extensions/references-view/src/types/model.ts b/extensions/references-view/src/types/model.ts index 31bbe9403e3..89dd001df55 100644 --- a/extensions/references-view/src/types/model.ts +++ b/extensions/references-view/src/types/model.ts @@ -6,8 +6,6 @@ import * as vscode from 'vscode'; import { SymbolItemDragAndDrop, SymbolItemEditorHighlights, SymbolItemNavigation, SymbolTreeInput } from '../references-view'; import { asResourceUrl, del, getThemeIcon, tail } from '../utils'; -import * as nls from 'vscode-nls'; -const localize = nls.loadMessageBundle(); export class TypesTreeInput implements SymbolTreeInput { @@ -19,8 +17,8 @@ export class TypesTreeInput implements SymbolTreeInput { readonly direction: TypeHierarchyDirection, ) { this.title = direction === TypeHierarchyDirection.Supertypes - ? localize('title.sup', 'Supertypes Of') - : localize('title.sub', 'Subtypes Of'); + ? vscode.l10n.t('Supertypes Of') + : vscode.l10n.t('Subtypes Of'); } async resolve() { @@ -35,7 +33,7 @@ export class TypesTreeInput implements SymbolTreeInput { return { provider, - get message() { return model.roots.length === 0 ? localize('noresult', 'No results.') : undefined; }, + get message() { return model.roots.length === 0 ? vscode.l10n.t('No results.') : undefined; }, navigation: model, highlights: model, dnd: model, @@ -176,7 +174,7 @@ class TypeItemDataProvider implements vscode.TreeDataProvider { item.iconPath = getThemeIcon(element.item.kind); item.command = { command: 'vscode.open', - title: localize('title.openType', 'Open Type'), + title: vscode.l10n.t('Open Type'), arguments: [ element.item.uri, { selection: element.item.selectionRange.with({ end: element.item.selectionRange.start }) }