Skip to content

Ensure valid editor constructed before attempting to use editor services #15238

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
colin-grant-work merged 6 commits into from
Mar 28, 2025
Merged

Ensure valid editor constructed before attempting to use editor services #15238

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e0dc27d
Ensure editor created before services used
colin-grant-work Mar 20, 2025
6d35a44
Lint
colin-grant-work Mar 25, 2025
118daf9
Close editor on successful action, not any change
colin-grant-work Mar 25, 2025
e2cf80c
Update DirtyDiffWidget change model when changes change
colin-grant-work Mar 25, 2025
d809c93
Update headings; jump in main editor; close if no changes
colin-grant-work Mar 26, 2025
fc8aa2d
Use the global instantiation service on disposal
colin-grant-work Mar 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Close editor on successful action, not any change
  • Loading branch information
@colin-grant-work
colin-grant-work committed Mar 26, 2025
commit 118daf9008c6122280295f15cf9f3cd4d6e90e35
1 change: 0 additions & 1 deletion packages/scm/src/browser/dirty-diff/dirty-diff-navigator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,6 @@ export class DirtyDiffController implements Disposable {

handleDirtyDiffUpdate(dirtyDiff: DirtyDiffUpdate): void {
if (dirtyDiff.editor === this.editor) {
this.closeWidget();
this.dirtyDiff = dirtyDiff;
}
}
Expand Down
4 changes: 3 additions & 1 deletion packages/scm/src/browser/dirty-diff/dirty-diff-widget.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,8 +315,10 @@ class DirtyDiffPeekView extends MonacoEditorPeekViewWidget {
if (item instanceof ActionMenuNode) {
const { command, id, label, icon, when } = item;
if (icon && menuCommandExecutor.isVisible(menuPath, command, this.widget) && (!when || contextKeyService.match(when))) {
// Close editor on successful contributed action.
// https://github.com/microsoft/vscode/blob/11b1500e0a2e8b5ba12e98a3905f9d120b8646a0/src/vs/workbench/contrib/scm/browser/quickDiffWidget.ts#L356-L361
this.addAction(id, label, icon, menuCommandExecutor.isEnabled(menuPath, command, this.widget), () => {
menuCommandExecutor.executeCommand(menuPath, command, this.widget);
menuCommandExecutor.executeCommand(menuPath, command, this.widget).then(() => this.dispose());
});
}
}
Expand Down