Skip to content

eslint: fix bracket notation in workbench services #334774

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Dmitriy Vasyura (dmitrivMS) merged 11 commits into from
Sep 12, 2026
Merged

eslint: fix bracket notation in workbench services #334774

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d8278cb
eslint: enable no bracket notation rule
dmitrivMS Sep 6, 2026
2e0b353
eslint: update bracket allowlist owners
dmitrivMS Sep 6, 2026
cda7e1c
eslint: group bracket notation exclusions
dmitrivMS Sep 6, 2026
0a13539
eslint: test no bracket notation rule
dmitrivMS Sep 6, 2026
6a2f337
eslint: fix bracket notation in workbench services
dmitrivMS Sep 6, 2026
1c8eff6
Merge branch 'main' into agents/fix-bracket-notation-workbench-services
dmitrivMS Sep 6, 2026
3f32b94
themes: read extension color description
dmitrivMS Sep 6, 2026
6eff68f
Merge branch 'main' into agents/fix-bracket-notation-workbench-services
dmitrivMS Sep 8, 2026
222f452
Merge branch 'main' into agents/fix-bracket-notation-workbench-services
dmitrivMS Sep 9, 2026
5072e9b
Merge branch 'main' into agents/fix-bracket-notation-workbench-services
dmitrivMS Sep 11, 2026
07779f5
Merge branch 'main' into agents/fix-bracket-notation-workbench-services
dmitrivMS Sep 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 1 addition & 23 deletions .eslint-allowed-bracket-notation-files
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,27 +508,5 @@ extensions/git/src/ipc/ipcClient.ts
extensions/git/src/ipc/ipcServer.ts
extensions/git/src/util.ts

# Workbench UI and remaining services (23 files)
src/vs/workbench/browser/parts/editor/editor.ts
src/vs/workbench/browser/parts/editor/editorGroupView.ts
src/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration.ts
src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEditPane.ts
src/vs/workbench/contrib/callHierarchy/browser/callHierarchyPeek.ts
src/vs/workbench/contrib/issue/electron-browser/nativeGitHubUploadService.ts
src/vs/workbench/contrib/localization/electron-browser/localization.contribution.ts
src/vs/workbench/contrib/policyExport/electron-browser/policyExport.contribution.ts
src/vs/workbench/contrib/policyExport/test/node/policyExport.integrationTest.ts
src/vs/workbench/contrib/search/browser/replaceService.ts
src/vs/workbench/contrib/tags/electron-browser/workspaceTags.ts
src/vs/workbench/contrib/tags/electron-browser/workspaceTagsService.ts
src/vs/workbench/contrib/themes/browser/themes.contribution.ts
src/vs/workbench/contrib/themes/test/node/colorRegistry.releaseTest.ts
src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchyPeek.ts
src/vs/workbench/contrib/update/common/updateInfoParser.ts
src/vs/workbench/contrib/webview/browser/pre/service-worker.js
src/vs/workbench/contrib/welcomeWalkthrough/browser/walkThroughInput.ts
# Default account service tests (1 file)
src/vs/workbench/services/accounts/test/browser/defaultAccount.test.ts
Comment thread
dmitrivMS marked this conversation as resolved.
src/vs/workbench/services/actions/common/menusExtensionPoint.ts
src/vs/workbench/services/extensionRecommendations/common/workspaceExtensionsConfig.ts
src/vs/workbench/services/textfile/test/node/encoding/encoding.integrationTest.ts
src/vs/workbench/services/themes/common/colorThemeData.ts
108 changes: 54 additions & 54 deletions src/vs/workbench/browser/parts/editor/editor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,61 +125,61 @@ function validateEditorPartOptions(options: IEditorPartOptions): IEditorPartOpti
}

