diff --git a/.eslintrc.json b/.eslintrc.json index 27a8cec44f8..5a88957f369 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -324,7 +324,6 @@ "restrictions": [ "vs/nls", "**/vs/base/common/**", - "**/vs/base/worker/**", "**/vs/platform/*/common/**", "**/vs/editor/common/**" ] @@ -622,7 +621,7 @@ "restrictions": [ "vs/nls", "vs/css!./**/*", - "**/vs/base/**/{common,browser,worker}/**", + "**/vs/base/**/{common,browser}/**", "**/vs/platform/**/{common,browser}/**", "**/vs/editor/{common,browser}/**", "**/vs/workbench/workbench.web.api", @@ -657,7 +656,7 @@ "restrictions": [ "vs/nls", "vs/css!./**/*", - "**/vs/base/**/{common,browser,worker,electron-sandbox}/**", + "**/vs/base/**/{common,browser,electron-sandbox}/**", "**/vs/platform/**/{common,browser,electron-sandbox}/**", "**/vs/editor/**", "**/vs/workbench/{common,browser,electron-sandbox}/**", @@ -674,7 +673,7 @@ "restrictions": [ "vs/nls", "vs/css!./**/*", - "**/vs/base/**/{common,browser,worker,node,electron-sandbox,electron-browser}/**", + "**/vs/base/**/{common,browser,node,electron-sandbox,electron-browser}/**", "**/vs/platform/**/{common,browser,node,electron-sandbox,electron-browser}/**", "**/vs/editor/**", "**/vs/workbench/{common,browser,node,electron-sandbox,electron-browser}/**", @@ -748,7 +747,7 @@ "restrictions": [ "vs/nls", "vs/css!./**/*", - "**/vs/base/**/{common,worker}/**", + "**/vs/base/**/common/**", "**/vs/platform/**/common/**", "**/vs/editor/**", "**/vs/workbench/common/**", @@ -811,7 +810,7 @@ "restrictions": [ "vs/nls", "vs/css!./**/*", - "**/vs/base/**/{common,browser,worker,electron-sandbox}/**", + "**/vs/base/**/{common,browser,electron-sandbox}/**", "**/vs/platform/**/{common,browser,electron-sandbox}/**", "**/vs/editor/**", "**/vs/workbench/{common,browser,electron-sandbox}/**", @@ -829,7 +828,7 @@ "restrictions": [ "vs/nls", "vs/css!./**/*", - "**/vs/base/**/{common,browser,worker,node,electron-sandbox,electron-browser}/**", + "**/vs/base/**/{common,browser,node,electron-sandbox,electron-browser}/**", "**/vs/platform/**/{common,browser,node,electron-sandbox,electron-browser}/**", "**/vs/editor/**", "**/vs/workbench/{common,browser,node,electron-sandbox,electron-browser}/**", diff --git a/build/monaco/monaco.d.ts.recipe b/build/monaco/monaco.d.ts.recipe index 8971c14ee2b..8cec618ef9e 100644 --- a/build/monaco/monaco.d.ts.recipe +++ b/build/monaco/monaco.d.ts.recipe @@ -58,7 +58,7 @@ declare namespace monaco.editor { #includeAll(vs/editor/standalone/browser/standaloneEditor;modes.=>languages.;editorCommon.=>): #include(vs/editor/standalone/common/standaloneTheme): BuiltinTheme, IStandaloneThemeData, IColors #include(vs/editor/common/languages/supports/tokenization): ITokenThemeRule -#include(vs/editor/common/services/webWorker): MonacoWebWorker, IWebWorkerOptions +#include(vs/editor/browser/services/webWorker): MonacoWebWorker, IWebWorkerOptions #include(vs/editor/standalone/browser/standaloneCodeEditor): IActionDescriptor, IGlobalEditorOptions, IStandaloneEditorConstructionOptions, IStandaloneDiffEditorConstructionOptions, IStandaloneCodeEditor, IStandaloneDiffEditor export interface ICommandHandler { (...args: any[]): void; diff --git a/src/tsec.exemptions.json b/src/tsec.exemptions.json index 7e7edeefd22..b25eebfee5f 100644 --- a/src/tsec.exemptions.json +++ b/src/tsec.exemptions.json @@ -12,7 +12,7 @@ "ban-trustedtypes-createpolicy": [ "vs/base/browser/dom.ts", "vs/base/browser/markdownRenderer.ts", - "vs/base/worker/defaultWorkerFactory.ts", + "vs/base/browser/defaultWorkerFactory.ts", "vs/base/worker/workerMain.ts", "vs/editor/browser/core/markdownRenderer.ts", "vs/editor/browser/view/domLineBreaksComputer.ts", @@ -27,7 +27,7 @@ "vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts" ], "ban-worker-calls": [ - "vs/base/worker/defaultWorkerFactory.ts", + "vs/base/browser/defaultWorkerFactory.ts", "vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts", "vs/platform/sharedProcess/electron-browser/sharedProcessWorkerService.ts" ], diff --git a/src/vs/base/worker/defaultWorkerFactory.ts b/src/vs/base/browser/defaultWorkerFactory.ts similarity index 100% rename from src/vs/base/worker/defaultWorkerFactory.ts rename to src/vs/base/browser/defaultWorkerFactory.ts diff --git a/src/vs/editor/common/services/editorWorkerService.ts b/src/vs/editor/browser/services/editorWorkerService.ts similarity index 98% rename from src/vs/editor/common/services/editorWorkerService.ts rename to src/vs/editor/browser/services/editorWorkerService.ts index 4b772394d74..31f2a5d8894 100644 --- a/src/vs/editor/common/services/editorWorkerService.ts +++ b/src/vs/editor/browser/services/editorWorkerService.ts @@ -7,7 +7,7 @@ import { IntervalTimer, timeout } from 'vs/base/common/async'; import { Disposable, IDisposable, dispose, toDisposable, DisposableStore } from 'vs/base/common/lifecycle'; import { URI } from 'vs/base/common/uri'; import { SimpleWorkerClient, logOnceWebWorkerWarning, IWorkerClient } from 'vs/base/common/worker/simpleWorker'; -import { DefaultWorkerFactory } from 'vs/base/worker/defaultWorkerFactory'; +import { DefaultWorkerFactory } from 'vs/base/browser/defaultWorkerFactory'; import { Position } from 'vs/editor/common/core/position'; import { IRange, Range } from 'vs/editor/common/core/range'; import { IChange } from 'vs/editor/common/editorCommon'; @@ -24,6 +24,7 @@ import { ILogService } from 'vs/platform/log/common/log'; import { StopWatch } from 'vs/base/common/stopwatch'; import { canceled } from 'vs/base/common/errors'; import { UnicodeHighlighterOptions } from 'vs/editor/common/languages/unicodeTextModelHighlighter'; +import { IEditorWorkerHost } from 'vs/editor/common/services/editorWorkerHost'; /** * Stop syncing a model to the worker if it was not needed for 1 min. @@ -399,7 +400,7 @@ export interface IEditorWorkerClient { fhr(method: string, args: any[]): Promise; } -export class EditorWorkerHost { +export class EditorWorkerHost implements IEditorWorkerHost { private readonly _workerClient: IEditorWorkerClient; diff --git a/src/vs/editor/common/services/webWorker.ts b/src/vs/editor/browser/services/webWorker.ts similarity index 98% rename from src/vs/editor/common/services/webWorker.ts rename to src/vs/editor/browser/services/webWorker.ts index ad14ddb8a6b..a88c165a758 100644 --- a/src/vs/editor/common/services/webWorker.ts +++ b/src/vs/editor/browser/services/webWorker.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { URI } from 'vs/base/common/uri'; -import { EditorWorkerClient } from 'vs/editor/common/services/editorWorkerService'; +import { EditorWorkerClient } from 'vs/editor/browser/services/editorWorkerService'; import { IModelService } from 'vs/editor/common/services/model'; import * as types from 'vs/base/common/types'; import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry'; diff --git a/src/vs/editor/common/services/editorSimpleWorker.ts b/src/vs/editor/common/services/editorSimpleWorker.ts index 15ad5461544..9cdbc71ee5a 100644 --- a/src/vs/editor/common/services/editorSimpleWorker.ts +++ b/src/vs/editor/common/services/editorSimpleWorker.ts @@ -21,7 +21,7 @@ import { BasicInplaceReplace } from 'vs/editor/common/languages/supports/inplace import { IDiffComputationResult, IUnicodeHighlightsResult } from 'vs/editor/common/services/editorWorker'; import { createMonacoBaseAPI } from 'vs/editor/common/standalone/standaloneBase'; import * as types from 'vs/base/common/types'; -import { EditorWorkerHost } from 'vs/editor/common/services/editorWorkerService'; +import { IEditorWorkerHost } from 'vs/editor/common/services/editorWorkerHost'; import { StopWatch } from 'vs/base/common/stopwatch'; import { UnicodeTextModelHighlighter, UnicodeHighlighterOptions } from 'vs/editor/common/languages/unicodeTextModelHighlighter'; @@ -327,12 +327,12 @@ declare const require: any; export class EditorSimpleWorker implements IRequestHandler, IDisposable { _requestHandlerBrand: any; - protected readonly _host: EditorWorkerHost; + protected readonly _host: IEditorWorkerHost; private _models: { [uri: string]: MirrorModel; }; private readonly _foreignModuleFactory: IForeignModuleFactory | null; private _foreignModule: any; - constructor(host: EditorWorkerHost, foreignModuleFactory: IForeignModuleFactory | null) { + constructor(host: IEditorWorkerHost, foreignModuleFactory: IForeignModuleFactory | null) { this._host = host; this._models = Object.create(null); this._foreignModuleFactory = foreignModuleFactory; @@ -681,7 +681,7 @@ export class EditorSimpleWorker implements IRequestHandler, IDisposable { * Called on the worker side * @internal */ -export function create(host: EditorWorkerHost): IRequestHandler { +export function create(host: IEditorWorkerHost): IRequestHandler { return new EditorSimpleWorker(host, null); } diff --git a/src/vs/editor/common/services/editorWorkerHost.ts b/src/vs/editor/common/services/editorWorkerHost.ts new file mode 100644 index 00000000000..df0a6aa1c35 --- /dev/null +++ b/src/vs/editor/common/services/editorWorkerHost.ts @@ -0,0 +1,9 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +export interface IEditorWorkerHost { + // foreign host request + fhr(method: string, args: any[]): Promise; +} diff --git a/src/vs/editor/contrib/suggest/test/wordDistance.test.ts b/src/vs/editor/contrib/suggest/test/wordDistance.test.ts index eb6d56e7c9f..9914191b000 100644 --- a/src/vs/editor/contrib/suggest/test/wordDistance.test.ts +++ b/src/vs/editor/contrib/suggest/test/wordDistance.test.ts @@ -14,7 +14,8 @@ import { DEFAULT_WORD_REGEXP } from 'vs/editor/common/model/wordHelper'; import * as modes from 'vs/editor/common/languages'; import { LanguageConfigurationRegistry } from 'vs/editor/common/languages/languageConfigurationRegistry'; import { EditorSimpleWorker } from 'vs/editor/common/services/editorSimpleWorker'; -import { EditorWorkerHost, EditorWorkerService } from 'vs/editor/common/services/editorWorkerService'; +import { EditorWorkerService } from 'vs/editor/browser/services/editorWorkerService'; +import { IEditorWorkerHost } from 'vs/editor/common/services/editorWorkerHost'; import { IModelService } from 'vs/editor/common/services/model'; import { ITextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfiguration'; import { CompletionItem } from 'vs/editor/contrib/suggest/suggest'; @@ -63,7 +64,7 @@ suite('suggest, word distance', function () { let service = new class extends EditorWorkerService { - private _worker = new EditorSimpleWorker(new class extends mock() { }, null); + private _worker = new EditorSimpleWorker(new class extends mock() { }, null); constructor() { super(modelService, new class extends mock() { }, new NullLogService(), new TestLanguageConfigurationService()); diff --git a/src/vs/editor/editor.worker.ts b/src/vs/editor/editor.worker.ts index fd7da4e6cb0..e5931ee62ba 100644 --- a/src/vs/editor/editor.worker.ts +++ b/src/vs/editor/editor.worker.ts @@ -5,7 +5,7 @@ import { SimpleWorkerServer } from 'vs/base/common/worker/simpleWorker'; import { EditorSimpleWorker } from 'vs/editor/common/services/editorSimpleWorker'; -import { EditorWorkerHost } from 'vs/editor/common/services/editorWorkerService'; +import { IEditorWorkerHost } from 'vs/editor/common/services/editorWorkerHost'; let initialized = false; @@ -17,7 +17,7 @@ export function initialize(foreignModule: any) { const simpleWorker = new SimpleWorkerServer((msg) => { (self).postMessage(msg); - }, (host: EditorWorkerHost) => new EditorSimpleWorker(host, foreignModule)); + }, (host: IEditorWorkerHost) => new EditorSimpleWorker(host, foreignModule)); self.onmessage = (e: MessageEvent) => { simpleWorker.onmessage(e.data); diff --git a/src/vs/editor/standalone/browser/standaloneEditor.ts b/src/vs/editor/standalone/browser/standaloneEditor.ts index 6f475e9c210..f4d225c26f3 100644 --- a/src/vs/editor/standalone/browser/standaloneEditor.ts +++ b/src/vs/editor/standalone/browser/standaloneEditor.ts @@ -21,7 +21,7 @@ import { ILanguageConfigurationService } from 'vs/editor/common/languages/langua import { NullState, nullTokenize } from 'vs/editor/common/languages/nullMode'; import { ILanguageService } from 'vs/editor/common/services/language'; import { IModelService } from 'vs/editor/common/services/model'; -import { createWebWorker as actualCreateWebWorker, IWebWorkerOptions, MonacoWebWorker } from 'vs/editor/common/services/webWorker'; +import { createWebWorker as actualCreateWebWorker, IWebWorkerOptions, MonacoWebWorker } from 'vs/editor/browser/services/webWorker'; import * as standaloneEnums from 'vs/editor/common/standalone/standaloneEnums'; import { Colorizer, IColorizerElementOptions, IColorizerOptions } from 'vs/editor/standalone/browser/colorizer'; import { createTextModel, IStandaloneCodeEditor, IStandaloneDiffEditor, IStandaloneDiffEditorConstructionOptions, IStandaloneEditorConstructionOptions, StandaloneDiffEditor, StandaloneEditor } from 'vs/editor/standalone/browser/standaloneCodeEditor'; diff --git a/src/vs/editor/standalone/browser/standaloneServices.ts b/src/vs/editor/standalone/browser/standaloneServices.ts index 448437ac6c5..0b658f5b130 100644 --- a/src/vs/editor/standalone/browser/standaloneServices.ts +++ b/src/vs/editor/standalone/browser/standaloneServices.ts @@ -61,7 +61,7 @@ import { IThemeService } from 'vs/platform/theme/common/themeService'; import { getSingletonServiceDescriptors, registerSingleton } from 'vs/platform/instantiation/common/extensions'; import { OpenerService } from 'vs/editor/browser/services/openerService'; import { IEditorWorkerService } from 'vs/editor/common/services/editorWorker'; -import { EditorWorkerService } from 'vs/editor/common/services/editorWorkerService'; +import { EditorWorkerService } from 'vs/editor/browser/services/editorWorkerService'; import { ILanguageService } from 'vs/editor/common/services/language'; import { MarkerDecorationsService } from 'vs/editor/common/services/markerDecorationsService'; import { IMarkerDecorationsService } from 'vs/editor/common/services/markerDecorations'; diff --git a/src/vs/editor/test/common/services/editorSimpleWorker.test.ts b/src/vs/editor/test/common/services/editorSimpleWorker.test.ts index da9442c0bc0..65d6053245c 100644 --- a/src/vs/editor/test/common/services/editorSimpleWorker.test.ts +++ b/src/vs/editor/test/common/services/editorSimpleWorker.test.ts @@ -6,7 +6,7 @@ import * as assert from 'assert'; import { Range } from 'vs/editor/common/core/range'; import { EditorSimpleWorker, ICommonModel } from 'vs/editor/common/services/editorSimpleWorker'; -import { EditorWorkerHost } from 'vs/editor/common/services/editorWorkerService'; +import { IEditorWorkerHost } from 'vs/editor/common/services/editorWorkerHost'; suite('EditorSimpleWorker', () => { @@ -32,7 +32,7 @@ suite('EditorSimpleWorker', () => { let model: ICommonModel; setup(() => { - worker = new WorkerWithModels(null!, null); + worker = new WorkerWithModels(null!, null); model = worker.addModel([ 'This is line one', //16 'and this is line number two', //27 diff --git a/src/vs/workbench/contrib/notebook/browser/notebook.contribution.ts b/src/vs/workbench/contrib/notebook/browser/notebook.contribution.ts index e42e6b82c2e..f62e5be147b 100644 --- a/src/vs/workbench/contrib/notebook/browser/notebook.contribution.ts +++ b/src/vs/workbench/contrib/notebook/browser/notebook.contribution.ts @@ -36,7 +36,7 @@ import { INotebookEditorModelResolverService } from 'vs/workbench/contrib/notebo import { NotebookDiffEditorInput } from 'vs/workbench/contrib/notebook/browser/notebookDiffEditorInput'; import { NotebookTextDiffEditor } from 'vs/workbench/contrib/notebook/browser/diff/notebookTextDiffEditor'; import { INotebookEditorWorkerService } from 'vs/workbench/contrib/notebook/common/services/notebookWorkerService'; -import { NotebookEditorWorkerServiceImpl } from 'vs/workbench/contrib/notebook/common/services/notebookWorkerServiceImpl'; +import { NotebookEditorWorkerServiceImpl } from 'vs/workbench/contrib/notebook/browser/services/notebookWorkerServiceImpl'; import { INotebookCellStatusBarService } from 'vs/workbench/contrib/notebook/common/notebookCellStatusBarService'; import { NotebookCellStatusBarService } from 'vs/workbench/contrib/notebook/browser/notebookCellStatusBarServiceImpl'; import { INotebookEditorService } from 'vs/workbench/contrib/notebook/browser/notebookEditorService'; diff --git a/src/vs/workbench/contrib/notebook/common/services/notebookWorkerServiceImpl.ts b/src/vs/workbench/contrib/notebook/browser/services/notebookWorkerServiceImpl.ts similarity index 96% rename from src/vs/workbench/contrib/notebook/common/services/notebookWorkerServiceImpl.ts rename to src/vs/workbench/contrib/notebook/browser/services/notebookWorkerServiceImpl.ts index 81e363fdba1..e9e4422f1a1 100644 --- a/src/vs/workbench/contrib/notebook/common/services/notebookWorkerServiceImpl.ts +++ b/src/vs/workbench/contrib/notebook/browser/services/notebookWorkerServiceImpl.ts @@ -6,11 +6,12 @@ import { Disposable, DisposableStore, dispose, IDisposable, toDisposable } from 'vs/base/common/lifecycle'; import { URI } from 'vs/base/common/uri'; import { SimpleWorkerClient } from 'vs/base/common/worker/simpleWorker'; -import { DefaultWorkerFactory } from 'vs/base/worker/defaultWorkerFactory'; +import { DefaultWorkerFactory } from 'vs/base/browser/defaultWorkerFactory'; import { NotebookCellTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookCellTextModel'; import { IMainCellDto, INotebookDiffResult, NotebookCellsChangeType } from 'vs/workbench/contrib/notebook/common/notebookCommon'; import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService'; import { NotebookEditorSimpleWorker } from 'vs/workbench/contrib/notebook/common/services/notebookSimpleWorker'; +import { INotebookWorkerHost } from 'vs/workbench/contrib/notebook/common/services/notebookWorkerHost'; import { INotebookEditorWorkerService } from 'vs/workbench/contrib/notebook/common/services/notebookWorkerService'; export class NotebookEditorWorkerServiceImpl extends Disposable implements INotebookEditorWorkerService { @@ -178,7 +179,7 @@ export class NotebookEditorModelManager extends Disposable { } } -export class EditorWorkerHost { +class NotebookWorkerHost implements INotebookWorkerHost { private readonly _workerClient: NotebookWorkerClient; @@ -234,10 +235,10 @@ export class NotebookWorkerClient extends Disposable { private _getOrCreateWorker(): IWorkerClient { if (!this._worker) { try { - this._worker = this._register(new SimpleWorkerClient( + this._worker = this._register(new SimpleWorkerClient( this._workerFactory, 'vs/workbench/contrib/notebook/common/services/notebookSimpleWorker', - new EditorWorkerHost(this) + new NotebookWorkerHost(this) )); } catch (err) { // logOnceWebWorkerWarning(err); diff --git a/src/vs/workbench/contrib/notebook/common/services/notebookSimpleWorker.ts b/src/vs/workbench/contrib/notebook/common/services/notebookSimpleWorker.ts index 9896908c11c..8cdd04fd116 100644 --- a/src/vs/workbench/contrib/notebook/common/services/notebookSimpleWorker.ts +++ b/src/vs/workbench/contrib/notebook/common/services/notebookSimpleWorker.ts @@ -11,7 +11,7 @@ import * as model from 'vs/editor/common/model'; import { PieceTreeTextBufferBuilder } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBufferBuilder'; import { CellKind, ICellDto2, IMainCellDto, INotebookDiffResult, IOutputDto, NotebookCellInternalMetadata, NotebookCellMetadata, NotebookCellsChangedEventDto, NotebookCellsChangeType, NotebookCellTextModelSplice, NotebookData, NotebookDocumentMetadata } from 'vs/workbench/contrib/notebook/common/notebookCommon'; import { Range } from 'vs/editor/common/core/range'; -import { EditorWorkerHost } from 'vs/workbench/contrib/notebook/common/services/notebookWorkerServiceImpl'; +import { INotebookWorkerHost } from 'vs/workbench/contrib/notebook/common/services/notebookWorkerHost'; import { VSBuffer } from 'vs/base/common/buffer'; function bufferHash(buffer: VSBuffer): number { @@ -282,6 +282,6 @@ export class NotebookEditorSimpleWorker implements IRequestHandler, IDisposable * Called on the worker side * @internal */ -export function create(host: EditorWorkerHost): IRequestHandler { +export function create(host: INotebookWorkerHost): IRequestHandler { return new NotebookEditorSimpleWorker(); } diff --git a/src/vs/workbench/contrib/notebook/common/services/notebookWorkerHost.ts b/src/vs/workbench/contrib/notebook/common/services/notebookWorkerHost.ts new file mode 100644 index 00000000000..44a4e22da79 --- /dev/null +++ b/src/vs/workbench/contrib/notebook/common/services/notebookWorkerHost.ts @@ -0,0 +1,9 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +export interface INotebookWorkerHost { + // foreign host request + fhr(method: string, args: any[]): Promise; +} diff --git a/src/vs/workbench/contrib/output/common/outputLinkProvider.ts b/src/vs/workbench/contrib/output/browser/outputLinkProvider.ts similarity index 97% rename from src/vs/workbench/contrib/output/common/outputLinkProvider.ts rename to src/vs/workbench/contrib/output/browser/outputLinkProvider.ts index efc4bff42cf..148647cd5b8 100644 --- a/src/vs/workbench/contrib/output/common/outputLinkProvider.ts +++ b/src/vs/workbench/contrib/output/browser/outputLinkProvider.ts @@ -9,7 +9,7 @@ import { IModelService } from 'vs/editor/common/services/model'; import { LinkProviderRegistry, ILink } from 'vs/editor/common/languages'; import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace'; import { OUTPUT_MODE_ID, LOG_MODE_ID } from 'vs/workbench/contrib/output/common/output'; -import { MonacoWebWorker, createWebWorker } from 'vs/editor/common/services/webWorker'; +import { MonacoWebWorker, createWebWorker } from 'vs/editor/browser/services/webWorker'; import { ICreateData, OutputLinkComputer } from 'vs/workbench/contrib/output/common/outputLinkComputer'; import { IDisposable, dispose } from 'vs/base/common/lifecycle'; import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry'; diff --git a/src/vs/workbench/contrib/output/browser/outputServices.ts b/src/vs/workbench/contrib/output/browser/outputServices.ts index a8dc8204d1b..b35cd34ed86 100644 --- a/src/vs/workbench/contrib/output/browser/outputServices.ts +++ b/src/vs/workbench/contrib/output/browser/outputServices.ts @@ -11,7 +11,7 @@ import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storag import { Registry } from 'vs/platform/registry/common/platform'; import { IOutputChannel, IOutputService, OUTPUT_VIEW_ID, OUTPUT_SCHEME, LOG_SCHEME, LOG_MIME, OUTPUT_MIME, OutputChannelUpdateMode } from 'vs/workbench/contrib/output/common/output'; import { IOutputChannelDescriptor, Extensions, IOutputChannelRegistry } from 'vs/workbench/services/output/common/output'; -import { OutputLinkProvider } from 'vs/workbench/contrib/output/common/outputLinkProvider'; +import { OutputLinkProvider } from 'vs/workbench/contrib/output/browser/outputLinkProvider'; import { ITextModelService, ITextModelContentProvider } from 'vs/editor/common/services/resolverService'; import { ITextModel } from 'vs/editor/common/model'; import { ILogService } from 'vs/platform/log/common/log'; diff --git a/src/vs/workbench/services/languageDetection/browser/languageDetectionSimpleWorker.ts b/src/vs/workbench/services/languageDetection/browser/languageDetectionSimpleWorker.ts index 6ebabfd62e8..725289fc812 100644 --- a/src/vs/workbench/services/languageDetection/browser/languageDetectionSimpleWorker.ts +++ b/src/vs/workbench/services/languageDetection/browser/languageDetectionSimpleWorker.ts @@ -7,13 +7,13 @@ import type { ModelOperations, ModelResult } from '@vscode/vscode-languagedetect import { StopWatch } from 'vs/base/common/stopwatch'; import { IRequestHandler } from 'vs/base/common/worker/simpleWorker'; import { EditorSimpleWorker } from 'vs/editor/common/services/editorSimpleWorker'; -import { EditorWorkerHost } from 'vs/editor/common/services/editorWorkerService'; +import { IEditorWorkerHost } from 'vs/editor/common/services/editorWorkerHost'; /** * Called on the worker side * @internal */ -export function create(host: EditorWorkerHost): IRequestHandler { +export function create(host: IEditorWorkerHost): IRequestHandler { return new LanguageDetectionSimpleWorker(host, null); } diff --git a/src/vs/workbench/services/languageDetection/browser/languageDetectionWorkerServiceImpl.ts b/src/vs/workbench/services/languageDetection/browser/languageDetectionWorkerServiceImpl.ts index 1bef048bfa2..fa2e75f1ab0 100644 --- a/src/vs/workbench/services/languageDetection/browser/languageDetectionWorkerServiceImpl.ts +++ b/src/vs/workbench/services/languageDetection/browser/languageDetectionWorkerServiceImpl.ts @@ -16,7 +16,7 @@ import { LanguageDetectionSimpleWorker } from 'vs/workbench/services/languageDet import { IModelService } from 'vs/editor/common/services/model'; import { SimpleWorkerClient } from 'vs/base/common/worker/simpleWorker'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; -import { EditorWorkerClient, EditorWorkerHost } from 'vs/editor/common/services/editorWorkerService'; +import { EditorWorkerClient, EditorWorkerHost } from 'vs/editor/browser/services/editorWorkerService'; import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry'; const moduleLocation = '../../../../../../node_modules/@vscode/vscode-languagedetection'; diff --git a/src/vs/workbench/services/search/browser/searchService.ts b/src/vs/workbench/services/search/browser/searchService.ts index 15687aa8d12..cbde6edad9a 100644 --- a/src/vs/workbench/services/search/browser/searchService.ts +++ b/src/vs/workbench/services/search/browser/searchService.ts @@ -16,7 +16,7 @@ import { SearchService } from 'vs/workbench/services/search/common/searchService import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity'; import { IWorkerClient, logOnceWebWorkerWarning, SimpleWorkerClient } from 'vs/base/common/worker/simpleWorker'; import { Disposable, DisposableStore } from 'vs/base/common/lifecycle'; -import { DefaultWorkerFactory } from 'vs/base/worker/defaultWorkerFactory'; +import { DefaultWorkerFactory } from 'vs/base/browser/defaultWorkerFactory'; import { registerSingleton } from 'vs/platform/instantiation/common/extensions'; import { ILocalFileSearchSimpleWorker, ILocalFileSearchSimpleWorkerHost } from 'vs/workbench/services/search/common/localFileSearchWorkerTypes'; import { memoize } from 'vs/base/common/decorators'; diff --git a/src/vs/workbench/services/textMate/browser/nativeTextMateService.ts b/src/vs/workbench/services/textMate/browser/nativeTextMateService.ts index f700e5ce11a..f68aea36d4d 100644 --- a/src/vs/workbench/services/textMate/browser/nativeTextMateService.ts +++ b/src/vs/workbench/services/textMate/browser/nativeTextMateService.ts @@ -11,7 +11,7 @@ import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/work import { INotificationService } from 'vs/platform/notification/common/notification'; import { ILogService } from 'vs/platform/log/common/log'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; -import { createWebWorker, MonacoWebWorker } from 'vs/editor/common/services/webWorker'; +import { createWebWorker, MonacoWebWorker } from 'vs/editor/browser/services/webWorker'; import { IModelService } from 'vs/editor/common/services/model'; import type { IRawTheme } from 'vscode-textmate'; import { IValidGrammarDefinition } from 'vs/workbench/services/textMate/common/TMScopeRegistry'; diff --git a/src/vs/workbench/workbench.common.main.ts b/src/vs/workbench/workbench.common.main.ts index c8356c7c283..287d972bf2a 100644 --- a/src/vs/workbench/workbench.common.main.ts +++ b/src/vs/workbench/workbench.common.main.ts @@ -105,7 +105,7 @@ import { ContextViewService } from 'vs/platform/contextview/browser/contextViewS import { IContextViewService } from 'vs/platform/contextview/browser/contextView'; import { IListService, ListService } from 'vs/platform/list/browser/listService'; import { IEditorWorkerService } from 'vs/editor/common/services/editorWorker'; -import { EditorWorkerService } from 'vs/editor/common/services/editorWorkerService'; +import { EditorWorkerService } from 'vs/editor/browser/services/editorWorkerService'; import { MarkerDecorationsService } from 'vs/editor/common/services/markerDecorationsService'; import { IMarkerDecorationsService } from 'vs/editor/common/services/markerDecorations'; import { IMarkerService } from 'vs/platform/markers/common/markers';