Fix mainThreadTreeExplorers layer breakage

src/vs/workbench/api/node/mainThreadTreeExplorers.ts

@@ -7,7 +7,7 @@
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IThreadService } from 'vs/workbench/services/thread/common/threadService';
 import { ExtHostContext, MainThreadTreeExplorersShape, ExtHostTreeExplorersShape } from './extHost.protocol';
-import { ICustomTreeExplorerService } from 'vs/workbench/parts/explorers/browser/customTreeExplorerService';
+import { ICustomTreeExplorerService } from 'vs/workbench/parts/explorers/common/customTreeExplorerService';
 import { InternalTreeExplorerNodeContent } from 'vs/workbench/parts/explorers/common/treeExplorerViewModel';
 import { IMessageService, Severity } from 'vs/platform/message/common/message';
 import { ICommandService } from 'vs/platform/commands/common/commands';

src/vs/workbench/parts/explorers/browser/customTreeExplorerService.ts

@@ -4,27 +4,13 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
+import Event, { Emitter } from 'vs/base/common/event';
 import { localize } from 'vs/nls';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { IInstantiationService, createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { InternalTreeExplorerNode, InternalTreeExplorerNodeProvider } from 'vs/workbench/parts/explorers/common/treeExplorerViewModel';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IMessageService, Severity } from 'vs/platform/message/common/message';
-import Event, { Emitter } from 'vs/base/common/event';
-
-export const ICustomTreeExplorerService = createDecorator<ICustomTreeExplorerService>('customTreeExplorerService');
-
-export interface ICustomTreeExplorerService {
-	_serviceBrand: any;
-
-	onTreeExplorerNodeProviderRegistered: Event<String>;
-
-	registerTreeExplorerNodeProvider(providerId: string, provider: InternalTreeExplorerNodeProvider): void;
-	hasProvider(providerId: string): boolean;
-
-	provideRootNode(providerId: string): TPromise<InternalTreeExplorerNode>;
-	resolveChildren(providerId: string, node: InternalTreeExplorerNode): TPromise<InternalTreeExplorerNode[]>;
-	executeCommand(providerId: string, node: InternalTreeExplorerNode): TPromise<void>;
-}
+import { InternalTreeExplorerNode, InternalTreeExplorerNodeProvider } from 'vs/workbench/parts/explorers/common/treeExplorerViewModel';
+import { ICustomTreeExplorerService } from 'vs/workbench/parts/explorers/common/customTreeExplorerService';
 
 export class CustomTreeExplorerService implements ICustomTreeExplorerService {
 	public _serviceBrand: any;

src/vs/workbench/parts/explorers/browser/treeExplorer.contribution.ts

@@ -12,7 +12,8 @@ import { createCSSRule } from 'vs/base/browser/dom';
 import { Registry } from 'vs/platform/platform';
 import { ExtensionsRegistry } from 'vs/platform/extensions/common/extensionsRegistry';
 import { IJSONSchema } from 'vs/base/common/jsonSchema';
-import { ICustomTreeExplorerService, CustomTreeExplorerService } from 'vs/workbench/parts/explorers/browser/customTreeExplorerService';
+import { ICustomTreeExplorerService } from 'vs/workbench/parts/explorers/common/customTreeExplorerService';
+import { CustomTreeExplorerService } from 'vs/workbench/parts/explorers/browser/customTreeExplorerService';
 import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { ViewletRegistry, Extensions as ViewletExtensions, ViewletDescriptor } from 'vs/workbench/browser/viewlet';
 import { ITreeExplorer } from 'vs/platform/extensionManagement/common/extensionManagement';

src/vs/workbench/parts/explorers/browser/views/treeExplorerView.ts

@@ -16,7 +16,7 @@ import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ICustomTreeExplorerService } from 'vs/workbench/parts/explorers/browser/customTreeExplorerService';
+import { ICustomTreeExplorerService } from 'vs/workbench/parts/explorers/common/customTreeExplorerService';
 import { ITree } from 'vs/base/parts/tree/browser/tree';
 import { Tree } from 'vs/base/parts/tree/browser/treeImpl';
 import { TreeExplorerViewletState, TreeDataSource, TreeRenderer, TreeController } from 'vs/workbench/parts/explorers/browser/views/treeExplorerViewer';

src/vs/workbench/parts/explorers/browser/views/treeExplorerViewer.ts

@@ -16,7 +16,7 @@ import { ContributableActionProvider } from 'vs/workbench/browser/actionBarRegis
 import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
 import { IExtensionService } from 'vs/platform/extensions/common/extensions';
 import { IModeService } from 'vs/editor/common/services/modeService';
-import { ICustomTreeExplorerService } from 'vs/workbench/parts/explorers/browser/customTreeExplorerService';
+import { ICustomTreeExplorerService } from 'vs/workbench/parts/explorers/common/customTreeExplorerService';
 import { IProgressService } from 'vs/platform/progress/common/progress';
 
 export class TreeDataSource implements IDataSource {

src/vs/workbench/parts/explorers/common/customTreeExplorerService.ts

+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+
+import Event from 'vs/base/common/event';
+import { TPromise } from 'vs/base/common/winjs.base';
+import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { InternalTreeExplorerNode, InternalTreeExplorerNodeProvider } from 'vs/workbench/parts/explorers/common/treeExplorerViewModel';
+
+export const ICustomTreeExplorerService = createDecorator<ICustomTreeExplorerService>('customTreeExplorerService');
+
+export interface ICustomTreeExplorerService {
+	_serviceBrand: any;
+
+	onTreeExplorerNodeProviderRegistered: Event<String>;
+
+	registerTreeExplorerNodeProvider(providerId: string, provider: InternalTreeExplorerNodeProvider): void;
+	hasProvider(providerId: string): boolean;
+
+	provideRootNode(providerId: string): TPromise<InternalTreeExplorerNode>;
+	resolveChildren(providerId: string, node: InternalTreeExplorerNode): TPromise<InternalTreeExplorerNode[]>;
+	executeCommand(providerId: string, node: InternalTreeExplorerNode): TPromise<void>;
+}