return verifyObject<IEditorPartOptions>({
'wrapTabs': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS['wrapTabs']),
'scrollToSwitchTabs': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS['scrollToSwitchTabs']),
'highlightModifiedTabs': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS['highlightModifiedTabs']),
'tabActionReserveSpace': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS['tabActionReserveSpace']),
'tabActionCloseVisibility': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS['tabActionCloseVisibility']),
'tabActionUnpinVisibility': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS['tabActionUnpinVisibility']),
'showTabIndex': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS['showTabIndex']),
'alwaysShowEditorActions': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS['alwaysShowEditorActions']),
'pinnedTabsOnSeparateRow': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS['pinnedTabsOnSeparateRow']),
'focusRecentEditorAfterClose': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS['focusRecentEditorAfterClose']),
'showIcons': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS['showIcons']),
'enablePreview': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS['enablePreview']),
'enablePreviewFromQuickOpen': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS['enablePreviewFromQuickOpen']),
'enablePreviewFromCodeNavigation': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS['enablePreviewFromCodeNavigation']),
'closeOnFileDelete': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS['closeOnFileDelete']),
'closeEmptyGroups': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS['closeEmptyGroups']),
'revealIfOpen': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS['revealIfOpen']),
'swipeToNavigate': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS['swipeToNavigate']),
'mouseBackForwardToNavigate': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS['mouseBackForwardToNavigate']),
'restoreViewState': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS['restoreViewState']),
'splitOnDragAndDrop': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS['splitOnDragAndDrop']),
'allowDropIntoGroup': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS['allowDropIntoGroup']),
'dragToOpenWindow': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS['dragToOpenWindow']),
'centeredLayoutFixedWidth': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS['centeredLayoutFixedWidth']),
'hasIcons': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS['hasIcons']),

'tabSizingFixedMinWidth': new NumberVerifier(DEFAULT_EDITOR_PART_OPTIONS['tabSizingFixedMinWidth']),
'tabSizingFixedMaxWidth': new NumberVerifier(DEFAULT_EDITOR_PART_OPTIONS['tabSizingFixedMaxWidth']),

'showTabs': new EnumVerifier(DEFAULT_EDITOR_PART_OPTIONS['showTabs'], ['multiple', 'single', 'none']),
'tabActionLocation': new EnumVerifier(DEFAULT_EDITOR_PART_OPTIONS['tabActionLocation'], ['left', 'right']),
'tabSizing': new EnumVerifier(DEFAULT_EDITOR_PART_OPTIONS['tabSizing'], ['fit', 'shrink', 'fixed']),
'pinnedTabSizing': new EnumVerifier(DEFAULT_EDITOR_PART_OPTIONS['pinnedTabSizing'], ['normal', 'compact', 'shrink']),
'tabHeight': new EnumVerifier(DEFAULT_EDITOR_PART_OPTIONS['tabHeight'], ['default', 'compact']),
'preventPinnedEditorClose': new EnumVerifier(DEFAULT_EDITOR_PART_OPTIONS['preventPinnedEditorClose'], ['keyboardAndMouse', 'keyboard', 'mouse', 'never']),
'titleScrollbarSizing': new EnumVerifier(DEFAULT_EDITOR_PART_OPTIONS['titleScrollbarSizing'], ['default', 'large']),
'titleScrollbarVisibility': new EnumVerifier(DEFAULT_EDITOR_PART_OPTIONS['titleScrollbarVisibility'], ['auto', 'visible', 'hidden']),
'openPositioning': new EnumVerifier(DEFAULT_EDITOR_PART_OPTIONS['openPositioning'], ['left', 'right', 'first', 'last']),
'openSideBySideDirection': new EnumVerifier(DEFAULT_EDITOR_PART_OPTIONS['openSideBySideDirection'], ['right', 'down']),
'labelFormat': new EnumVerifier(DEFAULT_EDITOR_PART_OPTIONS['labelFormat'], ['default', 'short', 'medium', 'long']),
'splitInGroupLayout': new EnumVerifier(DEFAULT_EDITOR_PART_OPTIONS['splitInGroupLayout'], ['vertical', 'horizontal']),
'splitSizing': new EnumVerifier(DEFAULT_EDITOR_PART_OPTIONS['splitSizing'], ['distribute', 'split', 'auto']),
'doubleClickTabToToggleEditorGroupSizes': new EnumVerifier(DEFAULT_EDITOR_PART_OPTIONS['doubleClickTabToToggleEditorGroupSizes'], ['maximize', 'expand', 'off']),
'editorActionsLocation': new EnumVerifier(DEFAULT_EDITOR_PART_OPTIONS['editorActionsLocation'], ['default', 'titleBar', 'hidden']),
'autoLockGroups': new SetVerifier<string>(DEFAULT_EDITOR_PART_OPTIONS['autoLockGroups']),

