diff --git a/src/vs/workbench/electron-browser/driver.ts b/src/vs/platform/driver/electron-browser/driver.ts similarity index 88% rename from src/vs/workbench/electron-browser/driver.ts rename to src/vs/platform/driver/electron-browser/driver.ts index 63b8aeb177f..2594eef1361 100644 --- a/src/vs/workbench/electron-browser/driver.ts +++ b/src/vs/platform/driver/electron-browser/driver.ts @@ -11,7 +11,6 @@ import * as electron from 'electron'; import { timeout } from 'vs/base/common/async'; import { BaseWindowDriver } from 'vs/platform/driver/browser/baseDriver'; import { IElectronService } from 'vs/platform/electron/node/electron'; -import { IElectronEnvironmentService } from 'vs/workbench/services/electron/electron-browser/electronEnvironmentService'; class WindowDriver extends BaseWindowDriver { @@ -46,10 +45,9 @@ class WindowDriver extends BaseWindowDriver { } } -export async function registerWindowDriver(accessor: ServicesAccessor): Promise { +export async function registerWindowDriver(accessor: ServicesAccessor, windowId: number): Promise { const instantiationService = accessor.get(IInstantiationService); const mainProcessService = accessor.get(IMainProcessService); - const electronEnvironmentService = accessor.get(IElectronEnvironmentService); const windowDriver = instantiationService.createInstance(WindowDriver); const windowDriverChannel = new WindowDriverChannel(windowDriver); @@ -58,12 +56,12 @@ export async function registerWindowDriver(accessor: ServicesAccessor): Promise< const windowDriverRegistryChannel = mainProcessService.getChannel('windowDriverRegistry'); const windowDriverRegistry = new WindowDriverRegistryChannelClient(windowDriverRegistryChannel); - await windowDriverRegistry.registerWindowDriver(electronEnvironmentService.windowId); + await windowDriverRegistry.registerWindowDriver(windowId); // const options = await windowDriverRegistry.registerWindowDriver(windowId); // if (options.verbose) { // windowDriver.openDevTools(); // } - return toDisposable(() => windowDriverRegistry.reloadWindowDriver(electronEnvironmentService.windowId)); + return toDisposable(() => windowDriverRegistry.reloadWindowDriver(windowId)); } diff --git a/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts b/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts index 1a2be4015cd..e6397184544 100644 --- a/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts +++ b/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts @@ -55,7 +55,7 @@ import { generateUuid } from 'vs/base/common/uuid'; import { platform } from 'vs/base/common/process'; import { URI } from 'vs/base/common/uri'; import { Schemas } from 'vs/base/common/network'; -import { renderMarkdownDocument } from 'vs/workbench/common/markdownDocumentRenderer'; +import { renderMarkdownDocument } from 'vs/workbench/contrib/markdown/common/markdownDocumentRenderer'; import { IModeService } from 'vs/editor/common/services/modeService'; import { TokenizationRegistry } from 'vs/editor/common/modes'; import { generateTokensCSSForColorMap } from 'vs/editor/common/modes/supports/tokenization'; diff --git a/src/vs/workbench/contrib/files/browser/files.contribution.ts b/src/vs/workbench/contrib/files/browser/files.contribution.ts index 28e2253c870..1f4cd95f65d 100644 --- a/src/vs/workbench/contrib/files/browser/files.contribution.ts +++ b/src/vs/workbench/contrib/files/browser/files.contribution.ts @@ -37,6 +37,7 @@ import { registerSingleton } from 'vs/platform/instantiation/common/extensions'; import { ExplorerService } from 'vs/workbench/contrib/files/common/explorerService'; import { SUPPORTED_ENCODINGS } from 'vs/workbench/services/textfile/common/textfiles'; import { Schemas } from 'vs/base/common/network'; +import { WorkspaceWatcher } from 'vs/workbench/contrib/files/common/workspaceWatcher'; // Viewlet Action export class OpenExplorerViewletAction extends ShowViewletAction { @@ -169,6 +170,8 @@ Registry.as(WorkbenchExtensions.Workbench).regi // Register uri display for file uris Registry.as(WorkbenchExtensions.Workbench).registerWorkbenchContribution(FileUriLabelContribution, LifecyclePhase.Starting); +// Workspace Watcher +Registry.as(WorkbenchExtensions.Workbench).registerWorkbenchContribution(WorkspaceWatcher, LifecyclePhase.Restored); // Configuration const configurationRegistry = Registry.as(ConfigurationExtensions.Configuration); diff --git a/src/vs/workbench/services/files/common/workspaceWatcher.ts b/src/vs/workbench/contrib/files/common/workspaceWatcher.ts similarity index 92% rename from src/vs/workbench/services/files/common/workspaceWatcher.ts rename to src/vs/workbench/contrib/files/common/workspaceWatcher.ts index da8c120643a..fb5c49afc6e 100644 --- a/src/vs/workbench/services/files/common/workspaceWatcher.ts +++ b/src/vs/workbench/contrib/files/common/workspaceWatcher.ts @@ -7,10 +7,7 @@ import { IDisposable, Disposable, dispose } from 'vs/base/common/lifecycle'; import { URI } from 'vs/base/common/uri'; import { IConfigurationService, IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration'; import { IFilesConfiguration, IFileService } from 'vs/platform/files/common/files'; -import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle'; import { IWorkspaceContextService, IWorkspaceFoldersChangeEvent } from 'vs/platform/workspace/common/workspace'; -import { Registry } from 'vs/platform/registry/common/platform'; -import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions'; import { ResourceMap } from 'vs/base/common/map'; import { onUnexpectedError } from 'vs/base/common/errors'; import { INotificationService, Severity, NeverShowAgainScope } from 'vs/platform/notification/common/notification'; @@ -152,5 +149,3 @@ export class WorkspaceWatcher extends Disposable { this.unwatchWorkspaces(); } } - -Registry.as(WorkbenchExtensions.Workbench).registerWorkbenchContribution(WorkspaceWatcher, LifecyclePhase.Restored); diff --git a/src/vs/workbench/common/markdownDocumentRenderer.ts b/src/vs/workbench/contrib/markdown/common/markdownDocumentRenderer.ts similarity index 100% rename from src/vs/workbench/common/markdownDocumentRenderer.ts rename to src/vs/workbench/contrib/markdown/common/markdownDocumentRenderer.ts diff --git a/src/vs/workbench/contrib/update/browser/releaseNotesEditor.ts b/src/vs/workbench/contrib/update/browser/releaseNotesEditor.ts index 5d5596f4588..632e7c74330 100644 --- a/src/vs/workbench/contrib/update/browser/releaseNotesEditor.ts +++ b/src/vs/workbench/contrib/update/browser/releaseNotesEditor.ts @@ -25,7 +25,7 @@ import { CancellationToken } from 'vs/base/common/cancellation'; import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions'; import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService'; import { generateUuid } from 'vs/base/common/uuid'; -import { renderMarkdownDocument } from 'vs/workbench/common/markdownDocumentRenderer'; +import { renderMarkdownDocument } from 'vs/workbench/contrib/markdown/common/markdownDocumentRenderer'; export class ReleaseNotesManager { diff --git a/src/vs/workbench/electron-browser/desktop.main.ts b/src/vs/workbench/electron-browser/desktop.main.ts index 0fa1a5b947c..7c335fedca7 100644 --- a/src/vs/workbench/electron-browser/desktop.main.ts +++ b/src/vs/workbench/electron-browser/desktop.main.ts @@ -33,7 +33,7 @@ import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { IStorageService } from 'vs/platform/storage/common/storage'; import { Disposable } from 'vs/base/common/lifecycle'; -import { registerWindowDriver } from 'vs/workbench/electron-browser/driver'; +import { registerWindowDriver } from 'vs/platform/driver/electron-browser/driver'; import { IMainProcessService, MainProcessService } from 'vs/platform/ipc/electron-browser/mainProcessService'; import { RemoteAuthorityResolverService } from 'vs/platform/remote/electron-browser/remoteAuthorityResolverService'; import { IRemoteAuthorityResolverService } from 'vs/platform/remote/common/remoteAuthorityResolver'; @@ -132,7 +132,7 @@ class DesktopMain extends Disposable { // Driver if (this.environmentService.configuration.driver) { - instantiationService.invokeFunction(async accessor => this._register(await registerWindowDriver(accessor))); + instantiationService.invokeFunction(async accessor => this._register(await registerWindowDriver(accessor, this.configuration.windowId))); } // Logging diff --git a/src/vs/workbench/services/electron/electron-browser/electronEnvironmentService.ts b/src/vs/workbench/services/electron/electron-browser/electronEnvironmentService.ts index d11589e9e3f..ead4c15e1ac 100644 --- a/src/vs/workbench/services/electron/electron-browser/electronEnvironmentService.ts +++ b/src/vs/workbench/services/electron/electron-browser/electronEnvironmentService.ts @@ -16,7 +16,6 @@ export interface IElectronEnvironmentService { readonly sharedIPCHandle: string; } - export class ElectronEnvironmentService implements IElectronEnvironmentService { _serviceBrand: undefined; diff --git a/src/vs/workbench/workbench.common.main.ts b/src/vs/workbench/workbench.common.main.ts index a583c11809e..883940d19a5 100644 --- a/src/vs/workbench/workbench.common.main.ts +++ b/src/vs/workbench/workbench.common.main.ts @@ -123,9 +123,6 @@ registerSingleton(IOpenerService, OpenerService, true); //#region --- workbench contributions -// Workspace File Watching -import 'vs/workbench/services/files/common/workspaceWatcher'; - // Telemetry import 'vs/workbench/contrib/telemetry/browser/telemetry.contribution';