From 8fcd2e659e3db0cd36716b3ff327fd64b67e6646 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Tue, 22 Oct 2019 16:16:26 -0700 Subject: [PATCH] Use ?. in a few more places --- src/vs/workbench/services/editor/browser/editorService.ts | 6 ++---- src/vs/workbench/services/history/browser/history.ts | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/vs/workbench/services/editor/browser/editorService.ts b/src/vs/workbench/services/editor/browser/editorService.ts index 6f8fdbbef770..9a1f593fa48f 100644 --- a/src/vs/workbench/services/editor/browser/editorService.ts +++ b/src/vs/workbench/services/editor/browser/editorService.ts @@ -152,7 +152,7 @@ export class EditorService extends Disposable implements EditorServiceImpl { for (const handler of this.openEditorHandlers) { const result = handler(event.editor, event.options, group); - const override = result ? result.override : undefined; + const override = result?.override; if (override) { event.prevent((() => override.then(editor => withNullAsUndefined(editor)))); break; @@ -161,9 +161,7 @@ export class EditorService extends Disposable implements EditorServiceImpl { } get activeControl(): IVisibleEditor | undefined { - const activeGroup = this.editorGroupService.activeGroup; - - return activeGroup ? activeGroup.activeControl : undefined; + return this.editorGroupService.activeGroup?.activeControl; } get activeTextEditorWidget(): ICodeEditor | IDiffEditor | undefined { diff --git a/src/vs/workbench/services/history/browser/history.ts b/src/vs/workbench/services/history/browser/history.ts index 964c80c9e1a6..2851a78df2b3 100644 --- a/src/vs/workbench/services/history/browser/history.ts +++ b/src/vs/workbench/services/history/browser/history.ts @@ -482,7 +482,7 @@ export class HistoryService extends Disposable implements IHistoryService { } private handleEditorEventInHistory(editor?: IBaseEditor): void { - const input = editor ? editor.input : undefined; + const input = editor?.input; // Ensure we have at least a name to show and not configured to exclude input if (!input || !input.getName() || !this.include(input)) {