'limit': new ObjectVerifier<IEditorPartLimitOptions>(DEFAULT_EDITOR_PART_OPTIONS['limit'], {
'enabled': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS['limit']['enabled']),
'value': new NumberVerifier(DEFAULT_EDITOR_PART_OPTIONS['limit']['value']),
'perEditorGroup': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS['limit']['perEditorGroup']),
'excludeDirty': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS['limit']['excludeDirty'])
'wrapTabs': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS.wrapTabs),
'scrollToSwitchTabs': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS.scrollToSwitchTabs),
'highlightModifiedTabs': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS.highlightModifiedTabs),
'tabActionReserveSpace': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS.tabActionReserveSpace),
'tabActionCloseVisibility': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS.tabActionCloseVisibility),
'tabActionUnpinVisibility': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS.tabActionUnpinVisibility),
'showTabIndex': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS.showTabIndex),
'alwaysShowEditorActions': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS.alwaysShowEditorActions),
'pinnedTabsOnSeparateRow': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS.pinnedTabsOnSeparateRow),
'focusRecentEditorAfterClose': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS.focusRecentEditorAfterClose),
'showIcons': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS.showIcons),
'enablePreview': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS.enablePreview),
'enablePreviewFromQuickOpen': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS.enablePreviewFromQuickOpen),
'enablePreviewFromCodeNavigation': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS.enablePreviewFromCodeNavigation),
'closeOnFileDelete': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS.closeOnFileDelete),
'closeEmptyGroups': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS.closeEmptyGroups),
'revealIfOpen': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS.revealIfOpen),
'swipeToNavigate': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS.swipeToNavigate),
'mouseBackForwardToNavigate': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS.mouseBackForwardToNavigate),
'restoreViewState': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS.restoreViewState),
'splitOnDragAndDrop': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS.splitOnDragAndDrop),
'allowDropIntoGroup': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS.allowDropIntoGroup),
'dragToOpenWindow': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS.dragToOpenWindow),
'centeredLayoutFixedWidth': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS.centeredLayoutFixedWidth),
'hasIcons': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS.hasIcons),

'tabSizingFixedMinWidth': new NumberVerifier(DEFAULT_EDITOR_PART_OPTIONS.tabSizingFixedMinWidth),
'tabSizingFixedMaxWidth': new NumberVerifier(DEFAULT_EDITOR_PART_OPTIONS.tabSizingFixedMaxWidth),

