From bfc7b7f55ab2ed319ccd79bcaf0a70b687a8881c Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Tue, 14 May 2019 11:40:47 -0700 Subject: [PATCH] Make getResource return undefined --- src/vs/base/parts/quickopen/browser/quickOpenModel.ts | 6 +++--- src/vs/workbench/browser/parts/editor/editorPicker.ts | 5 +++-- .../browser/parts/quickopen/quickOpenController.ts | 6 +++--- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/vs/base/parts/quickopen/browser/quickOpenModel.ts b/src/vs/base/parts/quickopen/browser/quickOpenModel.ts index 0347e161b09..3e79edb43ae 100644 --- a/src/vs/base/parts/quickopen/browser/quickOpenModel.ts +++ b/src/vs/base/parts/quickopen/browser/quickOpenModel.ts @@ -140,8 +140,8 @@ export class QuickOpenEntry { * A resource for this entry. Resource URIs can be used to compare different kinds of entries and group * them together. */ - getResource(): URI | null { - return null; + getResource(): URI | undefined { + return undefined; } /** @@ -245,7 +245,7 @@ export class QuickOpenEntryGroup extends QuickOpenEntry { return this.entry ? this.entry.getDetail() : super.getDetail(); } - getResource(): URI | null { + getResource(): URI | undefined { return this.entry ? this.entry.getResource() : super.getResource(); } diff --git a/src/vs/workbench/browser/parts/editor/editorPicker.ts b/src/vs/workbench/browser/parts/editor/editorPicker.ts index edb8142f7de..3b87ee6b7b8 100644 --- a/src/vs/workbench/browser/parts/editor/editorPicker.ts +++ b/src/vs/workbench/browser/parts/editor/editorPicker.ts @@ -18,6 +18,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti import { EditorInput, toResource, SideBySideEditor } from 'vs/workbench/common/editor'; import { compareItemsByScore, scoreItem, ScorerCache, prepareQuery } from 'vs/base/parts/quickopen/common/quickOpenScorer'; import { CancellationToken } from 'vs/base/common/cancellation'; +import { withNullAsUndefined } from 'vs/base/common/types'; export class EditorPickerEntry extends QuickOpenEntryGroup { @@ -32,7 +33,7 @@ export class EditorPickerEntry extends QuickOpenEntryGroup { getLabelOptions(): IIconLabelValueOptions { return { - extraClasses: getIconClasses(this.modelService, this.modeService, this.getResource() || undefined), + extraClasses: getIconClasses(this.modelService, this.modeService, this.getResource()), italic: !this._group.isPinned(this.editor) }; } @@ -50,7 +51,7 @@ export class EditorPickerEntry extends QuickOpenEntryGroup { } getResource() { - return toResource(this.editor, { supportSideBySide: SideBySideEditor.MASTER }); + return withNullAsUndefined(toResource(this.editor, { supportSideBySide: SideBySideEditor.MASTER })); } getAriaLabel(): string { diff --git a/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts b/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts index 68fd3569f5a..5ca5e588a35 100644 --- a/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts +++ b/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts @@ -782,8 +782,8 @@ export class EditorHistoryEntry extends EditorQuickOpenEntry { return this.description; } - getResource(): URI | null { - return types.withUndefinedAsNull(this.resource); + getResource(): URI | undefined { + return this.resource; } getInput(): IEditorInput | IResourceInput { @@ -848,7 +848,7 @@ export class RemoveFromEditorHistoryAction extends Action { return { input: h, - iconClasses: getIconClasses(this.modelService, this.modeService, types.withNullAsUndefined(entry.getResource())), + iconClasses: getIconClasses(this.modelService, this.modeService, entry.getResource()), label: entry.getLabel(), description: entry.getDescription() };