From cea28d669fe9f26844a257e7f1e46b32b3732a67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Mangeonjean?= Date: Thu, 25 Apr 2024 18:55:50 +0200 Subject: [PATCH 01/12] fix: do not fails when a single provider throws an error in readdir --- src/service-override/files.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/service-override/files.ts b/src/service-override/files.ts index 29a5cb8c..3fbf7dd0 100644 --- a/src/service-override/files.ts +++ b/src/service-override/files.ts @@ -368,7 +368,7 @@ class OverlayFileSystemProvider implements IFileSystemProviderWithFileReadWriteC } async readdir (resource: URI): Promise<[string, FileType][]> { - const results = await Promise.allSettled(this.delegates.map(delegate => delegate.readdir(resource))) + const results = await Promise.allSettled(this.delegates.map(async delegate => delegate.readdir(resource))) if (!results.some(isFullfiled)) { throw (results[0] as PromiseRejectedResult).reason } From 73079645d3d89e3bcea8ddc68d30702c2311a797 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Mangeonjean?= Date: Thu, 25 Apr 2024 19:36:18 +0200 Subject: [PATCH 02/12] lib: update monaco-editor to 0.48 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 343dcef0..90322bf4 100644 --- a/package.json +++ b/package.json @@ -36,8 +36,8 @@ "commit": "e170252f762678dec6ca2cc69aba1570769a5d39" }, "monaco": { - "ref": "v0.47.0", - "version": "0.47.0" + "ref": "v0.48.0", + "version": "0.48.0" } }, "devDependencies": { From 98d3743bc10b54d0bc0813803e1b5fa3c1077570 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Mangeonjean?= Date: Thu, 25 Apr 2024 19:36:49 +0200 Subject: [PATCH 03/12] fix: be more robust while detecting import expressions --- ...-add-a-way-to-register-a-locale-with-translation.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vscode-paches/0006-feat-add-a-way-to-register-a-locale-with-translation.patch b/vscode-paches/0006-feat-add-a-way-to-register-a-locale-with-translation.patch index 51307661..c2c87eb4 100644 --- a/vscode-paches/0006-feat-add-a-way-to-register-a-locale-with-translation.patch +++ b/vscode-paches/0006-feat-add-a-way-to-register-a-locale-with-translation.patch @@ -10,7 +10,7 @@ Subject: [PATCH] feat: add a way to register a locale with translations 3 files changed, 48 insertions(+), 3 deletions(-) diff --git a/build/lib/standalone.js b/build/lib/standalone.js -index 723a1127492..206d4dfb9a4 100644 +index 723a1127492..9d09ee7d9f5 100644 --- a/build/lib/standalone.js +++ b/build/lib/standalone.js @@ -4,8 +4,7 @@ @@ -41,7 +41,7 @@ index 723a1127492..206d4dfb9a4 100644 + }); + } + fileContents = fileContents.replace(/import { (localize2?) }/g, 'import { $1WithPath }'); -+ fileContents = fileContents.replace(/import { (localize2?), (localize2?) }/g, 'import { $1WithPath, $2WithPath }'); ++ fileContents = fileContents.replace(/import { (localize2?), *(localize2?) }/g, 'import { $1WithPath, $2WithPath }'); write(getDestAbsoluteFilePath(file), fileContents); continue; } @@ -54,7 +54,7 @@ index 723a1127492..206d4dfb9a4 100644 if (!/\.css/.test(module)) { return false; diff --git a/build/lib/standalone.ts b/build/lib/standalone.ts -index 90517a9236f..193ed02f7f6 100644 +index 90517a9236f..8095b353bb4 100644 --- a/build/lib/standalone.ts +++ b/build/lib/standalone.ts @@ -223,6 +223,14 @@ export function createESMSourcesAndResources2(options: IOptions2): void { @@ -67,7 +67,7 @@ index 90517a9236f..193ed02f7f6 100644 + }); + } + fileContents = fileContents.replace(/import { (localize2?) }/g, 'import { $1WithPath }'); -+ fileContents = fileContents.replace(/import { (localize2?), (localize2?) }/g, 'import { $1WithPath, $2WithPath }'); ++ fileContents = fileContents.replace(/import { (localize2?), *(localize2?) }/g, 'import { $1WithPath, $2WithPath }'); + write(getDestAbsoluteFilePath(file), fileContents); continue; From 6973577c790b1464fb829cb28bf03e9e66e5e2eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Mangeonjean?= Date: Fri, 26 Apr 2024 12:08:29 +0200 Subject: [PATCH 04/12] fix: prepare VSCode code to make it easier to manipulate it with the typescript language service --- vscode-paches/0052-fix-weird-syntax.patch | 28 ++++++++++ ...t-stuff-from-web-workbench-or-the-ty.patch | 54 +++++++++++++++++++ ...x-that-language-service-refactor-doe.patch | 26 +++++++++ 3 files changed, 108 insertions(+) create mode 100644 vscode-paches/0052-fix-weird-syntax.patch create mode 100644 vscode-paches/0053-fix-do-not-export-stuff-from-web-workbench-or-the-ty.patch create mode 100644 vscode-paches/0054-fix-change-syntax-that-language-service-refactor-doe.patch diff --git a/vscode-paches/0052-fix-weird-syntax.patch b/vscode-paches/0052-fix-weird-syntax.patch new file mode 100644 index 00000000..980a0752 --- /dev/null +++ b/vscode-paches/0052-fix-weird-syntax.patch @@ -0,0 +1,28 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Lo=C3=AFc=20Mangeonjean?= +Date: Tue, 23 Apr 2024 22:06:54 +0200 +Subject: [PATCH] fix: weird syntax + +--- + src/vs/platform/notification/common/notification.ts | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/vs/platform/notification/common/notification.ts b/src/vs/platform/notification/common/notification.ts +index 8506385b01c..3f6554ac9c0 100644 +--- a/src/vs/platform/notification/common/notification.ts ++++ b/src/vs/platform/notification/common/notification.ts +@@ -6,10 +6,12 @@ + import { IAction } from 'vs/base/common/actions'; + import { Event } from 'vs/base/common/event'; + import { IDisposable } from 'vs/base/common/lifecycle'; +-import BaseSeverity from 'vs/base/common/severity'; ++import Severity from 'vs/base/common/severity'; + import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; + +-export import Severity = BaseSeverity; ++export { ++ Severity ++}; + + export const INotificationService = createDecorator('notificationService'); + diff --git a/vscode-paches/0053-fix-do-not-export-stuff-from-web-workbench-or-the-ty.patch b/vscode-paches/0053-fix-do-not-export-stuff-from-web-workbench-or-the-ty.patch new file mode 100644 index 00000000..6983ba87 --- /dev/null +++ b/vscode-paches/0053-fix-do-not-export-stuff-from-web-workbench-or-the-ty.patch @@ -0,0 +1,54 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Lo=C3=AFc=20Mangeonjean?= +Date: Thu, 25 Apr 2024 18:13:11 +0200 +Subject: [PATCH] fix: do not export stuff from web workbench or the typescript + language service is trying to import from it + +--- + src/vs/workbench/workbench.web.main.ts | 28 ++------------------------ + 1 file changed, 2 insertions(+), 26 deletions(-) + +diff --git a/src/vs/workbench/workbench.web.main.ts b/src/vs/workbench/workbench.web.main.ts +index e4a0a7e3e72..da0be08af02 100644 +--- a/src/vs/workbench/workbench.web.main.ts ++++ b/src/vs/workbench/workbench.web.main.ts +@@ -175,37 +175,13 @@ import 'vs/workbench/contrib/remote/browser/remoteStartEntry.contribution'; + // + // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +-import { create, commands, env, window, workspace, logger } from 'vs/workbench/browser/web.factory'; +-import { Menu } from 'vs/workbench/browser/web.api'; +-import { URI } from 'vs/base/common/uri'; +-import { Event, Emitter } from 'vs/base/common/event'; +-import { Disposable } from 'vs/base/common/lifecycle'; +-import { GroupOrientation } from 'vs/workbench/services/editor/common/editorGroupsService'; ++import { create } from 'vs/workbench/browser/web.factory'; + import { UserDataSyncResourceProviderService } from 'vs/platform/userDataSync/common/userDataSyncResourceProvider'; +-import { RemoteAuthorityResolverError, RemoteAuthorityResolverErrorCode } from 'vs/platform/remote/common/remoteAuthorityResolver'; + + export { + + // Factory +- create, +- +- // Basic Types +- URI, +- Event, +- Emitter, +- Disposable, +- GroupOrientation, +- LogLevel, +- RemoteAuthorityResolverError, +- RemoteAuthorityResolverErrorCode, +- +- // Facade API +- env, +- window, +- workspace, +- commands, +- logger, +- Menu ++ create + }; + + //#endregion diff --git a/vscode-paches/0054-fix-change-syntax-that-language-service-refactor-doe.patch b/vscode-paches/0054-fix-change-syntax-that-language-service-refactor-doe.patch new file mode 100644 index 00000000..7780e276 --- /dev/null +++ b/vscode-paches/0054-fix-change-syntax-that-language-service-refactor-doe.patch @@ -0,0 +1,26 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Lo=C3=AFc=20Mangeonjean?= +Date: Thu, 25 Apr 2024 19:14:25 +0200 +Subject: [PATCH] fix: change syntax that language service refactor doesn't + support well + +the re-exports source are removed during "Move to new file" refactor +--- + src/vs/workbench/contrib/tasks/common/taskService.ts | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/vs/workbench/contrib/tasks/common/taskService.ts b/src/vs/workbench/contrib/tasks/common/taskService.ts +index 3ef60f6e047..7e3dd29b65a 100644 +--- a/src/vs/workbench/contrib/tasks/common/taskService.ts ++++ b/src/vs/workbench/contrib/tasks/common/taskService.ts +@@ -15,7 +15,9 @@ import { ITaskSummary, ITaskTerminateResponse, ITaskSystemInfo } from 'vs/workbe + import { IStringDictionary } from 'vs/base/common/collections'; + import { RawContextKey, ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey'; + +-export { ITaskSummary, Task, ITaskTerminateResponse as TaskTerminateResponse }; ++export { ITaskSummary } from 'vs/workbench/contrib/tasks/common/taskSystem'; ++export { Task } from 'vs/workbench/contrib/tasks/common/tasks'; ++export { ITaskTerminateResponse as TaskTerminateResponse } from 'vs/workbench/contrib/tasks/common/taskSystem'; + + export const CustomExecutionSupportedContext = new RawContextKey('customExecutionSupported', false, nls.localize('tasks.customExecutionSupported', "Whether CustomExecution tasks are supported. Consider using in the when clause of a \'taskDefinition\' contribution.")); + export const ShellExecutionSupportedContext = new RawContextKey('shellExecutionSupported', false, nls.localize('tasks.shellExecutionSupported', "Whether ShellExecution tasks are supported. Consider using in the when clause of a \'taskDefinition\' contribution.")); From 308066830a5b6448883747f7cf51badcb6e6d201 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Mangeonjean?= Date: Fri, 26 Apr 2024 12:09:23 +0200 Subject: [PATCH 05/12] feat: add and use script to extract VSCode service identifiers into new files it allows importing the service identifier WITHOUT importing all the code in the same module --- scripts/install-vscode | 3 + ...-tool-to-extract-service-identifiers.patch | 458 ++++++++++++++++++ 2 files changed, 461 insertions(+) create mode 100644 vscode-paches/0055-feat-add-build-tool-to-extract-service-identifiers.patch diff --git a/scripts/install-vscode b/scripts/install-vscode index 60a75184..b1db9aec 100755 --- a/scripts/install-vscode +++ b/scripts/install-vscode @@ -45,6 +45,9 @@ cd build yarn install --ignore-engines cd .. +echo "Extracting service identifiers" +node build/lib/extractServices.js + ## Change shake level from ClassMembers to Files to speed up build sed -i'' -e 's/shakeLevel: 2/shakeLevel: 0/g' build/gulpfile.editor.js ## build editor just to get the editor.api.d.ts file compiled diff --git a/vscode-paches/0055-feat-add-build-tool-to-extract-service-identifiers.patch b/vscode-paches/0055-feat-add-build-tool-to-extract-service-identifiers.patch new file mode 100644 index 00000000..0f6714a9 --- /dev/null +++ b/vscode-paches/0055-feat-add-build-tool-to-extract-service-identifiers.patch @@ -0,0 +1,458 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Lo=C3=AFc=20Mangeonjean?= +Date: Thu, 25 Apr 2024 19:34:56 +0200 +Subject: [PATCH] feat: add build tool to extract service identifiers + +--- + build/lib/extractServices.js | 199 +++++++++++++++++++++++++++++ + build/lib/extractServices.ts | 234 +++++++++++++++++++++++++++++++++++ + 2 files changed, 433 insertions(+) + create mode 100644 build/lib/extractServices.js + create mode 100644 build/lib/extractServices.ts + +diff --git a/build/lib/extractServices.js b/build/lib/extractServices.js +new file mode 100644 +index 00000000000..7b5dc28eeac +--- /dev/null ++++ b/build/lib/extractServices.js +@@ -0,0 +1,199 @@ ++"use strict"; ++Object.defineProperty(exports, "__esModule", { value: true }); ++/*--------------------------------------------------------------------------------------------- ++ * Copyright (c) Microsoft Corporation. All rights reserved. ++ * Licensed under the MIT License. See License.txt in the project root for license information. ++ *--------------------------------------------------------------------------------------------*/ ++const ts = require("typescript"); ++const fs = require("fs"); ++const path = require("path"); ++const REPO_ROOT = path.join(__dirname, '../../'); ++const SRC_DIR = path.join(REPO_ROOT, 'src'); ++/** ++ * The language service fails to properly render imports ++ * (Either because there are namespace/interface/object using the same name ++ * or sometime an import is duplicated) ++ */ ++const ORGANIZE_IMPORTS = [ ++ 'vs/platform/log/common/log.service.ts', ++ 'vs/platform/update/common/update.service.ts', ++ 'vs/platform/markers/common/markers.service.ts', ++ 'vs/platform/userDataSync/common/userDataSync.service.ts', ++ 'vs/workbench/contrib/chat/common/chatAgents.service.ts', ++ 'vs/workbench/contrib/tasks/common/taskService.ts', ++ 'vs/workbench/workbench.web.main.ts' ++]; ++const SERVICE_REGISTRATION_FUNCTIONS_NAMES = ['createDecorator', 'refineServiceDecorator']; ++const IGNORE = [ ++ 'vs/platform/instantiation/common/instantiation', ++ // Editor services ++ 'vs/editor/', ++ 'vs/platform/actionWidget/browser/actionWidget', ++ 'vs/platform/undoRedo/common/undoRedoService', ++ 'vs/platform/instantiation/common/extensions', ++ // The extension api, not modular anyway ++ 'vs/workbench/api/' ++]; ++function findFunctionDeclarations(sourceFile, names) { ++ const declarations = []; ++ function visit(node) { ++ if (ts.isFunctionDeclaration(node) && node.name !== undefined && ts.isIdentifier(node.name) && names.includes(node.name.text)) { ++ declarations.push(node); ++ return; ++ } ++ ts.forEachChild(node, visit); ++ } ++ visit(sourceFile); ++ return declarations; ++} ++function findFirstFunctionCall(sourceFile, names) { ++ const calls = []; ++ function visit(node) { ++ if (ts.isCallExpression(node) && ts.isIdentifier(node.expression) && names.includes(node.expression.text)) { ++ calls.push(node); ++ return; ++ } ++ ts.forEachChild(node, visit); ++ } ++ visit(sourceFile); ++ return calls[0]; ++} ++function findInterface(sourceFile, name) { ++ let interfaceNode; ++ function visit(node) { ++ if (ts.isInterfaceDeclaration(node) && name === node.name.text) { ++ interfaceNode = node; ++ return; ++ } ++ ts.forEachChild(node, visit); ++ } ++ visit(sourceFile); ++ return interfaceNode; ++} ++const sourceFileVersion = new Map(); ++function incrementScriptVersion(script) { ++ const newVersion = (sourceFileVersion.get(script) ?? 1) + 1; ++ sourceFileVersion.set(script, newVersion); ++ return newVersion.toString(); ++} ++function applyEdits(edits) { ++ for (const edit of edits) { ++ const filePath = edit.fileName; ++ let fileContent = fs.existsSync(filePath) ? fs.readFileSync(filePath, 'utf8') : ''; ++ for (const textChange of [...edit.textChanges].reverse()) { ++ const { span, newText } = textChange; ++ fileContent = fileContent.slice(0, span.start) + newText + fileContent.slice(span.start + span.length); ++ } ++ fs.writeFileSync(filePath, fileContent); ++ incrementScriptVersion(filePath); ++ } ++} ++async function run() { ++ const configPath = ts.findConfigFile(SRC_DIR, ts.sys.fileExists, 'tsconfig.json'); ++ const configFile = ts.readConfigFile(configPath, ts.sys.readFile); ++ const parsedConfig = ts.parseJsonConfigFileContent(configFile.config, ts.sys, path.dirname(configPath)); ++ const servicesHost = { ++ getScriptFileNames: () => parsedConfig.fileNames.filter(f => !f.endsWith('.test.ts')), ++ getScriptVersion: fileName => sourceFileVersion.get(fileName)?.toString() ?? '1', ++ getScriptSnapshot: fileName => { ++ if (!fs.existsSync(fileName)) { ++ return undefined; ++ } ++ return ts.ScriptSnapshot.fromString(fs.readFileSync(fileName).toString()); ++ }, ++ getCurrentDirectory: () => SRC_DIR, ++ getCompilationSettings: () => ({ ++ 'paths': { ++ 'vs/*': [ ++ './vs/*' ++ ] ++ }, ++ forceConsistentCasingInFileNames: true ++ }), ++ getDefaultLibFileName: options => ts.getDefaultLibFilePath(options), ++ fileExists: ts.sys.fileExists, ++ readFile: ts.sys.readFile, ++ readDirectory: ts.sys.readDirectory, ++ directoryExists: ts.sys.directoryExists, ++ getDirectories: ts.sys.getDirectories, ++ writeFile: ts.sys.writeFile, ++ useCaseSensitiveFileNames() { ++ return true; ++ } ++ }; ++ const service = ts.createLanguageService(servicesHost, ts.createDocumentRegistry(true)); ++ const instantiationModule = service.getProgram().getSourceFile('vs/platform/instantiation/common/instantiation.ts'); ++ const serviceFiles = new Set(); ++ for (const declaration of findFunctionDeclarations(instantiationModule, SERVICE_REGISTRATION_FUNCTIONS_NAMES)) { ++ for (const ref of service.findReferences(instantiationModule.fileName, declaration.getStart())) { ++ ref.references.forEach(ref => serviceFiles.add(ref.fileName)); ++ } ++ } ++ const changedFiles = new Set(); ++ for (const fileName of serviceFiles) { ++ if (IGNORE.some(ignored => fileName.includes(ignored))) { ++ continue; ++ } ++ if (service.getProgram().getSourceFile(fileName) === undefined) { ++ throw new Error(`${fileName} not found`); ++ } ++ function moveToNewFile(range) { ++ const refactors = service.getApplicableRefactors(fileName, range, { ++ allowTextChangesInNewFiles: true, ++ allowRenameOfImportPath: true, ++ preferTypeOnlyAutoImports: true ++ }, undefined, undefined, true); ++ const moveToFileRefactor = refactors.find(r => r.name === 'Move to file'); ++ const edits = service.getEditsForRefactor(fileName, {}, range, moveToFileRefactor.name, moveToFileRefactor.actions[0].name, { ++ allowTextChangesInNewFiles: true, ++ allowRenameOfImportPath: true, ++ preferTypeOnlyAutoImports: true ++ }, { ++ targetFile: path.resolve(path.dirname(fileName), `${path.basename(fileName, '.ts')}.service.ts`) ++ }); ++ applyEdits(edits.edits); ++ edits.edits.forEach(e => changedFiles.add(e.fileName)); ++ } ++ console.log(fileName); ++ // Move service declarations to new file ++ let call; ++ const serviceNames = []; ++ while ((call = findFirstFunctionCall(service.getProgram().getSourceFile(fileName), SERVICE_REGISTRATION_FUNCTIONS_NAMES)) !== undefined) { ++ const serviceRegistrationNode = call.parent.parent.parent; ++ const serviceName = call.parent.name.text; ++ console.log('service:', serviceName); ++ serviceNames.push(serviceName); ++ const serviceInterface = findInterface(service.getProgram().getSourceFile(fileName), serviceName); ++ if (serviceInterface === undefined) { ++ throw new Error(`Service interface "${serviceInterface}" not found`); ++ } ++ const sourceFile = service.getProgram().getSourceFile(fileName); ++ const statements = [...sourceFile.getChildren()[0].getChildren().filter(ts.isStatement)]; ++ const serviceDefinitionIndex = statements.indexOf(serviceRegistrationNode); ++ const serviceInterfaceIndex = statements.indexOf(serviceInterface); ++ if (Math.abs(serviceInterfaceIndex - serviceDefinitionIndex) > 1) { ++ // Not next to each other => move the interface ++ statements.splice(serviceInterfaceIndex > serviceDefinitionIndex ? serviceDefinitionIndex + 1 : serviceDefinitionIndex, 0, ...statements.splice(serviceInterfaceIndex, 1)); ++ const newSourceFile = ts.factory.updateSourceFile(sourceFile, statements); ++ const content = ts.createPrinter().printNode(ts.EmitHint.Unspecified, newSourceFile, newSourceFile); ++ fs.writeFileSync(fileName, content); ++ incrementScriptVersion(fileName); ++ } ++ else { ++ moveToNewFile({ ++ pos: Math.min(serviceRegistrationNode.getStart(), serviceInterface.getStart()), ++ end: Math.max(serviceRegistrationNode.getEnd(), serviceInterface.getEnd()) ++ }); ++ } ++ } ++ } ++ for (const changedFile of ORGANIZE_IMPORTS) { ++ console.log('Organizing imports', changedFile); ++ applyEdits(service.organizeImports({ ++ fileName: changedFile, ++ type: 'file' ++ }, {}, undefined)); ++ } ++} ++void run(); ++//# sourceMappingURL=extractServices.js.map +\ No newline at end of file +diff --git a/build/lib/extractServices.ts b/build/lib/extractServices.ts +new file mode 100644 +index 00000000000..d69352c6e86 +--- /dev/null ++++ b/build/lib/extractServices.ts +@@ -0,0 +1,234 @@ ++/*--------------------------------------------------------------------------------------------- ++ * Copyright (c) Microsoft Corporation. All rights reserved. ++ * Licensed under the MIT License. See License.txt in the project root for license information. ++ *--------------------------------------------------------------------------------------------*/ ++ ++/** ++ * The point of this file is to extract the service identifier to be able to import them without importing everything from the module ++ * It prevent importing useless classes when we just want to register a mocked implementation of the service ++ */ ++ ++import * as ts from 'typescript'; ++import * as fs from 'fs'; ++import * as path from 'path'; ++ ++const REPO_ROOT = path.join(__dirname, '../../'); ++const SRC_DIR = path.join(REPO_ROOT, 'src'); ++ ++/** ++ * The language service fails to properly render imports ++ * (Either because there are namespace/interface/object using the same name ++ * or sometime an import is duplicated) ++ */ ++const ORGANIZE_IMPORTS = [ ++ 'vs/platform/log/common/log.service.ts', ++ 'vs/platform/update/common/update.service.ts', ++ 'vs/platform/markers/common/markers.service.ts', ++ 'vs/platform/userDataSync/common/userDataSync.service.ts', ++ 'vs/workbench/contrib/chat/common/chatAgents.service.ts', ++ 'vs/workbench/contrib/tasks/common/taskService.ts', ++ 'vs/workbench/workbench.web.main.ts' ++]; ++ ++const SERVICE_REGISTRATION_FUNCTIONS_NAMES = ['createDecorator', 'refineServiceDecorator']; ++const IGNORE = [ ++ 'vs/platform/instantiation/common/instantiation', ++ ++ // Editor services ++ 'vs/editor/', ++ 'vs/platform/actionWidget/browser/actionWidget', ++ 'vs/platform/undoRedo/common/undoRedoService', ++ 'vs/platform/instantiation/common/extensions', ++ ++ // The extension api, not modular anyway ++ 'vs/workbench/api/' ++]; ++ ++function findFunctionDeclarations(sourceFile: ts.SourceFile, names: string[]): ts.FunctionDeclaration[] { ++ const declarations: ts.FunctionDeclaration[] = []; ++ function visit(node: ts.Node) { ++ if (ts.isFunctionDeclaration(node) && node.name !== undefined && ts.isIdentifier(node.name) && names.includes(node.name.text)) { ++ declarations.push(node); ++ return; ++ } ++ ts.forEachChild(node, visit); ++ } ++ visit(sourceFile); ++ return declarations; ++} ++ ++function findFirstFunctionCall(sourceFile: ts.SourceFile, names: string[]): ts.CallExpression | undefined { ++ const calls: ts.CallExpression[] = []; ++ function visit(node: ts.Node) { ++ if (ts.isCallExpression(node) && ts.isIdentifier(node.expression) && names.includes(node.expression.text)) { ++ calls.push(node); ++ return; ++ } ++ ts.forEachChild(node, visit); ++ } ++ visit(sourceFile); ++ return calls[0]; ++} ++ ++function findInterface(sourceFile: ts.SourceFile, name: string): ts.InterfaceDeclaration | undefined { ++ let interfaceNode: ts.InterfaceDeclaration | undefined; ++ function visit(node: ts.Node) { ++ if (ts.isInterfaceDeclaration(node) && name === node.name.text) { ++ interfaceNode = node; ++ return; ++ } ++ ts.forEachChild(node, visit); ++ } ++ visit(sourceFile); ++ return interfaceNode; ++} ++ ++const sourceFileVersion = new Map(); ++function incrementScriptVersion(script: string) { ++ const newVersion = (sourceFileVersion.get(script) ?? 1) + 1; ++ sourceFileVersion.set(script, newVersion); ++ return newVersion.toString(); ++} ++ ++function applyEdits(edits: readonly ts.FileTextChanges[]) { ++ for (const edit of edits) { ++ const filePath = edit.fileName; ++ let fileContent = fs.existsSync(filePath) ? fs.readFileSync(filePath, 'utf8') : ''; ++ ++ for (const textChange of [...edit.textChanges].reverse()) { ++ const { span, newText } = textChange; ++ fileContent = fileContent.slice(0, span.start) + newText + fileContent.slice(span.start + span.length); ++ } ++ ++ fs.writeFileSync(filePath, fileContent); ++ incrementScriptVersion(filePath); ++ } ++} ++ ++ ++async function run() { ++ const configPath = ts.findConfigFile(SRC_DIR, ts.sys.fileExists, 'tsconfig.json')!; ++ const configFile = ts.readConfigFile(configPath, ts.sys.readFile); ++ const parsedConfig = ts.parseJsonConfigFileContent(configFile.config, ts.sys, path.dirname(configPath)); ++ ++ const servicesHost: ts.LanguageServiceHost = { ++ getScriptFileNames: () => parsedConfig.fileNames.filter(f => !f.endsWith('.test.ts')), ++ getScriptVersion: fileName => sourceFileVersion.get(fileName)?.toString() ?? '1', ++ getScriptSnapshot: fileName => { ++ if (!fs.existsSync(fileName)) { ++ return undefined; ++ } ++ ++ return ts.ScriptSnapshot.fromString(fs.readFileSync(fileName).toString()); ++ }, ++ getCurrentDirectory: () => SRC_DIR, ++ getCompilationSettings: () => ({ ++ 'paths': { ++ 'vs/*': [ ++ './vs/*' ++ ] ++ }, ++ forceConsistentCasingInFileNames: true ++ }), ++ getDefaultLibFileName: options => ts.getDefaultLibFilePath(options), ++ fileExists: ts.sys.fileExists, ++ readFile: ts.sys.readFile, ++ readDirectory: ts.sys.readDirectory, ++ directoryExists: ts.sys.directoryExists, ++ getDirectories: ts.sys.getDirectories, ++ writeFile: ts.sys.writeFile, ++ useCaseSensitiveFileNames() { ++ return true; ++ } ++ }; ++ const service = ts.createLanguageService(servicesHost, ts.createDocumentRegistry(true)); ++ ++ const instantiationModule = service.getProgram()!.getSourceFile('vs/platform/instantiation/common/instantiation.ts')!; ++ const serviceFiles = new Set(); ++ for (const declaration of findFunctionDeclarations(instantiationModule, SERVICE_REGISTRATION_FUNCTIONS_NAMES)) { ++ for (const ref of service.findReferences(instantiationModule.fileName, declaration.getStart())!) { ++ ref.references.forEach(ref => serviceFiles.add(ref.fileName)); ++ } ++ } ++ ++ const changedFiles = new Set(); ++ for (const fileName of serviceFiles) { ++ if (IGNORE.some(ignored => fileName.includes(ignored))) { ++ continue; ++ } ++ if (service.getProgram()!.getSourceFile(fileName) === undefined) { ++ throw new Error(`${fileName} not found`); ++ } ++ ++ function moveToNewFile(range: ts.TextRange) { ++ const refactors = service.getApplicableRefactors(fileName, range, { ++ allowTextChangesInNewFiles: true, ++ allowRenameOfImportPath: true, ++ preferTypeOnlyAutoImports: true ++ }, undefined, undefined, true); ++ const moveToFileRefactor = refactors.find(r => r.name === 'Move to file')!; ++ const edits = service.getEditsForRefactor(fileName, { ++ ++ }, range, moveToFileRefactor.name, moveToFileRefactor.actions[0].name, { ++ allowTextChangesInNewFiles: true, ++ allowRenameOfImportPath: true, ++ preferTypeOnlyAutoImports: true ++ }, { ++ targetFile: path.resolve(path.dirname(fileName), `${path.basename(fileName, '.ts')}.service.ts`) ++ })!; ++ ++ applyEdits(edits.edits); ++ edits.edits.forEach(e => changedFiles.add(e.fileName)); ++ } ++ ++ console.log(fileName); ++ ++ // Move service declarations to new file ++ let call: ts.CallExpression | undefined; ++ const serviceNames: string[] = []; ++ while ((call = findFirstFunctionCall(service.getProgram()!.getSourceFile(fileName)!, SERVICE_REGISTRATION_FUNCTIONS_NAMES)) !== undefined) { ++ const serviceRegistrationNode = call!.parent.parent.parent as ts.ExportDeclaration; ++ ++ const serviceName = ((call!.parent as ts.VariableDeclaration).name as ts.Identifier).text; ++ console.log('service:', serviceName); ++ serviceNames.push(serviceName); ++ ++ const serviceInterface = findInterface(service.getProgram()!.getSourceFile(fileName)!, serviceName); ++ if (serviceInterface === undefined) { ++ throw new Error(`Service interface "${serviceInterface}" not found`); ++ } ++ ++ const sourceFile = service.getProgram()!.getSourceFile(fileName)!; ++ ++ const statements = [...sourceFile.getChildren()[0].getChildren().filter(ts.isStatement)]; ++ const serviceDefinitionIndex = statements.indexOf(serviceRegistrationNode); ++ const serviceInterfaceIndex = statements.indexOf(serviceInterface); ++ ++ if (Math.abs(serviceInterfaceIndex - serviceDefinitionIndex) > 1) { ++ // Not next to each other => move the interface ++ statements.splice( ++ serviceInterfaceIndex > serviceDefinitionIndex ? serviceDefinitionIndex + 1 : serviceDefinitionIndex, 0, ++ ...statements.splice(serviceInterfaceIndex, 1) ++ ); ++ const newSourceFile = ts.factory.updateSourceFile(sourceFile, statements); ++ const content = ts.createPrinter().printNode(ts.EmitHint.Unspecified, newSourceFile, newSourceFile); ++ fs.writeFileSync(fileName, content); ++ incrementScriptVersion(fileName); ++ } else { ++ moveToNewFile({ ++ pos: Math.min(serviceRegistrationNode.getStart(), serviceInterface!.getStart()), ++ end: Math.max(serviceRegistrationNode.getEnd(), serviceInterface!.getEnd()) ++ }); ++ } ++ } ++ } ++ ++ for (const changedFile of ORGANIZE_IMPORTS) { ++ console.log('Organizing imports', changedFile); ++ applyEdits(service.organizeImports({ ++ fileName: changedFile, ++ type: 'file' ++ }, {}, undefined)); ++ } ++} ++void run(); From cc9dfbd2ad45c0e93649959957fabca8983caf4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Mangeonjean?= Date: Fri, 26 Apr 2024 12:12:40 +0200 Subject: [PATCH 06/12] fix: update imports --- .eslintrc | 3 +- src/extensions.ts | 8 +- src/lifecycle.ts | 5 +- src/localExtensionHost.ts | 18 +- src/missing-services.ts | 414 +++++++++--------- src/monaco.ts | 20 +- src/service-override/accessibility.ts | 6 +- src/service-override/ai.ts | 4 +- src/service-override/authentication.ts | 8 +- src/service-override/base.ts | 29 +- src/service-override/chat.ts | 42 +- src/service-override/comments.ts | 3 +- src/service-override/configuration.ts | 79 ++-- src/service-override/debug.ts | 9 +- src/service-override/dialogs.ts | 3 +- src/service-override/editSessions.ts | 7 +- src/service-override/editor.ts | 8 +- src/service-override/environment.ts | 7 +- src/service-override/explorer.ts | 2 +- src/service-override/extensionGallery.ts | 39 +- src/service-override/extensions.ts | 55 +-- src/service-override/files.ts | 15 +- src/service-override/host.ts | 4 +- src/service-override/interactive.ts | 6 +- src/service-override/issue.ts | 5 +- src/service-override/keybindings.ts | 29 +- .../languageDetectionWorker.ts | 2 +- src/service-override/languages.ts | 3 +- src/service-override/layout.ts | 21 +- src/service-override/lifecycle.ts | 5 +- src/service-override/localization.ts | 11 +- src/service-override/log.ts | 12 +- src/service-override/multiDiffEditor.ts | 3 +- src/service-override/notebook.ts | 27 +- src/service-override/notifications.ts | 4 +- src/service-override/outline.ts | 2 +- src/service-override/output.ts | 5 +- src/service-override/preferences.ts | 7 +- src/service-override/quickaccess.ts | 3 +- src/service-override/remoteAgent.ts | 37 +- src/service-override/scm.ts | 4 +- src/service-override/search.ts | 10 +- src/service-override/secretStorage.ts | 4 +- src/service-override/share.ts | 2 +- src/service-override/snippets.ts | 5 +- src/service-override/speech.ts | 2 +- src/service-override/storage.ts | 12 +- src/service-override/task.ts | 2 +- src/service-override/terminal.ts | 21 +- src/service-override/testing.ts | 24 +- src/service-override/textmate.ts | 5 +- src/service-override/theme.ts | 2 +- src/service-override/timeline.ts | 2 +- src/service-override/tools/editor.ts | 24 +- src/service-override/tools/views.ts | 12 +- src/service-override/userDataSync.ts | 35 +- src/service-override/viewBanner.ts | 2 +- src/service-override/viewCommon.ts | 45 +- src/service-override/viewStatusBar.ts | 2 +- src/service-override/viewTitleBar.ts | 2 +- src/service-override/views.ts | 35 +- src/service-override/walkthrough.ts | 3 +- src/service-override/workbench.ts | 8 +- src/service-override/workingCopy.ts | 10 +- src/service-override/workspaceTrust.ts | 2 +- src/services.ts | 147 ++++--- src/tools/l10n.ts | 4 +- 67 files changed, 759 insertions(+), 637 deletions(-) diff --git a/.eslintrc b/.eslintrc index f2e01a7d..a4ba2491 100644 --- a/.eslintrc +++ b/.eslintrc @@ -36,7 +36,8 @@ "api": "always", "all": "always", "main": "always", - "save": "always" + "save": "always", + "service": "always" } ], "@typescript-eslint/no-unused-vars": [ diff --git a/src/extensions.ts b/src/extensions.ts index 1e07dbaa..61290d51 100644 --- a/src/extensions.ts +++ b/src/extensions.ts @@ -1,6 +1,6 @@ import type * as vscode from 'vscode' import { ExtensionType, IExtension, IExtensionContributions, IExtensionManifest, TargetPlatform } from 'vs/platform/extensions/common/extensions' -import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions' +import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions.service' import { URI } from 'vs/base/common/uri' import { getExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil' import { DisposableStore, IDisposable } from 'vs/base/common/lifecycle' @@ -8,11 +8,11 @@ import { ITranslations } from 'vs/platform/extensionManagement/common/extensionN import { joinPath } from 'vs/base/common/resources' import { FileAccess, Schemas } from 'vs/base/common/network' import { ExtensionHostKind } from 'vs/workbench/services/extensions/common/extensionHostKind' -import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService' +import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService.service' import { parse } from 'vs/base/common/json' -import { IFileService } from 'vs/platform/files/common/files' +import { IFileService } from 'vs/platform/files/common/files.service' import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation' -import { IWorkbenchExtensionEnablementService } from 'vs/workbench/services/extensionManagement/common/extensionManagement' +import { IWorkbenchExtensionEnablementService } from 'vs/workbench/services/extensionManagement/common/extensionManagement.service' import { StandaloneServices } from 'vs/editor/standalone/browser/standaloneServices' import { IExtensionWithExtHostKind, ExtensionServiceOverride } from './service-override/extensions' import { CustomSchemas, registerExtensionFile } from './service-override/files' diff --git a/src/lifecycle.ts b/src/lifecycle.ts index f99b4e90..09d30aeb 100644 --- a/src/lifecycle.ts +++ b/src/lifecycle.ts @@ -1,13 +1,14 @@ import { Registry } from 'vs/platform/registry/common/platform' import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions' -import { ILifecycleService, LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle' +import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle' +import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle.service' import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation' import { Barrier, RunOnceScheduler, _runWhenIdle, timeout } from 'vs/base/common/async' import { Emitter } from 'vs/base/common/event' import { EditorExtensions, IEditorFactoryRegistry } from 'vs/workbench/common/editor' import { StandaloneServices } from 'vs/editor/standalone/browser/standaloneServices' import { Disposable } from 'vs/base/common/lifecycle' -import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService' +import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService.service' const layoutEmitter = new Emitter() export const onLayout = layoutEmitter.event diff --git a/src/localExtensionHost.ts b/src/localExtensionHost.ts index 7e48802e..a8fb0054 100644 --- a/src/localExtensionHost.ts +++ b/src/localExtensionHost.ts @@ -13,15 +13,17 @@ import * as platform from 'vs/base/common/platform' import { IMessagePassingProtocol } from 'vs/base/parts/ipc/common/ipc' import { LocalProcessRunningLocation } from 'vs/workbench/services/extensions/common/extensionRunningLocation' import { IExtHostExtensionService, IHostUtils } from 'vs/workbench/api/common/extHostExtensionService' -import { ExtensionHostExtensions, ExtensionHostStartup, IExtensionHost, IExtensionService, nullExtensionDescription } from 'vs/workbench/services/extensions/common/extensions' +import { ExtensionHostExtensions, ExtensionHostStartup, IExtensionHost, nullExtensionDescription } from 'vs/workbench/services/extensions/common/extensions' +import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions.service' import { IWebWorkerExtensionHostDataProvider } from 'vs/workbench/services/extensions/browser/webWorkerExtensionHost' -import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry' -import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace' -import { ILabelService } from 'vs/platform/label/common/label' -import { ILogService, ILoggerService } from 'vs/platform/log/common/log' -import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService' -import { IProductService } from 'vs/platform/product/common/productService' -import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile' +import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry.service' +import { WorkbenchState } from 'vs/platform/workspace/common/workspace' +import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace.service' +import { ILabelService } from 'vs/platform/label/common/label.service' +import { ILogService, ILoggerService } from 'vs/platform/log/common/log.service' +import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService.service' +import { IProductService } from 'vs/platform/product/common/productService.service' +import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile.service' import { URI } from 'vs/base/common/uri' import { Event } from 'vs/base/common/event' import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions' diff --git a/src/missing-services.ts b/src/missing-services.ts index a0d142f9..a0d8b42d 100644 --- a/src/missing-services.ts +++ b/src/missing-services.ts @@ -1,208 +1,232 @@ +import { mainWindow } from 'vs/base/browser/window' import { Event } from 'vs/base/common/event' -import { URI } from 'vs/base/common/uri' -import { IEditorService } from 'vs/workbench/services/editor/common/editorService' -import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite' -import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity' -import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles' -import { IFileService } from 'vs/platform/files/common/files' -import { GroupOrientation, IEditorGroup, IEditorGroupsService, IEditorPart } from 'vs/workbench/services/editor/common/editorGroupsService' -import { IWorkingCopyFileService } from 'vs/workbench/services/workingCopy/common/workingCopyFileService' -import { IPathService } from 'vs/workbench/services/path/common/pathService' -import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions' -import { IProductService } from 'vs/platform/product/common/productService' -import { ILanguageStatusService } from 'vs/workbench/services/languageStatus/common/languageStatusService' -import { IHostService } from 'vs/workbench/services/host/browser/host' -import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle' -import { ILanguageDetectionService } from 'vs/workbench/services/languageDetection/common/languageDetectionWorkerService' -import { IExtensionService, NullExtensionService } from 'vs/workbench/services/extensions/common/extensions' -import { IKeyboardLayoutService } from 'vs/platform/keyboardLayout/common/keyboardLayout' +import { Disposable, IDisposable } from 'vs/base/common/lifecycle' +import { ResourceSet } from 'vs/base/common/map' import { OS } from 'vs/base/common/platform' -import { IEnvironmentService } from 'vs/platform/environment/common/environment' -import { IUserDataInitializationService } from 'vs/workbench/services/userData/browser/userDataInit' -import { IHostColorSchemeService } from 'vs/workbench/services/themes/common/hostColorSchemeService' -import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences' -import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey' -import { StandaloneServices } from 'vs/editor/standalone/browser/standaloneServices' +import { joinPath } from 'vs/base/common/resources' +import { URI } from 'vs/base/common/uri' import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService' -import { IUserDataProfilesService, toUserDataProfile } from 'vs/platform/userDataProfile/common/userDataProfile' -import { IPolicyService, NullPolicyService } from 'vs/platform/policy/common/policy' -import { IUserDataProfileImportExportService, IUserDataProfileManagementService, IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile' -import { UserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfileService' -import { ISnippetsService } from 'vs/workbench/contrib/snippets/browser/snippets' -import { AbstractLoggerService, ILogger, ILoggerService, LogLevel, NullLogger } from 'vs/platform/log/common/log' -import { Disposable, IDisposable } from 'vs/base/common/lifecycle' -import { FallbackKeyboardMapper } from 'vs/workbench/services/keybinding/common/fallbackKeyboardMapper' -import { ITextMateTokenizationService } from 'vs/workbench/services/textMate/browser/textMateTokenizationFeature' -import { IDebugService, IDebugModel, IViewModel, IAdapterManager } from 'vs/workbench/contrib/debug/common/debug' -import { IWorkspaceTrustEnablementService, IWorkspaceTrustRequestService, WorkspaceTrustUriResponse } from 'vs/platform/workspace/common/workspaceTrust' -import { IActivityService } from 'vs/workbench/services/activity/common/activity' -import { IExtensionHostDebugService } from 'vs/platform/debug/common/extensionHostDebug' -import { IViewContainerModel, IViewDescriptorService } from 'vs/workbench/common/views' -import { IHistoryService } from 'vs/workbench/services/history/common/history' -import { ITaskService } from 'vs/workbench/contrib/tasks/common/taskService' -import { IConfigurationResolverService } from 'vs/workbench/services/configurationResolver/common/configurationResolver' -import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService' -import { ICustomEndpointTelemetryService } from 'vs/platform/telemetry/common/telemetry' +import { IModelService } from 'vs/editor/common/services/model' +import { ITreeViewsDnDService } from 'vs/editor/common/services/treeViewsDndService' +import { StandaloneServices } from 'vs/editor/standalone/browser/standaloneServices' +import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey.service' +import { IExtensionHostDebugService } from 'vs/platform/debug/common/extensionHostDebug.service' +import { IDiagnosticsService } from 'vs/platform/diagnostics/common/diagnostics.service' +import { NullDiagnosticsService } from 'vs/platform/diagnostics/common/diagnostics' +import { IFileDialogService } from 'vs/platform/dialogs/common/dialogs.service' +import { IDownloadService } from 'vs/platform/download/common/download.service' +import { IEncryptionService } from 'vs/platform/encryption/common/encryptionService.service' +import { IEnvironmentService } from 'vs/platform/environment/common/environment.service' +import { ILocalExtension } from 'vs/platform/extensionManagement/common/extensionManagement' +import { IExtensionGalleryService, IExtensionManagementService, IExtensionTipsService, IGlobalExtensionEnablementService } from 'vs/platform/extensionManagement/common/extensionManagement.service' +import { IExtensionStorageService } from 'vs/platform/extensionManagement/common/extensionStorage.service' +import { IExtensionsProfileScannerService } from 'vs/platform/extensionManagement/common/extensionsProfileScannerService.service' +import { IExtensionsScannerService } from 'vs/platform/extensionManagement/common/extensionsScannerService.service' +import { IExtensionRecommendationNotificationService } from 'vs/platform/extensionRecommendations/common/extensionRecommendations.service' +import { IExtensionResourceLoaderService } from 'vs/platform/extensionResourceLoader/common/extensionResourceLoader.service' +import { IExtension, IRelaxedExtensionDescription } from 'vs/platform/extensions/common/extensions' +import { IBuiltinExtensionsScannerService } from 'vs/platform/extensions/common/extensions.service' +import { IFileService } from 'vs/platform/files/common/files.service' +import { IHoverService } from 'vs/platform/hover/browser/hover.service' +import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions' +import { IKeyboardLayoutService } from 'vs/platform/keyboardLayout/common/keyboardLayout.service' +import { ILanguagePackItem } from 'vs/platform/languagePacks/common/languagePacks' +import { ILanguagePackService } from 'vs/platform/languagePacks/common/languagePacks.service' +import { ILogger, LogLevel, AbstractLoggerService, NullLogger } from 'vs/platform/log/common/log' +import { ILoggerService } from 'vs/platform/log/common/log.service' +import { NullPolicyService } from 'vs/platform/policy/common/policy' +import { IPolicyService } from 'vs/platform/policy/common/policy.service' +import { IProductService } from 'vs/platform/product/common/productService.service' +import { IRemoteAuthorityResolverService } from 'vs/platform/remote/common/remoteAuthorityResolver.service' +import { IRemoteExtensionsScannerService } from 'vs/platform/remote/common/remoteExtensionsScanner.service' +import { IRemoteSocketFactoryService } from 'vs/platform/remote/common/remoteSocketFactoryService.service' +import { IRequestService } from 'vs/platform/request/common/request.service' +import { ISecretStorageService } from 'vs/platform/secrets/common/secrets.service' +import { ISignService } from 'vs/platform/sign/common/sign.service' +import { IMessage } from 'vs/platform/sign/common/sign' +import { ICustomEndpointTelemetryService } from 'vs/platform/telemetry/common/telemetry.service' import { NullEndpointTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils' -import { ISearchComplete, ISearchService } from 'vs/workbench/services/search/common/search' -import { IRequestService } from 'vs/platform/request/common/request' -import { IEditSessionIdentityService } from 'vs/platform/workspace/common/editSessions' -import { IWorkspaceEditingService } from 'vs/workbench/services/workspaces/common/workspaceEditing' -import { ITimerService } from 'vs/workbench/services/timer/browser/timerService' -import { IExtensionsWorkbenchService } from 'vs/workbench/contrib/extensions/common/extensions' -import { EnablementState, IExtensionManagementServerService, IWebExtensionsScannerService, IWorkbenchExtensionEnablementService, IWorkbenchExtensionManagementService } from 'vs/workbench/services/extensionManagement/common/extensionManagement' -import { ITunnelService } from 'vs/platform/tunnel/common/tunnel' -import { IResolvedWorkingCopyBackup, IWorkingCopyBackupService } from 'vs/workbench/services/workingCopy/common/workingCopyBackup' -import { IWorkingCopyService } from 'vs/workbench/services/workingCopy/common/workingCopyService' -import { IFilesConfigurationService } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService' -import { IUntitledTextEditorService } from 'vs/workbench/services/untitled/common/untitledTextEditorService' -import { IFileDialogService } from 'vs/platform/dialogs/common/dialogs' -import { IElevatedFileService } from 'vs/workbench/services/files/common/elevatedFileService' -import { IDecorationsService } from 'vs/workbench/services/decorations/common/decorations' +import { TerminalCapability } from 'vs/platform/terminal/common/capabilities/capabilities' +import { TerminalLocation } from 'vs/platform/terminal/common/terminal' +import { ITerminalLogService } from 'vs/platform/terminal/common/terminal.service' +import { ITunnelService } from 'vs/platform/tunnel/common/tunnel.service' +import { State } from 'vs/platform/update/common/update' +import { IUpdateService } from 'vs/platform/update/common/update.service' +import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity.service' import { UriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentityService' -import { IJSONEditingService } from 'vs/workbench/services/configuration/common/jsonEditing' -import { IWorkspacesService } from 'vs/platform/workspaces/common/workspaces' -import { ITextEditorService } from 'vs/workbench/services/textfile/common/textEditorService' -import { IEditorResolverService } from 'vs/workbench/services/editor/common/editorResolverService' -import { AbstractLifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycleService' -import { IOutputChannel, IOutputChannelDescriptor, IOutputService } from 'vs/workbench/services/output/common/output' -import { IOutputChannelModelService } from 'vs/workbench/contrib/output/common/outputChannelModelService' -import { IExtensionResourceLoaderService } from 'vs/platform/extensionResourceLoader/common/extensionResourceLoader' -import { IExplorerService } from 'vs/workbench/contrib/files/browser/files' -import { IExtensionStorageService } from 'vs/platform/extensionManagement/common/extensionStorage' -import { ILanguagePackItem, ILanguagePackService } from 'vs/platform/languagePacks/common/languagePacks' -import { ITreeViewsDnDService } from 'vs/editor/common/services/treeViewsDndService' -import { ITreeViewsService } from 'vs/workbench/services/views/browser/treeViewsService' -import { IBreadcrumbsService } from 'vs/workbench/browser/parts/editor/breadcrumbs' -import { IOutlineService } from 'vs/workbench/services/outline/browser/outline' -import { IUpdateService, State } from 'vs/platform/update/common/update' -import { IStatusbarService } from 'vs/workbench/services/statusbar/browser/statusbar' -import { IExtensionGalleryService, IExtensionManagementService, IExtensionTipsService, IGlobalExtensionEnablementService, ILocalExtension } from 'vs/platform/extensionManagement/common/extensionManagement' -import { IModelService } from 'vs/editor/common/services/model' -import { ITerminalEditorService, ITerminalGroupService, ITerminalInstance, ITerminalInstanceService, ITerminalService, TerminalConnectionState } from 'vs/workbench/contrib/terminal/browser/terminal' -import { ITerminalProfileResolverService, ITerminalProfileService } from 'vs/workbench/contrib/terminal/common/terminal' -import { ITerminalLogService, TerminalLocation } from 'vs/platform/terminal/common/terminal' -import { ITerminalContributionService } from 'vs/workbench/contrib/terminal/common/terminalExtensionPoints' -import { ITerminalLinkProviderService } from 'vs/workbench/contrib/terminalContrib/links/browser/links' -import { IEnvironmentVariableService } from 'vs/workbench/contrib/terminal/common/environmentVariable' -import { ITerminalQuickFixService } from 'vs/workbench/contrib/terminalContrib/quickFix/browser/quickFix' -import { IPreferencesSearchService } from 'vs/workbench/contrib/preferences/common/preferences' -import { AccountStatus, IUserDataSyncWorkbenchService } from 'vs/workbench/services/userDataSync/common/userDataSync' -import { IUserDataAutoSyncService, IUserDataSyncEnablementService, IUserDataSyncLocalStoreService, IUserDataSyncLogService, IUserDataSyncResourceProviderService, IUserDataSyncService, IUserDataSyncStoreManagementService, IUserDataSyncStoreService, IUserDataSyncUtilService, SyncStatus } from 'vs/platform/userDataSync/common/userDataSync' -import { IKeybindingEditingService } from 'vs/workbench/services/keybinding/common/keybindingEditing' -import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService' -import { ISearchHistoryService } from 'vs/workbench/contrib/search/common/searchHistoryService' -import { IReplaceService } from 'vs/workbench/contrib/search/browser/replace' -import { ISearchViewModelWorkbenchService } from 'vs/workbench/contrib/search/browser/searchModel' -import { INotebookEditorService } from 'vs/workbench/contrib/notebook/browser/services/notebookEditorService' -import { INotebookEditorModelResolverService } from 'vs/workbench/contrib/notebook/common/notebookEditorModelResolverService' -import { IWorkingCopyEditorService } from 'vs/workbench/services/workingCopy/common/workingCopyEditorService' -import { IUserActivityService } from 'vs/workbench/services/userActivity/common/userActivityService' -import { ICanonicalUriService } from 'vs/platform/workspace/common/canonicalUri' +import { IURLService } from 'vs/platform/url/common/url.service' +import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile.service' +import { IIgnoredExtensionsManagementService } from 'vs/platform/userDataSync/common/ignoredExtensions.service' +import { SyncStatus } from 'vs/platform/userDataSync/common/userDataSync' +import { IUserDataAutoSyncService, IUserDataSyncEnablementService, IUserDataSyncLocalStoreService, IUserDataSyncLogService, IUserDataSyncResourceProviderService, IUserDataSyncService, IUserDataSyncStoreManagementService, IUserDataSyncStoreService, IUserDataSyncUtilService } from 'vs/platform/userDataSync/common/userDataSync.service' +import { IUserDataSyncAccountService } from 'vs/platform/userDataSync/common/userDataSyncAccount.service' +import { IUserDataSyncMachinesService } from 'vs/platform/userDataSync/common/userDataSyncMachines.service' +import { ICanonicalUriService } from 'vs/platform/workspace/common/canonicalUri.service' +import { IEditSessionIdentityService } from 'vs/platform/workspace/common/editSessions.service' +import { WorkspaceTrustUriResponse } from 'vs/platform/workspace/common/workspaceTrust' +import { IWorkspaceTrustEnablementService, IWorkspaceTrustRequestService } from 'vs/platform/workspace/common/workspaceTrust.service' +import { IWorkspacesService } from 'vs/platform/workspaces/common/workspaces.service' import { ExtensionStatusBarEntry, IExtensionStatusBarItemService, StatusBarUpdateKind } from 'vs/workbench/api/browser/statusBarService' -import { IWorkbenchAssignmentService } from 'vs/workbench/services/assignment/common/assignmentService' -import { IChatService } from 'vs/workbench/contrib/chat/common/chatService' -import { IEmbedderTerminalService } from 'vs/workbench/services/terminal/common/embedderTerminalService' -import { ICustomEditorService } from 'vs/workbench/contrib/customEditor/common/customEditor' -import { IWebviewWorkbenchService } from 'vs/workbench/contrib/webviewPanel/browser/webviewWorkbenchService' -import { IWebview, IWebviewService } from 'vs/workbench/contrib/webview/browser/webview' -import { IWebviewViewService } from 'vs/workbench/contrib/webviewView/browser/webviewViewService' -import { IRemoteAuthorityResolverService } from 'vs/platform/remote/common/remoteAuthorityResolver' -import { IExternalUriOpenerService } from 'vs/workbench/contrib/externalUriOpener/common/externalUriOpenerService' -import { IAccessibleViewService } from 'vs/workbench/contrib/accessibility/browser/accessibleView' -import { IExtension, IBuiltinExtensionsScannerService, IRelaxedExtensionDescription } from 'vs/platform/extensions/common/extensions' -import { IExtensionManifestPropertiesService } from 'vs/workbench/services/extensions/common/extensionManifestPropertiesService' -import { IRemoteExtensionsScannerService } from 'vs/platform/remote/common/remoteExtensionsScanner' -import { IURLService } from 'vs/platform/url/common/url' -import { IRemoteSocketFactoryService } from 'vs/platform/remote/common/remoteSocketFactoryService' -import { IQuickDiffService } from 'vs/workbench/contrib/scm/common/quickDiff' -import { ISCMService, ISCMViewService } from 'vs/workbench/contrib/scm/common/scm' -import { IDownloadService } from 'vs/platform/download/common/download' -import { IExtensionUrlHandler } from 'vs/workbench/services/extensions/browser/extensionUrlHandler' -import { ICommentService } from 'vs/workbench/contrib/comments/browser/commentService' -import { INotebookCellStatusBarService } from 'vs/workbench/contrib/notebook/common/notebookCellStatusBarService' -import { INotebookKernelHistoryService, INotebookKernelService } from 'vs/workbench/contrib/notebook/common/notebookKernelService' -import { INotebookRendererMessagingService } from 'vs/workbench/contrib/notebook/common/notebookRendererMessagingService' -import { IInteractiveDocumentService } from 'vs/workbench/contrib/interactive/browser/interactiveDocumentService' -import { IInlineChatService } from 'vs/workbench/contrib/inlineChat/common/inlineChat' -import { IChatAccessibilityService, IChatCodeBlockContextProviderService, IChatWidgetService, IQuickChatService } from 'vs/workbench/contrib/chat/browser/chat' -import { IRemoteExplorerService } from 'vs/workbench/services/remote/common/remoteExplorerService' -import { IAuthenticationExtensionsService, IAuthenticationService } from 'vs/workbench/services/authentication/common/authentication' -import { ITimelineService } from 'vs/workbench/contrib/timeline/common/timeline' -import { ITestService } from 'vs/workbench/contrib/testing/common/testService' -import { ISecretStorageService } from 'vs/platform/secrets/common/secrets' -import { IShareService } from 'vs/workbench/contrib/share/common/share' -import { IWorkbenchIssueService } from 'vs/workbench/services/issue/common/issue' -import { INotebookExecutionStateService } from 'vs/workbench/contrib/notebook/common/notebookExecutionStateService' -import { IChatContributionService } from 'vs/workbench/contrib/chat/common/chatContributionService' -import { ITestProfileService } from 'vs/workbench/contrib/testing/common/testProfileService' -import { IEncryptionService } from 'vs/platform/encryption/common/encryptionService' -import { ITestResultService } from 'vs/workbench/contrib/testing/common/testResultService' -import { IDiagnosticsService, NullDiagnosticsService } from 'vs/platform/diagnostics/common/diagnostics' -import { INotebookSearchService } from 'vs/workbench/contrib/search/common/notebookSearch' -import { IChatSlashCommandService } from 'vs/workbench/contrib/chat/common/chatSlashCommands' -import { IChatVariablesService } from 'vs/workbench/contrib/chat/common/chatVariables' -import { IAiRelatedInformationService } from 'vs/workbench/services/aiRelatedInformation/common/aiRelatedInformation' -import { IAiEmbeddingVectorService } from 'vs/workbench/services/aiEmbeddingVector/common/aiEmbeddingVectorService' -import { ResourceSet } from 'vs/base/common/map' +import { IBreadcrumbsService } from 'vs/workbench/browser/parts/editor/breadcrumbs.service' import { DEFAULT_EDITOR_PART_OPTIONS, IEditorGroupView } from 'vs/workbench/browser/parts/editor/editor' -import { IMessage, ISignService } from 'vs/platform/sign/common/sign' -import { IBannerService } from 'vs/workbench/services/banner/browser/bannerService' -import { IChatAgentService } from 'vs/workbench/contrib/chat/common/chatAgents' -import { IActiveLanguagePackService, ILocaleService } from 'vs/workbench/services/localization/common/locale' -import { joinPath } from 'vs/base/common/resources' -import { IExtensionIgnoredRecommendationsService, IExtensionRecommendationsService } from 'vs/workbench/services/extensionRecommendations/common/extensionRecommendations' -import { IIgnoredExtensionsManagementService } from 'vs/platform/userDataSync/common/ignoredExtensions' -import { IExtensionRecommendationNotificationService } from 'vs/platform/extensionRecommendations/common/extensionRecommendations' -import { IWorkspaceExtensionsConfigService } from 'vs/workbench/services/extensionRecommendations/common/workspaceExtensionsConfig' -import { IRemoteUserDataProfilesService } from 'vs/workbench/services/userDataProfile/common/remoteUserDataProfiles' -import { IExtensionBisectService } from 'vs/workbench/services/extensionManagement/browser/extensionBisect' -import { IUserDataSyncAccountService } from 'vs/platform/userDataSync/common/userDataSyncAccount' -import { IWorkingCopyIdentifier, IWorkingCopyBackupMeta } from 'vs/workbench/services/workingCopy/common/workingCopy' -import { ITestResultStorage } from 'vs/workbench/contrib/testing/common/testResultStorage' -import { ITestingDecorationsService } from 'vs/workbench/contrib/testing/common/testingDecorations' -import { ITestingContinuousRunService } from 'vs/workbench/contrib/testing/common/testingContinuousRunService' -import { ITestExplorerFilterState } from 'vs/workbench/contrib/testing/common/testExplorerFilterState' -import { ITestingPeekOpener } from 'vs/workbench/contrib/testing/common/testingPeekOpener' -import { IAuxiliaryWindowService } from 'vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService' -import { ISpeechService } from 'vs/workbench/contrib/speech/common/speechService' -import { ITitleService } from 'vs/workbench/services/title/browser/titleService' -import { ITestCoverageService } from 'vs/workbench/contrib/testing/common/testCoverageService' -import { IChatWidgetHistoryService } from 'vs/workbench/contrib/chat/common/chatWidgetHistoryService' -import { INotebookEditorWorkerService } from 'vs/workbench/contrib/notebook/common/services/notebookWorkerService' -import { INotebookExecutionService } from 'vs/workbench/contrib/notebook/common/notebookExecutionService' -import { INotebookKeymapService } from 'vs/workbench/contrib/notebook/common/notebookKeymapService' -import { INotebookLoggingService } from 'vs/workbench/contrib/notebook/common/notebookLoggingService' -import { IWalkthroughsService } from 'vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedService' -import { IUserDataSyncMachinesService } from 'vs/platform/userDataSync/common/userDataSyncMachines' -import { IWorkingCopyHistoryService } from 'vs/workbench/services/workingCopy/common/workingCopyHistory' -import { mainWindow } from 'vs/base/browser/window' -import { IViewsService } from 'vs/workbench/services/views/common/viewsService' -import { IHoverService } from 'vs/platform/hover/browser/hover' -import { IInlineChatSessionService } from 'vs/workbench/contrib/inlineChat/browser/inlineChatSessionService' -import { IInlineChatSavingService } from 'vs/workbench/contrib/inlineChat/browser/inlineChatSavingService' -import { INotebookDocumentService } from 'vs/workbench/services/notebook/common/notebookDocumentService' -import { IDebugVisualizerService } from 'vs/workbench/contrib/debug/common/debugVisualizers' -import { IEditSessionsLogService, IEditSessionsStorageService, SyncResource } from 'vs/workbench/contrib/editSessions/common/editSessions' -import { IMultiDiffSourceResolverService } from 'vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService' -import { IInteractiveHistoryService } from 'vs/workbench/contrib/interactive/browser/interactiveHistoryService' -import { IWorkspaceTagsService } from 'vs/workbench/contrib/tags/common/workspaceTags' +import { IViewDescriptorService } from 'vs/workbench/common/views.service' +import { IAccessibleViewService } from 'vs/workbench/contrib/accessibility/browser/accessibleView.service' +import { IChatAccessibilityService, IChatCodeBlockContextProviderService, IChatWidgetService, IQuickChatService } from 'vs/workbench/contrib/chat/browser/chat.service' +import { IChatAgentService } from 'vs/workbench/contrib/chat/common/chatAgents.service' +import { IChatContributionService } from 'vs/workbench/contrib/chat/common/chatContributionService.service' +import { IChatService } from 'vs/workbench/contrib/chat/common/chatService.service' +import { IChatSlashCommandService } from 'vs/workbench/contrib/chat/common/chatSlashCommands.service' +import { IChatVariablesService } from 'vs/workbench/contrib/chat/common/chatVariables.service' +import { IChatWidgetHistoryService } from 'vs/workbench/contrib/chat/common/chatWidgetHistoryService.service' +import { ILanguageModelsService } from 'vs/workbench/contrib/chat/common/languageModels.service' +import { ICommentService } from 'vs/workbench/contrib/comments/browser/commentService.service' +import { ICustomEditorService } from 'vs/workbench/contrib/customEditor/common/customEditor.service' +import { IDebugService } from 'vs/workbench/contrib/debug/common/debug.service' +import { IDebugVisualizerService } from 'vs/workbench/contrib/debug/common/debugVisualizers.service' +import { IEditSessionsLogService, IEditSessionsStorageService } from 'vs/workbench/contrib/editSessions/common/editSessions.service' +import { IExtensionsWorkbenchService } from 'vs/workbench/contrib/extensions/common/extensions.service' +import { IExternalUriOpenerService } from 'vs/workbench/contrib/externalUriOpener/common/externalUriOpenerService.service' +import { IExplorerService } from 'vs/workbench/contrib/files/browser/files.service' +import { IInlineChatSavingService } from 'vs/workbench/contrib/inlineChat/browser/inlineChatSavingService.service' +import { IInlineChatSessionService } from 'vs/workbench/contrib/inlineChat/browser/inlineChatSessionService.service' +import { IInlineChatService } from 'vs/workbench/contrib/inlineChat/common/inlineChat.service' +import { IInteractiveDocumentService } from 'vs/workbench/contrib/interactive/browser/interactiveDocumentService.service' +import { IInteractiveHistoryService } from 'vs/workbench/contrib/interactive/browser/interactiveHistoryService.service' +import { IDefaultLogLevelsService } from 'vs/workbench/contrib/logs/common/defaultLogLevels.service' +import { IMultiDiffSourceResolverService } from 'vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService.service' +import { INotebookEditorService } from 'vs/workbench/contrib/notebook/browser/services/notebookEditorService.service' +import { INotebookCellStatusBarService } from 'vs/workbench/contrib/notebook/common/notebookCellStatusBarService.service' +import { INotebookEditorModelResolverService } from 'vs/workbench/contrib/notebook/common/notebookEditorModelResolverService.service' +import { INotebookExecutionService } from 'vs/workbench/contrib/notebook/common/notebookExecutionService.service' +import { INotebookExecutionStateService } from 'vs/workbench/contrib/notebook/common/notebookExecutionStateService.service' +import { INotebookKernelHistoryService, INotebookKernelService } from 'vs/workbench/contrib/notebook/common/notebookKernelService.service' +import { INotebookKeymapService } from 'vs/workbench/contrib/notebook/common/notebookKeymapService.service' +import { INotebookLoggingService } from 'vs/workbench/contrib/notebook/common/notebookLoggingService.service' +import { INotebookRendererMessagingService } from 'vs/workbench/contrib/notebook/common/notebookRendererMessagingService.service' +import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService.service' +import { INotebookEditorWorkerService } from 'vs/workbench/contrib/notebook/common/services/notebookWorkerService.service' +import { IOutputChannelModelService } from 'vs/workbench/contrib/output/common/outputChannelModelService.service' +import { IPreferencesSearchService } from 'vs/workbench/contrib/preferences/common/preferences.service' +import { IQuickDiffService } from 'vs/workbench/contrib/scm/common/quickDiff.service' +import { ISCMService, ISCMViewService } from 'vs/workbench/contrib/scm/common/scm.service' +import { IReplaceService } from 'vs/workbench/contrib/search/browser/replace.service' +import { ISearchViewModelWorkbenchService } from 'vs/workbench/contrib/search/browser/searchModel.service' +import { INotebookSearchService } from 'vs/workbench/contrib/search/common/notebookSearch.service' +import { ISearchHistoryService } from 'vs/workbench/contrib/search/common/searchHistoryService.service' +import { IShareService } from 'vs/workbench/contrib/share/common/share.service' +import { ISnippetsService } from 'vs/workbench/contrib/snippets/browser/snippets.service' +import { ISpeechService } from 'vs/workbench/contrib/speech/common/speechService.service' import { NoOpWorkspaceTagsService } from 'vs/workbench/contrib/tags/browser/workspaceTagsService' -import { IExtensionFeaturesManagementService } from 'vs/workbench/services/extensionManagement/common/extensionFeatures' -import { IEditorPaneService } from 'vs/workbench/services/editor/common/editorPaneService' -import { IWorkspaceIdentityService } from 'vs/workbench/services/workspaces/common/workspaceIdentityService' -import { IDefaultLogLevelsService } from 'vs/workbench/contrib/logs/common/defaultLogLevels' -import { ILanguageModelsService } from 'vs/workbench/contrib/chat/common/languageModels' -import { IExtensionsScannerService } from 'vs/platform/extensionManagement/common/extensionsScannerService' -import { IAuthenticationAccessService } from 'vs/workbench/services/authentication/browser/authenticationAccessService' -import { IAuthenticationUsageService } from 'vs/workbench/services/authentication/browser/authenticationUsageService' -import { ICustomEditorLabelService } from 'vs/workbench/services/editor/common/customEditorLabelService' -import { IExtensionsProfileScannerService } from 'vs/platform/extensionManagement/common/extensionsProfileScannerService' +import { IWorkspaceTagsService } from 'vs/workbench/contrib/tags/common/workspaceTags.service' +import { ITaskService } from 'vs/workbench/contrib/tasks/common/taskService.service' +import { ITerminalEditorService, ITerminalGroupService, ITerminalInstanceService, ITerminalService } from 'vs/workbench/contrib/terminal/browser/terminal.service' import { createInstanceCapabilityEventMultiplexer } from 'vs/workbench/contrib/terminal/browser/terminalEvents' -import { TerminalCapability } from 'vs/platform/terminal/common/capabilities/capabilities' -import { ITroubleshootIssueService } from 'vs/workbench/services/issue/browser/issueTroubleshoot' -import { getBuiltInExtensionTranslationsUris, getExtensionIdProvidingCurrentLocale } from './l10n' +import { IEnvironmentVariableService } from 'vs/workbench/contrib/terminal/common/environmentVariable.service' +import { ITerminalProfileResolverService, ITerminalProfileService } from 'vs/workbench/contrib/terminal/common/terminal.service' +import { ITerminalContributionService } from 'vs/workbench/contrib/terminal/common/terminalExtensionPoints.service' +import { ITerminalLinkProviderService } from 'vs/workbench/contrib/terminalContrib/links/browser/links.service' +import { ITerminalQuickFixService } from 'vs/workbench/contrib/terminalContrib/quickFix/browser/quickFix.service' +import { ITestCoverageService } from 'vs/workbench/contrib/testing/common/testCoverageService.service' +import { ITestExplorerFilterState } from 'vs/workbench/contrib/testing/common/testExplorerFilterState.service' +import { ITestProfileService } from 'vs/workbench/contrib/testing/common/testProfileService.service' +import { ITestResultService } from 'vs/workbench/contrib/testing/common/testResultService.service' +import { ITestResultStorage } from 'vs/workbench/contrib/testing/common/testResultStorage.service' +import { ITestService } from 'vs/workbench/contrib/testing/common/testService.service' +import { ITestingContinuousRunService } from 'vs/workbench/contrib/testing/common/testingContinuousRunService.service' +import { ITestingDecorationsService } from 'vs/workbench/contrib/testing/common/testingDecorations.service' +import { ITestingPeekOpener } from 'vs/workbench/contrib/testing/common/testingPeekOpener.service' +import { ITimelineService } from 'vs/workbench/contrib/timeline/common/timeline.service' +import { IWebviewService } from 'vs/workbench/contrib/webview/browser/webview.service' +import { IWebviewWorkbenchService } from 'vs/workbench/contrib/webviewPanel/browser/webviewWorkbenchService.service' +import { IWebviewViewService } from 'vs/workbench/contrib/webviewView/browser/webviewViewService.service' +import { IWalkthroughsService } from 'vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedService.service' +import { IActivityService } from 'vs/workbench/services/activity/common/activity.service' +import { IAiEmbeddingVectorService } from 'vs/workbench/services/aiEmbeddingVector/common/aiEmbeddingVectorService.service' +import { IAiRelatedInformationService } from 'vs/workbench/services/aiRelatedInformation/common/aiRelatedInformation.service' +import { IWorkbenchAssignmentService } from 'vs/workbench/services/assignment/common/assignmentService.service' +import { IAuthenticationAccessService } from 'vs/workbench/services/authentication/browser/authenticationAccessService.service' +import { IAuthenticationUsageService } from 'vs/workbench/services/authentication/browser/authenticationUsageService.service' +import { IAuthenticationExtensionsService, IAuthenticationService } from 'vs/workbench/services/authentication/common/authentication.service' +import { IAuxiliaryWindowService } from 'vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService.service' +import { IBannerService } from 'vs/workbench/services/banner/browser/bannerService.service' +import { IJSONEditingService } from 'vs/workbench/services/configuration/common/jsonEditing.service' +import { IConfigurationResolverService } from 'vs/workbench/services/configurationResolver/common/configurationResolver.service' +import { IDecorationsService } from 'vs/workbench/services/decorations/common/decorations.service' +import { ICustomEditorLabelService } from 'vs/workbench/services/editor/common/customEditorLabelService.service' +import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService.service' +import { IEditorPaneService } from 'vs/workbench/services/editor/common/editorPaneService.service' +import { IEditorResolverService } from 'vs/workbench/services/editor/common/editorResolverService.service' +import { IEditorService } from 'vs/workbench/services/editor/common/editorService.service' +import { IExtensionBisectService } from 'vs/workbench/services/extensionManagement/browser/extensionBisect.service' +import { IExtensionFeaturesManagementService } from 'vs/workbench/services/extensionManagement/common/extensionFeatures.service' +import { EnablementState } from 'vs/workbench/services/extensionManagement/common/extensionManagement' +import { IExtensionManagementServerService, IWebExtensionsScannerService, IWorkbenchExtensionEnablementService, IWorkbenchExtensionManagementService } from 'vs/workbench/services/extensionManagement/common/extensionManagement.service' +import { IExtensionIgnoredRecommendationsService, IExtensionRecommendationsService } from 'vs/workbench/services/extensionRecommendations/common/extensionRecommendations.service' +import { IWorkspaceExtensionsConfigService } from 'vs/workbench/services/extensionRecommendations/common/workspaceExtensionsConfig.service' +import { IExtensionUrlHandler } from 'vs/workbench/services/extensions/browser/extensionUrlHandler.service' +import { IExtensionManifestPropertiesService } from 'vs/workbench/services/extensions/common/extensionManifestPropertiesService.service' +import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions.service' +import { IElevatedFileService } from 'vs/workbench/services/files/common/elevatedFileService.service' +import { IFilesConfigurationService } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService.service' +import { IHistoryService } from 'vs/workbench/services/history/common/history.service' +import { IHostService } from 'vs/workbench/services/host/browser/host.service' +import { ITroubleshootIssueService } from 'vs/workbench/services/issue/browser/issueTroubleshoot.service' +import { IWorkbenchIssueService } from 'vs/workbench/services/issue/common/issue.service' +import { FallbackKeyboardMapper } from 'vs/workbench/services/keybinding/common/fallbackKeyboardMapper' +import { IKeybindingEditingService } from 'vs/workbench/services/keybinding/common/keybindingEditing.service' +import { ILanguageDetectionService } from 'vs/workbench/services/languageDetection/common/languageDetectionWorkerService.service' +import { ILanguageStatusService } from 'vs/workbench/services/languageStatus/common/languageStatusService.service' +import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle.service' +import { AbstractLifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycleService' +import { IActiveLanguagePackService, ILocaleService } from 'vs/workbench/services/localization/common/locale.service' +import { INotebookDocumentService } from 'vs/workbench/services/notebook/common/notebookDocumentService.service' +import { IOutlineService } from 'vs/workbench/services/outline/browser/outline.service' +import { IOutputService } from 'vs/workbench/services/output/common/output.service' +import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite.service' +import { IPathService } from 'vs/workbench/services/path/common/pathService.service' +import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences.service' +import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService.service' +import { IRemoteExplorerService } from 'vs/workbench/services/remote/common/remoteExplorerService.service' +import { ISearchService } from 'vs/workbench/services/search/common/search.service' +import { IStatusbarService } from 'vs/workbench/services/statusbar/browser/statusbar.service' +import { IEmbedderTerminalService } from 'vs/workbench/services/terminal/common/embedderTerminalService.service' +import { ITextMateTokenizationService } from 'vs/workbench/services/textMate/browser/textMateTokenizationFeature.service' +import { ITextEditorService } from 'vs/workbench/services/textfile/common/textEditorService.service' +import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles.service' +import { IHostColorSchemeService } from 'vs/workbench/services/themes/common/hostColorSchemeService.service' +import { ITimerService } from 'vs/workbench/services/timer/browser/timerService.service' +import { ITitleService } from 'vs/workbench/services/title/browser/titleService.service' +import { IUntitledTextEditorService } from 'vs/workbench/services/untitled/common/untitledTextEditorService.service' +import { IUserActivityService } from 'vs/workbench/services/userActivity/common/userActivityService.service' +import { IUserDataInitializationService } from 'vs/workbench/services/userData/browser/userDataInit.service' +import { IRemoteUserDataProfilesService } from 'vs/workbench/services/userDataProfile/common/remoteUserDataProfiles.service' +import { IUserDataProfileImportExportService, IUserDataProfileManagementService, IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile.service' +import { UserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfileService' +import { IUserDataSyncWorkbenchService } from 'vs/workbench/services/userDataSync/common/userDataSync.service' +import { ITreeViewsService } from 'vs/workbench/services/views/browser/treeViewsService.service' +import { IViewsService } from 'vs/workbench/services/views/common/viewsService.service' +import { IWorkingCopyBackupMeta, IWorkingCopyIdentifier } from 'vs/workbench/services/workingCopy/common/workingCopy' +import { IResolvedWorkingCopyBackup } from 'vs/workbench/services/workingCopy/common/workingCopyBackup' +import { IWorkingCopyBackupService } from 'vs/workbench/services/workingCopy/common/workingCopyBackup.service' +import { IWorkingCopyEditorService } from 'vs/workbench/services/workingCopy/common/workingCopyEditorService.service' +import { IWorkingCopyFileService } from 'vs/workbench/services/workingCopy/common/workingCopyFileService.service' +import { IWorkingCopyHistoryService } from 'vs/workbench/services/workingCopy/common/workingCopyHistory.service' +import { IWorkingCopyService } from 'vs/workbench/services/workingCopy/common/workingCopyService.service' +import { IWorkspaceEditingService } from 'vs/workbench/services/workspaces/common/workspaceEditing.service' +import { IWorkspaceIdentityService } from 'vs/workbench/services/workspaces/common/workspaceIdentityService.service' +import { IEditorGroup, GroupOrientation, IEditorPart } from 'vs/workbench/services/editor/common/editorGroupsService' +import { NullExtensionService } from 'vs/workbench/services/extensions/common/extensions' +import { toUserDataProfile } from 'vs/platform/userDataProfile/common/userDataProfile' +import { IAdapterManager, IDebugModel, IViewModel } from 'vs/workbench/contrib/debug/common/debug' +import { IViewContainerModel } from 'vs/workbench/common/views' +import { ISearchComplete } from 'vs/workbench/services/search/common/search' +import { IOutputChannel, IOutputChannelDescriptor } from 'vs/workbench/services/output/common/output' +import { ITerminalInstance, TerminalConnectionState } from 'vs/workbench/contrib/terminal/browser/terminal' +import { AccountStatus } from 'vs/workbench/services/userDataSync/common/userDataSync' +import { IWebview } from 'vs/workbench/contrib/webview/browser/webview' +import { SyncResource } from 'vs/workbench/contrib/editSessions/common/editSessions' import { unsupported } from './tools' +import { getBuiltInExtensionTranslationsUris, getExtensionIdProvidingCurrentLocale } from './l10n' registerSingleton(ILoggerService, class NullLoggerService extends AbstractLoggerService { constructor () { diff --git a/src/monaco.ts b/src/monaco.ts index 59b7255a..2a46d9a2 100644 --- a/src/monaco.ts +++ b/src/monaco.ts @@ -14,7 +14,7 @@ import { FoldingController } from 'vs/editor/contrib/folding/browser/folding' import { DisposableStore, IDisposable, IReference } from 'vs/base/common/lifecycle' import { Registry } from 'vs/platform/registry/common/platform' import { IJSONContributionRegistry, Extensions as JsonExtensions } from 'vs/platform/jsonschemas/common/jsonContributionRegistry' -import { CommandsRegistry, ICommandService } from 'vs/platform/commands/common/commands' +import { CommandsRegistry } from 'vs/platform/commands/common/commands' import { MenuRegistry, MenuId } from 'vs/platform/actions/common/actions' import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry' import { IJSONSchema } from 'vs/base/common/jsonSchema' @@ -23,24 +23,28 @@ import { EditorOptionsUtil } from 'vscode/src/vs/editor/browser/config/editorCon import { registerColor } from 'vs/platform/theme/common/colorRegistry' import { URI } from 'vs/base/common/uri' import { ITextModelService } from 'vs/editor/common/services/resolverService' -import { IFileDeleteOptions, IFileService } from 'vs/platform/files/common/files' +import { IFileDeleteOptions } from 'vs/platform/files/common/files' import { VSBuffer } from 'vs/base/common/buffer' import { ITextFileEditorModel } from 'vs/workbench/services/textfile/common/textfiles' import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection' -import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput' import { StandaloneQuickInputService } from 'vs/editor/standalone/browser/quickInput/standaloneQuickInputService' import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors' -import { IContextKeyService, ContextKeyExpr, RawContextKey } from 'vs/platform/contextkey/common/contextkey' -import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry' -import { INotificationService } from 'vs/platform/notification/common/notification' -import { ILogService } from 'vs/platform/log/common/log' +import { ContextKeyExpr, RawContextKey } from 'vs/platform/contextkey/common/contextkey' import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService' -import { IKeybindingService, IKeyboardEvent, KeybindingsSchemaContribution } from 'vs/platform/keybinding/common/keybinding' +import { IKeyboardEvent, KeybindingsSchemaContribution } from 'vs/platform/keybinding/common/keybinding' import { KeybindingResolver } from 'vs/platform/keybinding/common/keybindingResolver' import { ResolvedKeybindingItem } from 'vs/platform/keybinding/common/resolvedKeybindingItem' import { Keybinding, ResolvedKeybinding } from 'vs/base/common/keybindings' import { Event } from 'vs/base/common/event' +import { IFileService } from 'vs/platform/files/common/files.service' import { ResourceContextKey } from 'vs/workbench/common/contextkeys' +import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey.service' +import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding.service' +import { ICommandService } from 'vs/platform/commands/common/commands.service' +import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry.service' +import { INotificationService } from 'vs/platform/notification/common/notification.service' +import { ILogService } from 'vs/platform/log/common/log.service' +import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput.service' import { createInjectedClass } from './tools/injection' import { getService } from './services' export { registerEditorAction, registerEditorContribution, registerDiffEditorContribution, registerMultiEditorAction, EditorAction, EditorCommand } from 'vs/editor/browser/editorExtensions' diff --git a/src/service-override/accessibility.ts b/src/service-override/accessibility.ts index f19ab1fb..16ae6e47 100644 --- a/src/service-override/accessibility.ts +++ b/src/service-override/accessibility.ts @@ -1,8 +1,10 @@ import { IEditorOverrideServices } from 'vs/editor/standalone/browser/standaloneServices' import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors' -import { AccessibleViewService, IAccessibleViewService } from 'vs/workbench/contrib/accessibility/browser/accessibleView' -import { AccessibilitySignalService, IAccessibilitySignalService } from 'vs/platform/accessibilitySignal/browser/accessibilitySignalService' +import { AccessibleViewService } from 'vs/workbench/contrib/accessibility/browser/accessibleView' +import { AccessibilitySignalService } from 'vs/platform/accessibilitySignal/browser/accessibilitySignalService' import audioAssets from 'vs/platform/accessibilitySignal/browser/media/*.mp3' +import { IAccessibleViewService } from 'vs/workbench/contrib/accessibility/browser/accessibleView.service' +import { IAccessibilitySignalService } from 'vs/platform/accessibilitySignal/browser/accessibilitySignalService.service' import { registerAssets } from '../assets' import 'vs/workbench/contrib/accessibility/browser/accessibility.contribution' import 'vs/workbench/contrib/codeEditor/browser/accessibility/accessibility' diff --git a/src/service-override/ai.ts b/src/service-override/ai.ts index 200bf80a..f7c0ada9 100644 --- a/src/service-override/ai.ts +++ b/src/service-override/ai.ts @@ -1,8 +1,8 @@ import { IEditorOverrideServices } from 'vs/editor/standalone/browser/standaloneServices' import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors' +import { IAiEmbeddingVectorService } from 'vs/workbench/services/aiEmbeddingVector/common/aiEmbeddingVectorService.service' +import { IAiRelatedInformationService } from 'vs/workbench/services/aiRelatedInformation/common/aiRelatedInformation.service' import { AiRelatedInformationService } from 'vs/workbench/services/aiRelatedInformation/common/aiRelatedInformationService' -import { IAiRelatedInformationService } from 'vs/workbench/services/aiRelatedInformation/common/aiRelatedInformation' -import { IAiEmbeddingVectorService } from 'vs/workbench/services/aiEmbeddingVector/common/aiEmbeddingVectorService' export default function getServiceOverride (): IEditorOverrideServices { return { diff --git a/src/service-override/authentication.ts b/src/service-override/authentication.ts index 33d5a793..38ec3c64 100644 --- a/src/service-override/authentication.ts +++ b/src/service-override/authentication.ts @@ -1,10 +1,12 @@ import { IEditorOverrideServices } from 'vs/editor/standalone/browser/standaloneServices' import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors' -import { IAuthenticationExtensionsService, IAuthenticationService } from 'vs/workbench/services/authentication/common/authentication' +import { IAuthenticationExtensionsService, IAuthenticationService } from 'vs/workbench/services/authentication/common/authentication.service' import { AuthenticationService } from 'vs/workbench/services/authentication/browser/authenticationService' -import { AuthenticationAccessService, IAuthenticationAccessService } from 'vs/workbench/services/authentication/browser/authenticationAccessService' -import { AuthenticationUsageService, IAuthenticationUsageService } from 'vs/workbench/services/authentication/browser/authenticationUsageService' +import { AuthenticationAccessService } from 'vs/workbench/services/authentication/browser/authenticationAccessService' +import { AuthenticationUsageService } from 'vs/workbench/services/authentication/browser/authenticationUsageService' import { AuthenticationExtensionsService } from 'vs/workbench/services/authentication/browser/authenticationExtensionsService' +import { IAuthenticationAccessService } from 'vs/workbench/services/authentication/browser/authenticationAccessService.service' +import { IAuthenticationUsageService } from 'vs/workbench/services/authentication/browser/authenticationUsageService.service' export default function getServiceOverride (): IEditorOverrideServices { return { diff --git a/src/service-override/base.ts b/src/service-override/base.ts index 2d6cc835..6bea191d 100644 --- a/src/service-override/base.ts +++ b/src/service-override/base.ts @@ -1,28 +1,31 @@ import { IEditorOverrideServices } from 'vs/editor/standalone/browser/standaloneServices' import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors' -import { IRequestService } from 'vs/platform/request/common/request' -import { IDecorationsService } from 'vs/workbench/services/decorations/common/decorations' -import { IJSONEditingService } from 'vs/workbench/services/configuration/common/jsonEditing' +import { IRequestService } from 'vs/platform/request/common/request.service' +import { IDecorationsService } from 'vs/workbench/services/decorations/common/decorations.service' +import { IJSONEditingService } from 'vs/workbench/services/configuration/common/jsonEditing.service' import { ITreeViewsDnDService } from 'vs/editor/common/services/treeViewsDndService' -import { ITreeViewsService } from 'vs/workbench/services/views/browser/treeViewsService' +import { ITreeViewsService } from 'vs/workbench/services/views/browser/treeViewsService.service' import { TreeViewsDnDService } from 'vs/editor/common/services/treeViewsDnd' -import { IURLService } from 'vs/platform/url/common/url' +import { IURLService } from 'vs/platform/url/common/url.service' import { JSONEditingService } from 'vs/workbench/services/configuration/common/jsonEditingService' import { DecorationsService } from 'vs/workbench/services/decorations/browser/decorationsService' import { BrowserRequestService } from 'vs/workbench/services/request/browser/requestService' import { BrowserURLService } from 'vs/workbench/services/url/browser/urlService' import { TreeviewsService } from 'vs/workbench/services/views/common/treeViewsService' import { CanonicalUriService } from 'vs/workbench/services/workspaces/common/canonicalUriService' -import { ICanonicalUriService } from 'vs/platform/workspace/common/canonicalUri' -import { IUserActivityService, UserActivityService } from 'vs/workbench/services/userActivity/common/userActivityService' -import { IDownloadService } from 'vs/platform/download/common/download' +import { ICanonicalUriService } from 'vs/platform/workspace/common/canonicalUri.service' +import { IUserActivityService } from 'vs/workbench/services/userActivity/common/userActivityService.service' +import { IDownloadService } from 'vs/platform/download/common/download.service' import { DownloadService } from 'vs/platform/download/common/downloadService' -import { IPathService, AbstractPathService } from 'vs/workbench/services/path/common/pathService' -import { IWorkingCopyFileService, WorkingCopyFileService } from 'vs/workbench/services/workingCopy/common/workingCopyFileService' -import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService' -import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService' -import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace' +import { IPathService } from 'vs/workbench/services/path/common/pathService.service' +import { IWorkingCopyFileService } from 'vs/workbench/services/workingCopy/common/workingCopyFileService.service' +import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService.service' +import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService.service' +import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace.service' import { guessLocalUserHome } from 'vs/workbench/services/path/browser/pathService' +import { AbstractPathService } from 'vs/workbench/services/path/common/pathService' +import { UserActivityService } from 'vs/workbench/services/userActivity/common/userActivityService' +import { WorkingCopyFileService } from 'vs/workbench/services/workingCopy/common/workingCopyFileService' import { getEnvironmentOverride } from '../workbench' class BrowserPathServiceOverride extends AbstractPathService { diff --git a/src/service-override/chat.ts b/src/service-override/chat.ts index 89b4e29a..249b2063 100644 --- a/src/service-override/chat.ts +++ b/src/service-override/chat.ts @@ -1,28 +1,32 @@ import { IEditorOverrideServices } from 'vs/editor/standalone/browser/standaloneServices' import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors' -import { IChatService } from 'vs/workbench/contrib/chat/common/chatService' -import { IChatContributionService } from 'vs/workbench/contrib/chat/common/chatContributionService' -import { IChatWidgetService, IChatAccessibilityService, IQuickChatService, IChatCodeBlockContextProviderService } from 'vs/workbench/contrib/chat/browser/chat' -import { ChatContributionService } from 'vs/workbench/contrib/chat/browser/chatContributionServiceImpl' -import { ChatWidgetService } from 'vs/workbench/contrib/chat/browser/chatWidget' -import { ChatService } from 'vs/workbench/contrib/chat/common/chatServiceImpl' -import { ChatWidgetHistoryService, IChatWidgetHistoryService } from 'vs/workbench/contrib/chat/common/chatWidgetHistoryService' +import 'vs/workbench/contrib/chat/browser/chat.contribution' +import { IChatAccessibilityService, IChatCodeBlockContextProviderService, IChatWidgetService, IQuickChatService } from 'vs/workbench/contrib/chat/browser/chat.service' import { ChatAccessibilityService } from 'vs/workbench/contrib/chat/browser/chatAccessibilityService' -import { ChatSlashCommandService, IChatSlashCommandService } from 'vs/workbench/contrib/chat/common/chatSlashCommands' -import { IChatVariablesService } from 'vs/workbench/contrib/chat/common/chatVariables' -import { ChatVariablesService } from 'vs/workbench/contrib/chat/browser/chatVariables' +import { ChatContributionService } from 'vs/workbench/contrib/chat/browser/chatContributionServiceImpl' import { QuickChatService } from 'vs/workbench/contrib/chat/browser/chatQuick' -import { ChatAgentService, IChatAgentService } from 'vs/workbench/contrib/chat/common/chatAgents' -import { InlineChatServiceImpl } from 'vs/workbench/contrib/inlineChat/common/inlineChatServiceImpl' -import { IInlineChatService } from 'vs/workbench/contrib/inlineChat/common/inlineChat' -import { IInlineChatSessionService } from 'vs/workbench/contrib/inlineChat/browser/inlineChatSessionService' -import { InlineChatSessionServiceImpl } from 'vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl' -import { IInlineChatSavingService } from 'vs/workbench/contrib/inlineChat/browser/inlineChatSavingService' -import { InlineChatSavingServiceImpl } from 'vs/workbench/contrib/inlineChat/browser/inlineChatSavingServiceImpl' -import { ILanguageModelsService, LanguageModelsService } from 'vs/workbench/contrib/chat/common/languageModels' +import { ChatVariablesService } from 'vs/workbench/contrib/chat/browser/chatVariables' +import { ChatWidgetService } from 'vs/workbench/contrib/chat/browser/chatWidget' import { ChatCodeBlockContextProviderService } from 'vs/workbench/contrib/chat/browser/codeBlockContextProviderService' -import 'vs/workbench/contrib/chat/browser/chat.contribution' +import { ChatAgentService } from 'vs/workbench/contrib/chat/common/chatAgents' +import { IChatAgentService } from 'vs/workbench/contrib/chat/common/chatAgents.service' +import { IChatContributionService } from 'vs/workbench/contrib/chat/common/chatContributionService.service' +import { IChatService } from 'vs/workbench/contrib/chat/common/chatService.service' +import { ChatService } from 'vs/workbench/contrib/chat/common/chatServiceImpl' +import { ChatSlashCommandService } from 'vs/workbench/contrib/chat/common/chatSlashCommands' +import { IChatSlashCommandService } from 'vs/workbench/contrib/chat/common/chatSlashCommands.service' +import { IChatVariablesService } from 'vs/workbench/contrib/chat/common/chatVariables.service' +import { ChatWidgetHistoryService } from 'vs/workbench/contrib/chat/common/chatWidgetHistoryService' +import { IChatWidgetHistoryService } from 'vs/workbench/contrib/chat/common/chatWidgetHistoryService.service' +import { LanguageModelsService } from 'vs/workbench/contrib/chat/common/languageModels' +import { ILanguageModelsService } from 'vs/workbench/contrib/chat/common/languageModels.service' import 'vs/workbench/contrib/inlineChat/browser/inlineChat.contribution' +import { IInlineChatSavingService } from 'vs/workbench/contrib/inlineChat/browser/inlineChatSavingService.service' +import { InlineChatSavingServiceImpl } from 'vs/workbench/contrib/inlineChat/browser/inlineChatSavingServiceImpl' +import { IInlineChatSessionService } from 'vs/workbench/contrib/inlineChat/browser/inlineChatSessionService.service' +import { InlineChatSessionServiceImpl } from 'vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl' +import { IInlineChatService } from 'vs/workbench/contrib/inlineChat/common/inlineChat.service' +import { InlineChatServiceImpl } from 'vs/workbench/contrib/inlineChat/common/inlineChatServiceImpl' export default function getServiceOverride (): IEditorOverrideServices { return { diff --git a/src/service-override/comments.ts b/src/service-override/comments.ts index dd6468c7..af51fa8d 100644 --- a/src/service-override/comments.ts +++ b/src/service-override/comments.ts @@ -1,6 +1,7 @@ import { IEditorOverrideServices } from 'vs/editor/standalone/browser/standaloneServices' import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors' -import { CommentService, ICommentService } from 'vs/workbench/contrib/comments/browser/commentService' +import { ICommentService } from 'vs/workbench/contrib/comments/browser/commentService.service' +import { CommentService } from 'vs/workbench/contrib/comments/browser/commentService' import 'vs/workbench/contrib/comments/browser/comments.contribution' export default function getServiceOverride (): IEditorOverrideServices { diff --git a/src/service-override/configuration.ts b/src/service-override/configuration.ts index d0353007..f22c37e8 100644 --- a/src/service-override/configuration.ts +++ b/src/service-override/configuration.ts @@ -1,43 +1,46 @@ -import { IEditorOverrideServices } from 'vs/editor/standalone/browser/standaloneServices' -import { WorkspaceService } from 'vs/workbench/services/configuration/browser/configurationService' -import { IConfigurationService } from 'vs/platform/configuration/common/configuration' +import { VSBuffer } from 'vs/base/common/buffer' +import { IDisposable } from 'vs/base/common/lifecycle' +import { Schemas } from 'vs/base/common/network' +import { URI } from 'vs/base/common/uri' +import { generateUuid } from 'vs/base/common/uuid' import { ITextResourceConfigurationService, ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfiguration' import { TextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfigurationService' +import { IEditorOverrideServices } from 'vs/editor/standalone/browser/standaloneServices' +import { IConfigurationService } from 'vs/platform/configuration/common/configuration.service' +import { Extensions as ConfigurationExtensions, ConfigurationScope, IConfigurationDefaults, IConfigurationNode, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry' +import { IFileWriteOptions } from 'vs/platform/files/common/files' +import { IFileService } from 'vs/platform/files/common/files.service' import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors' -import { ConfigurationScope, IConfigurationRegistry, Extensions as ConfigurationExtensions, IConfigurationNode, IConfigurationDefaults } from 'vs/platform/configuration/common/configurationRegistry' -import { Registry } from 'vs/platform/registry/common/platform' -import { VSBuffer } from 'vs/base/common/buffer' -import { IFileService, IFileWriteOptions } from 'vs/platform/files/common/files' -import { ILogService } from 'vs/platform/log/common/log' -import { IColorCustomizations, IThemeScopedColorCustomizations } from 'vs/workbench/services/themes/common/workbenchThemeService' -import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile' -import { IPolicyService } from 'vs/platform/policy/common/policy' import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation' -import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile' -import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService' -import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity' +import { ILabelService } from 'vs/platform/label/common/label.service' +import { ILogService } from 'vs/platform/log/common/log.service' +import { IPolicyService } from 'vs/platform/policy/common/policy.service' +import { Registry } from 'vs/platform/registry/common/platform' +import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity.service' +import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile.service' +import { IAnyWorkspaceIdentifier, IEmptyWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, IWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace' +import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace.service' +import { IStoredWorkspace, IWorkspaceFolderCreationData } from 'vs/platform/workspaces/common/workspaces' +import { IWorkspacesService } from 'vs/platform/workspaces/common/workspaces.service' +import 'vs/workbench/api/common/configurationExtensionPoint' +import 'vs/workbench/contrib/workspaces/browser/workspaces.contribution' +import { WorkspaceService } from 'vs/workbench/services/configuration/browser/configurationService' import { ConfigurationCache } from 'vs/workbench/services/configuration/common/configurationCache' -import { Schemas } from 'vs/base/common/network' -import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService' -import { IAnyWorkspaceIdentifier, IEmptyWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, IWorkspaceContextService, IWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace' +import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService.service' +import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService.service' import { LabelService } from 'vs/workbench/services/label/common/labelService' -import { ILabelService } from 'vs/platform/label/common/label' -import { generateUuid } from 'vs/base/common/uuid' -import { IWorkspacesService, IWorkspaceFolderCreationData, IStoredWorkspace } from 'vs/platform/workspaces/common/workspaces' -import { BrowserWorkspacesService } from 'vs/workbench/services/workspaces/browser/workspacesService' -import { IWorkspaceEditingService } from 'vs/workbench/services/workspaces/common/workspaceEditing' -import { AbstractWorkspaceEditingService } from 'vs/workbench/services/workspaces/browser/abstractWorkspaceEditingService' -import { URI } from 'vs/base/common/uri' -import 'vs/workbench/api/common/configurationExtensionPoint' -import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService' -import { IDisposable } from 'vs/base/common/lifecycle' +import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService.service' import { TextResourcePropertiesService } from 'vs/workbench/services/textresourceProperties/common/textResourcePropertiesService' +import { IColorCustomizations, IThemeScopedColorCustomizations } from 'vs/workbench/services/themes/common/workbenchThemeService' +import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile.service' +import { AbstractWorkspaceEditingService } from 'vs/workbench/services/workspaces/browser/abstractWorkspaceEditingService' +import { BrowserWorkspacesService } from 'vs/workbench/services/workspaces/browser/workspacesService' +import { IWorkspaceEditingService } from 'vs/workbench/services/workspaces/common/workspaceEditing.service' import getFileServiceOverride, { initFile } from './files' -import { memoizedConstructor, unsupported } from '../tools' import { registerServiceInitializePreParticipant } from '../lifecycle' import { getService, withReadyServices } from '../services' +import { memoizedConstructor, unsupported } from '../tools' import { getWorkspaceIdentifier } from '../workbench' -import 'vs/workbench/contrib/workspaces/browser/workspaces.contribution' // This is the default value, but can be overriden by overriding the Environment or UserDataProfileService service const defaultUserConfigurationFile = URI.from({ scheme: Schemas.vscodeUserData, path: '/User/settings.json' }) @@ -163,21 +166,5 @@ function getServiceOverride (defaultWorkspace?: URI | IAnyWorkspaceIdentifier): export default getServiceOverride export { - defaultUserConfigurationFile, - initUserConfiguration, - updateUserConfiguration, - getUserConfiguration, - onUserConfigurationChange, - configurationRegistry, - ConfigurationScope, - IThemeScopedColorCustomizations, - IColorCustomizations, - IConfigurationNode, - IConfigurationDefaults, - IAnyWorkspaceIdentifier, - IWorkspaceIdentifier, - ISingleFolderWorkspaceIdentifier, - IEmptyWorkspaceIdentifier, - IWorkspaceFolderCreationData, - IStoredWorkspace + ConfigurationScope, IAnyWorkspaceIdentifier, IColorCustomizations, IConfigurationDefaults, IConfigurationNode, IEmptyWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, IStoredWorkspace, IThemeScopedColorCustomizations, IWorkspaceFolderCreationData, IWorkspaceIdentifier, configurationRegistry, defaultUserConfigurationFile, getUserConfiguration, initUserConfiguration, onUserConfigurationChange, updateUserConfiguration } diff --git a/src/service-override/debug.ts b/src/service-override/debug.ts index 248c8b34..1debeed9 100644 --- a/src/service-override/debug.ts +++ b/src/service-override/debug.ts @@ -1,15 +1,16 @@ import { IEditorOverrideServices } from 'vs/editor/standalone/browser/standaloneServices' import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors' -import { IDebugService } from 'vs/workbench/contrib/debug/common/debug' +import { IDebugService } from 'vs/workbench/contrib/debug/common/debug.service' import { DebugService } from 'vs/workbench/contrib/debug/browser/debugService' import { LanguageFeaturesService } from 'vscode/src/vs/editor/common/services/languageFeaturesService' import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures' import { ConfigurationResolverService } from 'vs/workbench/services/configurationResolver/browser/configurationResolverService' -import { IConfigurationResolverService } from 'vs/workbench/services/configurationResolver/common/configurationResolver' +import { IConfigurationResolverService } from 'vs/workbench/services/configurationResolver/common/configurationResolver.service' import { IAction } from 'vs/base/common/actions' -import { IExtensionHostDebugService } from 'vs/platform/debug/common/extensionHostDebug' +import { IExtensionHostDebugService } from 'vs/platform/debug/common/extensionHostDebug.service' import { BrowserExtensionHostDebugService } from 'vs/workbench/contrib/debug/browser/extensionHostDebugService' -import { DebugVisualizerService, IDebugVisualizerService } from 'vs/workbench/contrib/debug/common/debugVisualizers' +import { IDebugVisualizerService } from 'vs/workbench/contrib/debug/common/debugVisualizers.service' +import { DebugVisualizerService } from 'vs/workbench/contrib/debug/common/debugVisualizers' // Debug assets should be registered BEFORE the contribution code runs import './tools/debugAssets' import 'vs/workbench/contrib/debug/browser/debug.contribution' diff --git a/src/service-override/dialogs.ts b/src/service-override/dialogs.ts index 332297c3..1e302612 100644 --- a/src/service-override/dialogs.ts +++ b/src/service-override/dialogs.ts @@ -1,6 +1,7 @@ import { IEditorOverrideServices } from 'vs/editor/standalone/browser/standaloneServices' import { DialogService } from 'vs/workbench/services/dialogs/common/dialogService' -import { IDialogService, IFileDialogService, IOpenDialogOptions, IPickAndOpenOptions, ISaveDialogOptions } from 'vs/platform/dialogs/common/dialogs' +import { IOpenDialogOptions, IPickAndOpenOptions, ISaveDialogOptions } from 'vs/platform/dialogs/common/dialogs' +import { IDialogService, IFileDialogService } from 'vs/platform/dialogs/common/dialogs.service' import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors' import { AbstractFileDialogService } from 'vs/workbench/services/dialogs/browser/abstractFileDialogService' import { FileDialogService } from 'vs/workbench/services/dialogs/browser/fileDialogService' diff --git a/src/service-override/editSessions.ts b/src/service-override/editSessions.ts index 909f10af..d8704de4 100644 --- a/src/service-override/editSessions.ts +++ b/src/service-override/editSessions.ts @@ -1,10 +1,11 @@ import { IEditorOverrideServices } from 'vs/editor/standalone/browser/standaloneServices' import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors' import { EditSessionsLogService } from 'vs/workbench/contrib/editSessions/common/editSessionsLogService' -import { IEditSessionsLogService, IEditSessionsStorageService } from 'vs/workbench/contrib/editSessions/common/editSessions' +import { IEditSessionsLogService, IEditSessionsStorageService } from 'vs/workbench/contrib/editSessions/common/editSessions.service' import { EditSessionsWorkbenchService } from 'vs/workbench/contrib/editSessions/browser/editSessionsStorageService' -import { IWorkspaceIdentityService, WorkspaceIdentityService } from 'vs/workbench/services/workspaces/common/workspaceIdentityService' -import { IEditSessionIdentityService } from 'vs/platform/workspace/common/editSessions' +import { WorkspaceIdentityService } from 'vs/workbench/services/workspaces/common/workspaceIdentityService' +import { IWorkspaceIdentityService } from 'vs/workbench/services/workspaces/common/workspaceIdentityService.service' +import { IEditSessionIdentityService } from 'vs/platform/workspace/common/editSessions.service' import { EditSessionIdentityService } from 'vs/workbench/services/workspaces/common/editSessionIdentityService' import 'vs/workbench/contrib/editSessions/browser/editSessions.contribution' diff --git a/src/service-override/editor.ts b/src/service-override/editor.ts index 355a6123..6ae36a3a 100644 --- a/src/service-override/editor.ts +++ b/src/service-override/editor.ts @@ -3,12 +3,14 @@ import { Event } from 'vs/base/common/event' import { IResolvedTextEditorModel } from 'vs/editor/common/services/resolverService' import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService' import { CodeEditorService } from 'vs/workbench/services/editor/browser/codeEditorService' -import { IEditorService } from 'vs/workbench/services/editor/common/editorService' +import { IEditorService } from 'vs/workbench/services/editor/common/editorService.service' import { IEditorOptions } from 'vs/platform/editor/common/editor' import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors' import { IReference } from 'vs/base/common/lifecycle' -import { ITextEditorService, TextEditorService } from 'vs/workbench/services/textfile/common/textEditorService' -import { GroupOrientation, IEditorGroupsService, IEditorPart } from 'vs/workbench/services/editor/common/editorGroupsService' +import { TextEditorService } from 'vs/workbench/services/textfile/common/textEditorService' +import { ITextEditorService } from 'vs/workbench/services/textfile/common/textEditorService.service' +import { GroupOrientation, IEditorPart } from 'vs/workbench/services/editor/common/editorGroupsService' +import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService.service' import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation' import { DEFAULT_EDITOR_PART_OPTIONS } from 'vs/workbench/browser/parts/editor/editor' import { mainWindow } from 'vs/base/browser/window' diff --git a/src/service-override/environment.ts b/src/service-override/environment.ts index 70a57a54..c6b23938 100644 --- a/src/service-override/environment.ts +++ b/src/service-override/environment.ts @@ -1,8 +1,9 @@ import { IEditorOverrideServices } from 'vs/editor/standalone/browser/standaloneServices' import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors' -import { BrowserWorkbenchEnvironmentService, IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService' -import { IEnvironmentService } from 'vs/platform/environment/common/environment' -import { IProductService } from 'vs/platform/product/common/productService' +import { BrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService' +import { IEnvironmentService } from 'vs/platform/environment/common/environment.service' +import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService.service' +import { IProductService } from 'vs/platform/product/common/productService.service' import { IWorkbenchConstructionOptions } from 'vs/workbench/browser/web.api' import { getWorkbenchConstructionOptions, getWorkspaceIdentifier, logsPath } from '../workbench' diff --git a/src/service-override/explorer.ts b/src/service-override/explorer.ts index f76502c1..578266e5 100644 --- a/src/service-override/explorer.ts +++ b/src/service-override/explorer.ts @@ -1,7 +1,7 @@ import { IEditorOverrideServices } from 'vs/editor/standalone/browser/standaloneServices' import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors' import { ExplorerService } from 'vs/workbench/contrib/files/browser/explorerService' -import { IExplorerService } from 'vs/workbench/contrib/files/browser/files' +import { IExplorerService } from 'vs/workbench/contrib/files/browser/files.service' import 'vs/workbench/contrib/files/browser/fileCommands' import 'vs/workbench/contrib/files/browser/fileActions.contribution' import 'vs/workbench/contrib/files/browser/files.explorer.contribution' diff --git a/src/service-override/extensionGallery.ts b/src/service-override/extensionGallery.ts index cb9f0c4a..c6b15d4f 100644 --- a/src/service-override/extensionGallery.ts +++ b/src/service-override/extensionGallery.ts @@ -1,36 +1,43 @@ import { IEditorOverrideServices } from 'vs/editor/standalone/browser/standaloneServices' import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors' -import { IExtensionGalleryService, IExtensionManagementService, IExtensionTipsService, IGlobalExtensionEnablementService } from 'vs/platform/extensionManagement/common/extensionManagement' +import { IExtensionGalleryService, IExtensionManagementService, IExtensionTipsService, IGlobalExtensionEnablementService } from 'vs/platform/extensionManagement/common/extensionManagement.service' import { ExtensionGalleryService } from 'vs/platform/extensionManagement/common/extensionGalleryService' import { GlobalExtensionEnablementService } from 'vs/platform/extensionManagement/common/extensionEnablementService' -import { IExtension as IContribExtension, IExtensionsWorkbenchService } from 'vs/workbench/contrib/extensions/common/extensions' +import { IExtension as IContribExtension } from 'vs/workbench/contrib/extensions/common/extensions' +import { IExtensionsWorkbenchService } from 'vs/workbench/contrib/extensions/common/extensions.service' import { getLocale } from 'vs/platform/languagePacks/common/languagePacks' import { ExtensionsWorkbenchService } from 'vs/workbench/contrib/extensions/browser/extensionsWorkbenchService' -import { IExtensionManagementServerService, IWebExtensionsScannerService, IWorkbenchExtensionEnablementService } from 'vs/workbench/services/extensionManagement/common/extensionManagement' +import { IExtensionManagementServerService, IWebExtensionsScannerService, IWorkbenchExtensionEnablementService } from 'vs/workbench/services/extensionManagement/common/extensionManagement.service' import { ExtensionManagementServerService } from 'vs/workbench/services/extensionManagement/common/extensionManagementServerService' -import { IExtensionIgnoredRecommendationsService, IExtensionRecommendationsService } from 'vs/workbench/services/extensionRecommendations/common/extensionRecommendations' +import { IExtensionIgnoredRecommendationsService, IExtensionRecommendationsService } from 'vs/workbench/services/extensionRecommendations/common/extensionRecommendations.service' import { ExtensionRecommendationsService } from 'vs/workbench/contrib/extensions/browser/extensionRecommendationsService' import { WebExtensionsScannerService } from 'vs/workbench/services/extensionManagement/browser/webExtensionsScannerService' -import { IExtensionRecommendationNotificationService } from 'vs/platform/extensionRecommendations/common/extensionRecommendations' -import { IIgnoredExtensionsManagementService, IgnoredExtensionsManagementService } from 'vs/platform/userDataSync/common/ignoredExtensions' -import { ExtensionManifestPropertiesService, IExtensionManifestPropertiesService } from 'vs/workbench/services/extensions/common/extensionManifestPropertiesService' -import { IBuiltinExtensionsScannerService, IExtension } from 'vs/platform/extensions/common/extensions' +import { IExtensionRecommendationNotificationService } from 'vs/platform/extensionRecommendations/common/extensionRecommendations.service' +import { IgnoredExtensionsManagementService } from 'vs/platform/userDataSync/common/ignoredExtensions' +import { IIgnoredExtensionsManagementService } from 'vs/platform/userDataSync/common/ignoredExtensions.service' +import { ExtensionManifestPropertiesService } from 'vs/workbench/services/extensions/common/extensionManifestPropertiesService' +import { IExtensionManifestPropertiesService } from 'vs/workbench/services/extensions/common/extensionManifestPropertiesService.service' +import { IExtension } from 'vs/platform/extensions/common/extensions' +import { IBuiltinExtensionsScannerService } from 'vs/platform/extensions/common/extensions.service' import { ExtensionIgnoredRecommendationsService } from 'vs/workbench/services/extensionRecommendations/common/extensionIgnoredRecommendationsService' -import { IWorkspaceExtensionsConfigService, WorkspaceExtensionsConfigService } from 'vs/workbench/services/extensionRecommendations/common/workspaceExtensionsConfig' +import { WorkspaceExtensionsConfigService } from 'vs/workbench/services/extensionRecommendations/common/workspaceExtensionsConfig' +import { IWorkspaceExtensionsConfigService } from 'vs/workbench/services/extensionRecommendations/common/workspaceExtensionsConfig.service' import { ExtensionRecommendationNotificationService } from 'vs/workbench/contrib/extensions/browser/extensionRecommendationNotificationService' import { ExtensionTipsService } from 'vs/platform/extensionManagement/common/extensionTipsService' import { ExtensionManagementService } from 'vs/workbench/services/extensionManagement/common/extensionManagementService' -import { IRemoteUserDataProfilesService, RemoteUserDataProfilesService } from 'vs/workbench/services/userDataProfile/common/remoteUserDataProfiles' +import { RemoteUserDataProfilesService } from 'vs/workbench/services/userDataProfile/common/remoteUserDataProfiles' +import { IRemoteUserDataProfilesService } from 'vs/workbench/services/userDataProfile/common/remoteUserDataProfiles.service' import { ExtensionEnablementService } from 'vs/workbench/services/extensionManagement/browser/extensionEnablementService' -import { ExtensionUrlHandler, IExtensionUrlHandler } from 'vs/workbench/services/extensions/browser/extensionUrlHandler' -import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService' +import { ExtensionUrlHandler } from 'vs/workbench/services/extensions/browser/extensionUrlHandler' +import { IExtensionUrlHandler } from 'vs/workbench/services/extensions/browser/extensionUrlHandler.service' +import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService.service' import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation' -import { IExtensionsScannerService } from 'vs/platform/extensionManagement/common/extensionsScannerService' +import { IExtensionsScannerService } from 'vs/platform/extensionManagement/common/extensionsScannerService.service' import { ExtensionsScannerService } from 'vs/workbench/services/extensions/browser/extensionsScannerService' import { ExtensionsProfileScannerService } from 'vs/workbench/services/extensionManagement/browser/extensionsProfileScannerService' -import { IExtensionsProfileScannerService } from 'vs/platform/extensionManagement/common/extensionsProfileScannerService' -import { ILabelService } from 'vs/platform/label/common/label' -import { IExtensionFeaturesManagementService } from 'vs/workbench/services/extensionManagement/common/extensionFeatures' +import { IExtensionsProfileScannerService } from 'vs/platform/extensionManagement/common/extensionsProfileScannerService.service' +import { ILabelService } from 'vs/platform/label/common/label.service' +import { IExtensionFeaturesManagementService } from 'vs/workbench/services/extensionManagement/common/extensionFeatures.service' import { ExtensionFeaturesManagementService } from 'vs/workbench/services/extensionManagement/common/extensionFeaturesManagemetService' import { registerAssets } from '../assets' import { getExtensionManifests } from '../extensions' diff --git a/src/service-override/extensions.ts b/src/service-override/extensions.ts index 0ec57a60..c1239147 100644 --- a/src/service-override/extensions.ts +++ b/src/service-override/extensions.ts @@ -1,25 +1,27 @@ -import { IFileService } from 'vs/platform/files/common/files' -import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle' -import { ExtensionHostStartup, IExtensionHost, IExtensionService, toExtensionDescription } from 'vs/workbench/services/extensions/common/extensions' -import { ILogService, ILoggerService } from 'vs/platform/log/common/log' +import { IFileService } from 'vs/platform/files/common/files.service' +import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle.service' +import { toExtensionDescription, ExtensionHostStartup, IExtensionHost } from 'vs/workbench/services/extensions/common/extensions' +import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions.service' +import { ILogService, ILoggerService } from 'vs/platform/log/common/log.service' import { ExtensionIdentifier, IExtension, IExtensionDescription, IRelaxedExtensionDescription } from 'vs/platform/extensions/common/extensions' -import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace' +import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace.service' import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation' -import { INotificationService } from 'vs/platform/notification/common/notification' +import { INotificationService } from 'vs/platform/notification/common/notification.service' import { DeltaExtensionsQueueItem } from 'vs/workbench/services/extensions/common/abstractExtensionService' -import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry' -import { IDialogService } from 'vs/platform/dialogs/common/dialogs' -import { IRemoteAuthorityResolverService } from 'vs/platform/remote/common/remoteAuthorityResolver' -import { IRemoteExtensionsScannerService } from 'vs/platform/remote/common/remoteExtensionsScanner' -import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService' -import { IWebExtensionsScannerService, IWorkbenchExtensionEnablementService, IWorkbenchExtensionManagementService } from 'vs/workbench/services/extensionManagement/common/extensionManagement' -import { ExtensionManifestPropertiesService, IExtensionManifestPropertiesService } from 'vs/workbench/services/extensions/common/extensionManifestPropertiesService' -import { IConfigurationService } from 'vs/platform/configuration/common/configuration' -import { IProductService } from 'vs/platform/product/common/productService' -import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService' +import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry.service' +import { IDialogService } from 'vs/platform/dialogs/common/dialogs.service' +import { IRemoteAuthorityResolverService } from 'vs/platform/remote/common/remoteAuthorityResolver.service' +import { IRemoteExtensionsScannerService } from 'vs/platform/remote/common/remoteExtensionsScanner.service' +import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService.service' +import { IWebExtensionsScannerService, IWorkbenchExtensionEnablementService, IWorkbenchExtensionManagementService } from 'vs/workbench/services/extensionManagement/common/extensionManagement.service' +import { ExtensionManifestPropertiesService } from 'vs/workbench/services/extensions/common/extensionManifestPropertiesService' +import { IExtensionManifestPropertiesService } from 'vs/workbench/services/extensions/common/extensionManifestPropertiesService.service' +import { IConfigurationService } from 'vs/platform/configuration/common/configuration.service' +import { IProductService } from 'vs/platform/product/common/productService.service' +import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService.service' import { IEditorOverrideServices } from 'vs/editor/standalone/browser/standaloneServices' import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors' -import { IUserDataInitializationService } from 'vs/workbench/services/userData/browser/userDataInit' +import { IUserDataInitializationService } from 'vs/workbench/services/userData/browser/userDataInit.service' import { ExtensionsProposedApi } from 'vs/workbench/services/extensions/common/extensionsProposedApi' import { BrowserExtensionHostFactory, BrowserExtensionHostKindPicker, ExtensionService } from 'vs/workbench/services/extensions/browser/extensionService' import { ExtensionHostKind, ExtensionRunningPreference } from 'vs/workbench/services/extensions/common/extensionHostKind' @@ -27,18 +29,19 @@ import { ExtensionRunningLocation, LocalWebWorkerRunningLocation } from 'vs/work import { ExtensionRunningLocationTracker } from 'vs/workbench/services/extensions/common/extensionRunningLocationTracker' import { URI } from 'vs/base/common/uri' import { IWebWorkerExtensionHostDataProvider, WebWorkerExtensionHost } from 'vs/workbench/services/extensions/browser/webWorkerExtensionHost' -import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile' -import { ILayoutService } from 'vs/platform/layout/browser/layoutService' -import { IStorageService } from 'vs/platform/storage/common/storage' -import { ILabelService } from 'vs/platform/label/common/label' +import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile.service' +import { ILayoutService } from 'vs/platform/layout/browser/layoutService.service' +import { IStorageService } from 'vs/platform/storage/common/storage.service' +import { ILabelService } from 'vs/platform/label/common/label.service' import { ExtensionKind } from 'vs/platform/environment/common/environment' -import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile' -import { IWorkspaceTrustManagementService } from 'vs/platform/workspace/common/workspaceTrust' -import { IRemoteExplorerService } from 'vs/workbench/services/remote/common/remoteExplorerService' +import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile.service' +import { IWorkspaceTrustManagementService } from 'vs/platform/workspace/common/workspaceTrust.service' +import { IRemoteExplorerService } from 'vs/workbench/services/remote/common/remoteExplorerService.service' import { ExtensionDescriptionRegistrySnapshot } from 'vs/workbench/services/extensions/common/extensionDescriptionRegistry' import { ExtensionResourceLoaderService } from 'vs/platform/extensionResourceLoader/browser/extensionResourceLoaderService' -import { IExtensionResourceLoaderService } from 'vs/platform/extensionResourceLoader/common/extensionResourceLoader' -import { ExtensionBisectService, IExtensionBisectService } from 'vs/workbench/services/extensionManagement/browser/extensionBisect' +import { IExtensionResourceLoaderService } from 'vs/platform/extensionResourceLoader/common/extensionResourceLoader.service' +import { ExtensionBisectService } from 'vs/workbench/services/extensionManagement/browser/extensionBisect' +import { IExtensionBisectService } from 'vs/workbench/services/extensionManagement/browser/extensionBisect.service' import { changeUrlDomain } from './tools/url' import { CustomSchemas } from './files' import type { LocalExtensionHost } from '../localExtensionHost' diff --git a/src/service-override/files.ts b/src/service-override/files.ts index 3fbf7dd0..c66682f4 100644 --- a/src/service-override/files.ts +++ b/src/service-override/files.ts @@ -1,10 +1,12 @@ import { IEditorOverrideServices, StandaloneServices } from 'vs/editor/standalone/browser/standaloneServices' import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors' import { FileService } from 'vs/platform/files/common/fileService' -import { ILogService, LogLevel } from 'vs/platform/log/common/log' +import { LogLevel } from 'vs/platform/log/common/log' +import { ILogService } from 'vs/platform/log/common/log.service' import { InMemoryFileSystemProvider } from 'vs/platform/files/common/inMemoryFilesystemProvider' import { URI } from 'vs/base/common/uri' -import { FileChangeType, FilePermission, FileSystemProviderCapabilities, FileType, IFileSystemProvider, toFileSystemProviderErrorCode, createFileSystemProviderError, FileSystemProviderError, FileSystemProviderErrorCode, IFileChange, IFileDeleteOptions, IFileOverwriteOptions, IFileService, IFileSystemProviderWithFileReadWriteCapability, IFileWriteOptions, IStat, IWatchOptions } from 'vs/platform/files/common/files' +import { IFileService } from 'vs/platform/files/common/files.service' +import { FileChangeType, FilePermission, FileSystemProviderCapabilities, FileType, IFileSystemProvider, toFileSystemProviderErrorCode, createFileSystemProviderError, FileSystemProviderError, FileSystemProviderErrorCode, IFileChange, IFileDeleteOptions, IFileOverwriteOptions, IFileSystemProviderWithFileReadWriteCapability, IFileWriteOptions, IStat, IWatchOptions } from 'vs/platform/files/common/files' import { DisposableStore, IDisposable, Disposable, toDisposable } from 'vs/base/common/lifecycle' import { extUri, joinPath } from 'vs/base/common/resources' import { Emitter, Event } from 'vs/base/common/event' @@ -12,14 +14,15 @@ import { HTMLFileSystemProvider } from 'vs/platform/files/browser/htmlFileSystem import { Schemas } from 'vs/base/common/network' import { IndexedDBFileSystemProvider, IndexedDBFileSystemProviderErrorData, IndexedDBFileSystemProviderErrorDataClassification } from 'vs/platform/files/browser/indexedDBFileSystemProvider' import { IndexedDB } from 'vs/base/browser/indexedDB' -import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry' +import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry.service' import { BufferLogger } from 'vs/platform/log/common/bufferLog' import { localizeWithPath } from 'vs/nls' -import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles' +import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles.service' import { BrowserTextFileService } from 'vs/workbench/services/textfile/browser/browserTextFileService' -import { FilesConfigurationService, IFilesConfigurationService } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService' +import { FilesConfigurationService } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService' +import { IFilesConfigurationService } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService.service' import { BrowserElevatedFileService } from 'vs/workbench/services/files/browser/elevatedFileService' -import { IElevatedFileService } from 'vs/workbench/services/files/common/elevatedFileService' +import { IElevatedFileService } from 'vs/workbench/services/files/common/elevatedFileService.service' import { checkServicesNotInitialized, registerServiceInitializePreParticipant } from '../lifecycle' import { logsPath } from '../workbench' import 'vs/workbench/contrib/files/browser/files.configuration.contribution' diff --git a/src/service-override/host.ts b/src/service-override/host.ts index e0c321cb..e7084888 100644 --- a/src/service-override/host.ts +++ b/src/service-override/host.ts @@ -1,7 +1,7 @@ import { IEditorOverrideServices } from 'vs/editor/standalone/browser/standaloneServices' import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors' -import { IHostService } from 'vs/workbench/services/host/browser/host' -import { IHostColorSchemeService } from 'vs/workbench/services/themes/common/hostColorSchemeService' +import { IHostService } from 'vs/workbench/services/host/browser/host.service' +import { IHostColorSchemeService } from 'vs/workbench/services/themes/common/hostColorSchemeService.service' import { BrowserHostService } from 'vs/workbench/services/host/browser/browserHostService' import { BrowserHostColorSchemeService } from 'vs/workbench/services/themes/browser/browserHostColorSchemeService' diff --git a/src/service-override/interactive.ts b/src/service-override/interactive.ts index f7873057..84c1d425 100644 --- a/src/service-override/interactive.ts +++ b/src/service-override/interactive.ts @@ -1,7 +1,9 @@ import { IEditorOverrideServices } from 'vs/editor/standalone/browser/standaloneServices' import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors' -import { IInteractiveHistoryService, InteractiveHistoryService } from 'vs/workbench/contrib/interactive/browser/interactiveHistoryService' -import { IInteractiveDocumentService, InteractiveDocumentService } from 'vs/workbench/contrib/interactive/browser/interactiveDocumentService' +import { InteractiveHistoryService } from 'vs/workbench/contrib/interactive/browser/interactiveHistoryService' +import { IInteractiveHistoryService } from 'vs/workbench/contrib/interactive/browser/interactiveHistoryService.service' +import { InteractiveDocumentService } from 'vs/workbench/contrib/interactive/browser/interactiveDocumentService' +import { IInteractiveDocumentService } from 'vs/workbench/contrib/interactive/browser/interactiveDocumentService.service' import 'vs/workbench/contrib/interactive/browser/interactive.contribution' export default function getServiceOverride (): IEditorOverrideServices { diff --git a/src/service-override/issue.ts b/src/service-override/issue.ts index 743f00f3..c8850213 100644 --- a/src/service-override/issue.ts +++ b/src/service-override/issue.ts @@ -1,8 +1,9 @@ import { IEditorOverrideServices } from 'vs/editor/standalone/browser/standaloneServices' import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors' -import { IWorkbenchIssueService } from 'vs/workbench/services/issue/common/issue' +import { IWorkbenchIssueService } from 'vs/workbench/services/issue/common/issue.service' import { WebIssueService } from 'vs/workbench/services/issue/browser/issueService' -import { ITroubleshootIssueService, TroubleshootIssueService } from 'vs/workbench/services/issue/browser/issueTroubleshoot' +import { TroubleshootIssueService } from 'vs/workbench/services/issue/browser/issueTroubleshoot' +import { ITroubleshootIssueService } from 'vs/workbench/services/issue/browser/issueTroubleshoot.service' import 'vs/workbench/contrib/issue/browser/issue.contribution' export default function getServiceOverride (): IEditorOverrideServices { diff --git a/src/service-override/keybindings.ts b/src/service-override/keybindings.ts index 98e84fd6..24bfaf05 100644 --- a/src/service-override/keybindings.ts +++ b/src/service-override/keybindings.ts @@ -1,24 +1,27 @@ import { IEditorOverrideServices } from 'vs/editor/standalone/browser/standaloneServices' import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors' import { WorkbenchKeybindingService } from 'vs/workbench/services/keybinding/browser/keybindingService' -import { IKeybindingService, IKeyboardEvent, IUserFriendlyKeybinding } from 'vs/platform/keybinding/common/keybinding' +import { IKeyboardEvent, IUserFriendlyKeybinding } from 'vs/platform/keybinding/common/keybinding' +import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding.service' import { VSBuffer } from 'vs/base/common/buffer' -import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile' -import { IKeyboardLayoutService } from 'vs/platform/keyboardLayout/common/keyboardLayout' +import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile.service' +import { IKeyboardLayoutService } from 'vs/platform/keyboardLayout/common/keyboardLayout.service' import { BrowserKeyboardLayoutService } from 'vs/workbench/services/keybinding/browser/keyboardLayoutService' -import { IFileService, IFileWriteOptions } from 'vs/platform/files/common/files' -import { ICommandService } from 'vs/platform/commands/common/commands' +import { IFileWriteOptions } from 'vs/platform/files/common/files' +import { IFileService } from 'vs/platform/files/common/files.service' +import { ICommandService } from 'vs/platform/commands/common/commands.service' import { CommandService } from 'vs/workbench/services/commands/common/commandService' import { DisposableStore, toDisposable } from 'vs/base/common/lifecycle' import { KeybindingResolver } from 'vs/platform/keybinding/common/keybindingResolver' -import { IContextKeyService, IContextKeyServiceTarget } from 'vs/platform/contextkey/common/contextkey' -import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity' -import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry' -import { INotificationService } from 'vs/platform/notification/common/notification' -import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile' -import { IHostService } from 'vs/workbench/services/host/browser/host' -import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions' -import { ILogService } from 'vs/platform/log/common/log' +import { IContextKeyServiceTarget } from 'vs/platform/contextkey/common/contextkey' +import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey.service' +import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity.service' +import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry.service' +import { INotificationService } from 'vs/platform/notification/common/notification.service' +import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile.service' +import { IHostService } from 'vs/workbench/services/host/browser/host.service' +import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions.service' +import { ILogService } from 'vs/platform/log/common/log.service' import { WorkbenchContextKeysHandler } from 'vs/workbench/browser/contextkeys' import { Schemas } from 'vs/base/common/network' import { URI } from 'vs/base/common/uri' diff --git a/src/service-override/languageDetectionWorker.ts b/src/service-override/languageDetectionWorker.ts index 6cbeaf6a..4beda897 100644 --- a/src/service-override/languageDetectionWorker.ts +++ b/src/service-override/languageDetectionWorker.ts @@ -1,7 +1,7 @@ import { IEditorOverrideServices } from 'vs/editor/standalone/browser/standaloneServices' import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors' import { LanguageDetectionService } from 'vs/workbench/services/languageDetection/browser/languageDetectionWorkerServiceImpl' -import { ILanguageDetectionService } from 'vs/workbench/services/languageDetection/common/languageDetectionWorkerService' +import { ILanguageDetectionService } from 'vs/workbench/services/languageDetection/common/languageDetectionWorkerService.service' import { registerAssets } from '../assets' import 'vs/workbench/contrib/languageDetection/browser/languageDetection.contribution' diff --git a/src/service-override/languages.ts b/src/service-override/languages.ts index c9c5442d..77c343ee 100644 --- a/src/service-override/languages.ts +++ b/src/service-override/languages.ts @@ -2,7 +2,8 @@ import { IEditorOverrideServices } from 'vs/editor/standalone/browser/standalone import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors' import { WorkbenchLanguageService } from 'vs/workbench/services/language/common/languageService' import { ILanguageService } from 'vs/editor/common/languages/language' -import { ILanguageStatusService, LanguageStatusServiceImpl } from 'vs/workbench/services/languageStatus/common/languageStatusService' +import { LanguageStatusServiceImpl } from 'vs/workbench/services/languageStatus/common/languageStatusService' +import { ILanguageStatusService } from 'vs/workbench/services/languageStatus/common/languageStatusService.service' import getFileServiceOverride from './files' import 'vs/workbench/contrib/codeEditor/common/languageConfigurationExtensionPoint' diff --git a/src/service-override/layout.ts b/src/service-override/layout.ts index 0f318062..6a5a5b4e 100644 --- a/src/service-override/layout.ts +++ b/src/service-override/layout.ts @@ -1,24 +1,27 @@ import { IEditorOverrideServices, StandaloneServices } from 'vs/editor/standalone/browser/standaloneServices' -import { ActivityBarPosition, IWorkbenchLayoutService, LayoutSettings, PanelAlignment, Parts, Position, positionFromString, positionToString } from 'vs/workbench/services/layout/browser/layoutService' -import { ILayoutOffsetInfo, ILayoutService } from 'vs/platform/layout/browser/layoutService' +import { ActivityBarPosition, LayoutSettings, PanelAlignment, Parts, Position, positionFromString, positionToString } from 'vs/workbench/services/layout/browser/layoutService' +import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService.service' +import { ILayoutOffsetInfo } from 'vs/platform/layout/browser/layoutService' +import { ILayoutService } from 'vs/platform/layout/browser/layoutService.service' import { Emitter, Event } from 'vs/base/common/event' import * as dom from 'vs/base/browser/dom' import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors' import { Part } from 'vs/workbench/browser/part' import { isAncestorUsingFlowTo } from 'vs/base/browser/dom' -import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite' -import { IViewContainerModel, IViewDescriptorService, ViewContainerLocation } from 'vs/workbench/common/views' +import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite.service' +import { IViewContainerModel, ViewContainerLocation } from 'vs/workbench/common/views' +import { IViewDescriptorService } from 'vs/workbench/common/views.service' import { isChrome, isFirefox, isLinux, isSafari, isWindows } from 'vs/base/common/platform' import { coalesce } from 'vs/base/common/arrays' import { ActivitybarPart } from 'vs/workbench/browser/parts/activitybar/activitybarPart' -import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService' -import { IStatusbarService } from 'vs/workbench/services/statusbar/browser/statusbar' +import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService.service' +import { IStatusbarService } from 'vs/workbench/services/statusbar/browser/statusbar.service' import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation' -import { IConfigurationService } from 'vs/platform/configuration/common/configuration' +import { IConfigurationService } from 'vs/platform/configuration/common/configuration.service' import { Disposable, DisposableStore, toDisposable } from 'vs/base/common/lifecycle' -import { IAuxiliaryWindowService } from 'vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService' +import { IAuxiliaryWindowService } from 'vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService.service' import { StandaloneCodeEditor } from 'vs/editor/standalone/browser/standaloneCodeEditor' -import { IHostService } from 'vs/workbench/services/host/browser/host' +import { IHostService } from 'vs/workbench/services/host/browser/host.service' import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService' import { getMenuBarVisibility, getTitleBarStyle } from 'vs/platform/window/common/window' import { IDisposable } from '@xterm/headless' diff --git a/src/service-override/lifecycle.ts b/src/service-override/lifecycle.ts index 4160cf4e..ae13e3be 100644 --- a/src/service-override/lifecycle.ts +++ b/src/service-override/lifecycle.ts @@ -1,8 +1,9 @@ import { IEditorOverrideServices } from 'vs/editor/standalone/browser/standaloneServices' import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors' import { BrowserLifecycleService } from 'vs/workbench/services/lifecycle/browser/lifecycleService' -import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle' -import { ITimerService, TimerService } from 'vs/workbench/services/timer/browser/timerService' +import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle.service' +import { TimerService } from 'vs/workbench/services/timer/browser/timerService' +import { ITimerService } from 'vs/workbench/services/timer/browser/timerService.service' export default function getServiceOverride (): IEditorOverrideServices { return { diff --git a/src/service-override/localization.ts b/src/service-override/localization.ts index 0d74a240..b846e2a9 100644 --- a/src/service-override/localization.ts +++ b/src/service-override/localization.ts @@ -1,10 +1,11 @@ import { IEditorOverrideServices } from 'vs/editor/standalone/browser/standaloneServices' import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors' -import { ILanguagePackItem, ILanguagePackService } from 'vs/platform/languagePacks/common/languagePacks' -import { ILocaleService } from 'vs/workbench/services/localization/common/locale' -import { IDialogService } from 'vs/platform/dialogs/common/dialogs' -import { IHostService } from 'vs/workbench/services/host/browser/host' -import { IProductService } from 'vs/platform/product/common/productService' +import { ILanguagePackItem } from 'vs/platform/languagePacks/common/languagePacks' +import { ILanguagePackService } from 'vs/platform/languagePacks/common/languagePacks.service' +import { ILocaleService } from 'vs/workbench/services/localization/common/locale.service' +import { IDialogService } from 'vs/platform/dialogs/common/dialogs.service' +import { IHostService } from 'vs/workbench/services/host/browser/host.service' +import { IProductService } from 'vs/platform/product/common/productService.service' import { localize, localizeWithPath } from 'vs/nls' import { Language, language } from 'vs/base/common/platform' import { URI } from 'vs/base/common/uri' diff --git a/src/service-override/log.ts b/src/service-override/log.ts index 4750a989..b48b9b12 100644 --- a/src/service-override/log.ts +++ b/src/service-override/log.ts @@ -1,15 +1,17 @@ import { IEditorOverrideServices } from 'vs/editor/standalone/browser/standaloneServices' import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors' -import { IFileService } from 'vs/platform/files/common/files' -import { ConsoleLogger, ILogService, ILogger, ILoggerService, LogLevel, getLogLevel } from 'vs/platform/log/common/log' +import { IFileService } from 'vs/platform/files/common/files.service' +import { ILogger, LogLevel, ConsoleLogger, getLogLevel } from 'vs/platform/log/common/log' +import { ILogService, ILoggerService } from 'vs/platform/log/common/log.service' import { FileLoggerService } from 'vs/platform/log/common/fileLog' import { LogService } from 'vs/platform/log/common/logService' -import { IEnvironmentService } from 'vs/platform/environment/common/environment' +import { IEnvironmentService } from 'vs/platform/environment/common/environment.service' import { localizeWithPath } from 'vs/nls' import { windowLogId } from 'vs/workbench/services/log/common/logConstants' -import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService' +import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService.service' import { IDisposable, toDisposable } from 'vs/base/common/lifecycle' -import { IDefaultLogLevelsService, DefaultLogLevelsService } from 'vs/workbench/contrib/logs/common/defaultLogLevels' +import { DefaultLogLevelsService } from 'vs/workbench/contrib/logs/common/defaultLogLevels' +import { IDefaultLogLevelsService } from 'vs/workbench/contrib/logs/common/defaultLogLevels.service' import getEnvironmentServiceOverride from './environment' import { logsPath } from '../workbench' import { checkServicesNotInitialized } from '../lifecycle' diff --git a/src/service-override/multiDiffEditor.ts b/src/service-override/multiDiffEditor.ts index 8b13f60c..5893b239 100644 --- a/src/service-override/multiDiffEditor.ts +++ b/src/service-override/multiDiffEditor.ts @@ -1,6 +1,7 @@ import { IEditorOverrideServices } from 'vs/editor/standalone/browser/standaloneServices' import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors' -import { IMultiDiffSourceResolverService, MultiDiffSourceResolverService } from 'vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService' +import { MultiDiffSourceResolverService } from 'vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService' +import { IMultiDiffSourceResolverService } from 'vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService.service' import 'vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditor.contribution' export default function getServiceOverride (): IEditorOverrideServices { diff --git a/src/service-override/notebook.ts b/src/service-override/notebook.ts index a7942a8d..cdaa9ca8 100644 --- a/src/service-override/notebook.ts +++ b/src/service-override/notebook.ts @@ -1,32 +1,33 @@ import { IEditorOverrideServices } from 'vs/editor/standalone/browser/standaloneServices' import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors' -import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService' +import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService.service' import { NotebookService } from 'vs/workbench/contrib/notebook/browser/services/notebookServiceImpl' -import { INotebookEditorModelResolverService } from 'vs/workbench/contrib/notebook/common/notebookEditorModelResolverService' -import { INotebookEditorWorkerService } from 'vs/workbench/contrib/notebook/common/services/notebookWorkerService' +import { INotebookEditorModelResolverService } from 'vs/workbench/contrib/notebook/common/notebookEditorModelResolverService.service' +import { INotebookEditorWorkerService } from 'vs/workbench/contrib/notebook/common/services/notebookWorkerService.service' import { NotebookEditorWorkerServiceImpl } from 'vs/workbench/contrib/notebook/browser/services/notebookWorkerServiceImpl' -import { INotebookCellStatusBarService } from 'vs/workbench/contrib/notebook/common/notebookCellStatusBarService' +import { INotebookCellStatusBarService } from 'vs/workbench/contrib/notebook/common/notebookCellStatusBarService.service' import { NotebookCellStatusBarService } from 'vs/workbench/contrib/notebook/browser/services/notebookCellStatusBarServiceImpl' -import { INotebookEditorService } from 'vs/workbench/contrib/notebook/browser/services/notebookEditorService' +import { INotebookEditorService } from 'vs/workbench/contrib/notebook/browser/services/notebookEditorService.service' import { NotebookEditorWidgetService } from 'vs/workbench/contrib/notebook/browser/services/notebookEditorServiceImpl' import { NotebookModelResolverServiceImpl } from 'vs/workbench/contrib/notebook/common/notebookEditorModelResolverServiceImpl' -import { INotebookKernelHistoryService, INotebookKernelService } from 'vs/workbench/contrib/notebook/common/notebookKernelService' +import { INotebookKernelHistoryService, INotebookKernelService } from 'vs/workbench/contrib/notebook/common/notebookKernelService.service' import { NotebookKernelService } from 'vs/workbench/contrib/notebook/browser/services/notebookKernelServiceImpl' import { NotebookRendererMessagingService } from 'vs/workbench/contrib/notebook/browser/services/notebookRendererMessagingServiceImpl' -import { INotebookRendererMessagingService } from 'vs/workbench/contrib/notebook/common/notebookRendererMessagingService' +import { INotebookRendererMessagingService } from 'vs/workbench/contrib/notebook/common/notebookRendererMessagingService.service' import { NotebookExecutionStateService } from 'vs/workbench/contrib/notebook/browser/services/notebookExecutionStateServiceImpl' import { NotebookExecutionService } from 'vs/workbench/contrib/notebook/browser/services/notebookExecutionServiceImpl' -import { INotebookExecutionService } from 'vs/workbench/contrib/notebook/common/notebookExecutionService' -import { INotebookKeymapService } from 'vs/workbench/contrib/notebook/common/notebookKeymapService' +import { INotebookExecutionService } from 'vs/workbench/contrib/notebook/common/notebookExecutionService.service' +import { INotebookKeymapService } from 'vs/workbench/contrib/notebook/common/notebookKeymapService.service' import { NotebookKeymapService } from 'vs/workbench/contrib/notebook/browser/services/notebookKeymapServiceImpl' -import { INotebookExecutionStateService } from 'vs/workbench/contrib/notebook/common/notebookExecutionStateService' +import { INotebookExecutionStateService } from 'vs/workbench/contrib/notebook/common/notebookExecutionStateService.service' import { NotebookKernelHistoryService } from 'vs/workbench/contrib/notebook/browser/services/notebookKernelHistoryServiceImpl' -import { INotebookLoggingService } from 'vs/workbench/contrib/notebook/common/notebookLoggingService' +import { INotebookLoggingService } from 'vs/workbench/contrib/notebook/common/notebookLoggingService.service' import { NotebookLoggingService } from 'vs/workbench/contrib/notebook/browser/services/notebookLoggingServiceImpl' -import { INotebookSearchService } from 'vs/workbench/contrib/search/common/notebookSearch' +import { INotebookSearchService } from 'vs/workbench/contrib/search/common/notebookSearch.service' import { NotebookSearchService } from 'vs/workbench/contrib/search/browser/notebookSearch/notebookSearchService' +import { NotebookDocumentWorkbenchService } from 'vs/workbench/services/notebook/common/notebookDocumentService' +import { INotebookDocumentService } from 'vs/workbench/services/notebook/common/notebookDocumentService.service' import 'vs/workbench/contrib/notebook/browser/notebook.contribution' -import { INotebookDocumentService, NotebookDocumentWorkbenchService } from 'vs/workbench/services/notebook/common/notebookDocumentService' export default function getServiceOverride (): IEditorOverrideServices { return { diff --git a/src/service-override/notifications.ts b/src/service-override/notifications.ts index 9ebe4ff3..99eaac64 100644 --- a/src/service-override/notifications.ts +++ b/src/service-override/notifications.ts @@ -2,14 +2,14 @@ import { NotificationsToasts } from 'vs/workbench/browser/parts/notifications/no import { IEditorOverrideServices } from 'vs/editor/standalone/browser/standaloneServices' import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation' import { NotificationService } from 'vs/workbench/services/notification/common/notificationService' -import { INotificationService } from 'vs/platform/notification/common/notification' +import { INotificationService } from 'vs/platform/notification/common/notification.service' import * as dom from 'vs/base/browser/dom' import { registerNotificationCommands } from 'vs/workbench/browser/parts/notifications/notificationsCommands' import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors' import { NotificationsCenter } from 'vs/workbench/browser/parts/notifications/notificationsCenter' import { NotificationsAlerts } from 'vs/workbench/browser/parts/notifications/notificationsAlerts' import { NotificationsTelemetry } from 'vs/workbench/browser/parts/notifications/notificationsTelemetry' -import { ILayoutService } from 'vs/platform/layout/browser/layoutService' +import { ILayoutService } from 'vs/platform/layout/browser/layoutService.service' import { NotificationsStatus } from 'vs/workbench/browser/parts/notifications/notificationsStatus' import { onRenderWorkbench } from '../lifecycle' diff --git a/src/service-override/outline.ts b/src/service-override/outline.ts index 60e1ea92..29acbe7f 100644 --- a/src/service-override/outline.ts +++ b/src/service-override/outline.ts @@ -2,7 +2,7 @@ import { IEditorOverrideServices } from 'vs/editor/standalone/browser/standalone import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors' import 'vs/workbench/contrib/codeEditor/browser/outline/documentSymbolsOutline' import 'vs/workbench/contrib/outline/browser/outline.contribution' -import { IOutlineService } from 'vs/workbench/services/outline/browser/outline' +import { IOutlineService } from 'vs/workbench/services/outline/browser/outline.service' import { OutlineService } from 'vs/workbench/services/outline/browser/outlineService' export default function getServiceOverride (): IEditorOverrideServices { diff --git a/src/service-override/output.ts b/src/service-override/output.ts index c2ac0ced..6cb387c9 100644 --- a/src/service-override/output.ts +++ b/src/service-override/output.ts @@ -2,8 +2,9 @@ import { IEditorOverrideServices } from 'vs/editor/standalone/browser/standalone import { LogLevel } from 'vs/platform/log/common/log' import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors' import { OutputService } from 'vs/workbench/contrib/output/browser/outputServices' -import { IOutputService } from 'vs/workbench/services/output/common/output' -import { IOutputChannelModelService, OutputChannelModelService } from 'vs/workbench/contrib/output/common/outputChannelModelService' +import { IOutputService } from 'vs/workbench/services/output/common/output.service' +import { OutputChannelModelService } from 'vs/workbench/contrib/output/common/outputChannelModelService' +import { IOutputChannelModelService } from 'vs/workbench/contrib/output/common/outputChannelModelService.service' import getLogServiceOverride from './log' import 'vs/workbench/contrib/output/browser/output.contribution' diff --git a/src/service-override/preferences.ts b/src/service-override/preferences.ts index eff862cf..79bc2007 100644 --- a/src/service-override/preferences.ts +++ b/src/service-override/preferences.ts @@ -1,10 +1,11 @@ import { IEditorOverrideServices } from 'vs/editor/standalone/browser/standaloneServices' import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors' -import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences' +import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences.service' import { PreferencesService } from 'vs/workbench/services/preferences/browser/preferencesService' -import { IPreferencesSearchService } from 'vs/workbench/contrib/preferences/common/preferences' +import { IPreferencesSearchService } from 'vs/workbench/contrib/preferences/common/preferences.service' import { PreferencesSearchService } from 'vs/workbench/contrib/preferences/browser/preferencesSearch' -import { IKeybindingEditingService, KeybindingsEditingService } from 'vs/workbench/services/keybinding/common/keybindingEditing' +import { KeybindingsEditingService } from 'vs/workbench/services/keybinding/common/keybindingEditing' +import { IKeybindingEditingService } from 'vs/workbench/services/keybinding/common/keybindingEditing.service' import 'vs/workbench/contrib/preferences/browser/preferences.contribution' export default function getServiceOverride (): IEditorOverrideServices { diff --git a/src/service-override/quickaccess.ts b/src/service-override/quickaccess.ts index 20b6a5e7..48bed608 100644 --- a/src/service-override/quickaccess.ts +++ b/src/service-override/quickaccess.ts @@ -1,5 +1,6 @@ import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors' -import { IInputBox, IInputOptions, IPickOptions, IQuickInputButton, IQuickInputService, IQuickNavigateConfiguration, IQuickPick, IQuickPickItem, IQuickWidget, QuickPickInput } from 'vs/platform/quickinput/common/quickInput' +import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput.service' +import { IInputBox, IInputOptions, IPickOptions, IQuickInputButton, IQuickNavigateConfiguration, IQuickPick, IQuickPickItem, IQuickWidget, QuickPickInput } from 'vs/platform/quickinput/common/quickInput' import { CancellationToken } from 'vs/base/common/cancellation' import { StandaloneQuickInputService } from 'vs/editor/standalone/browser/quickInput/standaloneQuickInputService' import { IEditorOverrideServices, StandaloneServices } from 'vs/editor/standalone/browser/standaloneServices' diff --git a/src/service-override/remoteAgent.ts b/src/service-override/remoteAgent.ts index c9eb63f9..7052799d 100644 --- a/src/service-override/remoteAgent.ts +++ b/src/service-override/remoteAgent.ts @@ -1,28 +1,33 @@ import { IEditorOverrideServices } from 'vs/editor/standalone/browser/standaloneServices' import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors' -import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService' +import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService.service' import { RemoteAgentService } from 'vs/workbench/services/remote/browser/remoteAgentService' -import { IRemoteSocketFactoryService, RemoteSocketFactoryService } from 'vs/platform/remote/common/remoteSocketFactoryService' -import { IRemoteAuthorityResolverService, RemoteConnectionType } from 'vs/platform/remote/common/remoteAuthorityResolver' +import { RemoteSocketFactoryService } from 'vs/platform/remote/common/remoteSocketFactoryService' +import { IRemoteSocketFactoryService } from 'vs/platform/remote/common/remoteSocketFactoryService.service' +import { RemoteConnectionType } from 'vs/platform/remote/common/remoteAuthorityResolver' +import { IRemoteAuthorityResolverService } from 'vs/platform/remote/common/remoteAuthorityResolver.service' import { RemoteAuthorityResolverService } from 'vs/platform/remote/browser/remoteAuthorityResolverService' import { BrowserSocketFactory } from 'vs/platform/remote/browser/browserSocketFactory' import { RemoteFileSystemProviderClient } from 'vs/workbench/services/remote/common/remoteFileSystemProviderClient' -import { BrowserWorkbenchEnvironmentService, IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService' -import { IFileService } from 'vs/platform/files/common/files' -import { ILogService } from 'vs/platform/log/common/log' -import { IRemoteExplorerService, RemoteExplorerService } from 'vs/workbench/services/remote/common/remoteExplorerService' -import { ExternalUriOpenerService, IExternalUriOpenerService } from 'vs/workbench/contrib/externalUriOpener/common/externalUriOpenerService' +import { BrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService' +import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService.service' +import { IFileService } from 'vs/platform/files/common/files.service' +import { ILogService } from 'vs/platform/log/common/log.service' +import { RemoteExplorerService } from 'vs/workbench/services/remote/common/remoteExplorerService' +import { IRemoteExplorerService } from 'vs/workbench/services/remote/common/remoteExplorerService.service' +import { ExternalUriOpenerService } from 'vs/workbench/contrib/externalUriOpener/common/externalUriOpenerService' +import { IExternalUriOpenerService } from 'vs/workbench/contrib/externalUriOpener/common/externalUriOpenerService.service' import { RemoteExtensionsScannerService } from 'vs/workbench/services/remote/common/remoteExtensionsScanner' -import { IRemoteExtensionsScannerService } from 'vs/platform/remote/common/remoteExtensionsScanner' -import { IProductService } from 'vs/platform/product/common/productService' -import { IEnvironmentService } from 'vs/platform/environment/common/environment' +import { IRemoteExtensionsScannerService } from 'vs/platform/remote/common/remoteExtensionsScanner.service' +import { IProductService } from 'vs/platform/product/common/productService.service' +import { IEnvironmentService } from 'vs/platform/environment/common/environment.service' import { BrowserRemoteResourceLoader } from 'vs/workbench/services/remote/browser/browserRemoteResourceHandler' -import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService' -import { IRemoteUserDataProfilesService } from 'vs/workbench/services/userDataProfile/common/remoteUserDataProfiles' -import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile' -import { IActiveLanguagePackService } from 'vs/workbench/services/localization/common/locale' +import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService.service' +import { IRemoteUserDataProfilesService } from 'vs/workbench/services/userDataProfile/common/remoteUserDataProfiles.service' +import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile.service' +import { IActiveLanguagePackService } from 'vs/workbench/services/localization/common/locale.service' import { IExtensionDescription } from 'vs/platform/extensions/common/extensions' -import { ITunnelService } from 'vs/platform/tunnel/common/tunnel' +import { ITunnelService } from 'vs/platform/tunnel/common/tunnel.service' import { TunnelService } from 'vs/workbench/services/tunnel/browser/tunnelService' import getEnvironmentServiceOverride from './environment' import { getWorkbenchConstructionOptions } from '../workbench' diff --git a/src/service-override/scm.ts b/src/service-override/scm.ts index ef4a0b26..17967f65 100644 --- a/src/service-override/scm.ts +++ b/src/service-override/scm.ts @@ -1,8 +1,8 @@ import { IEditorOverrideServices } from 'vs/editor/standalone/browser/standaloneServices' -import { ISCMService, ISCMViewService } from 'vs/workbench/contrib/scm/common/scm' +import { ISCMService, ISCMViewService } from 'vs/workbench/contrib/scm/common/scm.service' import { SCMService } from 'vs/workbench/contrib/scm/common/scmService' import { SCMViewService } from 'vs/workbench/contrib/scm/browser/scmViewService' -import { IQuickDiffService } from 'vs/workbench/contrib/scm/common/quickDiff' +import { IQuickDiffService } from 'vs/workbench/contrib/scm/common/quickDiff.service' import { QuickDiffService } from 'vs/workbench/contrib/scm/common/quickDiffService' import 'vs/workbench/contrib/scm/browser/scm.contribution' import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors' diff --git a/src/service-override/search.ts b/src/service-override/search.ts index 090e886c..9645f816 100644 --- a/src/service-override/search.ts +++ b/src/service-override/search.ts @@ -1,10 +1,12 @@ import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors' import { IEditorOverrideServices } from 'vs/editor/standalone/browser/standaloneServices' -import { ISearchService } from 'vs/workbench/services/search/common/search' +import { ISearchService } from 'vs/workbench/services/search/common/search.service' import { SearchService } from 'vs/workbench/services/search/common/searchService' -import { ISearchViewModelWorkbenchService, SearchViewModelWorkbenchService } from 'vs/workbench/contrib/search/browser/searchModel' -import { ISearchHistoryService, SearchHistoryService } from 'vs/workbench/contrib/search/common/searchHistoryService' -import { IReplaceService } from 'vs/workbench/contrib/search/browser/replace' +import { SearchViewModelWorkbenchService } from 'vs/workbench/contrib/search/browser/searchModel' +import { ISearchViewModelWorkbenchService } from 'vs/workbench/contrib/search/browser/searchModel.service' +import { SearchHistoryService } from 'vs/workbench/contrib/search/common/searchHistoryService' +import { ISearchHistoryService } from 'vs/workbench/contrib/search/common/searchHistoryService.service' +import { IReplaceService } from 'vs/workbench/contrib/search/browser/replace.service' import { ReplaceService } from 'vs/workbench/contrib/search/browser/replaceService' import { RemoteSearchService } from 'vs/workbench/services/search/browser/searchService' import 'vs/workbench/contrib/search/browser/search.contribution' diff --git a/src/service-override/secretStorage.ts b/src/service-override/secretStorage.ts index 27a848ba..1d344c6f 100644 --- a/src/service-override/secretStorage.ts +++ b/src/service-override/secretStorage.ts @@ -1,7 +1,7 @@ import { IEditorOverrideServices } from 'vs/editor/standalone/browser/standaloneServices' -import { IEncryptionService } from 'vs/platform/encryption/common/encryptionService' +import { IEncryptionService } from 'vs/platform/encryption/common/encryptionService.service' import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors' -import { ISecretStorageService } from 'vs/platform/secrets/common/secrets' +import { ISecretStorageService } from 'vs/platform/secrets/common/secrets.service' import { EncryptionService } from 'vs/workbench/services/encryption/browser/encryptionService' import { BrowserSecretStorageService } from 'vs/workbench/services/secrets/browser/secretStorageService' diff --git a/src/service-override/share.ts b/src/service-override/share.ts index 8318134d..62f6219c 100644 --- a/src/service-override/share.ts +++ b/src/service-override/share.ts @@ -1,7 +1,7 @@ import { IEditorOverrideServices } from 'vs/editor/standalone/browser/standaloneServices' import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors' import { ShareService } from 'vs/workbench/contrib/share/browser/shareService' -import { IShareService } from 'vs/workbench/contrib/share/common/share' +import { IShareService } from 'vs/workbench/contrib/share/common/share.service' import 'vs/workbench/contrib/share/browser/share.contribution' export default function getServiceOverride (): IEditorOverrideServices { diff --git a/src/service-override/snippets.ts b/src/service-override/snippets.ts index 29e002c4..9b429d70 100644 --- a/src/service-override/snippets.ts +++ b/src/service-override/snippets.ts @@ -1,8 +1,9 @@ import { IEditorOverrideServices, StandaloneServices } from 'vs/editor/standalone/browser/standaloneServices' import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors' -import { ISnippetsService } from 'vs/workbench/contrib/snippets/browser/snippets' +import { ISnippetsService } from 'vs/workbench/contrib/snippets/browser/snippets.service' import { SnippetsService } from 'vs/workbench/contrib/snippets/browser/snippetsService' -import { ILifecycleService, LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle' +import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle' +import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle.service' import getFileServiceOverride from './files' import { registerServiceInitializeParticipant } from '../lifecycle' import 'vs/workbench/contrib/snippets/browser/snippets.contribution' diff --git a/src/service-override/speech.ts b/src/service-override/speech.ts index a1c4b64f..040450e6 100644 --- a/src/service-override/speech.ts +++ b/src/service-override/speech.ts @@ -1,6 +1,6 @@ import { IEditorOverrideServices } from 'vs/editor/standalone/browser/standaloneServices' import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors' -import { ISpeechService } from 'vs/workbench/contrib/speech/common/speechService' +import { ISpeechService } from 'vs/workbench/contrib/speech/common/speechService.service' import { SpeechService } from 'vs/workbench/contrib/speech/browser/speechService' import 'vs/workbench/contrib/speech/browser/speech.contribution' diff --git a/src/service-override/storage.ts b/src/service-override/storage.ts index 5ff7abfe..75f5dd34 100644 --- a/src/service-override/storage.ts +++ b/src/service-override/storage.ts @@ -3,14 +3,16 @@ import { IDisposable } from 'vs/base/common/lifecycle' import { IStorage, IStorageDatabase, IStorageItemsChangeEvent, IUpdateRequest, Storage } from 'vs/base/parts/storage/common/storage' import { IEditorOverrideServices } from 'vs/editor/standalone/browser/standaloneServices' import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors' -import { AbstractStorageService, IStorageService, StorageScope as VSStorageScope } from 'vs/platform/storage/common/storage' +import { AbstractStorageService, StorageScope as VSStorageScope } from 'vs/platform/storage/common/storage' +import { IStorageService } from 'vs/platform/storage/common/storage.service' import { IUserDataProfile } from 'vs/platform/userDataProfile/common/userDataProfile' import { IAnyWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace' import { BrowserStorageService } from 'vs/workbench/services/storage/browser/storageService' -import { ILogService } from 'vs/platform/log/common/log' -import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile' -import { IHostService } from 'vs/workbench/services/host/browser/host' -import { ExtensionStorageService, IExtensionStorageService } from 'vs/platform/extensionManagement/common/extensionStorage' +import { ILogService } from 'vs/platform/log/common/log.service' +import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile.service' +import { IHostService } from 'vs/workbench/services/host/browser/host.service' +import { ExtensionStorageService } from 'vs/platform/extensionManagement/common/extensionStorage' +import { IExtensionStorageService } from 'vs/platform/extensionManagement/common/extensionStorage.service' import { registerServiceInitializePreParticipant } from '../lifecycle' import { getWorkspaceIdentifier } from '../workbench' diff --git a/src/service-override/task.ts b/src/service-override/task.ts index a3df6c4b..85f19bc1 100644 --- a/src/service-override/task.ts +++ b/src/service-override/task.ts @@ -1,6 +1,6 @@ import { IEditorOverrideServices } from 'vs/editor/standalone/browser/standaloneServices' import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors' -import { ITaskService } from 'vs/workbench/contrib/tasks/common/taskService' +import { ITaskService } from 'vs/workbench/contrib/tasks/common/taskService.service' import { TaskService } from 'vs/workbench/contrib/tasks/browser/taskService' import 'vs/workbench/contrib/tasks/browser/task.contribution' diff --git a/src/service-override/terminal.ts b/src/service-override/terminal.ts index a9e5bd03..b6356ae0 100644 --- a/src/service-override/terminal.ts +++ b/src/service-override/terminal.ts @@ -1,20 +1,22 @@ import { IEditorOverrideServices } from 'vs/editor/standalone/browser/standaloneServices' import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors' -import { IProcessReadyEvent, ITerminalBackend, ITerminalBackendRegistry, ITerminalChildProcess, ITerminalLaunchError, ITerminalProfile, ITerminalsLayoutInfo, TerminalExtensions, ITerminalLogService, IPtyHostLatencyMeasurement } from 'vs/platform/terminal/common/terminal' -import { ITerminalProfileResolverService, ITerminalProfileService } from 'vs/workbench/contrib/terminal/common/terminal' -import { ITerminalEditorService, ITerminalGroupService, ITerminalInstanceService, ITerminalService } from 'vs/workbench/contrib/terminal/browser/terminal' +import { ITerminalsLayoutInfo, IProcessReadyEvent, ITerminalBackend, ITerminalBackendRegistry, ITerminalChildProcess, ITerminalLaunchError, ITerminalProfile, TerminalExtensions, IPtyHostLatencyMeasurement } from 'vs/platform/terminal/common/terminal' +import { ITerminalLogService } from 'vs/platform/terminal/common/terminal.service' +import { ITerminalProfileResolverService, ITerminalProfileService } from 'vs/workbench/contrib/terminal/common/terminal.service' +import { ITerminalEditorService, ITerminalGroupService, ITerminalInstanceService, ITerminalService } from 'vs/workbench/contrib/terminal/browser/terminal.service' import { TerminalService } from 'vs/workbench/contrib/terminal/browser/terminalService' import { TerminalEditorService } from 'vs/workbench/contrib/terminal/browser/terminalEditorService' import { TerminalGroupService } from 'vs/workbench/contrib/terminal/browser/terminalGroupService' import { TerminalInstanceService } from 'vs/workbench/contrib/terminal/browser/terminalInstanceService' import { TerminalProfileService } from 'vs/workbench/contrib/terminal/browser/terminalProfileService' -import { ITerminalContributionService, TerminalContributionService } from 'vs/workbench/contrib/terminal/common/terminalExtensionPoints' -import { ITerminalLinkProviderService } from 'vs/workbench/contrib/terminalContrib/links/browser/links' +import { TerminalContributionService } from 'vs/workbench/contrib/terminal/common/terminalExtensionPoints' +import { ITerminalContributionService } from 'vs/workbench/contrib/terminal/common/terminalExtensionPoints.service' +import { ITerminalLinkProviderService } from 'vs/workbench/contrib/terminalContrib/links/browser/links.service' import { TerminalLinkProviderService } from 'vs/workbench/contrib/terminalContrib/links/browser/terminalLinkProviderService' import { ElectronTerminalProfileResolverService } from 'vs/workbench/contrib/terminal/electron-sandbox/terminalProfileResolverService' import { EnvironmentVariableService } from 'vs/workbench/contrib/terminal/common/environmentVariableService' -import { IEnvironmentVariableService } from 'vs/workbench/contrib/terminal/common/environmentVariable' -import { ITerminalQuickFixService } from 'vs/workbench/contrib/terminalContrib/quickFix/browser/quickFix' +import { IEnvironmentVariableService } from 'vs/workbench/contrib/terminal/common/environmentVariable.service' +import { ITerminalQuickFixService } from 'vs/workbench/contrib/terminalContrib/quickFix/browser/quickFix.service' import { TerminalLogService } from 'vs/platform/terminal/common/terminalLogService' import { TerminalQuickFixService } from 'vs/workbench/contrib/terminalContrib/quickFix/browser/terminalQuickFixService' import { Emitter, Event } from 'vs/base/common/event' @@ -22,13 +24,14 @@ import { Registry } from 'vs/platform/registry/common/platform' import { IProcessEnvironment } from 'vs/base/common/platform' import { PerformanceMark } from 'vs/base/common/performance' import { DeferredPromise } from 'vs/base/common/async' -import { EmbedderTerminalService, IEmbedderTerminalService } from 'vs/workbench/services/terminal/common/embedderTerminalService' +import { EmbedderTerminalService } from 'vs/workbench/services/terminal/common/embedderTerminalService' +import { IEmbedderTerminalService } from 'vs/workbench/services/terminal/common/embedderTerminalService.service' import { unsupported } from '../tools' import 'vs/workbench/contrib/terminal/browser/terminal.contribution' import 'vs/workbench/contrib/terminal/terminal.all' import 'vs/workbench/contrib/externalTerminal/browser/externalTerminal.contribution' import 'vs/workbench/contrib/terminal/browser/terminal.web.contribution' -export { ITerminalService, ITerminalInstanceService } from 'vs/workbench/contrib/terminal/browser/terminal' +export { ITerminalService, ITerminalInstanceService } from 'vs/workbench/contrib/terminal/browser/terminal.service' abstract class SimpleTerminalBackend implements ITerminalBackend { getLatency = async (): Promise => [] diff --git a/src/service-override/testing.ts b/src/service-override/testing.ts index 303fa589..ab155c7f 100644 --- a/src/service-override/testing.ts +++ b/src/service-override/testing.ts @@ -1,17 +1,23 @@ import { IEditorOverrideServices } from 'vs/editor/standalone/browser/standaloneServices' import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors' -import { ITestProfileService, TestProfileService } from 'vs/workbench/contrib/testing/common/testProfileService' -import { ITestResultService, TestResultService } from 'vs/workbench/contrib/testing/common/testResultService' -import { ITestResultStorage, TestResultStorage } from 'vs/workbench/contrib/testing/common/testResultStorage' -import { ITestService } from 'vs/workbench/contrib/testing/common/testService' +import { TestProfileService } from 'vs/workbench/contrib/testing/common/testProfileService' +import { ITestProfileService } from 'vs/workbench/contrib/testing/common/testProfileService.service' +import { TestResultService } from 'vs/workbench/contrib/testing/common/testResultService' +import { ITestResultService } from 'vs/workbench/contrib/testing/common/testResultService.service' +import { TestResultStorage } from 'vs/workbench/contrib/testing/common/testResultStorage' +import { ITestResultStorage } from 'vs/workbench/contrib/testing/common/testResultStorage.service' +import { ITestService } from 'vs/workbench/contrib/testing/common/testService.service' import { TestService } from 'vs/workbench/contrib/testing/common/testServiceImpl' -import { ITestingDecorationsService } from 'vs/workbench/contrib/testing/common/testingDecorations' +import { ITestingDecorationsService } from 'vs/workbench/contrib/testing/common/testingDecorations.service' import { TestingDecorationService } from 'vs/workbench/contrib/testing/browser/testingDecorations' -import { ITestingPeekOpener } from 'vs/workbench/contrib/testing/common/testingPeekOpener' -import { ITestingContinuousRunService, TestingContinuousRunService } from 'vs/workbench/contrib/testing/common/testingContinuousRunService' -import { ITestExplorerFilterState, TestExplorerFilterState } from 'vs/workbench/contrib/testing/common/testExplorerFilterState' +import { ITestingPeekOpener } from 'vs/workbench/contrib/testing/common/testingPeekOpener.service' +import { TestingContinuousRunService } from 'vs/workbench/contrib/testing/common/testingContinuousRunService' +import { ITestingContinuousRunService } from 'vs/workbench/contrib/testing/common/testingContinuousRunService.service' +import { TestExplorerFilterState } from 'vs/workbench/contrib/testing/common/testExplorerFilterState' +import { ITestExplorerFilterState } from 'vs/workbench/contrib/testing/common/testExplorerFilterState.service' import { TestingPeekOpener } from 'vs/workbench/contrib/testing/browser/testingOutputPeek' -import { ITestCoverageService, TestCoverageService } from 'vs/workbench/contrib/testing/common/testCoverageService' +import { TestCoverageService } from 'vs/workbench/contrib/testing/common/testCoverageService' +import { ITestCoverageService } from 'vs/workbench/contrib/testing/common/testCoverageService.service' import getTerminalServiceOverride from './terminal' import 'vs/workbench/contrib/testing/browser/testing.contribution' import 'vs/workbench/contrib/testing/browser/testingConfigurationUi' diff --git a/src/service-override/textmate.ts b/src/service-override/textmate.ts index bdc3a1b4..af113bd0 100644 --- a/src/service-override/textmate.ts +++ b/src/service-override/textmate.ts @@ -1,8 +1,9 @@ import { IEditorOverrideServices, StandaloneServices } from 'vs/editor/standalone/browser/standaloneServices' -import { ITextMateTokenizationService } from 'vs/workbench/services/textMate/browser/textMateTokenizationFeature' +import { ITextMateTokenizationService } from 'vs/workbench/services/textMate/browser/textMateTokenizationFeature.service' import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors' import { TextMateTokenizationFeature } from 'vs/workbench/services/textMate/browser/textMateTokenizationFeatureImpl' -import { ILifecycleService, LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle' +import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle' +import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle.service' import getFileServiceOverride from './files' import { registerServiceInitializeParticipant } from '../lifecycle' import { registerAssets } from '../assets' diff --git a/src/service-override/theme.ts b/src/service-override/theme.ts index 3af5a1f9..1b8971e3 100644 --- a/src/service-override/theme.ts +++ b/src/service-override/theme.ts @@ -1,7 +1,7 @@ import { WorkbenchThemeService } from 'vs/workbench/services/themes/browser/workbenchThemeService' import { IThemeExtensionPoint } from 'vs/workbench/services/themes/common/workbenchThemeService' import { IEditorOverrideServices } from 'vs/editor/standalone/browser/standaloneServices' -import { IThemeService } from 'vs/platform/theme/common/themeService' +import { IThemeService } from 'vs/platform/theme/common/themeService.service' import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors' import type { StandaloneThemeService } from 'vs/editor/standalone/browser/standaloneThemeService' import { ConfigurationTarget } from 'vs/platform/configuration/common/configuration' diff --git a/src/service-override/timeline.ts b/src/service-override/timeline.ts index f49ea28e..9ac9795d 100644 --- a/src/service-override/timeline.ts +++ b/src/service-override/timeline.ts @@ -2,7 +2,7 @@ import { IEditorOverrideServices } from 'vs/editor/standalone/browser/standalone import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors' import 'vs/workbench/contrib/timeline/browser/timeline.contribution' import 'vs/workbench/contrib/localHistory/browser/localHistory.contribution' -import { ITimelineService } from 'vs/workbench/contrib/timeline/common/timeline' +import { ITimelineService } from 'vs/workbench/contrib/timeline/common/timeline.service' import { TimelineService } from 'vs/workbench/contrib/timeline/common/timelineService' export default function getServiceOverride (): IEditorOverrideServices { diff --git a/src/service-override/tools/editor.ts b/src/service-override/tools/editor.ts index 1eee392b..7c5727a1 100644 --- a/src/service-override/tools/editor.ts +++ b/src/service-override/tools/editor.ts @@ -1,6 +1,7 @@ import { StandaloneServices } from 'vs/editor/standalone/browser/standaloneServices' import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService' -import { IEditorService, isPreferredGroup, PreferredGroup, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService' +import { isPreferredGroup, PreferredGroup, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService' +import { IEditorService } from 'vs/workbench/services/editor/common/editorService.service' import { EditorCloseContext, EditorInputWithOptions, GroupModelChangeKind, IActiveEditorChangeEvent, IEditorCloseEvent, IEditorControl, IEditorPane, IEditorWillOpenEvent, IResourceDiffEditorInput, isEditorInput, isResourceEditorInput, ITextDiffEditorPane, IUntitledTextResourceEditorInput, IUntypedEditorInput, IVisibleEditorPane } from 'vs/workbench/common/editor' import { EditorInput } from 'vs/workbench/common/editor/editorInput' import { IEditorOptions, IResourceEditorInput, ITextResourceEditorInput } from 'vs/platform/editor/common/editor' @@ -12,19 +13,20 @@ import { IResolvedTextEditorModel, ITextModelService } from 'vs/editor/common/se import { IStandaloneCodeEditor, StandaloneCodeEditor, StandaloneEditor } from 'vs/editor/standalone/browser/standaloneCodeEditor' import { Disposable, IDisposable, IReference } from 'vs/base/common/lifecycle' import { EditorService } from 'vs/workbench/services/editor/browser/editorService' -import { IActiveEditorActions, IAuxiliaryEditorPart, IEditorDropTargetDelegate, IEditorGroup, IEditorGroupsService, IEditorPart } from 'vs/workbench/services/editor/common/editorGroupsService' +import { IAuxiliaryEditorPart, IEditorDropTargetDelegate, IEditorPart, IActiveEditorActions, IEditorGroup } from 'vs/workbench/services/editor/common/editorGroupsService' +import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService.service' import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation' -import { IConfigurationService } from 'vs/platform/configuration/common/configuration' -import { IWorkspaceTrustRequestService } from 'vs/platform/workspace/common/workspaceTrust' -import { IEditorResolverService } from 'vs/workbench/services/editor/common/editorResolverService' -import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity' -import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace' -import { IFileService } from 'vs/platform/files/common/files' -import { ITextEditorService } from 'vs/workbench/services/textfile/common/textEditorService' -import { IHostService } from 'vs/workbench/services/host/browser/host' +import { IConfigurationService } from 'vs/platform/configuration/common/configuration.service' +import { IWorkspaceTrustRequestService } from 'vs/platform/workspace/common/workspaceTrust.service' +import { IEditorResolverService } from 'vs/workbench/services/editor/common/editorResolverService.service' +import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity.service' +import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace.service' +import { IFileService } from 'vs/platform/files/common/files.service' +import { ITextEditorService } from 'vs/workbench/services/textfile/common/textEditorService.service' +import { IHostService } from 'vs/workbench/services/host/browser/host.service' import { Emitter, Event } from 'vs/base/common/event' import { TextResourceEditorInput } from 'vs/workbench/common/editor/textResourceEditorInput' -import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey' +import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey.service' import { URI } from 'vs/base/common/uri' import { IGroupModelChangeEvent } from 'vs/workbench/common/editor/editorGroupModel' import { EditorLayoutInfo } from 'vs/editor/common/config/editorOptions' diff --git a/src/service-override/tools/views.ts b/src/service-override/tools/views.ts index 079d749b..8f27b618 100644 --- a/src/service-override/tools/views.ts +++ b/src/service-override/tools/views.ts @@ -8,7 +8,8 @@ import { Registry } from 'vs/platform/registry/common/platform' import { ViewPaneContainer } from 'vs/workbench/browser/parts/views/viewPaneContainer' import { URI } from 'vs/base/common/uri' import { Codicon } from 'vs/base/common/codicons' -import { EditorInputFactoryObject, IEditorResolverService, RegisteredEditorInfo, RegisteredEditorOptions, RegisteredEditorPriority } from 'vs/workbench/services/editor/common/editorResolverService' +import { EditorInputFactoryObject, RegisteredEditorInfo, RegisteredEditorOptions, RegisteredEditorPriority } from 'vs/workbench/services/editor/common/editorResolverService' +import { IEditorResolverService } from 'vs/workbench/services/editor/common/editorResolverService.service' import { EditorInput, IEditorCloseHandler } from 'vs/workbench/common/editor/editorInput' import { EditorExtensions, EditorInputCapabilities, IEditorFactoryRegistry, IEditorOpenContext, IEditorSerializer, Verbosity } from 'vs/workbench/common/editor' import { IEditorOptions } from 'vs/platform/editor/common/editor' @@ -20,9 +21,9 @@ import { IAction } from 'vs/base/common/actions' import { BaseActionViewItem } from 'vs/base/browser/ui/actionbar/actionViewItems' import { EditorPaneDescriptor, IEditorPaneRegistry } from 'vs/workbench/browser/editor' import { EditorPane } from 'vs/workbench/browser/parts/editor/editorPane' -import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry' -import { IStorageService } from 'vs/platform/storage/common/storage' -import { IThemeService } from 'vs/platform/theme/common/themeService' +import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry.service' +import { IStorageService } from 'vs/platform/storage/common/storage.service' +import { IThemeService } from 'vs/platform/theme/common/themeService.service' import { CancellationToken } from 'vs/base/common/cancellation' import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement' import { assertAllDefined, assertIsDefined } from 'vs/base/common/types' @@ -30,7 +31,8 @@ import { ScrollbarVisibility } from 'vs/base/common/scrollable' import { ConfirmResult } from 'vs/platform/dialogs/common/dialogs' import { AbstractResourceEditorInput } from 'vs/workbench/common/editor/resourceEditorInput' import { AbstractTextResourceEditorInput } from 'vs/workbench/common/editor/textResourceEditorInput' -import { IWorkbenchLayoutService, Parts, Position } from 'vs/workbench/services/layout/browser/layoutService' +import { Parts, Position } from 'vs/workbench/services/layout/browser/layoutService' +import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService.service' import { StandaloneServices } from 'vs/editor/standalone/browser/standaloneServices' import { Event } from 'vs/base/common/event' import { IView, SplitView } from 'vs/base/browser/ui/splitview/splitview' diff --git a/src/service-override/userDataSync.ts b/src/service-override/userDataSync.ts index 6e89144a..f6f61569 100644 --- a/src/service-override/userDataSync.ts +++ b/src/service-override/userDataSync.ts @@ -1,36 +1,39 @@ import { IEditorOverrideServices } from 'vs/editor/standalone/browser/standaloneServices' import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors' -import { IUserDataAutoSyncService, IUserDataSyncEnablementService, IUserDataSyncLocalStoreService, IUserDataSyncLogService, IUserDataSyncResourceProviderService, IUserDataSyncService, IUserDataSyncStoreManagementService, IUserDataSyncStoreService, IUserDataSyncUtilService } from 'vs/platform/userDataSync/common/userDataSync' -import { IUserDataSyncAccountService, UserDataSyncAccountService } from 'vs/platform/userDataSync/common/userDataSyncAccount' -import { IUserDataSyncMachinesService, UserDataSyncMachinesService } from 'vs/platform/userDataSync/common/userDataSyncMachines' +import { IUserDataAutoSyncService, IUserDataSyncEnablementService, IUserDataSyncLocalStoreService, IUserDataSyncLogService, IUserDataSyncResourceProviderService, IUserDataSyncService, IUserDataSyncStoreManagementService, IUserDataSyncStoreService, IUserDataSyncUtilService } from 'vs/platform/userDataSync/common/userDataSync.service' +import { UserDataSyncAccountService } from 'vs/platform/userDataSync/common/userDataSyncAccount' +import { IUserDataSyncAccountService } from 'vs/platform/userDataSync/common/userDataSyncAccount.service' +import { UserDataSyncMachinesService } from 'vs/platform/userDataSync/common/userDataSyncMachines' +import { IUserDataSyncMachinesService } from 'vs/platform/userDataSync/common/userDataSyncMachines.service' import { UserDataSyncStoreManagementService, UserDataSyncStoreService } from 'vs/platform/userDataSync/common/userDataSyncStoreService' import { UserDataAutoSyncService } from 'vs/platform/userDataSync/common/userDataAutoSyncService' import { WebUserDataSyncEnablementService } from 'vs/workbench/services/userDataSync/browser/webUserDataSyncEnablementService' import { UserDataSyncService } from 'vs/platform/userDataSync/common/userDataSyncService' import { UserDataSyncLogService } from 'vs/platform/userDataSync/common/userDataSyncLog' import { BrowserUserDataProfilesService } from 'vs/platform/userDataProfile/browser/userDataProfile' -import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile' +import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile.service' import { UserDataSyncResourceProviderService } from 'vs/platform/userDataSync/common/userDataSyncResourceProvider' import { UserDataSyncLocalStoreService } from 'vs/platform/userDataSync/common/userDataSyncLocalStoreService' import { UserDataSyncWorkbenchService } from 'vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService' -import { IUserDataSyncWorkbenchService } from 'vs/workbench/services/userDataSync/common/userDataSync' +import { IUserDataSyncWorkbenchService } from 'vs/workbench/services/userDataSync/common/userDataSync.service' import 'vs/workbench/contrib/userDataSync/browser/userDataSync.contribution' -import { IUserDataInitializationService, IUserDataInitializer, UserDataInitializationService } from 'vs/workbench/services/userData/browser/userDataInit' +import { IUserDataInitializer, UserDataInitializationService } from 'vs/workbench/services/userData/browser/userDataInit' +import { IUserDataInitializationService } from 'vs/workbench/services/userData/browser/userDataInit.service' import { UserDataSyncInitializer } from 'vs/workbench/services/userDataSync/browser/userDataSyncInit' import { UserDataProfileInitializer } from 'vs/workbench/services/userDataProfile/browser/userDataProfileInit' -import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService' -import { ISecretStorageService } from 'vs/platform/secrets/common/secrets' -import { IFileService } from 'vs/platform/files/common/files' -import { IStorageService } from 'vs/platform/storage/common/storage' -import { IProductService } from 'vs/platform/product/common/productService' -import { IRequestService } from 'vs/platform/request/common/request' -import { ILogService } from 'vs/platform/log/common/log' -import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity' -import { IUserDataProfileImportExportService, IUserDataProfileManagementService, IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile' +import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService.service' +import { ISecretStorageService } from 'vs/platform/secrets/common/secrets.service' +import { IFileService } from 'vs/platform/files/common/files.service' +import { IStorageService } from 'vs/platform/storage/common/storage.service' +import { IProductService } from 'vs/platform/product/common/productService.service' +import { IRequestService } from 'vs/platform/request/common/request.service' +import { ILogService } from 'vs/platform/log/common/log.service' +import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity.service' +import { IUserDataProfileImportExportService, IUserDataProfileManagementService, IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile.service' import { mark } from 'vs/base/common/performance' import type { WorkspaceService } from 'vs/workbench/services/configuration/browser/configurationService' import { timeout } from 'vs/base/common/async' -import { IWorkbenchConfigurationService } from 'vs/workbench/services/configuration/common/configuration' +import { IWorkbenchConfigurationService } from 'vs/workbench/services/configuration/common/configuration.service' import { UserDataSyncUtilService } from 'vs/workbench/services/userDataSync/common/userDataSyncUtil' import { UserDataProfileImportExportService } from 'vs/workbench/services/userDataProfile/browser/userDataProfileImportExportService' import { UserDataProfileManagementService } from 'vs/workbench/services/userDataProfile/browser/userDataProfileManagement' diff --git a/src/service-override/viewBanner.ts b/src/service-override/viewBanner.ts index 0eb6a1ef..d1988945 100644 --- a/src/service-override/viewBanner.ts +++ b/src/service-override/viewBanner.ts @@ -1,7 +1,7 @@ import { IEditorOverrideServices } from 'vs/editor/standalone/browser/standaloneServices' import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors' import { BannerPart } from 'vs/workbench/browser/parts/banner/bannerPart' -import { IBannerService } from 'vs/workbench/services/banner/browser/bannerService' +import { IBannerService } from 'vs/workbench/services/banner/browser/bannerService.service' import { registerServiceInitializePostParticipant } from '../lifecycle' import 'vs/workbench/contrib/welcomeBanner/browser/welcomeBanner.contribution' diff --git a/src/service-override/viewCommon.ts b/src/service-override/viewCommon.ts index 0df8963b..9ac427f6 100644 --- a/src/service-override/viewCommon.ts +++ b/src/service-override/viewCommon.ts @@ -1,38 +1,45 @@ import { IEditorOverrideServices } from 'vs/editor/standalone/browser/standaloneServices' import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors' -import { IViewDescriptorService } from 'vs/workbench/common/views' +import { IViewDescriptorService } from 'vs/workbench/common/views.service' import { ViewDescriptorService } from 'vs/workbench/services/views/browser/viewDescriptorService' -import { IActivityService } from 'vs/workbench/services/activity/common/activity' +import { IActivityService } from 'vs/workbench/services/activity/common/activity.service' import { ActivityService } from 'vs/workbench/services/activity/browser/activityService' -import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite' -import { IEditorResolverService } from 'vs/workbench/services/editor/common/editorResolverService' +import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite.service' +import { IEditorResolverService } from 'vs/workbench/services/editor/common/editorResolverService.service' import { EditorResolverService } from 'vs/workbench/services/editor/browser/editorResolverService' -import { BreadcrumbsService, IBreadcrumbsService } from 'vs/workbench/browser/parts/editor/breadcrumbs' -import { IContextViewService } from 'vs/platform/contextview/browser/contextView' +import { BreadcrumbsService } from 'vs/workbench/browser/parts/editor/breadcrumbs' +import { IBreadcrumbsService } from 'vs/workbench/browser/parts/editor/breadcrumbs.service' +import { IContextViewService } from 'vs/platform/contextview/browser/contextView.service' import { ContextViewService } from 'vs/platform/contextview/browser/contextViewService' import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService' -import { ITextEditorService, TextEditorService } from 'vs/workbench/services/textfile/common/textEditorService' +import { TextEditorService } from 'vs/workbench/services/textfile/common/textEditorService' +import { ITextEditorService } from 'vs/workbench/services/textfile/common/textEditorService.service' import { CodeEditorService } from 'vs/workbench/services/editor/browser/codeEditorService' -import { IUntitledTextEditorService, UntitledTextEditorService } from 'vs/workbench/services/untitled/common/untitledTextEditorService' -import { IHistoryService } from 'vs/workbench/services/history/common/history' +import { UntitledTextEditorService } from 'vs/workbench/services/untitled/common/untitledTextEditorService' +import { IUntitledTextEditorService } from 'vs/workbench/services/untitled/common/untitledTextEditorService.service' +import { IHistoryService } from 'vs/workbench/services/history/common/history.service' import { HistoryService } from 'vs/workbench/services/history/browser/historyService' -import { ICustomEditorService } from 'vs/workbench/contrib/customEditor/common/customEditor' +import { ICustomEditorService } from 'vs/workbench/contrib/customEditor/common/customEditor.service' import { CustomEditorService } from 'vs/workbench/contrib/customEditor/browser/customEditors' import { WebviewService } from 'vs/workbench/contrib/webview/browser/webviewService' -import { IWebviewWorkbenchService, WebviewEditorService } from 'vs/workbench/contrib/webviewPanel/browser/webviewWorkbenchService' -import { IWebviewService } from 'vs/workbench/contrib/webview/browser/webview' -import { IWebviewViewService, WebviewViewService } from 'vs/workbench/contrib/webviewView/browser/webviewViewService' -import { IProgressService } from 'vs/platform/progress/common/progress' +import { WebviewEditorService } from 'vs/workbench/contrib/webviewPanel/browser/webviewWorkbenchService' +import { IWebviewWorkbenchService } from 'vs/workbench/contrib/webviewPanel/browser/webviewWorkbenchService.service' +import { IWebviewService } from 'vs/workbench/contrib/webview/browser/webview.service' +import { WebviewViewService } from 'vs/workbench/contrib/webviewView/browser/webviewViewService' +import { IWebviewViewService } from 'vs/workbench/contrib/webviewView/browser/webviewViewService.service' +import { IProgressService } from 'vs/platform/progress/common/progress.service' import { ProgressService } from 'vs/workbench/services/progress/browser/progressService' import { PaneCompositePartService } from 'vs/workbench/browser/parts/paneCompositePartService' -import { BrowserAuxiliaryWindowService, IAuxiliaryWindowService } from 'vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService' -import { IViewsService } from 'vs/workbench/services/views/common/viewsService' +import { BrowserAuxiliaryWindowService } from 'vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService' +import { IAuxiliaryWindowService } from 'vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService.service' +import { IViewsService } from 'vs/workbench/services/views/common/viewsService.service' import { ViewsService } from 'vs/workbench/services/views/browser/viewsService' -import { IHoverService } from 'vs/platform/hover/browser/hover' -import { IEditorPaneService } from 'vs/workbench/services/editor/common/editorPaneService' +import { IHoverService } from 'vs/platform/hover/browser/hover.service' +import { IEditorPaneService } from 'vs/workbench/services/editor/common/editorPaneService.service' import { EditorPaneService } from 'vs/workbench/services/editor/browser/editorPaneService' import { HoverService } from 'vs/editor/browser/services/hoverService/hoverService' -import { CustomEditorLabelService, ICustomEditorLabelService } from 'vs/workbench/services/editor/common/customEditorLabelService' +import { CustomEditorLabelService } from 'vs/workbench/services/editor/common/customEditorLabelService' +import { ICustomEditorLabelService } from 'vs/workbench/services/editor/common/customEditorLabelService.service' import getBulkEditServiceOverride from './bulkEdit' import { changeUrlDomain } from './tools/url' import { registerAssets } from '../assets' diff --git a/src/service-override/viewStatusBar.ts b/src/service-override/viewStatusBar.ts index 8159f5f4..b519561b 100644 --- a/src/service-override/viewStatusBar.ts +++ b/src/service-override/viewStatusBar.ts @@ -1,7 +1,7 @@ import { IEditorOverrideServices } from 'vs/editor/standalone/browser/standaloneServices' import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors' import { StatusbarService } from 'vs/workbench/browser/parts/statusbar/statusbarPart' -import { IStatusbarService } from 'vs/workbench/services/statusbar/browser/statusbar' +import { IStatusbarService } from 'vs/workbench/services/statusbar/browser/statusbar.service' import { ExtensionStatusBarItemService, IExtensionStatusBarItemService } from 'vs/workbench/api/browser/statusBarService' import 'vs/workbench/api/browser/statusBarExtensionPoint' diff --git a/src/service-override/viewTitleBar.ts b/src/service-override/viewTitleBar.ts index d4b5d475..df3d4fea 100644 --- a/src/service-override/viewTitleBar.ts +++ b/src/service-override/viewTitleBar.ts @@ -1,7 +1,7 @@ import { IEditorOverrideServices } from 'vs/editor/standalone/browser/standaloneServices' import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors' import { BrowserTitleService } from 'vs/workbench/browser/parts/titlebar/titlebarPart' -import { ITitleService } from 'vs/workbench/services/title/browser/titleService' +import { ITitleService } from 'vs/workbench/services/title/browser/titleService.service' import { registerServiceInitializePostParticipant } from '../lifecycle' export default function getServiceOverride (): IEditorOverrideServices { diff --git a/src/service-override/views.ts b/src/service-override/views.ts index bdc0adf3..d45236f9 100644 --- a/src/service-override/views.ts +++ b/src/service-override/views.ts @@ -1,39 +1,44 @@ import { IEditorOverrideServices, StandaloneServices } from 'vs/editor/standalone/browser/standaloneServices' import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors' -import { IViewDescriptorService, ViewContainerLocation } from 'vs/workbench/common/views' +import { ViewContainerLocation } from 'vs/workbench/common/views' +import { IViewDescriptorService } from 'vs/workbench/common/views.service' import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation' import { SidebarPart } from 'vs/workbench/browser/parts/sidebar/sidebarPart' import { ActivityService } from 'vs/workbench/services/activity/browser/activityService' -import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite' +import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite.service' import { ActivitybarPart } from 'vs/workbench/browser/parts/activitybar/activitybarPart' import { IDisposable, IReference } from 'vs/base/common/lifecycle' import { PanelPart } from 'vs/workbench/browser/parts/panel/panelPart' import { URI } from 'vs/base/common/uri' import { Part } from 'vs/workbench/browser/part' import { EditorPart } from 'vs/workbench/browser/parts/editor/editorPart' -import { GroupOrientation, GroupsOrder, IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService' -import { IEditorService } from 'vs/workbench/services/editor/common/editorService' +import { GroupOrientation, GroupsOrder } from 'vs/workbench/services/editor/common/editorGroupsService' +import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService.service' +import { IEditorService } from 'vs/workbench/services/editor/common/editorService.service' import { GroupIdentifier, IUntypedEditorInput, isResourceEditorInput, pathsToEditors } from 'vs/workbench/common/editor' import { IEditorOptions } from 'vs/platform/editor/common/editor' import { IResolvedTextEditorModel } from 'vs/editor/common/services/resolverService' import { Parts, Position, positionToString } from 'vs/workbench/services/layout/browser/layoutService' -import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage' -import { IFileService } from 'vs/platform/files/common/files' -import { ILayoutService } from 'vs/platform/layout/browser/layoutService' -import { ILifecycleService, StartupKind } from 'vs/workbench/services/lifecycle/common/lifecycle' +import { StorageScope } from 'vs/platform/storage/common/storage' +import { IStorageService } from 'vs/platform/storage/common/storage.service' +import { IFileService } from 'vs/platform/files/common/files.service' +import { ILayoutService } from 'vs/platform/layout/browser/layoutService.service' +import { StartupKind } from 'vs/workbench/services/lifecycle/common/lifecycle' +import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle.service' import { AuxiliaryBarPart } from 'vs/workbench/browser/parts/auxiliarybar/auxiliaryBarPart' -import { ILogService } from 'vs/platform/log/common/log' +import { ILogService } from 'vs/platform/log/common/log.service' import { mark } from 'vs/base/common/performance' -import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions' +import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions.service' import { Promises } from 'vs/base/common/async' import { isWeb } from 'vs/base/common/platform' -import { IEnvironmentService } from 'vs/platform/environment/common/environment' +import { IEnvironmentService } from 'vs/platform/environment/common/environment.service' import { IEditorToOpen, IInitialEditorsState, ILayoutInitializationState } from 'vs/workbench/browser/layout' -import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService' -import { IWorkspaceContextService, WorkbenchState, isTemporaryWorkspace } from 'vs/platform/workspace/common/workspace' -import { IConfigurationService } from 'vs/platform/configuration/common/configuration' +import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService.service' +import { WorkbenchState, isTemporaryWorkspace } from 'vs/platform/workspace/common/workspace' +import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace.service' +import { IConfigurationService } from 'vs/platform/configuration/common/configuration.service' import { coalesce } from 'vs/base/common/arrays' -import { IWorkingCopyBackupService } from 'vs/workbench/services/workingCopy/common/workingCopyBackup' +import { IWorkingCopyBackupService } from 'vs/workbench/services/workingCopy/common/workingCopyBackup.service' import { EditorParts } from 'vs/workbench/browser/parts/editor/editorParts' import { HoverService } from 'vs/editor/browser/services/hoverService/hoverService' import { MonacoDelegateEditorGroupsService, MonacoEditorService, OpenEditor } from './tools/editor' diff --git a/src/service-override/walkthrough.ts b/src/service-override/walkthrough.ts index 2592c383..e9fc0db8 100644 --- a/src/service-override/walkthrough.ts +++ b/src/service-override/walkthrough.ts @@ -1,6 +1,7 @@ import { IEditorOverrideServices } from 'vs/editor/standalone/browser/standaloneServices' import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors' -import { IWalkthroughsService, WalkthroughsService } from 'vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedService' +import { WalkthroughsService } from 'vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedService' +import { IWalkthroughsService } from 'vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedService.service' import 'vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution' import 'vs/workbench/contrib/welcomeWalkthrough/browser/walkThrough.contribution' import svgAssets from 'vs/workbench/contrib/welcomeGettingStarted/common/media/*.svg' diff --git a/src/service-override/workbench.ts b/src/service-override/workbench.ts index 56bb7181..57a13ef9 100644 --- a/src/service-override/workbench.ts +++ b/src/service-override/workbench.ts @@ -1,12 +1,12 @@ import { IEditorOverrideServices } from 'vs/editor/standalone/browser/standaloneServices' import { IWorkbenchOptions, Workbench } from 'vs/workbench/browser/workbench' -import { ILogService } from 'vs/platform/log/common/log' +import { ILogService } from 'vs/platform/log/common/log.service' import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection' import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation' -import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService' +import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService.service' import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors' -import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService' -import { IEditorService } from 'vs/workbench/services/editor/common/editorService' +import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService.service' +import { IEditorService } from 'vs/workbench/services/editor/common/editorService.service' import { EditorService } from 'vs/workbench/services/editor/browser/editorService' import { EditorParts } from 'vs/workbench/browser/parts/editor/editorParts' import { onUnexpectedError } from 'vs/base/common/errors' diff --git a/src/service-override/workingCopy.ts b/src/service-override/workingCopy.ts index d2e4a3d4..b63e10f2 100644 --- a/src/service-override/workingCopy.ts +++ b/src/service-override/workingCopy.ts @@ -1,10 +1,12 @@ import { IEditorOverrideServices } from 'vs/editor/standalone/browser/standaloneServices' import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors' import { BrowserWorkingCopyBackupService } from 'vs/workbench/services/workingCopy/browser/workingCopyBackupService' -import { IWorkingCopyBackupService } from 'vs/workbench/services/workingCopy/common/workingCopyBackup' -import { IWorkingCopyService, WorkingCopyService } from 'vs/workbench/services/workingCopy/common/workingCopyService' -import { IWorkingCopyEditorService, WorkingCopyEditorService } from 'vs/workbench/services/workingCopy/common/workingCopyEditorService' -import { IWorkingCopyHistoryService } from 'vs/workbench/services/workingCopy/common/workingCopyHistory' +import { IWorkingCopyBackupService } from 'vs/workbench/services/workingCopy/common/workingCopyBackup.service' +import { WorkingCopyService } from 'vs/workbench/services/workingCopy/common/workingCopyService' +import { IWorkingCopyService } from 'vs/workbench/services/workingCopy/common/workingCopyService.service' +import { WorkingCopyEditorService } from 'vs/workbench/services/workingCopy/common/workingCopyEditorService' +import { IWorkingCopyEditorService } from 'vs/workbench/services/workingCopy/common/workingCopyEditorService.service' +import { IWorkingCopyHistoryService } from 'vs/workbench/services/workingCopy/common/workingCopyHistory.service' import { BrowserWorkingCopyHistoryService } from 'vs/workbench/services/workingCopy/browser/workingCopyHistoryService' import getFileServiceOverride from './files' diff --git a/src/service-override/workspaceTrust.ts b/src/service-override/workspaceTrust.ts index 30c2804a..e7df0228 100644 --- a/src/service-override/workspaceTrust.ts +++ b/src/service-override/workspaceTrust.ts @@ -1,6 +1,6 @@ import { IEditorOverrideServices } from 'vs/editor/standalone/browser/standaloneServices' import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors' -import { IWorkspaceTrustEnablementService, IWorkspaceTrustManagementService, IWorkspaceTrustRequestService } from 'vs/platform/workspace/common/workspaceTrust' +import { IWorkspaceTrustEnablementService, IWorkspaceTrustManagementService, IWorkspaceTrustRequestService } from 'vs/platform/workspace/common/workspaceTrust.service' import { WorkspaceTrustEnablementService, WorkspaceTrustManagementService, WorkspaceTrustRequestService } from 'vs/workbench/services/workspaces/common/workspaceTrust' import 'vs/workbench/contrib/workspace/browser/workspace.contribution' diff --git a/src/services.ts b/src/services.ts index fd1499c2..53a9881e 100644 --- a/src/services.ts +++ b/src/services.ts @@ -3,19 +3,19 @@ import './contributions' import 'vs/editor/editor.all' import 'vs/editor/standalone/browser/iPadShowKeyboard/iPadShowKeyboard' import Severity from 'vs/base/common/severity' -import { IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration' import { ITextModelContentProvider } from 'vs/editor/common/services/resolverService' -import { IColorTheme } from 'vs/platform/theme/common/themeService' import { StorageScope, StorageTarget } from 'vs/platform/storage/common/storage' import { IEditorOverrideServices, StandaloneServices } from 'vs/editor/standalone/browser/standaloneServices' import { mixin } from 'vs/base/common/objects' import { GetLeadingNonServiceArgs, IInstantiationService, ServiceIdentifier, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation' import { IAction } from 'vs/base/common/actions' -import { IProductService } from 'vs/platform/product/common/productService' import { DisposableStore, IDisposable } from 'vs/base/common/lifecycle' import { IWorkbenchConstructionOptions } from 'vs/workbench/browser/web.api' import { IProductConfiguration } from 'vs/base/common/product' import { ILazyWorkbenchContributionInstantiation, IOnEditorWorkbenchContributionInstantiation, IWorkbenchContribution, WorkbenchContributionInstantiation, WorkbenchPhase, registerWorkbenchContribution2 } from 'vs/workbench/common/contributions' +import { IProductService } from 'vs/platform/product/common/productService.service' +import { IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration' +import { IColorTheme } from 'vs/platform/theme/common/themeService' import { EnvironmentOverride, initialize as initializeWorkbench } from './workbench' import { checkServicesNotInitialized, checkServicesReady, serviceInitializedBarrier, serviceInitializedEmitter, startup, waitServicesReady } from './lifecycle' import getQuickAccessOverride from './service-override/quickaccess' @@ -108,8 +108,8 @@ export { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors' // Export all services as monaco doesn't export them export { StandaloneServices } from 'vs/editor/standalone/browser/standaloneServices' -export { ICommandService } from 'vs/platform/commands/common/commands' -export { INotificationService } from 'vs/platform/notification/common/notification' +export { ICommandService } from 'vs/platform/commands/common/commands.service' +export { INotificationService } from 'vs/platform/notification/common/notification.service' export { IBulkEditService } from 'vs/editor/browser/services/bulkEditService' export { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService' export { ILanguageService } from 'vs/editor/common/languages/language' @@ -118,18 +118,21 @@ export { IEditorWorkerService } from 'vs/editor/common/services/editorWorker' export { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures' export { IModelService } from 'vs/editor/common/services/model' export { ITextModelService } from 'vs/editor/common/services/resolverService' -export { IClipboardService } from 'vs/platform/clipboard/common/clipboardService' -export { IDialogService, IFileDialogService } from 'vs/platform/dialogs/common/dialogs' -export { IFileService } from 'vs/platform/files/common/files' +export { IClipboardService } from 'vs/platform/clipboard/common/clipboardService.service' +export { IDialogService, IFileDialogService } from 'vs/platform/dialogs/common/dialogs.service' +export { IFileService } from 'vs/platform/files/common/files.service' export { IInstantiationService } from 'vs/platform/instantiation/common/instantiation' -export { IMarkerService } from 'vs/platform/markers/common/markers' -export { IOpenerService } from 'vs/platform/opener/common/opener' -export { IQuickInputService } from 'vs/platform/quickinput/common/quickInput' -export { ITelemetryService } from 'vs/platform/telemetry/common/telemetry' -export { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity' -export { IBreadcrumbsService } from 'vs/workbench/browser/parts/editor/breadcrumbs' +export { IMarkerService } from 'vs/platform/markers/common/markers.service' +export { IOpenerService } from 'vs/platform/opener/common/opener.service' +export { IQuickInputService } from 'vs/platform/quickinput/common/quickInput.service' +export { ITelemetryService } from 'vs/platform/telemetry/common/telemetry.service' +export { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity.service' +export { IBreadcrumbsService } from 'vs/workbench/browser/parts/editor/breadcrumbs.service' +export { + IEditorGroupsService +} from 'vs/workbench/services/editor/common/editorGroupsService.service' export { - IEditorGroupsService, + IEditorGroup, GroupDirection, GroupOrientation, GroupLocation, @@ -144,8 +147,7 @@ export { ICloseAllEditorsOptions, IEditorReplacement, GroupsOrder, - IEditorSideGroup, - IEditorGroup + IEditorSideGroup } from 'vs/workbench/services/editor/common/editorGroupsService' export { IEditorPane, @@ -169,44 +171,50 @@ export { IDimension } from 'vs/editor/common/core/dimension' export { IEditorOptions, ITextEditorOptions, IResourceEditorInput } from 'vs/platform/editor/common/editor' export { EditorInput } from 'vs/workbench/common/editor/editorInput' export { IGroupModelChangeEvent } from 'vs/workbench/common/editor/editorGroupModel' -export { IEditorService } from 'vs/workbench/services/editor/common/editorService' -export { IEditorResolverService } from 'vs/workbench/services/editor/common/editorResolverService' -export { ITextEditorService } from 'vs/workbench/services/textfile/common/textEditorService' -export { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService' -export { IHostService } from 'vs/workbench/services/host/browser/host' -export { ILanguageStatusService } from 'vs/workbench/services/languageStatus/common/languageStatusService' -export { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite' -export { IPathService } from 'vs/workbench/services/path/common/pathService' -export { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles' -export { IWorkingCopyFileService } from 'vs/workbench/services/workingCopy/common/workingCopyFileService' -export { IConfigurationService } from 'vs/platform/configuration/common/configuration' -export { IContextKeyService } from 'vs/platform/contextkey/common/contextkey' -export { IThemeService } from 'vs/platform/theme/common/themeService' -export { ISnippetsService } from 'vs/workbench/contrib/snippets/browser/snippets' -export { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace' -export { IStorageService } from 'vs/platform/storage/common/storage' -export { IAccessibilitySignalService } from 'vs/platform/accessibilitySignal/browser/accessibilitySignalService' -export { IDebugService } from 'vs/workbench/contrib/debug/common/debug' -export { ILoggerService, LogLevel } from 'vs/platform/log/common/log' -export { ILogService } from 'vs/platform/log/common/log' -export { IViewDescriptorService } from 'vs/workbench/common/views' -export { IViewsService } from 'vs/workbench/services/views/common/viewsService' -export { ILayoutService } from 'vs/platform/layout/browser/layoutService' -export { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences' -export { IPreferencesSearchService } from 'vs/workbench/contrib/preferences/common/preferences' -export { IKeybindingEditingService } from 'vs/workbench/services/keybinding/common/keybindingEditing' -export { IOutputService } from 'vs/workbench/services/output/common/output' -export { IHistoryService, GoFilter, GoScope } from 'vs/workbench/services/history/common/history' -export { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService' -export { IRemoteAuthorityResolverService } from 'vs/platform/remote/common/remoteAuthorityResolver' -export { IRemoteSocketFactoryService } from 'vs/platform/remote/common/remoteSocketFactoryService' -export { IFilesConfigurationService } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService' -export { ILabelService } from 'vs/platform/label/common/label' -export { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService' -export { ILanguagePackService } from 'vs/platform/languagePacks/common/languagePacks' -export { ILocaleService } from 'vs/workbench/services/localization/common/locale' +export { IEditorService } from 'vs/workbench/services/editor/common/editorService.service' +export { IEditorResolverService } from 'vs/workbench/services/editor/common/editorResolverService.service' +export { ITextEditorService } from 'vs/workbench/services/textfile/common/textEditorService.service' +export { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService.service' +export { IHostService } from 'vs/workbench/services/host/browser/host.service' +export { ILanguageStatusService } from 'vs/workbench/services/languageStatus/common/languageStatusService.service' +export { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite.service' +export { IPathService } from 'vs/workbench/services/path/common/pathService.service' +export { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles.service' +export { IWorkingCopyFileService } from 'vs/workbench/services/workingCopy/common/workingCopyFileService.service' +export { IConfigurationService } from 'vs/platform/configuration/common/configuration.service' +export { IContextKeyService } from 'vs/platform/contextkey/common/contextkey.service' +export { IThemeService } from 'vs/platform/theme/common/themeService.service' +export { ISnippetsService } from 'vs/workbench/contrib/snippets/browser/snippets.service' +export { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace.service' +export { IStorageService } from 'vs/platform/storage/common/storage.service' +export { IAccessibilitySignalService } from 'vs/platform/accessibilitySignal/browser/accessibilitySignalService.service' +export { IDebugService } from 'vs/workbench/contrib/debug/common/debug.service' +export { ILoggerService } from 'vs/platform/log/common/log.service' +export { LogLevel } from 'vs/platform/log/common/log' +export { ILogService } from 'vs/platform/log/common/log.service' +export { IViewDescriptorService } from 'vs/workbench/common/views.service' +export { IViewsService } from 'vs/workbench/services/views/common/viewsService.service' +export { ILayoutService } from 'vs/platform/layout/browser/layoutService.service' +export { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences.service' +export { IPreferencesSearchService } from 'vs/workbench/contrib/preferences/common/preferences.service' +export { IKeybindingEditingService } from 'vs/workbench/services/keybinding/common/keybindingEditing.service' +export { IOutputService } from 'vs/workbench/services/output/common/output.service' +export { IHistoryService } from 'vs/workbench/services/history/common/history.service' +export { GoFilter, GoScope } from 'vs/workbench/services/history/common/history' +export { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService.service' +export { IRemoteAuthorityResolverService } from 'vs/platform/remote/common/remoteAuthorityResolver.service' +export { IRemoteSocketFactoryService } from 'vs/platform/remote/common/remoteSocketFactoryService.service' +export { IFilesConfigurationService } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService.service' +export { ILabelService } from 'vs/platform/label/common/label.service' +export { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService.service' +export { ILanguagePackService } from 'vs/platform/languagePacks/common/languagePacks.service' +export { ILocaleService } from 'vs/workbench/services/localization/common/locale.service' // Export all Notification service parts +export { + NoOpNotification, + NoOpProgress +} from 'vs/platform/notification/common/notification' export { NotificationsFilter, NotificationMessage, @@ -222,9 +230,7 @@ export { IPromptChoice, IPromptChoiceWithMenu, IPromptOptions, - IStatusMessageOptions, - NoOpNotification, - NoOpProgress + IStatusMessageOptions } from 'vs/platform/notification/common/notification' // Export all Dialog service parts @@ -232,15 +238,12 @@ export { IDialogArgs, DialogType, IDialogResult, - IDialogHandler, IConfirmDialogArgs, IInputDialogArgs, IPromptDialogArgs, IBaseDialogOptions, ICheckbox, ICheckboxResult, - ICustomDialogOptions, - ICustomDialogMarkdown, IConfirmation, IConfirmationResult, IInput, @@ -255,16 +258,24 @@ export { IPromptWithCustomCancel, IPromptWithDefaultCancel } from 'vs/platform/dialogs/common/dialogs' +export { + IDialogHandler, + ICustomDialogOptions, + ICustomDialogMarkdown +} from 'vs/platform/dialogs/common/dialogs' export { IMarkdownString, MarkdownStringTrustedOptions } from 'vs/base/common/htmlContent' -export { IActivityService, IBadge } from 'vs/workbench/services/activity/common/activity' -export { IHoverService } from 'vs/platform/hover/browser/hover' -export { IExplorerService } from 'vs/workbench/contrib/files/browser/files' -export { IStatusbarService } from 'vs/workbench/services/statusbar/browser/statusbar' -export { ITitleService } from 'vs/workbench/services/title/browser/titleService' -export { IBannerService } from 'vs/workbench/services/banner/browser/bannerService' -export { IWorkspaceTrustManagementService, IWorkspaceTrustUriInfo, IWorkspaceTrustRequestService, IWorkspaceTrustEnablementService } from 'vs/platform/workspace/common/workspaceTrust' -export { IKeybindingService } from 'vs/platform/keybinding/common/keybinding' -export { ISecretStorageProvider, ISecretStorageService } from 'vs/platform/secrets/common/secrets' +export { IActivityService } from 'vs/workbench/services/activity/common/activity.service' +export { IBadge } from 'vs/workbench/services/activity/common/activity' +export { IHoverService } from 'vs/platform/hover/browser/hover.service' +export { IExplorerService } from 'vs/workbench/contrib/files/browser/files.service' +export { IStatusbarService } from 'vs/workbench/services/statusbar/browser/statusbar.service' +export { ITitleService } from 'vs/workbench/services/title/browser/titleService.service' +export { IBannerService } from 'vs/workbench/services/banner/browser/bannerService.service' +export { IWorkspaceTrustManagementService, IWorkspaceTrustRequestService, IWorkspaceTrustEnablementService } from 'vs/platform/workspace/common/workspaceTrust.service' +export { IWorkspaceTrustUriInfo } from 'vs/platform/workspace/common/workspaceTrust' +export { IKeybindingService } from 'vs/platform/keybinding/common/keybinding.service' +export { ISecretStorageService } from 'vs/platform/secrets/common/secrets.service' +export { ISecretStorageProvider } from 'vs/platform/secrets/common/secrets' export { IProductConfiguration } from 'vs/base/common/product' export { diff --git a/src/tools/l10n.ts b/src/tools/l10n.ts index 3a4e300e..5b2dec5e 100644 --- a/src/tools/l10n.ts +++ b/src/tools/l10n.ts @@ -3,8 +3,8 @@ import { ParseError, getNodeType, parse } from 'vs/base/common/json' import { joinPath } from 'vs/base/common/resources' import { URI } from 'vs/base/common/uri' import { IExtensionManifest } from 'vs/platform/extensions/common/extensions' -import { IFileService } from 'vs/platform/files/common/files' -import { ILogService } from 'vs/platform/log/common/log' +import { IFileService } from 'vs/platform/files/common/files.service' +import { ILogService } from 'vs/platform/log/common/log.service' import { localizeManifest } from 'vs/platform/extensionManagement/common/extensionNls' import { getParseErrorMessage } from 'vs/base/common/jsonErrorMessages' import * as platform from 'vs/base/common/platform' From 409fff82a05bb363db537112ed03b07053c69168 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Mangeonjean?= Date: Fri, 26 Apr 2024 12:28:13 +0200 Subject: [PATCH 07/12] fix(demo): regenerate package-lock --- demo/package-lock.json | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/demo/package-lock.json b/demo/package-lock.json index d47d1796..cef7c0b0 100644 --- a/demo/package-lock.json +++ b/demo/package-lock.json @@ -820,9 +820,7 @@ "@codingame/monaco-vscode-files-service-override": "0.0.0-semantic-release", "@codingame/monaco-vscode-host-service-override": "0.0.0-semantic-release", "@codingame/monaco-vscode-layout-service-override": "0.0.0-semantic-release", - "@codingame/monaco-vscode-quickaccess-service-override": "0.0.0-semantic-release", - "@vscode/iconv-lite-umd": "0.7.0", - "jschardet": "3.0.0" + "@codingame/monaco-vscode-quickaccess-service-override": "0.0.0-semantic-release" } }, "../dist/rollup-vsix-plugin": { @@ -895,6 +893,7 @@ "version": "0.0.0-semantic-release", "license": "MIT", "dependencies": { + "@codingame/monaco-vscode-files-service-override": "0.0.0-semantic-release", "vscode": "npm:@codingame/monaco-vscode-api@^0.0.0-semantic-release" } }, @@ -967,6 +966,7 @@ "version": "0.0.0-semantic-release", "license": "MIT", "dependencies": { + "@codingame/monaco-vscode-files-service-override": "0.0.0-semantic-release", "vscode": "npm:@codingame/monaco-vscode-api@^0.0.0-semantic-release" } }, @@ -1007,6 +1007,7 @@ "version": "0.0.0-semantic-release", "license": "MIT", "dependencies": { + "@codingame/monaco-vscode-files-service-override": "0.0.0-semantic-release", "vscode": "npm:@codingame/monaco-vscode-api@^0.0.0-semantic-release" } }, @@ -1024,6 +1025,7 @@ "version": "0.0.0-semantic-release", "license": "MIT", "dependencies": { + "@codingame/monaco-vscode-files-service-override": "0.0.0-semantic-release", "vscode": "npm:@codingame/monaco-vscode-api@^0.0.0-semantic-release" } }, @@ -1056,6 +1058,7 @@ "version": "0.0.0-semantic-release", "license": "MIT", "dependencies": { + "@codingame/monaco-vscode-environment-service-override": "0.0.0-semantic-release", "vscode": "npm:@codingame/monaco-vscode-api@^0.0.0-semantic-release" } }, @@ -1153,6 +1156,7 @@ "version": "0.0.0-semantic-release", "license": "MIT", "dependencies": { + "@codingame/monaco-vscode-environment-service-override": "0.0.0-semantic-release", "vscode": "npm:@codingame/monaco-vscode-api@^0.0.0-semantic-release" } }, @@ -1193,6 +1197,7 @@ "version": "0.0.0-semantic-release", "license": "MIT", "dependencies": { + "@codingame/monaco-vscode-files-service-override": "0.0.0-semantic-release", "vscode": "npm:@codingame/monaco-vscode-api@^0.0.0-semantic-release" } }, @@ -1257,6 +1262,7 @@ "version": "0.0.0-semantic-release", "license": "MIT", "dependencies": { + "@codingame/monaco-vscode-files-service-override": "0.0.0-semantic-release", "vscode": "npm:@codingame/monaco-vscode-api@^0.0.0-semantic-release", "vscode-oniguruma": "1.7.0", "vscode-textmate": "9.0.0" @@ -1267,6 +1273,7 @@ "version": "0.0.0-semantic-release", "license": "MIT", "dependencies": { + "@codingame/monaco-vscode-files-service-override": "0.0.0-semantic-release", "vscode": "npm:@codingame/monaco-vscode-api@^0.0.0-semantic-release" } }, @@ -1333,6 +1340,7 @@ "license": "MIT", "dependencies": { "@codingame/monaco-vscode-keybindings-service-override": "0.0.0-semantic-release", + "@codingame/monaco-vscode-quickaccess-service-override": "0.0.0-semantic-release", "@codingame/monaco-vscode-view-common-service-override": "0.0.0-semantic-release", "vscode": "npm:@codingame/monaco-vscode-api@^0.0.0-semantic-release" } @@ -1358,7 +1366,10 @@ "version": "0.0.0-semantic-release", "license": "MIT", "dependencies": { + "@codingame/monaco-vscode-keybindings-service-override": "0.0.0-semantic-release", + "@codingame/monaco-vscode-quickaccess-service-override": "0.0.0-semantic-release", "@codingame/monaco-vscode-view-banner-service-override": "0.0.0-semantic-release", + "@codingame/monaco-vscode-view-common-service-override": "0.0.0-semantic-release", "@codingame/monaco-vscode-view-status-bar-service-override": "0.0.0-semantic-release", "@codingame/monaco-vscode-view-title-bar-service-override": "0.0.0-semantic-release", "vscode": "npm:@codingame/monaco-vscode-api@^0.0.0-semantic-release" @@ -1369,6 +1380,7 @@ "version": "0.0.0-semantic-release", "license": "MIT", "dependencies": { + "@codingame/monaco-vscode-files-service-override": "0.0.0-semantic-release", "vscode": "npm:@codingame/monaco-vscode-api@^0.0.0-semantic-release" } }, From 5a1e50cfda3e90f008b34a21021eb5b6818143e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Mangeonjean?= Date: Mon, 29 Apr 2024 11:08:15 +0200 Subject: [PATCH 08/12] cleanup: remove out of date README section --- README.md | 8 -------- 1 file changed, 8 deletions(-) diff --git a/README.md b/README.md index 0dbf2665..7e602d3d 100644 --- a/README.md +++ b/README.md @@ -16,14 +16,6 @@ npm install -D @types/vscode ## Troubleshooting -### `process` node builtin - -Since v1.86, VSCode detects its running environment by checking if a global variable `process` exists. -For backward compatibility reasons or to be able to use node libraries in the browser, bundlers can be configured to inject a polyfill for it. -Doing so may create unexpected behaviors and crashes. - -Make sure `typeof process === 'undefined'` returns true when using this library. - ### If you use Webpack Starting from v2, [monaco-editor-webpack-plugin](https://www.npmjs.com/package/monaco-editor-webpack-plugin) can't be used From 28aa36e2cde1f4d04fa0bf9ffef9b438b9d8eedc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Mangeonjean?= Date: Mon, 29 Apr 2024 11:08:28 +0200 Subject: [PATCH 09/12] fix: backport css fix --- vscode-paches/0056-fix-fix-editor-css.patch | 41 +++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 vscode-paches/0056-fix-fix-editor-css.patch diff --git a/vscode-paches/0056-fix-fix-editor-css.patch b/vscode-paches/0056-fix-fix-editor-css.patch new file mode 100644 index 00000000..445e4c72 --- /dev/null +++ b/vscode-paches/0056-fix-fix-editor-css.patch @@ -0,0 +1,41 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Lo=C3=AFc=20Mangeonjean?= +Date: Mon, 29 Apr 2024 10:37:17 +0200 +Subject: [PATCH] fix: fix editor css + +https://github.com/microsoft/monaco-editor/issues/4455 +--- + .../standalone/browser/standalone-tokens.css | 20 +++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +diff --git a/src/vs/editor/standalone/browser/standalone-tokens.css b/src/vs/editor/standalone/browser/standalone-tokens.css +index c74aca00541..a47a00a7aff 100644 +--- a/src/vs/editor/standalone/browser/standalone-tokens.css ++++ b/src/vs/editor/standalone/browser/standalone-tokens.css +@@ -37,16 +37,16 @@ + clip-path: inset(50%); + } + +-.monaco-editor.standalone, .monaco-diff-editor.standalone .synthetic-focus, +-.monaco-editor.standalone, .monaco-diff-editor.standalone [tabindex="0"]:focus, +-.monaco-editor.standalone, .monaco-diff-editor.standalone [tabindex="-1"]:focus, +-.monaco-editor.standalone, .monaco-diff-editor.standalone button:focus, +-.monaco-editor.standalone, .monaco-diff-editor.standalone input[type=button]:focus, +-.monaco-editor.standalone, .monaco-diff-editor.standalone input[type=checkbox]:focus, +-.monaco-editor.standalone, .monaco-diff-editor.standalone input[type=search]:focus, +-.monaco-editor.standalone, .monaco-diff-editor.standalone input[type=text]:focus, +-.monaco-editor.standalone, .monaco-diff-editor.standalone select:focus, +-.monaco-editor.standalone, .monaco-diff-editor.standalone textarea:focus { ++.monaco-editor.standalone .synthetic-focus, .monaco-diff-editor.standalone .synthetic-focus, ++.monaco-editor.standalone [tabindex="0"]:focus, .monaco-diff-editor.standalone [tabindex="0"]:focus, ++.monaco-editor.standalone [tabindex="-1"]:focus, .monaco-diff-editor.standalone [tabindex="-1"]:focus, ++.monaco-editor.standalone button:focus, .monaco-diff-editor.standalone button:focus, ++.monaco-editor.standalone input[type=button]:focus, .monaco-diff-editor.standalone input[type=button]:focus, ++.monaco-editor.standalone input[type=checkbox]:focus, .monaco-diff-editor.standalone input[type=checkbox]:focus, ++.monaco-editor.standalone input[type=search]:focus, .monaco-diff-editor.standalone input[type=search]:focus, ++.monaco-editor.standalone input[type=text]:focus, .monaco-diff-editor.standalone input[type=text]:focus, ++.monaco-editor.standalone select:focus, .monaco-diff-editor.standalone select:focus, ++.monaco-editor.standalone textarea:focus, .monaco-diff-editor.standalone textarea:focus { + outline-width: 1px; + outline-style: solid; + outline-offset: -1px; From 8d2b7d787f2f07d2afa2704e13f1028b4b076063 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Mangeonjean?= Date: Mon, 29 Apr 2024 11:08:49 +0200 Subject: [PATCH 10/12] fix: move token inspection to textmate service override as it requires it --- src/contributions.ts | 1 - src/service-override/textmate.ts | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/contributions.ts b/src/contributions.ts index 7b07c7ae..0d02d037 100644 --- a/src/contributions.ts +++ b/src/contributions.ts @@ -6,7 +6,6 @@ import 'vs/workbench/contrib/codeEditor/browser/workbenchReferenceSearch' import 'vs/workbench/contrib/codeEditor/browser/menuPreventer' import 'vs/workbench/contrib/codeEditor/browser/diffEditorHelper' import 'vs/workbench/contrib/codeEditor/browser/largeFileOptimizations' -import 'vs/workbench/contrib/codeEditor/browser/inspectEditorTokens/inspectEditorTokens' import 'vs/workbench/contrib/codeEditor/browser/saveParticipants' import 'vs/workbench/contrib/codeEditor/browser/toggleMinimap' import 'vs/workbench/contrib/codeEditor/browser/toggleMultiCursorModifier' diff --git a/src/service-override/textmate.ts b/src/service-override/textmate.ts index af113bd0..659586c2 100644 --- a/src/service-override/textmate.ts +++ b/src/service-override/textmate.ts @@ -8,6 +8,7 @@ import getFileServiceOverride from './files' import { registerServiceInitializeParticipant } from '../lifecycle' import { registerAssets } from '../assets' import 'vs/workbench/services/themes/common/tokenClassificationExtensionPoint' +import 'vs/workbench/contrib/codeEditor/browser/inspectEditorTokens/inspectEditorTokens' const _onigWasm = new URL('vscode-oniguruma/release/onig.wasm', import.meta.url).href registerAssets({ From 374b66554ea9e6e629e3072216d5e5597c870fc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Mangeonjean?= Date: Mon, 29 Apr 2024 11:09:13 +0200 Subject: [PATCH 11/12] feat: add monarch service override to load standalone tokenizer/theme contributions --- README.md | 2 ++ src/service-override/monarch.ts | 8 ++++++++ 2 files changed, 10 insertions(+) create mode 100644 src/service-override/monarch.ts diff --git a/README.md b/README.md index 7e602d3d..236d1a52 100644 --- a/README.md +++ b/README.md @@ -111,6 +111,8 @@ Additionally, several packages that include the VSCode version of some services - **Base** (included by default): `@codingame/monaco-vscode-base-service-override` - Contains some general-use services that are mandatory to most of the other features +- **Monarch**: + - When textmate and theme service overrides are not used, it allows to restore some standalone features (Token inspection and toggle high contrast commands) - **Host** (included by default): `@codingame/monaco-vscode-host-service-override` - Interaction with the host/browser (shutdown veto, focus/active management, window opening, fullscreen...) - **Extensions** (included by default): `@codingame/monaco-vscode-extensions-service-override` diff --git a/src/service-override/monarch.ts b/src/service-override/monarch.ts new file mode 100644 index 00000000..9a326e36 --- /dev/null +++ b/src/service-override/monarch.ts @@ -0,0 +1,8 @@ +import { IEditorOverrideServices } from 'vs/editor/standalone/browser/standaloneServices' +import 'vs/editor/standalone/browser/inspectTokens/inspectTokens' +import 'vs/editor/standalone/browser/toggleHighContrast/toggleHighContrast' + +export default function getServiceOverride (): IEditorOverrideServices { + return { + } +} From 6a874ae70a4a5d3fc108a89ec5945c237bbc4067 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Mangeonjean?= Date: Mon, 29 Apr 2024 11:09:38 +0200 Subject: [PATCH 12/12] cleanup: help rollup removing dead commonjs code --- rollup/rollup.config.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/rollup/rollup.config.ts b/rollup/rollup.config.ts index 36210293..68057798 100644 --- a/rollup/rollup.config.ts +++ b/rollup/rollup.config.ts @@ -510,6 +510,7 @@ export default (args: Record): rollup.RollupOptions[] => { VSCODE_VERSION: JSON.stringify(vscodeVersion), VSCODE_REF: JSON.stringify(vscodeRef), VSCODE_COMMIT: JSON.stringify(vscodeCommit), + 'globalThis.require': 'undefined', preventAssignment: true }), (() => {