'showTabs': new EnumVerifier(DEFAULT_EDITOR_PART_OPTIONS.showTabs, ['multiple', 'single', 'none']),
'tabActionLocation': new EnumVerifier(DEFAULT_EDITOR_PART_OPTIONS.tabActionLocation, ['left', 'right']),
'tabSizing': new EnumVerifier(DEFAULT_EDITOR_PART_OPTIONS.tabSizing, ['fit', 'shrink', 'fixed']),
'pinnedTabSizing': new EnumVerifier(DEFAULT_EDITOR_PART_OPTIONS.pinnedTabSizing, ['normal', 'compact', 'shrink']),
'tabHeight': new EnumVerifier(DEFAULT_EDITOR_PART_OPTIONS.tabHeight, ['default', 'compact']),
'preventPinnedEditorClose': new EnumVerifier(DEFAULT_EDITOR_PART_OPTIONS.preventPinnedEditorClose, ['keyboardAndMouse', 'keyboard', 'mouse', 'never']),
'titleScrollbarSizing': new EnumVerifier(DEFAULT_EDITOR_PART_OPTIONS.titleScrollbarSizing, ['default', 'large']),
'titleScrollbarVisibility': new EnumVerifier(DEFAULT_EDITOR_PART_OPTIONS.titleScrollbarVisibility, ['auto', 'visible', 'hidden']),
'openPositioning': new EnumVerifier(DEFAULT_EDITOR_PART_OPTIONS.openPositioning, ['left', 'right', 'first', 'last']),
'openSideBySideDirection': new EnumVerifier(DEFAULT_EDITOR_PART_OPTIONS.openSideBySideDirection, ['right', 'down']),
'labelFormat': new EnumVerifier(DEFAULT_EDITOR_PART_OPTIONS.labelFormat, ['default', 'short', 'medium', 'long']),
'splitInGroupLayout': new EnumVerifier(DEFAULT_EDITOR_PART_OPTIONS.splitInGroupLayout, ['vertical', 'horizontal']),
'splitSizing': new EnumVerifier(DEFAULT_EDITOR_PART_OPTIONS.splitSizing, ['distribute', 'split', 'auto']),
'doubleClickTabToToggleEditorGroupSizes': new EnumVerifier(DEFAULT_EDITOR_PART_OPTIONS.doubleClickTabToToggleEditorGroupSizes, ['maximize', 'expand', 'off']),
'editorActionsLocation': new EnumVerifier(DEFAULT_EDITOR_PART_OPTIONS.editorActionsLocation, ['default', 'titleBar', 'hidden']),
'autoLockGroups': new SetVerifier<string>(DEFAULT_EDITOR_PART_OPTIONS.autoLockGroups),

