Skip to content

Commit a380176

Browse files
author
Benjamin Pasero
committed
💄 move things around
1 parent 632115a commit a380176

9 files changed

Lines changed: 10 additions & 18 deletions

File tree

src/vs/workbench/electron-browser/driver.ts renamed to src/vs/platform/driver/electron-browser/driver.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import * as electron from 'electron';
1111
import { timeout } from 'vs/base/common/async';
1212
import { BaseWindowDriver } from 'vs/platform/driver/browser/baseDriver';
1313
import { IElectronService } from 'vs/platform/electron/node/electron';
14-
import { IElectronEnvironmentService } from 'vs/workbench/services/electron/electron-browser/electronEnvironmentService';
1514

1615
class WindowDriver extends BaseWindowDriver {
1716

@@ -46,10 +45,9 @@ class WindowDriver extends BaseWindowDriver {
4645
}
4746
}
4847

49-
export async function registerWindowDriver(accessor: ServicesAccessor): Promise<IDisposable> {
48+
export async function registerWindowDriver(accessor: ServicesAccessor, windowId: number): Promise<IDisposable> {
5049
const instantiationService = accessor.get(IInstantiationService);
5150
const mainProcessService = accessor.get(IMainProcessService);
52-
const electronEnvironmentService = accessor.get(IElectronEnvironmentService);
5351

5452
const windowDriver = instantiationService.createInstance(WindowDriver);
5553
const windowDriverChannel = new WindowDriverChannel(windowDriver);
@@ -58,12 +56,12 @@ export async function registerWindowDriver(accessor: ServicesAccessor): Promise<
5856
const windowDriverRegistryChannel = mainProcessService.getChannel('windowDriverRegistry');
5957
const windowDriverRegistry = new WindowDriverRegistryChannelClient(windowDriverRegistryChannel);
6058

61-
await windowDriverRegistry.registerWindowDriver(electronEnvironmentService.windowId);
59+
await windowDriverRegistry.registerWindowDriver(windowId);
6260
// const options = await windowDriverRegistry.registerWindowDriver(windowId);
6361

6462
// if (options.verbose) {
6563
// windowDriver.openDevTools();
6664
// }
6765

68-
return toDisposable(() => windowDriverRegistry.reloadWindowDriver(electronEnvironmentService.windowId));
66+
return toDisposable(() => windowDriverRegistry.reloadWindowDriver(windowId));
6967
}

‎src/vs/workbench/contrib/extensions/browser/extensionEditor.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ import { generateUuid } from 'vs/base/common/uuid';
5555
import { platform } from 'vs/base/common/process';
5656
import { URI } from 'vs/base/common/uri';
5757
import { Schemas } from 'vs/base/common/network';
58-
import { renderMarkdownDocument } from 'vs/workbench/common/markdownDocumentRenderer';
58+
import { renderMarkdownDocument } from 'vs/workbench/contrib/markdown/common/markdownDocumentRenderer';
5959
import { IModeService } from 'vs/editor/common/services/modeService';
6060
import { TokenizationRegistry } from 'vs/editor/common/modes';
6161
import { generateTokensCSSForColorMap } from 'vs/editor/common/modes/supports/tokenization';

‎src/vs/workbench/contrib/files/browser/files.contribution.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
3737
import { ExplorerService } from 'vs/workbench/contrib/files/common/explorerService';
3838
import { SUPPORTED_ENCODINGS } from 'vs/workbench/services/textfile/common/textfiles';
3939
import { Schemas } from 'vs/base/common/network';
40+
import { WorkspaceWatcher } from 'vs/workbench/contrib/files/common/workspaceWatcher';
4041

4142
// Viewlet Action
4243
export class OpenExplorerViewletAction extends ShowViewletAction {
@@ -169,6 +170,8 @@ Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).regi
169170
// Register uri display for file uris
170171
Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(FileUriLabelContribution, LifecyclePhase.Starting);
171172

173+
// Workspace Watcher
174+
Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(WorkspaceWatcher, LifecyclePhase.Restored);
172175

173176
// Configuration
174177
const configurationRegistry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration);

