diff --git a/eslint.config.js b/eslint.config.js index a64868e144c..509648a12c1 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -731,10 +731,6 @@ export default tseslint.config( 'src/vs/workbench/contrib/preferences/browser/settingsTree.ts', 'src/vs/workbench/contrib/preferences/browser/settingsTreeModels.ts', 'src/vs/workbench/contrib/remote/browser/tunnelView.ts', - 'src/vs/workbench/contrib/scm/browser/quickDiffWidget.ts', - 'src/vs/workbench/contrib/scm/browser/scmRepositoriesViewPane.ts', - 'src/vs/workbench/contrib/scm/browser/scmViewPane.ts', - 'src/vs/workbench/contrib/scm/browser/util.ts', 'src/vs/workbench/contrib/search/browser/AISearch/aiSearchModel.ts', 'src/vs/workbench/contrib/search/browser/AISearch/aiSearchModelBase.ts', 'src/vs/workbench/contrib/search/browser/notebookSearch/notebookSearchModel.ts', diff --git a/src/vs/workbench/contrib/scm/browser/quickDiffWidget.ts b/src/vs/workbench/contrib/scm/browser/quickDiffWidget.ts index 619519173b5..51bf45c1fad 100644 --- a/src/vs/workbench/contrib/scm/browser/quickDiffWidget.ts +++ b/src/vs/workbench/contrib/scm/browser/quickDiffWidget.ts @@ -108,7 +108,7 @@ export class QuickDiffPickerBaseAction extends Action { class QuickDiffWidgetActionRunner extends ActionRunner { - protected override runAction(action: IAction, context: any): Promise { + protected override runAction(action: IAction, context: unknown[]): Promise { if (action instanceof MenuItemAction) { return action.run(...context); } @@ -140,7 +140,7 @@ class QuickDiffWidgetEditorAction extends Action { this.editor = editor; } - override run(): Promise { + override run(): Promise { return Promise.resolve(this.instantiationService.invokeFunction(accessor => this.action.run(accessor, this.editor, null))); } } diff --git a/src/vs/workbench/contrib/scm/browser/scmRepositoriesViewPane.ts b/src/vs/workbench/contrib/scm/browser/scmRepositoriesViewPane.ts index 7e3c11a21da..b689e9d9fbe 100644 --- a/src/vs/workbench/contrib/scm/browser/scmRepositoriesViewPane.ts +++ b/src/vs/workbench/contrib/scm/browser/scmRepositoriesViewPane.ts @@ -79,7 +79,7 @@ class RepositoryTreeIdentityProvider implements IIdentityProvider; + private tree!: WorkbenchCompressibleAsyncDataTree; private treeDataSource!: RepositoryTreeDataSource; private treeIdentityProvider!: RepositoryTreeIdentityProvider; private readonly treeOperationSequencer = new Sequencer(); @@ -229,7 +229,7 @@ export class SCMRepositoriesViewPane extends ViewPane { } } } - ) as WorkbenchCompressibleAsyncDataTree; + ) as WorkbenchCompressibleAsyncDataTree; this._register(this.tree); this._register(autorun(reader => { diff --git a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts index 339857fc6a8..204e6632e8c 100644 --- a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts +++ b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts @@ -515,7 +515,7 @@ class RepositoryPaneActionRunner extends ActionRunner { super(); } - protected override async runAction(action: IAction, context: ISCMResourceGroup | ISCMResource | IResourceNode): Promise { + protected override async runAction(action: IAction, context: ISCMResourceGroup | ISCMResource | IResourceNode): Promise { if (!(action instanceof MenuItemAction)) { return super.runAction(action, context); } @@ -1694,7 +1694,7 @@ class SCMInputWidget { } // Validation - const validationDelayer = new ThrottledDelayer(200); + const validationDelayer = new ThrottledDelayer(200); const validate = async () => { const position = this.inputEditor.getSelection()?.getStartPosition(); const offset = position && textModel.getOffsetAt(position); @@ -2612,7 +2612,7 @@ export class SCMViewPane extends ViewPane { } const element = e.element; - let context: any = element; + let context: unknown = element; let actions: IAction[] = []; const disposables = new DisposableStore(); diff --git a/src/vs/workbench/contrib/scm/browser/util.ts b/src/vs/workbench/contrib/scm/browser/util.ts index f915cda154e..1d9b9215cec 100644 --- a/src/vs/workbench/contrib/scm/browser/util.ts +++ b/src/vs/workbench/contrib/scm/browser/util.ts @@ -21,47 +21,47 @@ import { IResourceNode, ResourceTree } from '../../../../base/common/resourceTre import { ThemeIcon } from '../../../../base/common/themables.js'; import { Codicon } from '../../../../base/common/codicons.js'; -export function isSCMViewService(element: any): element is ISCMViewService { +export function isSCMViewService(element: unknown): element is ISCMViewService { return Array.isArray((element as ISCMViewService).repositories) && Array.isArray((element as ISCMViewService).visibleRepositories); } -export function isSCMRepository(element: any): element is ISCMRepository { +export function isSCMRepository(element: unknown): element is ISCMRepository { return !!(element as ISCMRepository).provider && !!(element as ISCMRepository).input; } -export function isSCMInput(element: any): element is ISCMInput { +export function isSCMInput(element: unknown): element is ISCMInput { return !!(element as ISCMInput).validateInput && typeof (element as ISCMInput).value === 'string'; } -export function isSCMActionButton(element: any): element is ISCMActionButton { +export function isSCMActionButton(element: unknown): element is ISCMActionButton { return (element as ISCMActionButton).type === 'actionButton'; } -export function isSCMResourceGroup(element: any): element is ISCMResourceGroup { +export function isSCMResourceGroup(element: unknown): element is ISCMResourceGroup { return !!(element as ISCMResourceGroup).provider && !!(element as ISCMResourceGroup).resources; } -export function isSCMResource(element: any): element is ISCMResource { +export function isSCMResource(element: unknown): element is ISCMResource { return !!(element as ISCMResource).sourceUri && isSCMResourceGroup((element as ISCMResource).resourceGroup); } -export function isSCMResourceNode(element: any): element is IResourceNode { +export function isSCMResourceNode(element: unknown): element is IResourceNode { return ResourceTree.isResourceNode(element) && isSCMResourceGroup(element.context); } -export function isSCMHistoryItemViewModelTreeElement(element: any): element is SCMHistoryItemViewModelTreeElement { +export function isSCMHistoryItemViewModelTreeElement(element: unknown): element is SCMHistoryItemViewModelTreeElement { return (element as SCMHistoryItemViewModelTreeElement).type === 'historyItemViewModel'; } -export function isSCMHistoryItemLoadMoreTreeElement(element: any): element is SCMHistoryItemLoadMoreTreeElement { +export function isSCMHistoryItemLoadMoreTreeElement(element: unknown): element is SCMHistoryItemLoadMoreTreeElement { return (element as SCMHistoryItemLoadMoreTreeElement).type === 'historyItemLoadMore'; } -export function isSCMHistoryItemChangeViewModelTreeElement(element: any): element is SCMHistoryItemChangeViewModelTreeElement { +export function isSCMHistoryItemChangeViewModelTreeElement(element: unknown): element is SCMHistoryItemChangeViewModelTreeElement { return (element as SCMHistoryItemChangeViewModelTreeElement).type === 'historyItemChangeViewModel'; } -export function isSCMHistoryItemChangeNode(element: any): element is IResourceNode { +export function isSCMHistoryItemChangeNode(element: unknown): element is IResourceNode { return ResourceTree.isResourceNode(element) && isSCMHistoryItemViewModelTreeElement(element.context); }