development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-07-17 11:07:22 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Extension host veto is registered multiple times on restart (#183778) (#184126)

Browse source
This commit is contained in:
Benjamin Pasero 2023-06-02 09:44:18 +02:00 committed by GitHub
parent 23850e2363
commit 9170aa877c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/vs/workbench/api/browser/mainThreadCustomEditors.ts
View file

@ -106,26 +106,6 @@ export class MainThreadCustomEditors extends Disposable implements extHostProtoc
// Working copy operations
this._register(workingCopyFileService.onWillRunWorkingCopyFileOperation(async e => this.onWillRunWorkingCopyFileOperation(e)));
this._register(extensionService.onWillStop(e => {
const dirtyCustomEditors = workingCopyService.workingCopies.filter(workingCopy => {
return workingCopy instanceof MainThreadCustomEditorModel && workingCopy.isDirty();
});
if (!dirtyCustomEditors.length) {
return;
}
e.veto((async () => {
for (const dirtyCustomEditor of dirtyCustomEditors) {
const didSave = await dirtyCustomEditor.save();
if (!didSave) {
// Veto
return true;
}
}
return false; // Don't veto
})(), localize('vetoExtHostRestart', "One or more custom editors could not be saved."));
}));
}
public $registerTextEditorProvider(extensionData: extHostProtocol.WebviewExtensionDescription, viewType: string, options: extHostProtocol.IWebviewPanelOptions, capabilities: extHostProtocol.CustomTextEditorCapabilities, serializeBuffersForPostMessage: boolean): void {
@ -399,6 +379,7 @@ class MainThreadCustomEditorModel extends ResourceWorkingCopy implements ICustom
@IWorkbenchEnvironmentService private readonly _environmentService: IWorkbenchEnvironmentService,
@IWorkingCopyService workingCopyService: IWorkingCopyService,
@IPathService private readonly _pathService: IPathService,
@IExtensionService extensionService: IExtensionService,
) {
super(MainThreadCustomEditorModel.toWorkingCopyResource(_viewType, _editorResource), fileService);
@ -406,6 +387,21 @@ class MainThreadCustomEditorModel extends ResourceWorkingCopy implements ICustom
if (_editable) {
this._register(workingCopyService.registerWorkingCopy(this));
this._register(extensionService.onWillStop(e => {
if (!this.isDirty()) {
return;
}
e.veto((async () => {
const didSave = await this.save();
if (!didSave) {
// Veto
return true;
}
return false; // Don't veto
})(), localize('vetoExtHostRestart', "Custom editor '{0}' could not be saved.", this.name));
}));
}
// Normally means we're re-opening an untitled file

2
src/vs/workbench/contrib/notebook/common/notebookEditorModel.ts
View file

@ -70,7 +70,7 @@ export class SimpleNotebookEditorModel extends EditorModel implements INotebookE
return true;
}
return false; // Don't veto
})(), localize('vetoExtHostRestart', "Notebook could not be saved."));
})(), localize('vetoExtHostRestart', "Notebook '{0}' could not be saved.", this._workingCopy?.name));
}));
}