From 06b27a740daf3eb891e11a7a8f60d6a381010aee Mon Sep 17 00:00:00 2001 From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com> Date: Thu, 13 Nov 2025 17:11:50 +0000 Subject: [PATCH] Git - more `any` cleanup (#277190) --- eslint.config.js | 1 - extensions/git/src/repository.ts | 19 +++++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/eslint.config.js b/eslint.config.js index ac4dbe12aab..4f9dd8630c1 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -365,7 +365,6 @@ export default tseslint.config( 'extensions/git/src/commands.ts', 'extensions/git/src/decorators.ts', 'extensions/git/src/git.ts', - 'extensions/git/src/repository.ts', 'extensions/git/src/util.ts', 'extensions/git-base/src/decorators.ts', 'extensions/github/src/util.ts', diff --git a/extensions/git/src/repository.ts b/extensions/git/src/repository.ts index 4be995d8023..f62ef8d45cd 100644 --- a/extensions/git/src/repository.ts +++ b/extensions/git/src/repository.ts @@ -186,7 +186,7 @@ export class Resource implements SourceControlResourceState { get renameResourceUri(): Uri | undefined { return this._renameResourceUri; } get contextValue(): string | undefined { return this._repositoryKind; } - private static Icons: any = { + private static Icons = { light: { Modified: getIconUri('status-modified', 'light'), Added: getIconUri('status-added', 'light'), @@ -211,7 +211,7 @@ export class Resource implements SourceControlResourceState { } }; - private getIconPath(theme: string): Uri { + private getIconPath(theme: 'light' | 'dark'): Uri { switch (this.type) { case Status.INDEX_MODIFIED: return Resource.Icons[theme].Modified; case Status.MODIFIED: return Resource.Icons[theme].Modified; @@ -720,7 +720,9 @@ export class Repository implements Disposable { @memoize get onDidChangeOperations(): Event { - return anyEvent(this.onRunOperation as Event, this.onDidRunOperation as Event); + return anyEvent( + this.onRunOperation as Event, + this.onDidRunOperation as Event) as Event; } private _sourceControl: SourceControl; @@ -2324,14 +2326,15 @@ export class Repository implements Disposable { private async run( operation: Operation, - runOperation: () => Promise = () => Promise.resolve(null), - getOptimisticResourceGroups: () => GitResourceGroups | undefined = () => undefined): Promise { + runOperation: () => Promise = () => Promise.resolve(null) as Promise, + getOptimisticResourceGroups: () => GitResourceGroups | undefined = () => undefined + ): Promise { if (this.state !== RepositoryState.Idle) { throw new Error('Repository not initialized'); } - let error: any = null; + let error: unknown = null; this._operations.start(operation); this._onRunOperation.fire(operation.kind); @@ -2347,7 +2350,7 @@ export class Repository implements Disposable { } catch (err) { error = err; - if (err.gitErrorCode === GitErrorCodes.NotAGitRepository) { + if (err instanceof GitError && err.gitErrorCode === GitErrorCodes.NotAGitRepository) { this.state = RepositoryState.Disposed; } @@ -2362,7 +2365,7 @@ export class Repository implements Disposable { } } - private async retryRun(operation: Operation, runOperation: () => Promise = () => Promise.resolve(null)): Promise { + private async retryRun(operation: Operation, runOperation: () => Promise): Promise { let attempt = 0; while (true) {