Make implements type relationships more explicit to help treeshaking

build/monaco/monaco.usage.recipe

@@ -2,15 +2,9 @@
 // This file is adding references to various symbols which should not be removed via tree shaking
 
 import { ServiceIdentifier } from './vs/platform/instantiation/common/instantiation';
-import { IContextViewService } from './vs/platform/contextview/browser/contextView';
 import { IHighlight } from './vs/base/parts/quickopen/browser/quickOpenModel';
-import { IWorkspaceContextService } from './vs/platform/workspace/common/workspace';
-import { IEnvironmentService } from './vs/platform/environment/common/environment';
-import { CountBadge } from './vs/base/browser/ui/countBadge/countBadge';
 import { SimpleWorkerClient, create as create1 } from './vs/base/common/worker/simpleWorker';
 import { create as create2 } from './vs/editor/common/services/editorSimpleWorker';
-import { QuickOpenWidget } from './vs/base/parts/quickopen/browser/quickOpenWidget';
-import { WorkbenchAsyncDataTree } from './vs/platform/list/browser/listService';
 import { SyncDescriptor0, SyncDescriptor1, SyncDescriptor2, SyncDescriptor3, SyncDescriptor4, SyncDescriptor5, SyncDescriptor6, SyncDescriptor7, SyncDescriptor8 } from './vs/platform/instantiation/common/descriptors';
 import { DiffNavigator } from './vs/editor/browser/widget/diffNavigator';
 import { DocumentRangeFormattingEditProvider } from './vs/editor/common/modes';
