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

workspace trust - remove async from showing editor pane

Browse source 
//cc @sbatten
This commit is contained in:
Benjamin Pasero 2021-05-13 13:12:21 +02:00
parent 23dc403a17
commit e02dfbbcab
1 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/vs/workbench/browser/parts/editor/editorControl.ts
View file

@ -72,7 +72,7 @@ export class EditorControl extends Disposable {
// to handle errors properly.
const editor = this._activeEditorPane?.input;
const options = this._activeEditorPane?.options;
if (editor && editor.requiresWorkspaceTrust()) {
if (editor?.requiresWorkspaceTrust()) {
this.groupView.openEditor(editor, options);
}
}
@ -80,7 +80,7 @@ export class EditorControl extends Disposable {
async openEditor(editor: EditorInput, options: EditorOptions | undefined, context: IEditorOpenContext = Object.create(null)): Promise<IOpenEditorResult> {
// Editor descriptor
const descriptor = await this.resolveEditorDescriptor(editor);
const descriptor = this.getEditorDescriptor(editor);
// Editor pane
const editorPane = this.doShowEditorPane(descriptor);
@ -90,17 +90,16 @@ export class EditorControl extends Disposable {
return { editorPane, editorChanged };
}
private async resolveEditorDescriptor(editor: EditorInput): Promise<IEditorDescriptor> {
const editorRequiresTrust = editor.requiresWorkspaceTrust();
const editorBlockedByTrust = editorRequiresTrust && !this.workspaceTrustService.isWorkpaceTrusted();
private getEditorDescriptor(editor: EditorInput): IEditorDescriptor {
if (editor.requiresWorkspaceTrust() && !this.workspaceTrustService.isWorkpaceTrusted()) {
// Workspace trust: if an editor signals it needs workspace trust
// but the current workspace is untrusted, we fallback to a generic
// editor descriptor to indicate this an do NOT load the registered
// editor.
return WorkspaceTrustRequiredEditor.DESCRIPTOR;
}
// Workspace trust: if an editor signals it needs workspace trust
// but the current workspace is untrusted, we fallback to a generic
// editor descriptor to indicate this an do NOT load the registered
// editor.
const descriptor = editorBlockedByTrust ? WorkspaceTrustRequiredEditor.DESCRIPTOR : this.editorsRegistry.getEditor(editor);
return assertIsDefined(descriptor);
return assertIsDefined(this.editorsRegistry.getEditor(editor));
}
private doShowEditorPane(descriptor: IEditorDescriptor): EditorPane {