mirror of
https://github.com/microsoft/vscode.git
synced 2026-04-27 12:04:04 +01:00
Merge branch 'main' into correct-response-for-apply-edit
This commit is contained in:
@@ -3,7 +3,7 @@
|
||||
* Licensed under the MIT License. See License.txt in the project root for license information.
|
||||
*--------------------------------------------------------------------------------------------*/
|
||||
|
||||
import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
|
||||
import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
|
||||
import { IExtHostOutputService, ExtHostOutputService } from 'vs/workbench/api/common/extHostOutput';
|
||||
import { IExtHostWorkspace, ExtHostWorkspace } from 'vs/workbench/api/common/extHostWorkspace';
|
||||
import { IExtHostDecorations, ExtHostDecorations } from 'vs/workbench/api/common/extHostDecorations';
|
||||
@@ -30,9 +30,9 @@ import { ExtHostVariableResolverProviderService, IExtHostVariableResolverProvide
|
||||
import { ExtHostTelemetryLogService, IExtHostTelemetryLogService } from 'vs/workbench/api/common/extHostTelemetryLogService';
|
||||
import { ExtHostLocalizationService, IExtHostLocalizationService } from 'vs/workbench/api/common/extHostLocalizationService';
|
||||
|
||||
registerSingleton(IExtHostLocalizationService, ExtHostLocalizationService, true);
|
||||
registerSingleton(ILoggerService, ExtHostLoggerService, true);
|
||||
registerSingleton(ILogService, ExtHostLogService, true);
|
||||
registerSingleton(IExtHostLocalizationService, ExtHostLocalizationService, InstantiationType.Delayed);
|
||||
registerSingleton(ILoggerService, ExtHostLoggerService, InstantiationType.Delayed);
|
||||
registerSingleton(ILogService, ExtHostLogService, InstantiationType.Delayed);
|
||||
registerSingleton(IExtHostApiDeprecationService, ExtHostApiDeprecationService, false);
|
||||
registerSingleton(IExtHostCommands, ExtHostCommands, false);
|
||||
registerSingleton(IExtHostConfiguration, ExtHostConfiguration, false);
|
||||
@@ -41,7 +41,7 @@ registerSingleton(IExtHostDebugService, WorkerExtHostDebugService, false);
|
||||
registerSingleton(IExtHostDecorations, ExtHostDecorations, false);
|
||||
registerSingleton(IExtHostDocumentsAndEditors, ExtHostDocumentsAndEditors, false);
|
||||
registerSingleton(IExtHostFileSystemInfo, ExtHostFileSystemInfo, false);
|
||||
registerSingleton(IExtHostOutputService, ExtHostOutputService, true);
|
||||
registerSingleton(IExtHostOutputService, ExtHostOutputService, InstantiationType.Delayed);
|
||||
registerSingleton(IExtHostSearch, ExtHostSearch, false);
|
||||
registerSingleton(IExtHostStorage, ExtHostStorage, false);
|
||||
registerSingleton(IExtHostTask, WorkerExtHostTask, false);
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
* Licensed under the MIT License. See License.txt in the project root for license information.
|
||||
*--------------------------------------------------------------------------------------------*/
|
||||
|
||||
import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
|
||||
import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
|
||||
import { ExtHostTerminalService } from 'vs/workbench/api/node/extHostTerminalService';
|
||||
import { ExtHostTask } from 'vs/workbench/api/node/extHostTask';
|
||||
import { ExtHostDebugService } from 'vs/workbench/api/node/extHostDebugService';
|
||||
@@ -30,7 +30,7 @@ import { IExtHostVariableResolverProvider } from 'vs/workbench/api/common/extHos
|
||||
// #########################################################################
|
||||
|
||||
registerSingleton(IExtHostExtensionService, ExtHostExtensionService, false);
|
||||
registerSingleton(ILoggerService, ExtHostLoggerService, true);
|
||||
registerSingleton(ILoggerService, ExtHostLoggerService, InstantiationType.Delayed);
|
||||
registerSingleton(IExtensionStoragePaths, ExtensionStoragePaths, false);
|
||||
|
||||
registerSingleton(IExtHostDebugService, ExtHostDebugService, false);
|
||||
|
||||
Reference in New Issue
Block a user