@@ -19,13 +13,6 @@ import * as editorAPI from './vs/editor/editor.api';
 (function () {
 	var a: any;
 	var b: any;
-	a = (<IContextViewService>b).layout; // IContextViewProvider
-	a = (<IWorkspaceContextService>b).getWorkspaceFolder; // IWorkspaceFolderProvider
-	a = (<IWorkspaceContextService>b).getWorkspace; // IWorkspaceFolderProvider
-	a = (<CountBadge>b).style; // IThemable
-	a = (<QuickOpenWidget>b).style; // IThemable
-	a = (<WorkbenchAsyncDataTree<any,any>>b).style; // IThemable
-	a = (<IEnvironmentService>b).userHome; // IUserHomeProvider
 	a = (<DiffNavigator>b).previous; // IDiffNavigator
 	a = (<ServiceIdentifier<any>>b).type;
 	a = (<IHighlight>b).start;

src/vs/base/browser/ui/countBadge/countBadge.ts

@@ -8,6 +8,7 @@ import { $, append } from 'vs/base/browser/dom';
 import { format } from 'vs/base/common/strings';
 import { Color } from 'vs/base/common/color';
 import { mixin } from 'vs/base/common/objects';
+import { IThemable } from 'vs/base/common/styler';
 
 export interface ICountBadgeOptions extends ICountBadgetyles {
 	count?: number;
@@ -26,7 +27,7 @@ const defaultOpts = {
 	badgeForeground: Color.fromHex('#FFFFFF')
 };
 
-export class CountBadge {
+export class CountBadge implements IThemable {
 
 	private element: HTMLElement;
 	private count: number = 0;

src/vs/base/browser/ui/tree/asyncDataTree.ts

@@ -19,6 +19,7 @@ import { toggleClass } from 'vs/base/browser/dom';
 import { values } from 'vs/base/common/map';
 import { ScrollEvent } from 'vs/base/common/scrollable';
 import { ICompressedTreeNode, ICompressedTreeElement } from 'vs/base/browser/ui/tree/compressedObjectTreeModel';
+import { IThemable } from 'vs/base/common/styler';
 
 interface IAsyncDataTreeNode<TInput, T> {
 	element: TInput | T;
@@ -261,7 +262,7 @@ function dfs<TInput, T>(node: IAsyncDataTreeNode<TInput, T>, fn: (node: IAsyncDa
 	node.children.forEach(child => dfs(child, fn));
 }
 
-export class AsyncDataTree<TInput, T, TFilterData = void> implements IDisposable {
+export class AsyncDataTree<TInput, T, TFilterData = void> implements IDisposable, IThemable {
 
 	protected readonly tree: ObjectTree<IAsyncDataTreeNode<TInput, T>, TFilterData>;
 	protected readonly root: IAsyncDataTreeNode<TInput, T>;

src/vs/base/common/styler.ts

+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Color } from 'vs/base/common/color';
+
+export type styleFn = (colors: { [name: string]: Color | undefined }) => void;
+
+export interface IThemable {
+	style: styleFn;
+}

src/vs/base/parts/quickopen/browser/quickOpenWidget.ts

@@ -23,6 +23,7 @@ import { ScrollbarVisibility } from 'vs/base/common/scrollable';
 import { Color } from 'vs/base/common/color';
 import { mixin } from 'vs/base/common/objects';
 import { StandardMouseEvent, IMouseEvent } from 'vs/base/browser/mouseEvent';
+import { IThemable } from 'vs/base/common/styler';
 
 export interface IQuickOpenCallbacks {
 	onOk: () => void;
@@ -92,7 +93,7 @@ const defaultStyles = {
 
 const DEFAULT_INPUT_ARIA_LABEL = nls.localize('quickOpenAriaLabel', "Quick picker. Type to narrow down results.");
 
-export class QuickOpenWidget extends Disposable implements IModelProvider {
+export class QuickOpenWidget extends Disposable implements IModelProvider, IThemable {
 
 	private static readonly MAX_WIDTH = 600;			// Max total width of quick open widget
 	private static readonly MAX_ITEMS_HEIGHT = 20 * 22;	// Max height of item list below input field

src/vs/editor/contrib/codeAction/codeActionWidget.ts

@@ -54,7 +54,9 @@ export class CodeActionWidget extends Disposable {
 	) {
 		super();
 
-		this._keybindingResolver = new CodeActionKeybindingResolver(keybindingService);
+		this._keybindingResolver = new CodeActionKeybindingResolver({
+			getKeybindings: () => keybindingService.getKeybindings()
+		});
 	}
 
 	get isVisible(): boolean {

src/vs/platform/contextview/browser/contextView.ts

@@ -7,11 +7,11 @@ import { IDisposable } from 'vs/base/common/lifecycle';
 import { Event } from 'vs/base/common/event';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { IContextMenuDelegate } from 'vs/base/browser/contextmenu';
-import { AnchorAlignment } from 'vs/base/browser/ui/contextview/contextview';
+import { AnchorAlignment, IContextViewProvider } from 'vs/base/browser/ui/contextview/contextview';
 
 export const IContextViewService = createDecorator<IContextViewService>('contextViewService');
 
-export interface IContextViewService {
+export interface IContextViewService extends IContextViewProvider {
 
 	_serviceBrand: undefined;
 
@@ -41,4 +41,4 @@ export interface IContextMenuService {
 
 	showContextMenu(delegate: IContextMenuDelegate): void;
 	onDidContextMenu: Event<void>; // TODO@isidor these event should be removed once we get async context menus
-}
\ No newline at end of file
+}

src/vs/platform/environment/common/environment.ts

@@ -5,6 +5,7 @@
 
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { URI } from 'vs/base/common/uri';
+import { IUserHomeProvider } from 'vs/base/common/labels';
 
 export interface ParsedArgs {
 	_: string[];
@@ -99,7 +100,7 @@ export interface IExtensionHostDebugParams extends IDebugParams {
 
 export const BACKUPS = 'Backups';
 
-export interface IEnvironmentService {
+export interface IEnvironmentService extends IUserHomeProvider {
 
 	_serviceBrand: undefined;
 

src/vs/platform/theme/common/styler.ts

@@ -8,17 +8,12 @@ import { focusBorder, inputBackground, inputForeground, ColorIdentifier, selectF
 import { IDisposable } from 'vs/base/common/lifecycle';
 import { Color } from 'vs/base/common/color';
 import { mixin } from 'vs/base/common/objects';
-
-export type styleFn = (colors: { [name: string]: Color | undefined }) => void;
+import { IThemable, styleFn } from 'vs/base/common/styler';
 
 export interface IStyleOverrides {
 	[color: string]: ColorIdentifier | undefined;
 }
 
-export interface IThemable {
-	style: styleFn;
-}
-
 export interface IColorMapping {
 	[optionsKey: string]: ColorValue | undefined;
 }

src/vs/platform/workspace/common/workspace.ts

@@ -9,10 +9,11 @@ import { createDecorator } from 'vs/platform/instantiation/common/instantiation'
 import { TernarySearchTree } from 'vs/base/common/map';
 import { Event } from 'vs/base/common/event';
 import { IWorkspaceIdentifier, IStoredWorkspaceFolder, isRawFileWorkspaceFolder, isRawUriWorkspaceFolder, ISingleFolderWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
+import { IWorkspaceFolderProvider } from 'vs/base/common/labels';
 
 export const IWorkspaceContextService = createDecorator<IWorkspaceContextService>('contextService');
 
-export interface IWorkspaceContextService {
+export interface IWorkspaceContextService extends IWorkspaceFolderProvider {
 	_serviceBrand: undefined;
 
 	/**

src/vs/workbench/contrib/codeEditor/browser/suggestEnabledInput/suggestEnabledInput.ts

@@ -27,12 +27,13 @@ import { SuggestController } from 'vs/editor/contrib/suggest/suggestController';
 import { IContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { ColorIdentifier, editorSelectionBackground, inputBackground, inputBorder, inputForeground, inputPlaceholderForeground, selectionBackground } from 'vs/platform/theme/common/colorRegistry';
-import { IStyleOverrides, IThemable, attachStyler } from 'vs/platform/theme/common/styler';
+import { IStyleOverrides, attachStyler } from 'vs/platform/theme/common/styler';
 import { IThemeService, registerThemingParticipant } from 'vs/platform/theme/common/themeService';
 import { MenuPreventer } from 'vs/workbench/contrib/codeEditor/browser/menuPreventer';
 import { getSimpleEditorOptions } from 'vs/workbench/contrib/codeEditor/browser/simpleEditorOptions';
 import { SelectionClipboardContributionID } from 'vs/workbench/contrib/codeEditor/browser/selectionClipboard';
 import { EditorExtensionsRegistry } from 'vs/editor/browser/editorExtensions';
+import { IThemable } from 'vs/base/common/styler';
 
 interface SuggestResultsProvider {
 	/**