Skip to content

Commit 320aec9

Browse files
alexdimaalexdima
committed
Rename defaultWorkerFactory to webWorkerFactory 
1 parent a152a40 commit 320aec9

File tree

12 files changed

+24
-26
lines changed

12 files changed

+24
-26
lines changed

‎src/tsec.exemptions.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts"
1919
],
2020
"ban-worker-calls": [
21-
"vs/base/browser/defaultWorkerFactory.ts",
21+
"vs/base/browser/webWorkerFactory.ts",
2222
"vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts"
2323
],
2424
"ban-worker-importscripts": [

‎src/vs/base/browser/defaultWorkerFactory.ts renamed to ‎src/vs/base/browser/webWorkerFactory.ts

+8-10
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export function createBlobWorker(blobUrl: string, options?: WorkerOptions): Work
3030
return new Worker(ttPolicy ? ttPolicy.createScriptURL(blobUrl) as unknown as string : blobUrl, { ...options, type: 'module' });
3131
}
3232

33-
function getWorker(descriptor: IWorkerDescriptor, id: number): Worker | Promise<Worker> {
33+
function getWorker(descriptor: IWebWorkerDescriptor, id: number): Worker | Promise<Worker> {
3434
const label = descriptor.label || 'anonymous' + id;
3535

3636
// Option for hosts to overwrite the worker script (used in the standalone editor)
@@ -132,7 +132,7 @@ class WebWorker extends Disposable implements IWebWorker {
132132
private readonly _onError = this._register(new Emitter<any>());
133133
public readonly onError = this._onError.event;
134134

135-
constructor(descriptorOrWorker: IWorkerDescriptor | Worker) {
135+
constructor(descriptorOrWorker: IWebWorkerDescriptor | Worker) {
136136
super();
137137
this.id = ++WebWorker.LAST_WORKER_ID;
138138
const workerOrPromise = (
@@ -187,23 +187,21 @@ class WebWorker extends Disposable implements IWebWorker {
187187
}
188188
}
189189

190-
export interface IWorkerDescriptor {
190+
export interface IWebWorkerDescriptor {
191191
readonly esmModuleLocation: URI | undefined;
192192
readonly label: string | undefined;
193193
}
194194

195-
export class WorkerDescriptor implements IWorkerDescriptor {
196-
195+
export class WebWorkerDescriptor implements IWebWorkerDescriptor {
197196
constructor(
198197
public readonly esmModuleLocation: URI,
199198
public readonly label: string | undefined,
200-
) {
201-
}
199+
) { }
202200
}
203201

204202
export function createWebWorker<T extends object>(esmModuleLocation: URI, label: string | undefined): IWebWorkerClient<T>;
205-
export function createWebWorker<T extends object>(workerDescriptor: IWorkerDescriptor | Worker): IWebWorkerClient<T>;
206-
export function createWebWorker<T extends object>(arg0: URI | IWorkerDescriptor | Worker, arg1?: string | undefined): IWebWorkerClient<T> {
207-
const workerDescriptorOrWorker = (URI.isUri(arg0) ? new WorkerDescriptor(arg0, arg1) : arg0);
203+
export function createWebWorker<T extends object>(workerDescriptor: IWebWorkerDescriptor | Worker): IWebWorkerClient<T>;
204+
export function createWebWorker<T extends object>(arg0: URI | IWebWorkerDescriptor | Worker, arg1?: string | undefined): IWebWorkerClient<T> {
205+
const workerDescriptorOrWorker = (URI.isUri(arg0) ? new WebWorkerDescriptor(arg0, arg1) : arg0);
208206
return new WebWorkerClient<T>(new WebWorker(workerDescriptorOrWorker));
209207
}

‎src/vs/editor/browser/services/editorWorkerService.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { timeout } from '../../../base/common/async.js';
77
import { Disposable, IDisposable } from '../../../base/common/lifecycle.js';
88
import { URI } from '../../../base/common/uri.js';
99
import { logOnceWebWorkerWarning, IWebWorkerClient, Proxied } from '../../../base/common/worker/webWorker.js';
10-
import { createWebWorker, IWorkerDescriptor } from '../../../base/browser/defaultWorkerFactory.js';
10+
import { createWebWorker, IWebWorkerDescriptor } from '../../../base/browser/webWorkerFactory.js';
1111
import { Position } from '../../common/core/position.js';
1212
import { IRange, Range } from '../../common/core/range.js';
1313
import { ITextModel } from '../../common/model.js';
@@ -59,7 +59,7 @@ export abstract class EditorWorkerService extends Disposable implements IEditorW
5959
private readonly _logService: ILogService;
6060

6161
constructor(
62-
workerDescriptor: IWorkerDescriptor,
62+
workerDescriptor: IWebWorkerDescriptor,
6363
@IModelService modelService: IModelService,
6464
@ITextResourceConfigurationService configurationService: ITextResourceConfigurationService,
6565
@ILogService logService: ILogService,
@@ -313,7 +313,7 @@ class WorkerManager extends Disposable {
313313
private _lastWorkerUsedTime: number;
314314

315315
constructor(
316-
private readonly _workerDescriptor: IWorkerDescriptor,
316+
private readonly _workerDescriptor: IWebWorkerDescriptor,
317317
@IModelService modelService: IModelService
318318
) {
319319
super();
@@ -410,7 +410,7 @@ export class EditorWorkerClient extends Disposable implements IEditorWorkerClien
410410
private _disposed = false;
411411

412412
constructor(
413-
private readonly _workerDescriptorOrWorker: IWorkerDescriptor | Worker,
413+
private readonly _workerDescriptorOrWorker: IWebWorkerDescriptor | Worker,
414414
keepIdleModels: boolean,
415415
@IModelService modelService: IModelService,
416416
) {

‎src/vs/editor/standalone/browser/standaloneServices.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ import { mainWindow } from '../../../base/browser/window.js';
9898
import { ResourceMap } from '../../../base/common/map.js';
9999
import { ITreeSitterParserService } from '../../common/services/treeSitterParserService.js';
100100
import { StandaloneTreeSitterParserService } from './standaloneTreeSitterService.js';
101-
import { IWorkerDescriptor } from '../../../base/browser/defaultWorkerFactory.js';
101+
import { IWebWorkerDescriptor } from '../../../base/browser/webWorkerFactory.js';
102102

103103
class SimpleModel implements IResolvedTextEditorModel {
104104

@@ -1077,7 +1077,7 @@ class StandaloneContextMenuService extends ContextMenuService {
10771077
}
10781078
}
10791079

1080-
const standaloneEditorWorkerDescriptor: IWorkerDescriptor = {
1080+
const standaloneEditorWorkerDescriptor: IWebWorkerDescriptor = {
10811081
esmModuleLocation: undefined,
10821082
label: 'editorWorkerService'
10831083
};

‎src/vs/platform/profiling/electron-sandbox/profileAnalysisWorkerService.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*--------------------------------------------------------------------------------------------*/
55

66

7-
import { createWebWorker } from '../../../base/browser/defaultWorkerFactory.js';
7+
import { createWebWorker } from '../../../base/browser/webWorkerFactory.js';
88
import { URI } from '../../../base/common/uri.js';
99
import { Proxied } from '../../../base/common/worker/webWorker.js';
1010
import { InstantiationType, registerSingleton } from '../../instantiation/common/extensions.js';

‎src/vs/workbench/contrib/codeEditor/browser/workbenchEditorWorkerService.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Licensed under the MIT License. See License.txt in the project root for license information.
44
*--------------------------------------------------------------------------------------------*/
55

6-
import { WorkerDescriptor } from '../../../../base/browser/defaultWorkerFactory.js';
6+
import { WebWorkerDescriptor } from '../../../../base/browser/webWorkerFactory.js';
77
import { FileAccess } from '../../../../base/common/network.js';
88
import { EditorWorkerService } from '../../../../editor/browser/services/editorWorkerService.js';
99
import { ILanguageConfigurationService } from '../../../../editor/common/languages/languageConfigurationRegistry.js';
@@ -20,7 +20,7 @@ export class WorkbenchEditorWorkerService extends EditorWorkerService {
2020
@ILanguageConfigurationService languageConfigurationService: ILanguageConfigurationService,
2121
@ILanguageFeaturesService languageFeaturesService: ILanguageFeaturesService,
2222
) {
23-
const workerDescriptor = new WorkerDescriptor(FileAccess.asBrowserUri('vs/editor/common/services/editorWebWorkerMain.js'), 'TextEditorWorker');
23+
const workerDescriptor = new WebWorkerDescriptor(FileAccess.asBrowserUri('vs/editor/common/services/editorWebWorkerMain.js'), 'TextEditorWorker');
2424
super(workerDescriptor, modelService, configurationService, logService, languageConfigurationService, languageFeaturesService);
2525
}
2626
}

‎src/vs/workbench/contrib/notebook/browser/services/notebookWorkerServiceImpl.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import { Disposable, DisposableStore, dispose, IDisposable, toDisposable } from '../../../../../base/common/lifecycle.js';
77
import { URI } from '../../../../../base/common/uri.js';
88
import { IWebWorkerClient, Proxied } from '../../../../../base/common/worker/webWorker.js';
9-
import { createWebWorker } from '../../../../../base/browser/defaultWorkerFactory.js';
9+
import { createWebWorker } from '../../../../../base/browser/webWorkerFactory.js';
1010
import { NotebookCellTextModel } from '../../common/model/notebookCellTextModel.js';
1111
import { CellUri, IMainCellDto, INotebookDiffResult, NotebookCellsChangeType, NotebookRawContentEventDto } from '../../common/notebookCommon.js';
1212
import { INotebookService } from '../../common/notebookService.js';

‎src/vs/workbench/contrib/output/browser/outputLinkProvider.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { OUTPUT_MODE_ID, LOG_MODE_ID } from '../../../services/output/common/out
1212
import { OutputLinkComputer } from '../common/outputLinkComputer.js';
1313
import { IDisposable, dispose, Disposable } from '../../../../base/common/lifecycle.js';
1414
import { ILanguageFeaturesService } from '../../../../editor/common/services/languageFeatures.js';
15-
import { createWebWorker } from '../../../../base/browser/defaultWorkerFactory.js';
15+
import { createWebWorker } from '../../../../base/browser/webWorkerFactory.js';
1616
import { IWebWorkerClient } from '../../../../base/common/worker/webWorker.js';
1717
import { WorkerTextModelSyncClient } from '../../../../editor/common/services/textModelSync/textModelSync.impl.js';
1818
import { FileAccess } from '../../../../base/common/network.js';

‎src/vs/workbench/services/languageDetection/browser/languageDetectionWorkerServiceImpl.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import { IStorageService, StorageScope, StorageTarget } from '../../../../platfo
2222
import { LRUCache } from '../../../../base/common/map.js';
2323
import { ILogService } from '../../../../platform/log/common/log.js';
2424
import { canASAR } from '../../../../amdX.js';
25-
import { createWebWorker } from '../../../../base/browser/defaultWorkerFactory.js';
25+
import { createWebWorker } from '../../../../base/browser/webWorkerFactory.js';
2626
import { WorkerTextModelSyncClient } from '../../../../editor/common/services/textModelSync/textModelSync.impl.js';
2727
import { ILanguageDetectionWorker, LanguageDetectionWorkerHost } from './languageDetectionWorker.protocol.js';
2828

‎src/vs/workbench/services/search/browser/searchService.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import { SearchService } from '../common/searchService.js';
1616
import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
1717
import { IWebWorkerClient, logOnceWebWorkerWarning } from '../../../../base/common/worker/webWorker.js';
1818
import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
19-
import { createWebWorker } from '../../../../base/browser/defaultWorkerFactory.js';
19+
import { createWebWorker } from '../../../../base/browser/webWorkerFactory.js';
2020
import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
2121
import { ILocalFileSearchWorker, LocalFileSearchWorkerHost } from '../common/localFileSearchWorkerTypes.js';
2222
import { memoize } from '../../../../base/common/decorators.js';

‎src/vs/workbench/services/textMate/browser/backgroundTokenization/threadedBackgroundTokenizerFactory.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import { TextMateWorkerHost } from './worker/textMateWorkerHost.js';
2222
import { TextMateWorkerTokenizerController } from './textMateWorkerTokenizerController.js';
2323
import { IValidGrammarDefinition } from '../../common/TMScopeRegistry.js';
2424
import type { IRawTheme } from 'vscode-textmate';
25-
import { createWebWorker } from '../../../../../base/browser/defaultWorkerFactory.js';
25+
import { createWebWorker } from '../../../../../base/browser/webWorkerFactory.js';
2626
import { IWebWorkerClient, Proxied } from '../../../../../base/common/worker/webWorker.js';
2727

2828
export class ThreadedBackgroundTokenizerFactory implements IDisposable {

‎src/vs/workbench/services/timer/browser/timerService.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import { IPaneCompositePartService } from '../../panecomposite/browser/panecompo
1818
import { ViewContainerLocation } from '../../../common/views.js';
1919
import { TelemetryTrustedValue } from '../../../../platform/telemetry/common/telemetryUtils.js';
2020
import { isWeb } from '../../../../base/common/platform.js';
21-
import { createBlobWorker } from '../../../../base/browser/defaultWorkerFactory.js';
21+
import { createBlobWorker } from '../../../../base/browser/webWorkerFactory.js';
2222
import { Registry } from '../../../../platform/registry/common/platform.js';
2323
import { ITerminalBackendRegistry, TerminalExtensions } from '../../../../platform/terminal/common/terminal.js';
2424

0 commit comments

Comments
 (0)