diff --git a/eslint.config.js b/eslint.config.js index c54623a4e06..c66495d75f4 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -440,7 +440,6 @@ export default tseslint.config( 'src/vs/base/common/observableInternal/logging/debugger/rpc.ts', 'src/vs/base/test/browser/ui/grid/util.ts', // Platform - 'src/vs/platform/browserElements/electron-main/nativeBrowserElementsMainService.ts', 'src/vs/platform/commands/common/commands.ts', 'src/vs/platform/contextkey/browser/contextKeyService.ts', 'src/vs/platform/contextkey/common/contextkey.ts', @@ -448,7 +447,6 @@ export default tseslint.config( 'src/vs/platform/debug/common/extensionHostDebugIpc.ts', 'src/vs/platform/debug/electron-main/extensionHostDebugIpc.ts', 'src/vs/platform/diagnostics/common/diagnostics.ts', - 'src/vs/platform/diagnostics/node/diagnosticsService.ts', 'src/vs/platform/download/common/downloadIpc.ts', 'src/vs/platform/extensions/common/extensions.ts', 'src/vs/platform/instantiation/common/descriptors.ts', @@ -619,7 +617,6 @@ export default tseslint.config( 'src/vs/workbench/contrib/chat/browser/chatSessions/view/sessionsTreeRenderer.ts', 'src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.ts', 'src/vs/workbench/contrib/chat/common/chatModel.ts', - 'src/vs/workbench/contrib/chat/common/chatModes.ts', 'src/vs/workbench/contrib/chat/common/chatService.ts', 'src/vs/workbench/contrib/chat/common/chatServiceImpl.ts', 'src/vs/workbench/contrib/chat/common/chatSessionsService.ts', @@ -680,7 +677,6 @@ export default tseslint.config( 'src/vs/workbench/contrib/markdown/browser/markdownDocumentRenderer.ts', 'src/vs/workbench/contrib/markdown/browser/markdownSettingRenderer.ts', 'src/vs/workbench/contrib/markers/browser/markers.contribution.ts', - 'src/vs/workbench/contrib/markers/browser/markersTable.ts', 'src/vs/workbench/contrib/markers/browser/markersView.ts', 'src/vs/workbench/contrib/mergeEditor/browser/commands/commands.ts', 'src/vs/workbench/contrib/mergeEditor/browser/utils.ts', @@ -714,7 +710,6 @@ export default tseslint.config( 'src/vs/workbench/contrib/notebook/common/model/notebookTextModel.ts', 'src/vs/workbench/contrib/notebook/common/notebookCommon.ts', 'src/vs/workbench/contrib/notebook/common/notebookEditorModelResolverServiceImpl.ts', - 'src/vs/workbench/contrib/notebook/common/notebookRange.ts', 'src/vs/workbench/contrib/notebook/test/browser/testNotebookEditor.ts', 'src/vs/workbench/contrib/performance/electron-browser/startupProfiler.ts', 'src/vs/workbench/contrib/preferences/browser/preferences.contribution.ts', @@ -745,8 +740,6 @@ export default tseslint.config( 'src/vs/workbench/contrib/search/browser/searchTreeModel/searchTreeCommon.ts', 'src/vs/workbench/contrib/search/browser/searchTreeModel/textSearchHeading.ts', 'src/vs/workbench/contrib/search/browser/searchView.ts', - 'src/vs/workbench/contrib/search/browser/searchWidget.ts', - 'src/vs/workbench/contrib/search/common/cacheState.ts', 'src/vs/workbench/contrib/search/test/browser/mockSearchTree.ts', 'src/vs/workbench/contrib/searchEditor/browser/searchEditor.contribution.ts', 'src/vs/workbench/contrib/searchEditor/browser/searchEditorActions.ts', diff --git a/src/vs/platform/browserElements/electron-main/nativeBrowserElementsMainService.ts b/src/vs/platform/browserElements/electron-main/nativeBrowserElementsMainService.ts index 404c5d17877..acdcbe060b6 100644 --- a/src/vs/platform/browserElements/electron-main/nativeBrowserElementsMainService.ts +++ b/src/vs/platform/browserElements/electron-main/nativeBrowserElementsMainService.ts @@ -39,7 +39,7 @@ export class NativeBrowserElementsMainService extends Disposable implements INat get windowId(): never { throw new Error('Not implemented in electron-main'); } - async findWebviewTarget(debuggers: any, windowId: number, browserType: BrowserType): Promise { + async findWebviewTarget(debuggers: Electron.Debugger, windowId: number, browserType: BrowserType): Promise { const { targetInfos } = await debuggers.sendCommand('Target.getTargets'); let target: typeof targetInfos[number] | undefined = undefined; const matchingTarget = targetInfos.find((targetInfo: { url: string }) => { @@ -104,7 +104,7 @@ export class NativeBrowserElementsMainService extends Disposable implements INat return target.targetId; } - async waitForWebviewTargets(debuggers: any, windowId: number, browserType: BrowserType): Promise { + async waitForWebviewTargets(debuggers: Electron.Debugger, windowId: number, browserType: BrowserType): Promise { const start = Date.now(); const timeout = 10000; @@ -172,7 +172,7 @@ export class NativeBrowserElementsMainService extends Disposable implements INat }); } - async finishOverlay(debuggers: any, sessionId: string | undefined): Promise { + async finishOverlay(debuggers: Electron.Debugger, sessionId: string | undefined): Promise { if (debuggers.isAttached() && sessionId) { await debuggers.sendCommand('Overlay.setInspectMode', { mode: 'none', @@ -340,9 +340,9 @@ export class NativeBrowserElementsMainService extends Disposable implements INat return { outerHTML: nodeData.outerHTML, computedStyle: nodeData.computedStyle, bounds: scaledBounds }; } - async getNodeData(sessionId: string, debuggers: any, window: BrowserWindow, cancellationId?: number): Promise { + async getNodeData(sessionId: string, debuggers: Electron.Debugger, window: BrowserWindow, cancellationId?: number): Promise { return new Promise((resolve, reject) => { - const onMessage = async (event: any, method: string, params: { backendNodeId: number }) => { + const onMessage = async (event: Electron.Event, method: string, params: { backendNodeId: number }) => { if (method === 'Overlay.inspectNodeRequested') { debuggers.off('message', onMessage); await debuggers.sendCommand('Runtime.evaluate', { @@ -416,7 +416,7 @@ export class NativeBrowserElementsMainService extends Disposable implements INat }); } - formatMatchedStyles(matched: any): string { + formatMatchedStyles(matched: { inlineStyle?: { cssProperties?: Array<{ name: string; value: string }> }; matchedCSSRules?: Array<{ rule: { selectorList: { selectors: Array<{ text: string }> }; origin: string; style: { cssProperties: Array<{ name: string; value: string }> } } }>; inherited?: Array<{ matchedCSSRules?: Array<{ rule: { selectorList: { selectors: Array<{ text: string }> }; origin: string; style: { cssProperties: Array<{ name: string; value: string }> } } }> }> }): string { const lines: string[] = []; // inline @@ -435,7 +435,7 @@ export class NativeBrowserElementsMainService extends Disposable implements INat if (matched.matchedCSSRules?.length) { for (const ruleEntry of matched.matchedCSSRules) { const rule = ruleEntry.rule; - const selectors = rule.selectorList.selectors.map((s: any) => s.text).join(', '); + const selectors = rule.selectorList.selectors.map(s => s.text).join(', '); lines.push(`/* Matched Rule from ${rule.origin} */`); lines.push(`${selectors} {`); for (const prop of rule.style.cssProperties) { @@ -454,7 +454,7 @@ export class NativeBrowserElementsMainService extends Disposable implements INat const rules = inherited.matchedCSSRules || []; for (const ruleEntry of rules) { const rule = ruleEntry.rule; - const selectors = rule.selectorList.selectors.map((s: any) => s.text).join(', '); + const selectors = rule.selectorList.selectors.map(s => s.text).join(', '); lines.push(`/* Inherited from ancestor level ${level} (${rule.origin}) */`); lines.push(`${selectors} {`); for (const prop of rule.style.cssProperties) { diff --git a/src/vs/platform/diagnostics/node/diagnosticsService.ts b/src/vs/platform/diagnostics/node/diagnosticsService.ts index a3154a69271..ea57c9326e4 100644 --- a/src/vs/platform/diagnostics/node/diagnosticsService.ts +++ b/src/vs/platform/diagnostics/node/diagnosticsService.ts @@ -431,7 +431,7 @@ export class DiagnosticsService implements IDiagnosticsService { return output.join('\n'); } - private expandGPUFeatures(gpuFeatures: any): string { + private expandGPUFeatures(gpuFeatures: Record): string { const longestFeatureName = Math.max(...Object.keys(gpuFeatures).map(feature => feature.length)); // Make columns aligned by adding spaces after feature name return Object.keys(gpuFeatures).map(feature => `${feature}: ${' '.repeat(longestFeatureName - feature.length)} ${gpuFeatures[feature]}`).join('\n '); diff --git a/src/vs/workbench/contrib/chat/common/chatModes.ts b/src/vs/workbench/contrib/chat/common/chatModes.ts index 463e05f6a65..598f4776b65 100644 --- a/src/vs/workbench/contrib/chat/common/chatModes.ts +++ b/src/vs/workbench/contrib/chat/common/chatModes.ts @@ -99,7 +99,7 @@ export class ChatModeService extends Disposable implements IChatModeService { } } - private deserializeCachedModes(cachedCustomModes: any): void { + private deserializeCachedModes(cachedCustomModes: unknown): void { if (!Array.isArray(cachedCustomModes)) { this.logService.error('Invalid cached custom modes data: expected array'); return; diff --git a/src/vs/workbench/contrib/markers/browser/markersTable.ts b/src/vs/workbench/contrib/markers/browser/markersTable.ts index 3f058e518ad..def75a1daa9 100644 --- a/src/vs/workbench/contrib/markers/browser/markersTable.ts +++ b/src/vs/workbench/contrib/markers/browser/markersTable.ts @@ -252,12 +252,12 @@ class MarkerSourceColumnRenderer implements ITableRenderer { +class MarkersTableVirtualDelegate implements ITableVirtualDelegate { static readonly HEADER_ROW_HEIGHT = 24; static readonly ROW_HEIGHT = 24; readonly headerRowHeight = MarkersTableVirtualDelegate.HEADER_ROW_HEIGHT; - getHeight(item: any) { + getHeight(item: MarkerTableItem) { return MarkersTableVirtualDelegate.ROW_HEIGHT; } } @@ -341,8 +341,7 @@ export class MarkersTable extends Disposable implements IProblemsWidget { // mouseover/mouseleave event handlers const onRowHover = Event.chain(this._register(new DomEmitter(list, 'mouseover')).event, $ => $.map(e => DOM.findParentWithClass(e.target as HTMLElement, 'monaco-list-row', 'monaco-list-rows')) - // eslint-disable-next-line local/code-no-any-casts - .filter(((e: HTMLElement | null) => !!e) as any) + .filter(e => !!e) .map(e => parseInt(e.getAttribute('data-index')!)) ); diff --git a/src/vs/workbench/contrib/notebook/common/notebookRange.ts b/src/vs/workbench/contrib/notebook/common/notebookRange.ts index 75a7a105757..1487d1869b0 100644 --- a/src/vs/workbench/contrib/notebook/common/notebookRange.ts +++ b/src/vs/workbench/contrib/notebook/common/notebookRange.ts @@ -19,12 +19,12 @@ export interface ICellRange { } -export function isICellRange(candidate: any): candidate is ICellRange { +export function isICellRange(candidate: unknown): candidate is ICellRange { if (!candidate || typeof candidate !== 'object') { return false; } - return typeof (candidate).start === 'number' - && typeof (candidate).end === 'number'; + return typeof (candidate as ICellRange).start === 'number' + && typeof (candidate as ICellRange).end === 'number'; } export function cellIndexesToRanges(indexes: number[]) { diff --git a/src/vs/workbench/contrib/search/browser/searchWidget.ts b/src/vs/workbench/contrib/search/browser/searchWidget.ts index aecf245b582..2b370417065 100644 --- a/src/vs/workbench/contrib/search/browser/searchWidget.ts +++ b/src/vs/workbench/contrib/search/browser/searchWidget.ts @@ -84,11 +84,11 @@ class ReplaceAllAction extends Action { this._searchWidget = searchWidget; } - override run(): Promise { + override run(): Promise { if (this._searchWidget) { return this._searchWidget.triggerReplaceAll(); } - return Promise.resolve(null); + return Promise.resolve(); } } @@ -548,9 +548,9 @@ export class SearchWidget extends Widget { this._register(this.replaceInput.onPreserveCaseKeyDown((keyboardEvent: IKeyboardEvent) => this.onPreserveCaseKeyDown(keyboardEvent))); } - triggerReplaceAll(): Promise { + triggerReplaceAll(): Promise { this._onReplaceAll.fire(); - return Promise.resolve(null); + return Promise.resolve(); } private onToggleReplaceButton(): void { diff --git a/src/vs/workbench/contrib/search/common/cacheState.ts b/src/vs/workbench/contrib/search/common/cacheState.ts index 9090835bda7..bf7f55ecfcf 100644 --- a/src/vs/workbench/contrib/search/common/cacheState.ts +++ b/src/vs/workbench/contrib/search/common/cacheState.ts @@ -45,7 +45,7 @@ export class FileQueryCacheState { constructor( private cacheQuery: (cacheKey: string) => IFileQuery, - private loadFn: (query: IFileQuery) => Promise, + private loadFn: (query: IFileQuery) => Promise, private disposeFn: (cacheKey: string) => Promise, private previousCacheState: FileQueryCacheState | undefined ) {