development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-27 21:09:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Git - fix close diff editor regression (#184410)

Browse source
This commit is contained in:
Ladislau Szomoru 2023-06-06 14:35:15 +02:00 committed by GitHub
parent 9d5ee94f9e
commit ad34af09f9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
extensions/git/src/repository.ts
View file

@ -1196,6 +1196,10 @@ export class Repository implements Disposable {
}
async commit(message: string | undefined, opts: CommitOptions = Object.create(null)): Promise<void> {
const indexResources = [...this.indexGroup.resourceStates.map(r => r.resourceUri.fsPath)];
const workingGroupResources = opts.all && opts.all !== 'tracked' ?
[...this.workingTreeGroup.resourceStates.map(r => r.resourceUri.fsPath)] : [];
if (this.rebaseCommit) {
await this.run(
Operation.RebaseContinue,
@ -1206,7 +1210,7 @@ export class Repository implements Disposable {
}
await this.repository.rebaseContinue();
await this.commitOperationCleanup(message, opts);
await this.commitOperationCleanup(message, indexResources, workingGroupResources);
},
() => this.commitOperationGetOptimisticResourceGroups(opts));
} else {
@ -1229,7 +1233,7 @@ export class Repository implements Disposable {
}
await this.repository.commit(message, opts);
await this.commitOperationCleanup(message, opts);
await this.commitOperationCleanup(message, indexResources, workingGroupResources);
},
() => this.commitOperationGetOptimisticResourceGroups(opts));
@ -1240,15 +1244,10 @@ export class Repository implements Disposable {
}
}
private async commitOperationCleanup(message: string | undefined, opts: CommitOptions) {
private async commitOperationCleanup(message: string | undefined, indexResources: string[], workingGroupResources: string[]) {
if (message) {
this.inputBox.value = await this.getInputTemplate();
}
const indexResources = [...this.indexGroup.resourceStates.map(r => r.resourceUri.fsPath)];
const workingGroupResources = opts.all && opts.all !== 'tracked' ?
[...this.workingTreeGroup.resourceStates.map(r => r.resourceUri.fsPath)] : [];
this.closeDiffEditors(indexResources, workingGroupResources);
}