fix layer breakers

microsoft · Nov 20, 2015 · 6e94b27 · 6e94b27
1 parent 01751b0
commit 6e94b27
Show file tree

Hide file tree

Showing 10 changed files with 7 additions and 8 deletions.
diff --git a/src/vs/workbench/buildfile.js b/src/vs/workbench/buildfile.js
@@ -41,6 +41,6 @@ exports.collectModules= function(excludes) {
 
  createModuleDescription('vs/workbench/node/pluginHostProcess', []),
 
- createModuleDescription('vs/workbench/parts/sharedProcess/node/sharedProcessMain', [])
+ createModuleDescription('vs/workbench/electron-main/sharedProcessMain', [])
  ];
 };
diff --git a/src/vs/workbench/electron-browser/shell.ts b/src/vs/workbench/electron-browser/shell.ts
@@ -96,7 +96,7 @@ import {IThemeService, ThemeService} from 'vs/workbench/services/themes/node/the
 import { IServiceCtor, isServiceEvent } from 'vs/base/common/service';
 import { connect, Client } from 'vs/base/node/service.net';
 import { IExtensionsService } from 'vs/workbench/parts/extensions/common/extensions';
-import { ExtensionsService } from 'vs/workbench/parts/extensions/electron-browser/extensionsService';
+import { ExtensionsService } from 'vs/workbench/parts/extensions/node/extensionsService';
 
 /**
  * This ugly beast is needed because at the point when we need shared services

diff --git a/src/vs/workbench/electron-main/main.ts b/src/vs/workbench/electron-main/main.ts
@@ -23,7 +23,7 @@ import {Server, serve, connect} from 'vs/base/node/service.net';
 import {getUserEnvironment, IEnv} from 'vs/base/node/env';
 import {Promise, TPromise} from 'vs/base/common/winjs.base';
 import {GitAskpassService} from 'vs/workbench/parts/git/electron-main/askpassService';
-import { spawnSharedProcess } from 'vs/workbench/parts/sharedProcess/node/sharedProcess';
+import { spawnSharedProcess } from 'vs/workbench/electron-main/sharedProcess';
 
 export class LaunchService {
  public start(args: env.ICommandLineArguments): Promise {

diff --git a/...parts/sharedProcess/node/sharedProcess.ts → .../workbench/electron-main/sharedProcess.ts b/...parts/sharedProcess/node/sharedProcess.ts → .../workbench/electron-main/sharedProcess.ts
@@ -35,7 +35,7 @@ function getEnvironment(): IEnvironment {
 export function spawnSharedProcess(): cp.ChildProcess {
  const result = cp.fork(boostrapPath, ['--type=SharedProcess'], {
  env: assign(assign({}, process.env), {
- AMD_ENTRYPOINT: 'vs/workbench/parts/sharedProcess/node/sharedProcessMain'
+ AMD_ENTRYPOINT: 'vs/workbench/electron-main/sharedProcessMain'
  })
  });
 

diff --git a/...s/sharedProcess/node/sharedProcessMain.ts → ...kbench/electron-main/sharedProcessMain.ts b/...s/sharedProcess/node/sharedProcessMain.ts → ...kbench/electron-main/sharedProcessMain.ts
@@ -23,7 +23,7 @@ import { ConfigurationService } from 'vs/workbench/services/configuration/common
 
 // Extra services
 import { IExtensionsService } from 'vs/workbench/parts/extensions/common/extensions';
-import { ExtensionsService } from 'vs/workbench/parts/extensions/electron-browser/extensionsService';
+import { ExtensionsService } from 'vs/workbench/parts/extensions/node/extensionsService';
 
 interface IInitData {
  configuration: IConfiguration;

diff --git a/src/vs/workbench/node/pluginHostMain.ts b/src/vs/workbench/node/pluginHostMain.ts
@@ -40,7 +40,7 @@ import Severity from 'vs/base/common/severity';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { Client } from 'vs/base/node/service.net';
 import { IExtensionsService } from 'vs/workbench/parts/extensions/common/extensions';
-import { ExtensionsService } from 'vs/workbench/parts/extensions/electron-browser/extensionsService';
+import { ExtensionsService } from 'vs/workbench/parts/extensions/node/extensionsService';
 
 const DIRNAME = URI.parse(require.toUrl('./')).fsPath;
 const BASE_PATH = paths.normalize(paths.join(DIRNAME, '../../../..'));

diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.ts b/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.ts
@@ -6,7 +6,7 @@
 import platform = require('vs/platform/platform');
 import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { IGalleryService } from 'vs/workbench/parts/extensions/common/extensions';
-import { GalleryService } from './vsoGalleryService';
+import { GalleryService } from 'vs/workbench/parts/extensions/node/vsoGalleryService';
 import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
 import { ExtensionsWorkbenchExtension } from 'vs/workbench/parts/extensions/electron-browser/extensionsWorkbenchExtension';
 

diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionsWorkbenchExtension.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionsWorkbenchExtension.ts
@@ -13,7 +13,6 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
 import { IMessageService } from 'vs/platform/message/common/message';
 import Severity from 'vs/base/common/severity';
 import { IWorkspaceContextService } from 'vs/workbench/services/workspace/common/contextService';
-import { IPath } from 'vs/workbench/electron-main/window';
 import { ReloadWindowAction } from 'vs/workbench/electron-browser/actions';
 import wbaregistry = require('vs/workbench/browser/actionRegistry');
 import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';

diff --git a/...ons/electron-browser/extensionsService.ts → ...arts/extensions/node/extensionsService.ts b/...ons/electron-browser/extensionsService.ts → ...arts/extensions/node/extensionsService.ts
diff --git a/...ons/electron-browser/vsoGalleryService.ts → ...arts/extensions/node/vsoGalleryService.ts b/...ons/electron-browser/vsoGalleryService.ts → ...arts/extensions/node/vsoGalleryService.ts