Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-20 02:08:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Git - more any cleanup (#277190)

Browse Source
This commit is contained in:
Ladislau Szomoru
2025-11-13 17:11:50 +00:00
committed by GitHub
parent 5e6b70eace
commit 06b27a740d
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
eslint.config.js
View File

@@ -365,7 +365,6 @@ export default tseslint.config(
'extensions/git/src/commands.ts', 'extensions/git/src/commands.ts',
'extensions/git/src/decorators.ts', 'extensions/git/src/decorators.ts',
'extensions/git/src/git.ts', 'extensions/git/src/git.ts',
'extensions/git/src/repository.ts',
'extensions/git/src/util.ts', 'extensions/git/src/util.ts',
'extensions/git-base/src/decorators.ts', 'extensions/git-base/src/decorators.ts',
'extensions/github/src/util.ts', 'extensions/github/src/util.ts',

19
extensions/git/src/repository.ts
View File

@@ -186,7 +186,7 @@ export class Resource implements SourceControlResourceState {
get renameResourceUri(): Uri | undefined { return this._renameResourceUri; } get renameResourceUri(): Uri | undefined { return this._renameResourceUri; }
get contextValue(): string | undefined { return this._repositoryKind; } get contextValue(): string | undefined { return this._repositoryKind; }
private static Icons: any = { private static Icons = {
light: { light: {
Modified: getIconUri('status-modified', 'light'), Modified: getIconUri('status-modified', 'light'),
Added: getIconUri('status-added', '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) { switch (this.type) {
case Status.INDEX_MODIFIED: return Resource.Icons[theme].Modified; case Status.INDEX_MODIFIED: return Resource.Icons[theme].Modified;
case Status.MODIFIED: return Resource.Icons[theme].Modified; case Status.MODIFIED: return Resource.Icons[theme].Modified;
@@ -720,7 +720,9 @@ export class Repository implements Disposable {
@memoize @memoize
get onDidChangeOperations(): Event<void> { get onDidChangeOperations(): Event<void> {
return anyEvent(this.onRunOperation as Event<any>, this.onDidRunOperation as Event<any>); return anyEvent(
this.onRunOperation as Event<unknown>,
this.onDidRunOperation as Event<unknown>) as Event<void>;
} }
private _sourceControl: SourceControl; private _sourceControl: SourceControl;
@@ -2324,14 +2326,15 @@ export class Repository implements Disposable {
private async run<T>( private async run<T>(
operation: Operation, operation: Operation,
runOperation: () => Promise<T> = () => Promise.resolve<any>(null), runOperation: () => Promise<T> = () => Promise.resolve(null) as Promise<T>,
getOptimisticResourceGroups: () => GitResourceGroups | undefined = () => undefined): Promise<T> { getOptimisticResourceGroups: () => GitResourceGroups | undefined = () => undefined
): Promise<T> {
if (this.state !== RepositoryState.Idle) { if (this.state !== RepositoryState.Idle) {
throw new Error('Repository not initialized'); throw new Error('Repository not initialized');
} }
let error: any = null; let error: unknown = null;
this._operations.start(operation); this._operations.start(operation);
this._onRunOperation.fire(operation.kind); this._onRunOperation.fire(operation.kind);
@@ -2347,7 +2350,7 @@ export class Repository implements Disposable {
} catch (err) { } catch (err) {
error = err; error = err;
if (err.gitErrorCode === GitErrorCodes.NotAGitRepository) { if (err instanceof GitError && err.gitErrorCode === GitErrorCodes.NotAGitRepository) {
this.state = RepositoryState.Disposed; this.state = RepositoryState.Disposed;
} }
@@ -2362,7 +2365,7 @@ export class Repository implements Disposable {
} }
} }
private async retryRun<T>(operation: Operation, runOperation: () => Promise<T> = () => Promise.resolve<any>(null)): Promise<T> { private async retryRun<T>(operation: Operation, runOperation: () => Promise<T>): Promise<T> {
let attempt = 0; let attempt = 0;
while (true) { while (true) {