From e917594477f466baecc310ff8a137e184d0b27c5 Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Wed, 3 Apr 2019 15:53:02 +0200 Subject: [PATCH] fix bad type --- src/vs/platform/environment/common/environment.ts | 1 - src/vs/workbench/browser/contextkeys.ts | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/vs/platform/environment/common/environment.ts b/src/vs/platform/environment/common/environment.ts index eb1873cd94c..8471cefb237 100644 --- a/src/vs/platform/environment/common/environment.ts +++ b/src/vs/platform/environment/common/environment.ts @@ -7,7 +7,6 @@ import { createDecorator } from 'vs/platform/instantiation/common/instantiation' import { URI } from 'vs/base/common/uri'; export interface ParsedArgs { - [arg: string]: any; _: string[]; 'folder-uri'?: string | string[]; 'file-uri'?: string | string[]; diff --git a/src/vs/workbench/browser/contextkeys.ts b/src/vs/workbench/browser/contextkeys.ts index 44c72c35c19..f65489c7aec 100644 --- a/src/vs/workbench/browser/contextkeys.ts +++ b/src/vs/workbench/browser/contextkeys.ts @@ -7,7 +7,7 @@ import { Event } from 'vs/base/common/event'; import { Disposable } from 'vs/base/common/lifecycle'; import { IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey'; import { InputFocusedContext } from 'vs/platform/contextkey/common/contextkeys'; -import { IWindowConfiguration, IWindowService } from 'vs/platform/windows/common/windows'; +import { IWindowService, IWindowsConfiguration } from 'vs/platform/windows/common/windows'; import { ActiveEditorContext, EditorsVisibleContext, TextCompareEditorVisibleContext, TextCompareEditorActiveContext, ActiveEditorGroupEmptyContext, MultipleEditorGroupsContext, TEXT_DIFF_EDITOR_ID, SplitEditorsVertically, InEditorZenModeContext } from 'vs/workbench/common/editor'; import { IsMacContext, IsLinuxContext, IsWindowsContext, HasMacNativeTabsContext, IsDevelopmentContext, SupportsWorkspacesContext, SupportsOpenFileFolderContext, WorkbenchStateContext, WorkspaceFolderCountContext, IsRemoteContext } from 'vs/workbench/common/contextkeys'; import { trackFocus, addDisposableListener, EventType } from 'vs/base/browser/dom'; @@ -91,7 +91,7 @@ export class WorkbenchContextKeysHandler extends Disposable { IsRemoteContext.bindTo(this.contextKeyService).set(!!this.windowService.getConfiguration().remoteAuthority); // macOS Native Tabs - const windowConfig = this.configurationService.getValue(); + const windowConfig = this.configurationService.getValue(); HasMacNativeTabsContext.bindTo(this.contextKeyService).set(windowConfig && windowConfig.window && windowConfig.window.nativeTabs); // Development -- GitLab