development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-26 20:39:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing name and description for custom editor on data uris

Browse source
This commit is contained in:
Matt Bierner 2019-10-02 14:30:35 -07:00
parent b8869cd989
commit 2cf9921ee5
2 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/vs/workbench/contrib/customEditor/browser/customEditorInput.ts
View file

@ -7,7 +7,7 @@ import { memoize } from 'vs/base/common/decorators';
import { Emitter } from 'vs/base/common/event';
import { UnownedDisposable } from 'vs/base/common/lifecycle';
import { basename } from 'vs/base/common/path';
import { isEqual } from 'vs/base/common/resources';
import { isEqual, DataUri } from 'vs/base/common/resources';
import { URI } from 'vs/base/common/uri';
import { WebviewContentState } from 'vs/editor/common/modes';
import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
@ -18,12 +18,12 @@ import { WebviewEditorOverlay } from 'vs/workbench/contrib/webview/browser/webvi
import { WebviewInput } from 'vs/workbench/contrib/webview/browser/webviewEditorInput';
import { IWebviewEditorService } from 'vs/workbench/contrib/webview/browser/webviewEditorService';
import { promptSave } from 'vs/workbench/services/textfile/browser/textFileService';
import { Schemas } from 'vs/base/common/network';
export class CustomFileEditorInput extends WebviewInput {
public static typeId = 'workbench.editors.webviewEditor';
private name?: string;
private _hasResolved = false;
private readonly _editorResource: URI;
private _state = WebviewContentState.Readonly;
@ -49,11 +49,28 @@ export class CustomFileEditorInput extends WebviewInput {
return this._editorResource;
}
@memoize
getName(): string {
if (!this.name) {
this.name = basename(this.labelService.getUriLabel(this.getResource()));
if (this.getResource().scheme === Schemas.data) {
const metadata = DataUri.parseMetaData(this.getResource());
const label = metadata.get(DataUri.META_DATA_LABEL);
if (typeof label === 'string') {
return label;
}
}
return this.name;
return basename(this.labelService.getUriLabel(this.getResource()));
}
@memoize
getDescription(): string | undefined {
if (this.getResource().scheme === Schemas.data) {
const metadata = DataUri.parseMetaData(this.getResource());
const description = metadata.get(DataUri.META_DATA_DESCRIPTION);
if (typeof description === 'string') {
return description;
}
}
return super.getDescription();
}
matches(other: IEditorInput): boolean {

2
src/vs/workbench/contrib/webview/browser/webviewEditorInput.ts
View file

@ -94,7 +94,7 @@ export class WebviewInput extends EditorInput {
return this.getName();
}
public getDescription() {
public getDescription(): string | undefined {
return undefined;
}