'limit': new ObjectVerifier<IEditorPartLimitOptions>(DEFAULT_EDITOR_PART_OPTIONS.limit, {
'enabled': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS.limit.enabled),
'value': new NumberVerifier(DEFAULT_EDITOR_PART_OPTIONS.limit.value),
'perEditorGroup': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS.limit.perEditorGroup),
'excludeDirty': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS.limit.excludeDirty)
}),
'decorations': new ObjectVerifier<IEditorPartDecorationOptions>(DEFAULT_EDITOR_PART_OPTIONS['decorations'], {
'badges': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS['decorations']['badges']),
'colors': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS['decorations']['colors'])
'decorations': new ObjectVerifier<IEditorPartDecorationOptions>(DEFAULT_EDITOR_PART_OPTIONS.decorations, {
'badges': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS.decorations.badges),
'colors': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS.decorations.colors)
}),
}, options);
}
Expand Down
6 changes: 3 additions & 3 deletions src/vs/workbench/browser/parts/editor/editorGroupView.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -754,7 +754,7 @@ export class EditorGroupView extends Themable implements IEditorGroupView {

const resource = EditorResourceAccessor.getOriginalUri(editor, { supportSideBySide: SideBySideEditor.BOTH });
if (URI.isUri(resource)) {
descriptor['resource'] = this.toResourceTelemetryDescriptor(resource);
descriptor.resource = this.toResourceTelemetryDescriptor(resource);

/* __GDPR__FRAGMENT__
"EditorTelemetryDescriptor" : {
Expand All @@ -764,10 +764,10 @@ export class EditorGroupView extends Themable implements IEditorGroupView {
return descriptor;
} else if (resource) {
if (resource.primary) {
descriptor['resource'] = this.toResourceTelemetryDescriptor(resource.primary);
descriptor.resource = this.toResourceTelemetryDescriptor(resource.primary);
}
if (resource.secondary) {
descriptor['resourceSecondary'] = this.toResourceTelemetryDescriptor(resource.secondary);
descriptor.resourceSecondary = this.toResourceTelemetryDescriptor(resource.secondary);
}
/* __GDPR__FRAGMENT__
"EditorTelemetryDescriptor" : {
Expand Down
2 changes: 1 addition & 1 deletion src/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1106,7 +1106,7 @@ Registry.as<IConfigurationMigrationRegistry>(WorkbenchExtensions.ConfigurationMi
}]);

function getDelaysFromConfig(accessor: (key: string) => any, type: 'general' | 'errorAtPosition' | 'warningAtPosition'): { announcement: number; sound: number } | undefined {
return accessor(`accessibility.signalOptions.experimental.delays.${type}`) || accessor('accessibility.signalOptions')?.['experimental.delays']?.[`${type}`] || accessor('accessibility.signalOptions')?.['delays']?.[`${type}`];
return accessor(`accessibility.signalOptions.experimental.delays.${type}`) || accessor('accessibility.signalOptions')?.['experimental.delays']?.[`${type}`] || accessor('accessibility.signalOptions')?.delays?.[`${type}`];
}

function getVolumeFromConfig(accessor: (key: string) => any): string | undefined {
Expand Down
2 changes: 1 addition & 1 deletion src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEditPane.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ export class BulkEditPane extends ViewPane {
}

private _setState(state: State): void {
this.element.dataset['state'] = state;
this.element.dataset.state = state;
}

async setInput(edit: ResourceEdit[], token: CancellationToken): Promise<ResourceEdit[] | undefined> {
Expand Down
6 changes: 3 additions & 3 deletions src/vs/workbench/contrib/callHierarchy/browser/callHierarchyPeek.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,13 +346,13 @@ export class CallHierarchyTreePeekWidget extends peekView.PeekViewWidget {
}

showLoading(): void {
this._parent.dataset['state'] = State.Loading;
this._parent.dataset.state = State.Loading;
this.setTitle(localize('title.loading', "Loading..."));
this._show();
}

showMessage(message: string): void {
this._parent.dataset['state'] = State.Message;
this._parent.dataset.state = State.Message;
this.setTitle('');
this.setMetaTitle('');
this._message.innerText = message;
Expand All @@ -377,7 +377,7 @@ export class CallHierarchyTreePeekWidget extends peekView.PeekViewWidget {
: localize('empt.callsTo', "No callers of '{0}'", model.root.name));

} else {
this._parent.dataset['state'] = State.Data;
this._parent.dataset.state = State.Data;
if (!viewState || this._tree.getFocus().length === 0) {
this._tree.setFocus([root.children[0].element]);
}
Expand Down
2 changes: 1 addition & 1 deletion src/vs/workbench/contrib/issue/electron-browser/nativeGitHubUploadService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export class NativeGitHubUploadService extends Disposable implements IGitHubUplo
async resolveRepositoryId(owner: string, repo: string, token?: string): Promise<string> {
const headers: Record<string, string> = { 'Accept': 'application/vnd.github+json', 'X-GitHub-Api-Version': '2022-11-28' };
if (token) {
headers['Authorization'] = `Bearer ${token}`;
headers.Authorization = `Bearer ${token}`;
}
const r = await fetch(`https://api.github.com/repos/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}`, { headers });
if (!r.ok) {
Expand Down
4 changes: 2 additions & 2 deletions src/vs/workbench/contrib/localization/electron-browser/localization.contribution.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,15 +164,15 @@ class NativeLocalizationWorkbenchContribution extends BaseLocalizationWorkbenchC
};

const searchAction = {
label: translations['searchMarketplace'],
label: translations.searchMarketplace,
run: async () => {
logUserReaction('search');
await this.extensionsWorkbenchService.openSearch(`tag:lp-${locale}`);
}
};

const installAndRestartAction = {
label: translations['installAndRestart'],
label: translations.installAndRestart,
run: async () => {
logUserReaction('installAndRestart');
await this.localeService.setLocale({
Expand Down
2 changes: 1 addition & 1 deletion src/vs/workbench/contrib/policyExport/electron-browser/policyExport.contribution.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ export class PolicyExportContribution extends Disposable implements IWorkbenchCo
// Checks DISTRO_PRODUCT_JSON env var (for testing),
// then falls back to fetching from GitHub API with GITHUB_TOKEN.
const distroProduct = await this.getDistroProductJson();
const extensionPolicies = distroProduct['extensionConfigurationPolicy'] as Record<string, ExtensionConfigurationPolicyEntry | ExtensionConfigurationPolicyReferenceEntry> | undefined;
const extensionPolicies = distroProduct.extensionConfigurationPolicy as Record<string, ExtensionConfigurationPolicyEntry | ExtensionConfigurationPolicyReferenceEntry> | undefined;
// Reference-shaped product entries (extension settings attaching to an in-code-owned
// policy), collected by owning policy name so they can be linked below.
const productReferencesByPolicyName = new Map<string, string[]>();
Expand Down
2 changes: 1 addition & 1 deletion src/vs/workbench/contrib/search/browser/replaceService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const toReplaceResource = (fileResource: URI): URI => {
};

const toFileResource = (replaceResource: URI): URI => {
return replaceResource.with({ scheme: JSON.parse(replaceResource.query)['scheme'], fragment: '', query: '' });
return replaceResource.with({ scheme: JSON.parse(replaceResource.query).scheme, fragment: '', query: '' });
};

export class ReplacePreviewContentProvider implements ITextModelContentProvider, IWorkbenchContribution {
Expand Down
4 changes: 2 additions & 2 deletions src/vs/workbench/contrib/tags/electron-browser/workspaceTags.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ export class WorkspaceTags implements IWorkbenchContribution {
const names = (<IFileStat[]>[]).concat(...results.map(result => result.success ? (result.stat!.children || []) : [])).map(c => c.name);
const referencesAzure = WorkspaceTags.searchArray(names, /azure/i);
if (referencesAzure) {
tags['node'] = true;
tags.node = true;
}
return tags;
},
Expand Down Expand Up @@ -179,7 +179,7 @@ export class WorkspaceTags implements IWorkbenchContribution {
});
})).then(javas => {
if (javas.indexOf(true) !== -1) {
tags['java'] = true;
tags.java = true;
}
return tags;
});
Expand Down
4 changes: 2 additions & 2 deletions src/vs/workbench/contrib/tags/electron-browser/workspaceTagsService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1405,7 +1405,7 @@ export class WorkspaceTagsService implements IWorkspaceTagsService {
const content = await this.fileService.readFile(aiGeneratedWorkspaces);
const workspaces = JSON.parse(content.value.toString()) as string[];
if (workspaces.indexOf(workspace.folders[0].uri.toString()) > -1) {
tags['aiGenerated'] = true;
tags.aiGenerated = true;
}
} catch (e) {
// Ignore errors when resolving file contents
Expand Down Expand Up @@ -1556,7 +1556,7 @@ export class WorkspaceTagsService implements IWorkspaceTagsService {
const packageJsonPromises = getFilePromises('package.json', this.fileService, this.textFileService, content => {
try {
const packageJsonContents = JSON.parse(content.value);
const dependencies = Object.keys(packageJsonContents['dependencies'] || {}).concat(Object.keys(packageJsonContents['devDependencies'] || {}));
const dependencies = Object.keys(packageJsonContents.dependencies || {}).concat(Object.keys(packageJsonContents.devDependencies || {}));

for (const dependency of dependencies) {
if (dependency.startsWith('react-native')) {
Expand Down
2 changes: 1 addition & 1 deletion src/vs/workbench/contrib/themes/browser/themes.contribution.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -688,7 +688,7 @@ interface ThemeItem extends IQuickPickItem {

function isItem(i: QuickPickInput<ThemeItem>): i is ThemeItem {
// eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
return (<any>i)['type'] !== 'separator';
return (<any>i).type !== 'separator';
}

const defaultThemeDescriptions: Record<string, string> = {
Expand Down
Loading