src/vs/workbench/services/files/common/workspaceWatcher.ts renamed to src/vs/workbench/contrib/files/common/workspaceWatcher.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,7 @@ import { IDisposable, Disposable, dispose } from 'vs/base/common/lifecycle';
77
import { URI } from 'vs/base/common/uri';
88
import { IConfigurationService, IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration';
99
import { IFilesConfiguration, IFileService } from 'vs/platform/files/common/files';
10-
import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
1110
import { IWorkspaceContextService, IWorkspaceFoldersChangeEvent } from 'vs/platform/workspace/common/workspace';
12-
import { Registry } from 'vs/platform/registry/common/platform';
13-
import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
1411
import { ResourceMap } from 'vs/base/common/map';
1512
import { onUnexpectedError } from 'vs/base/common/errors';
1613
import { INotificationService, Severity, NeverShowAgainScope } from 'vs/platform/notification/common/notification';
@@ -152,5 +149,3 @@ export class WorkspaceWatcher extends Disposable {
152149
this.unwatchWorkspaces();
153150
}
154151
}
155-
156-
Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(WorkspaceWatcher, LifecyclePhase.Restored);

src/vs/workbench/common/markdownDocumentRenderer.ts renamed to src/vs/workbench/contrib/markdown/common/markdownDocumentRenderer.ts

File renamed without changes.

‎src/vs/workbench/contrib/update/browser/releaseNotesEditor.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import { CancellationToken } from 'vs/base/common/cancellation';
2525
import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
2626
import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
2727
import { generateUuid } from 'vs/base/common/uuid';
28-
import { renderMarkdownDocument } from 'vs/workbench/common/markdownDocumentRenderer';
28+
import { renderMarkdownDocument } from 'vs/workbench/contrib/markdown/common/markdownDocumentRenderer';
2929

3030
export class ReleaseNotesManager {
3131

‎src/vs/workbench/electron-browser/desktop.main.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace
3333
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
3434
import { IStorageService } from 'vs/platform/storage/common/storage';
3535
import { Disposable } from 'vs/base/common/lifecycle';
36-
import { registerWindowDriver } from 'vs/workbench/electron-browser/driver';
36+
import { registerWindowDriver } from 'vs/platform/driver/electron-browser/driver';
3737
import { IMainProcessService, MainProcessService } from 'vs/platform/ipc/electron-browser/mainProcessService';
3838
import { RemoteAuthorityResolverService } from 'vs/platform/remote/electron-browser/remoteAuthorityResolverService';
3939
import { IRemoteAuthorityResolverService } from 'vs/platform/remote/common/remoteAuthorityResolver';
@@ -132,7 +132,7 @@ class DesktopMain extends Disposable {
132132

133133
// Driver
134134
if (this.environmentService.configuration.driver) {
135-
instantiationService.invokeFunction(async accessor => this._register(await registerWindowDriver(accessor)));
135+
instantiationService.invokeFunction(async accessor => this._register(await registerWindowDriver(accessor, this.configuration.windowId)));
136136
}
137137

138138
// Logging

‎src/vs/workbench/services/electron/electron-browser/electronEnvironmentService.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ export interface IElectronEnvironmentService {
1616
readonly sharedIPCHandle: string;
1717
}
1818

19-
2019
export class ElectronEnvironmentService implements IElectronEnvironmentService {
2120

2221
_serviceBrand: undefined;

‎src/vs/workbench/workbench.common.main.ts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,6 @@ registerSingleton(IOpenerService, OpenerService, true);
123123

124124
//#region --- workbench contributions
125125

126-
// Workspace File Watching
127-
import 'vs/workbench/services/files/common/workspaceWatcher';
128-
129126
// Telemetry
130127
import 'vs/workbench/contrib/telemetry/browser/telemetry.contribution';
131128

0 commit comments

Comments
 (0)