@codingame/monaco-vscode-configuration-service-override 4.4.1 → 4.5.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (16) hide show
  1. package/configuration.d.ts +2 -2
  2. package/configuration.js +25 -25
  3. package/index.d.ts +1 -1
  4. package/package.json +11 -9
  5. package/tools.js +22 -1
  6. package/vscode/src/vs/editor/common/services/textResourceConfigurationService.js +1 -1
  7. package/vscode/src/vs/workbench/contrib/workspaces/browser/workspaces.contribution.js +13 -10
  8. package/vscode/src/vs/workbench/services/configuration/browser/configuration.js +1 -1
  9. package/vscode/src/vs/workbench/services/configuration/browser/configurationService.js +18 -16
  10. package/vscode/src/vs/workbench/services/configuration/common/configurationEditing.js +17 -14
  11. package/vscode/src/vs/workbench/services/configuration/common/configurationModels.js +1 -1
  12. package/vscode/src/vs/workbench/services/label/common/labelService.js +8 -7
  13. package/vscode/src/vs/workbench/services/textresourceProperties/common/textResourcePropertiesService.js +4 -4
  14. package/vscode/src/vs/workbench/services/workspaces/browser/abstractWorkspaceEditingService.js +20 -17
  15. package/vscode/src/vs/workbench/services/workspaces/browser/workspacesService.js +8 -6
  16. package/override/vs/platform/dialogs/common/dialogs.js +0 -10
package/configuration.d.ts CHANGED
@@ -1,11 +1,11 @@
1
+ import { IDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
2
+ import { URI } from 'vscode/vscode/vs/base/common/uri';
1
3
  import { IEditorOverrideServices } from 'vscode/vscode/vs/editor/standalone/browser/standaloneServices';
2
4
  import { IConfigurationRegistry } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
3
5
  export { ConfigurationScope, IConfigurationDefaults, IConfigurationNode } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
4
6
  import { IFileWriteOptions } from 'vscode/vscode/vs/platform/files/common/files';
5
7
  import { IAnyWorkspaceIdentifier } from 'vscode/vscode/vs/platform/workspace/common/workspace';
6
8
  export { IAnyWorkspaceIdentifier, IEmptyWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, IWorkspaceIdentifier } from 'vscode/vscode/vs/platform/workspace/common/workspace';
7
- import { URI } from 'vscode/vscode/vs/base/common/uri';
8
- import { IDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
9
9
 
10
10
  declare const defaultUserConfigurationFile: URI;
11
11
  /**
package/configuration.js CHANGED
@@ -1,41 +1,41 @@
1
1
  import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
2
- import { WorkspaceService } from './vscode/src/vs/workbench/services/configuration/browser/configurationService.js';
3
- import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
2
+ import { VSBuffer } from 'vscode/vscode/vs/base/common/buffer';
3
+ import { Schemas } from 'vscode/vscode/vs/base/common/network';
4
+ import { URI } from 'vscode/vscode/vs/base/common/uri';
5
+ import { generateUuid } from 'vscode/vscode/vs/base/common/uuid';
4
6
  import { ITextResourceConfigurationService, ITextResourcePropertiesService } from 'vscode/vscode/vs/editor/common/services/textResourceConfiguration';
5
7
  import { TextResourceConfigurationService } from './vscode/src/vs/editor/common/services/textResourceConfigurationService.js';
6
- import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
8
+ import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
7
9
  import { Extensions } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
8
10
  export { ConfigurationScope } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
9
- import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
10
- import { VSBuffer } from 'vscode/vscode/vs/base/common/buffer';
11
- import { IFileService } from 'vscode/vscode/vs/platform/files/common/files';
12
- import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
13
- import { IUserDataProfilesService } from 'vscode/vscode/vs/platform/userDataProfile/common/userDataProfile';
14
- import { IPolicyService } from 'vscode/vscode/vs/platform/policy/common/policy';
11
+ import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
12
+ import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
15
13
  import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
16
- import { IUserDataProfileService } from 'vscode/vscode/vs/workbench/services/userDataProfile/common/userDataProfile';
17
- import { IRemoteAgentService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteAgentService';
18
- import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity';
14
+ import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label.service';
15
+ import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
16
+ import { IPolicyService } from 'vscode/vscode/vs/platform/policy/common/policy.service';
17
+ import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
18
+ import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
19
+ import { IUserDataProfilesService } from 'vscode/vscode/vs/platform/userDataProfile/common/userDataProfile.service';
20
+ import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
21
+ import { IWorkspacesService } from 'vscode/vscode/vs/platform/workspaces/common/workspaces.service';
22
+ import './vscode/src/vs/workbench/api/common/configurationExtensionPoint.js';
23
+ import './vscode/src/vs/workbench/contrib/workspaces/browser/workspaces.contribution.js';
24
+ import { WorkspaceService } from './vscode/src/vs/workbench/services/configuration/browser/configurationService.js';
19
25
  import { ConfigurationCache } from './vscode/src/vs/workbench/services/configuration/common/configurationCache.js';
20
- import { Schemas } from 'vscode/vscode/vs/base/common/network';
21
- import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService';
22
- import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace';
26
+ import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService.service';
23
27
  import { LabelService } from './vscode/src/vs/workbench/services/label/common/labelService.js';
24
- import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
25
- import { generateUuid } from 'vscode/vscode/vs/base/common/uuid';
26
- import { IWorkspacesService } from 'vscode/vscode/vs/platform/workspaces/common/workspaces';
27
- import { BrowserWorkspacesService } from './vscode/src/vs/workbench/services/workspaces/browser/workspacesService.js';
28
- import { IWorkspaceEditingService } from 'vscode/vscode/vs/workbench/services/workspaces/common/workspaceEditing';
29
- import { AbstractWorkspaceEditingService } from './vscode/src/vs/workbench/services/workspaces/browser/abstractWorkspaceEditingService.js';
30
- import { URI } from 'vscode/vscode/vs/base/common/uri';
31
- import './vscode/src/vs/workbench/api/common/configurationExtensionPoint.js';
28
+ import { IRemoteAgentService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteAgentService.service';
32
29
  import { TextResourcePropertiesService } from './vscode/src/vs/workbench/services/textresourceProperties/common/textResourcePropertiesService.js';
30
+ import { IUserDataProfileService } from 'vscode/vscode/vs/workbench/services/userDataProfile/common/userDataProfile.service';
31
+ import { AbstractWorkspaceEditingService } from './vscode/src/vs/workbench/services/workspaces/browser/abstractWorkspaceEditingService.js';
32
+ import { BrowserWorkspacesService } from './vscode/src/vs/workbench/services/workspaces/browser/workspacesService.js';
33
+ import { IWorkspaceEditingService } from 'vscode/vscode/vs/workbench/services/workspaces/common/workspaceEditing.service';
33
34
  import getServiceOverride$1, { initFile } from '@codingame/monaco-vscode-files-service-override';
34
- import { memoizedConstructor, unsupported } from './tools.js';
35
35
  import { registerServiceInitializePreParticipant } from 'vscode/lifecycle';
36
36
  import { getService, withReadyServices } from 'vscode/services';
37
+ import { unsupported, memoizedConstructor } from './tools.js';
37
38
  import { getWorkspaceIdentifier } from 'vscode/workbench';
38
- import './vscode/src/vs/workbench/contrib/workspaces/browser/workspaces.contribution.js';
39
39
 
40
40
  const defaultUserConfigurationFile = ( URI.from({ scheme: Schemas.vscodeUserData, path: '/User/settings.json' }));
41
41
  async function initUserConfiguration(configurationJson, options, file = defaultUserConfigurationFile) {
package/index.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  export { configurationRegistry, default, defaultUserConfigurationFile, getUserConfiguration, initUserConfiguration, onUserConfigurationChange, reinitializeWorkspace, updateUserConfiguration } from './configuration.js';
2
2
  export { ConfigurationScope, IConfigurationDefaults, IConfigurationNode } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
3
- export { IColorCustomizations, IThemeScopedColorCustomizations } from 'vscode/vscode/vs/workbench/services/themes/common/workbenchThemeService';
4
3
  export { IAnyWorkspaceIdentifier, IEmptyWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, IWorkspaceIdentifier } from 'vscode/vscode/vs/platform/workspace/common/workspace';
5
4
  export { IStoredWorkspace, IWorkspaceFolderCreationData } from 'vscode/vscode/vs/platform/workspaces/common/workspaces';
5
+ export { IColorCustomizations, IThemeScopedColorCustomizations } from 'vscode/vscode/vs/workbench/services/themes/common/workbenchThemeService';
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@codingame/monaco-vscode-configuration-service-override",
3
- "version": "4.4.1",
3
+ "version": "4.5.0",
4
4
  "keywords": [],
5
5
  "author": {
6
6
  "name": "CodinGame",
@@ -17,14 +17,16 @@
17
17
  "main": "index.js",
18
18
  "module": "index.js",
19
19
  "types": "index.d.ts",
20
+ "exports": {
21
+ ".": {
22
+ "default": "./index.js"
23
+ },
24
+ "./vscode/*": {
25
+ "default": "./vscode/src/*.js"
26
+ }
27
+ },
20
28
  "dependencies": {
21
- "vscode": "npm:@codingame/monaco-vscode-api@4.4.1",
22
- "@codingame/monaco-vscode-files-service-override": "4.4.1",
23
- "@codingame/monaco-vscode-quickaccess-service-override": "4.4.1",
24
- "@codingame/monaco-vscode-extensions-service-override": "4.4.1",
25
- "@codingame/monaco-vscode-environment-service-override": "4.4.1",
26
- "@codingame/monaco-vscode-layout-service-override": "4.4.1",
27
- "@codingame/monaco-vscode-host-service-override": "4.4.1",
28
- "@codingame/monaco-vscode-base-service-override": "4.4.1"
29
+ "vscode": "npm:@codingame/monaco-vscode-api@4.5.0",
30
+ "@codingame/monaco-vscode-files-service-override": "4.5.0"
29
31
  }
30
32
  }
package/tools.js CHANGED
@@ -17,5 +17,26 @@ function memoizedConstructor(ctor) {
17
17
  })
18
18
  });
19
19
  }
20
+ async function sleep(duration) {
21
+ await new Promise(resolve => setTimeout(resolve, duration));
22
+ }
23
+ function throttle(fct, merge, delay) {
24
+ let lastPromise = Promise.resolve();
25
+ let toConsume = null;
26
+ return async (param) => {
27
+ if (toConsume == null) {
28
+ toConsume = param;
29
+ lastPromise = lastPromise.then(async () => sleep(delay)).then(async () => {
30
+ const _toConsume = toConsume;
31
+ toConsume = null;
32
+ await fct(_toConsume);
33
+ });
34
+ }
35
+ else {
36
+ toConsume = merge(toConsume, param);
37
+ }
38
+ await lastPromise;
39
+ };
40
+ }
20
41
 
21
- export { memoized, memoizedConstructor, unsupported };
42
+ export { memoized, memoizedConstructor, sleep, throttle, unsupported };
package/vscode/src/vs/editor/common/services/textResourceConfigurationService.js CHANGED
@@ -4,7 +4,7 @@ import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
4
4
  import { Position } from 'vscode/vscode/vs/editor/common/core/position';
5
5
  import { ILanguageService } from 'vscode/vscode/vs/editor/common/languages/language';
6
6
  import { IModelService } from 'vscode/vscode/vs/editor/common/services/model';
7
- import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
7
+ import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
8
8
 
9
9
  let TextResourceConfigurationService = class TextResourceConfigurationService extends Disposable {
10
10
  constructor(configurationService, modelService, languageService) {
package/vscode/src/vs/workbench/contrib/workspaces/browser/workspaces.contribution.js CHANGED
@@ -1,20 +1,23 @@
1
1
  import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
2
- import { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
2
+ import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
3
3
  import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
4
4
  import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
5
- import { IWorkspaceContextService, WORKSPACE_SUFFIX, hasWorkspaceFileExtension } from 'vscode/vscode/vs/platform/workspace/common/workspace';
5
+ import { hasWorkspaceFileExtension, WORKSPACE_SUFFIX } from 'vscode/vscode/vs/platform/workspace/common/workspace';
6
+ import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
6
7
  import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
7
- import { IFileService } from 'vscode/vscode/vs/platform/files/common/files';
8
- import { INotificationService, NeverShowAgainScope, Severity, NotificationPriority } from 'vscode/vscode/vs/platform/notification/common/notification';
9
- import { isEqual, joinPath } from 'vscode/vscode/vs/base/common/resources';
10
- import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/host';
11
- import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput';
12
- import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
8
+ import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
9
+ import { NeverShowAgainScope, NotificationPriority } from 'vscode/vscode/vs/platform/notification/common/notification';
10
+ import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
11
+ import { joinPath, isEqual } from 'vscode/vscode/vs/base/common/resources';
12
+ import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/host.service';
13
+ import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
14
+ import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
13
15
  import { isVirtualWorkspace } from 'vscode/vscode/vs/platform/workspace/common/virtualWorkspace';
14
16
  import { registerAction2, Action2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
15
17
  import { ResourceContextKey, ActiveEditorContext, TemporaryWorkspaceContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
16
18
  import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
17
19
  import { TEXT_FILE_EDITOR_ID } from 'vscode/vscode/vs/workbench/contrib/files/common/files';
20
+ import Severity$1 from 'vscode/vscode/vs/base/common/severity';
18
21
 
19
22
  let WorkspacesFinderContribution = class WorkspacesFinderContribution extends Disposable {
20
23
  constructor(contextService, notificationService, fileService, quickInputService, hostService, storageService) {
@@ -44,7 +47,7 @@ let WorkspacesFinderContribution = class WorkspacesFinderContribution extends Di
44
47
  const neverShowAgain = { id: 'workspaces.dontPromptToOpen', scope: NeverShowAgainScope.WORKSPACE, isSecondary: true };
45
48
  if (workspaces.length === 1) {
46
49
  const workspaceFile = workspaces[0];
47
- this.notificationService.prompt(Severity.Info, ( localizeWithPath('vs/workbench/contrib/workspaces/browser/workspaces.contribution', {
50
+ this.notificationService.prompt(Severity$1.Info, ( localizeWithPath('vs/workbench/contrib/workspaces/browser/workspaces.contribution', {
48
51
  key: 'foundWorkspace',
49
52
  comment: ['{Locked="]({1})"}']
50
53
  }, "This folder contains a workspace file '{0}'. Do you want to open it? [Learn more]({1}) about workspace files.", workspaceFile, 'https://go.microsoft.com/fwlink/?linkid=2025315')), [{
@@ -60,7 +63,7 @@ let WorkspacesFinderContribution = class WorkspacesFinderContribution extends Di
60
63
  });
61
64
  }
62
65
  else if (workspaces.length > 1) {
63
- this.notificationService.prompt(Severity.Info, ( localizeWithPath('vs/workbench/contrib/workspaces/browser/workspaces.contribution', {
66
+ this.notificationService.prompt(Severity$1.Info, ( localizeWithPath('vs/workbench/contrib/workspaces/browser/workspaces.contribution', {
64
67
  key: 'foundWorkspaces',
65
68
  comment: ['{Locked="]({0})"}']
66
69
  }, "This folder contains multiple workspace files. Do you want to open one? [Learn more]({0}) about workspace files.", 'https://go.microsoft.com/fwlink/?linkid=2025315')), [{
package/vscode/src/vs/workbench/services/configuration/browser/configuration.js CHANGED
@@ -5,7 +5,7 @@ import { RunOnceScheduler } from 'vscode/vscode/vs/base/common/async';
5
5
  import { whenProviderRegistered } from 'vscode/vscode/vs/platform/files/common/files';
6
6
  import { UserSettings, ConfigurationModelParser, ConfigurationModel } from 'vscode/vscode/vs/platform/configuration/common/configurationModels';
7
7
  import { StandaloneConfigurationModelParser, WorkspaceConfigurationModelParser } from '../common/configurationModels.js';
8
- import { APPLY_ALL_PROFILES_SETTING, TASKS_CONFIGURATION_KEY, REMOTE_MACHINE_SCOPES, WORKSPACE_SCOPES, FOLDER_SCOPES, FOLDER_SETTINGS_NAME, LAUNCH_CONFIGURATION_KEY } from 'vscode/vscode/vs/workbench/services/configuration/common/configuration';
8
+ import { APPLY_ALL_PROFILES_SETTING, TASKS_CONFIGURATION_KEY, REMOTE_MACHINE_SCOPES, WORKSPACE_SCOPES, FOLDER_SETTINGS_NAME, FOLDER_SCOPES, LAUNCH_CONFIGURATION_KEY } from 'vscode/vscode/vs/workbench/services/configuration/common/configuration';
9
9
  import { Extensions, OVERRIDE_PROPERTY_REGEX } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
10
10
  import { equals } from 'vscode/vscode/vs/base/common/objects';
11
11
  import { hash } from 'vscode/vscode/vs/base/common/hash';
package/vscode/src/vs/workbench/services/configuration/browser/configurationService.js CHANGED
@@ -1,35 +1,37 @@
1
1
  import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
2
2
  import { URI } from 'vscode/vscode/vs/base/common/uri';
3
- import { Event, Emitter } from 'vscode/vscode/vs/base/common/event';
3
+ import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
4
4
  import { ResourceMap } from 'vscode/vscode/vs/base/common/map';
5
5
  import { equals } from 'vscode/vscode/vs/base/common/objects';
6
6
  import { Disposable, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
7
- import { Delayer, Barrier, Queue, Promises } from 'vscode/vscode/vs/base/common/async';
8
- import { Extensions as Extensions$2 } from 'vscode/vscode/vs/platform/jsonschemas/common/jsonContributionRegistry';
9
- import { IWorkspaceContextService, isWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, isWorkspaceFolder, toWorkspaceFolder, Workspace as Workspace$1 } from 'vscode/vscode/vs/platform/workspace/common/workspace';
7
+ import { Barrier, Queue, Promises, Delayer } from 'vscode/vscode/vs/base/common/async';
8
+ import { Extensions as Extensions$1 } from 'vscode/vscode/vs/platform/jsonschemas/common/jsonContributionRegistry';
9
+ import { Workspace as Workspace$1, isWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, isWorkspaceFolder, toWorkspaceFolder } from 'vscode/vscode/vs/platform/workspace/common/workspace';
10
+ import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
10
11
  import { ConfigurationModel, mergeChanges, ConfigurationChangeEvent } from 'vscode/vscode/vs/platform/configuration/common/configurationModels';
11
- import { IConfigurationService, isConfigurationOverrides, isConfigurationUpdateOverrides, ConfigurationTargetToString } from 'vscode/vscode/vs/platform/configuration/common/configuration';
12
+ import { isConfigurationOverrides, isConfigurationUpdateOverrides, ConfigurationTargetToString } from 'vscode/vscode/vs/platform/configuration/common/configuration';
13
+ import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
12
14
  import { NullPolicyConfiguration, PolicyConfiguration } from 'vscode/vscode/vs/platform/configuration/common/configurations';
13
15
  import { Configuration } from '../common/configurationModels.js';
14
- import { APPLY_ALL_PROFILES_SETTING, defaultSettingsSchemaId, userSettingsSchemaId, profileSettingsSchemaId, machineSettingsSchemaId, workspaceSettingsSchemaId, folderSettingsSchemaId, FOLDER_CONFIG_FOLDER_NAME, LOCAL_MACHINE_SCOPES, LOCAL_MACHINE_PROFILE_SCOPES, PROFILE_SCOPES } from 'vscode/vscode/vs/workbench/services/configuration/common/configuration';
16
+ import { LOCAL_MACHINE_SCOPES, LOCAL_MACHINE_PROFILE_SCOPES, PROFILE_SCOPES, APPLY_ALL_PROFILES_SETTING, FOLDER_CONFIG_FOLDER_NAME, defaultSettingsSchemaId, userSettingsSchemaId, profileSettingsSchemaId, machineSettingsSchemaId, workspaceSettingsSchemaId, folderSettingsSchemaId } from 'vscode/vscode/vs/workbench/services/configuration/common/configuration';
15
17
  import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
16
- import { Extensions, allSettings, applicationSettings, windowSettings, resourceSettings, machineSettings, machineOverridableSettings, OVERRIDE_PROPERTY_PATTERN, resourceLanguageSettingsSchemaId, configurationDefaultsSchemaId, keyFromOverrideIdentifiers } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
18
+ import { Extensions, keyFromOverrideIdentifiers, allSettings, applicationSettings, windowSettings, resourceSettings, machineSettings, machineOverridableSettings, OVERRIDE_PROPERTY_PATTERN, resourceLanguageSettingsSchemaId, configurationDefaultsSchemaId } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
17
19
  import { isStoredWorkspaceFolder, toWorkspaceFolders, getStoredWorkspaceFolder } from 'vscode/vscode/vs/platform/workspaces/common/workspaces';
18
20
  import { ConfigurationEditing } from '../common/configurationEditing.js';
19
21
  import { DefaultConfiguration, UserConfiguration, RemoteUserConfiguration, WorkspaceConfiguration, ApplicationConfiguration, FolderConfiguration } from './configuration.js';
20
22
  import { mark } from 'vscode/vscode/vs/base/common/performance';
21
- import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService';
22
- import { Extensions as Extensions$1, registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
23
- import { ILifecycleService } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
23
+ import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService.service';
24
+ import { Extensions as Extensions$2, registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
25
+ import { ILifecycleService } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle.service';
24
26
  import { toErrorMessage } from 'vscode/vscode/vs/base/common/errorMessage';
25
- import { IWorkspaceTrustManagementService } from 'vscode/vscode/vs/platform/workspace/common/workspaceTrust';
27
+ import { IWorkspaceTrustManagementService } from 'vscode/vscode/vs/platform/workspace/common/workspaceTrust.service';
26
28
  import { distinct, delta, equals as equals$1 } from 'vscode/vscode/vs/base/common/arrays';
27
- import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
28
- import { IWorkbenchAssignmentService } from 'vscode/vscode/vs/workbench/services/assignment/common/assignmentService';
29
+ import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
30
+ import { IWorkbenchAssignmentService } from 'vscode/vscode/vs/workbench/services/assignment/common/assignmentService.service';
29
31
  import { isUndefined } from 'vscode/vscode/vs/base/common/types';
30
32
  import { localizeWithPath } from 'vscode/vscode/vs/nls';
31
33
  import { NullPolicyService } from 'vscode/vscode/vs/platform/policy/common/policy';
32
- import { IJSONEditingService } from 'vscode/vscode/vs/workbench/services/configuration/common/jsonEditing';
34
+ import { IJSONEditingService } from 'vscode/vscode/vs/workbench/services/configuration/common/jsonEditing.service';
33
35
  import { workbenchConfigurationNodeBase } from 'vscode/vscode/vs/workbench/common/configuration';
34
36
  import { mainWindow } from 'vscode/vscode/vs/base/browser/window';
35
37
  import { runWhenWindowIdle } from 'vscode/vscode/vs/base/browser/dom';
@@ -1092,7 +1094,7 @@ let RegisterConfigurationSchemasContribution = class RegisterConfigurationSchema
1092
1094
  });
1093
1095
  }
1094
1096
  registerSchemas(schemas) {
1095
- const jsonRegistry = ( Registry.as(Extensions$2.JSONContribution));
1097
+ const jsonRegistry = ( Registry.as(Extensions$1.JSONContribution));
1096
1098
  jsonRegistry.registerSchema(defaultSettingsSchemaId, schemas.defaultSettingsSchema);
1097
1099
  jsonRegistry.registerSchema(userSettingsSchemaId, schemas.userSettingsSchema);
1098
1100
  jsonRegistry.registerSchema(profileSettingsSchemaId, schemas.profileSettingsSchema);
@@ -1175,7 +1177,7 @@ let UpdateExperimentalSettingsDefaults = class UpdateExperimentalSettingsDefault
1175
1177
  UpdateExperimentalSettingsDefaults = ( __decorate([
1176
1178
  ( __param(0, IWorkbenchAssignmentService))
1177
1179
  ], UpdateExperimentalSettingsDefaults));
1178
- const workbenchContributionsRegistry = ( Registry.as(Extensions$1.Workbench));
1180
+ const workbenchContributionsRegistry = ( Registry.as(Extensions$2.Workbench));
1179
1181
  workbenchContributionsRegistry.registerWorkbenchContribution(RegisterConfigurationSchemasContribution, 3 );
1180
1182
  workbenchContributionsRegistry.registerWorkbenchContribution(ResetConfigurationDefaultsOverridesCache, 4 );
1181
1183
  registerWorkbenchContribution2(UpdateExperimentalSettingsDefaults.ID, UpdateExperimentalSettingsDefaults, 2 );
package/vscode/src/vs/workbench/services/configuration/common/configurationEditing.js CHANGED
@@ -4,22 +4,25 @@ import { parse } from 'vscode/vscode/vs/base/common/json';
4
4
  import { setProperty } from 'vscode/vscode/vs/base/common/jsonEdit';
5
5
  import { Queue } from 'vscode/vscode/vs/base/common/async';
6
6
  import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
7
- import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace';
8
- import { ITextFileService } from 'vscode/vscode/vs/workbench/services/textfile/common/textfiles';
9
- import { IWorkbenchConfigurationService, TASKS_CONFIGURATION_KEY, LAUNCH_CONFIGURATION_KEY, TASKS_DEFAULT, FOLDER_SCOPES, FOLDER_SETTINGS_PATH, USER_STANDALONE_CONFIGURATIONS, WORKSPACE_STANDALONE_CONFIGURATIONS } from 'vscode/vscode/vs/workbench/services/configuration/common/configuration';
10
- import { IFileService } from 'vscode/vscode/vs/platform/files/common/files';
7
+ import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
8
+ import { ITextFileService } from 'vscode/vscode/vs/workbench/services/textfile/common/textfiles.service';
9
+ import { TASKS_CONFIGURATION_KEY, LAUNCH_CONFIGURATION_KEY, TASKS_DEFAULT, FOLDER_SCOPES, USER_STANDALONE_CONFIGURATIONS, WORKSPACE_STANDALONE_CONFIGURATIONS, FOLDER_SETTINGS_PATH } from 'vscode/vscode/vs/workbench/services/configuration/common/configuration';
10
+ import { IWorkbenchConfigurationService } from 'vscode/vscode/vs/workbench/services/configuration/common/configuration.service';
11
+ import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
11
12
  import { ITextModelService } from 'vscode/vscode/vs/editor/common/services/resolverService';
12
13
  import { Extensions, OVERRIDE_PROPERTY_REGEX, keyFromOverrideIdentifiers } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
13
- import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
14
- import { INotificationService, Severity } from 'vscode/vscode/vs/platform/notification/common/notification';
15
- import { IPreferencesService } from 'vscode/vscode/vs/workbench/services/preferences/common/preferences';
16
- import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity';
14
+ import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
15
+ import 'vscode/vscode/vs/platform/notification/common/notification';
16
+ import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
17
+ import { IPreferencesService } from 'vscode/vscode/vs/workbench/services/preferences/common/preferences.service';
18
+ import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
17
19
  import { Range } from 'vscode/vscode/vs/editor/common/core/range';
18
20
  import { EditOperation } from 'vscode/vscode/vs/editor/common/core/editOperation';
19
21
  import { Selection } from 'vscode/vscode/vs/editor/common/core/selection';
20
- import { IUserDataProfileService } from 'vscode/vscode/vs/workbench/services/userDataProfile/common/userDataProfile';
21
- import { IUserDataProfilesService } from 'vscode/vscode/vs/platform/userDataProfile/common/userDataProfile';
22
+ import { IUserDataProfileService } from 'vscode/vscode/vs/workbench/services/userDataProfile/common/userDataProfile.service';
23
+ import { IUserDataProfilesService } from 'vscode/vscode/vs/platform/userDataProfile/common/userDataProfile.service';
22
24
  import { ErrorNoTelemetry } from 'vscode/vscode/vs/base/common/errors';
25
+ import Severity$1 from 'vscode/vscode/vs/base/common/severity';
23
26
 
24
27
  class ConfigurationEditingError extends ErrorNoTelemetry {
25
28
  constructor(message, code) {
@@ -164,13 +167,13 @@ let ConfigurationEditing = class ConfigurationEditing {
164
167
  ))
165
168
  : null;
166
169
  if (openStandAloneConfigurationActionLabel) {
167
- this.notificationService.prompt(Severity.Error, error.message, [{
170
+ this.notificationService.prompt(Severity$1.Error, error.message, [{
168
171
  label: openStandAloneConfigurationActionLabel,
169
172
  run: () => this.openFile(operation.resource)
170
173
  }]);
171
174
  }
172
175
  else {
173
- this.notificationService.prompt(Severity.Error, error.message, [{
176
+ this.notificationService.prompt(Severity$1.Error, error.message, [{
174
177
  label: ( localizeWithPath(
175
178
  'vs/workbench/services/configuration/common/configurationEditing',
176
179
  'open',
@@ -193,7 +196,7 @@ let ConfigurationEditing = class ConfigurationEditing {
193
196
  ))
194
197
  : null;
195
198
  if (openStandAloneConfigurationActionLabel) {
196
- this.notificationService.prompt(Severity.Error, error.message, [{
199
+ this.notificationService.prompt(Severity$1.Error, error.message, [{
197
200
  label: ( localizeWithPath(
198
201
  'vs/workbench/services/configuration/common/configurationEditing',
199
202
  'saveAndRetry',
@@ -210,7 +213,7 @@ let ConfigurationEditing = class ConfigurationEditing {
210
213
  }]);
211
214
  }
212
215
  else {
213
- this.notificationService.prompt(Severity.Error, error.message, [{
216
+ this.notificationService.prompt(Severity$1.Error, error.message, [{
214
217
  label: ( localizeWithPath(
215
218
  'vs/workbench/services/configuration/common/configurationEditing',
216
219
  'saveAndRetry',
package/vscode/src/vs/workbench/services/configuration/common/configurationModels.js CHANGED
@@ -1,6 +1,6 @@
1
1
  import { equals } from 'vscode/vscode/vs/base/common/objects';
2
2
  import { toValuesTree } from 'vscode/vscode/vs/platform/configuration/common/configuration';
3
- import { Configuration as Configuration$1, ConfigurationModelParser, ConfigurationModel } from 'vscode/vscode/vs/platform/configuration/common/configurationModels';
3
+ import { ConfigurationModelParser, ConfigurationModel, Configuration as Configuration$1 } from 'vscode/vscode/vs/platform/configuration/common/configurationModels';
4
4
  import { isBoolean } from 'vscode/vscode/vs/base/common/types';
5
5
  import { distinct } from 'vscode/vscode/vs/base/common/arrays';
6
6
 
package/vscode/src/vs/workbench/services/label/common/labelService.js CHANGED
@@ -6,20 +6,21 @@ import { sep, posix, win32 } from 'vscode/vscode/vs/base/common/path';
6
6
  import { Emitter } from 'vscode/vscode/vs/base/common/event';
7
7
  import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
8
8
  import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
9
- import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService';
10
- import { IWorkspaceContextService, isWorkspace, toWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier, isUntitledWorkspace, isTemporaryWorkspace, WORKSPACE_EXTENSION } from 'vscode/vscode/vs/platform/workspace/common/workspace';
9
+ import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService.service';
10
+ import { isWorkspace, toWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier, isUntitledWorkspace, isTemporaryWorkspace, WORKSPACE_EXTENSION } from 'vscode/vscode/vs/platform/workspace/common/workspace';
11
+ import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
11
12
  import { basenameOrAuthority, basename, joinPath, dirname } from 'vscode/vscode/vs/base/common/resources';
12
13
  import { getPathLabel, tildify } from 'vscode/vscode/vs/base/common/labels';
13
- import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
14
+ import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label.service';
14
15
  import { ExtensionsRegistry } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionsRegistry';
15
16
  import { match } from 'vscode/vscode/vs/base/common/glob';
16
- import { ILifecycleService } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
17
- import { IPathService } from 'vscode/vscode/vs/workbench/services/path/common/pathService';
17
+ import { ILifecycleService } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle.service';
18
+ import { IPathService } from 'vscode/vscode/vs/workbench/services/path/common/pathService.service';
18
19
  import { isProposedApiEnabled } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
19
20
  import { OS } from 'vscode/vscode/vs/base/common/platform';
20
- import { IRemoteAgentService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteAgentService';
21
+ import { IRemoteAgentService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteAgentService.service';
21
22
  import { Schemas } from 'vscode/vscode/vs/base/common/network';
22
- import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
23
+ import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
23
24
  import { Memento } from 'vscode/vscode/vs/workbench/common/memento';
24
25
  import { firstOrDefault } from 'vscode/vscode/vs/base/common/arrays';
25
26
 
package/vscode/src/vs/workbench/services/textresourceProperties/common/textResourcePropertiesService.js CHANGED
@@ -1,11 +1,11 @@
1
1
  import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
2
- import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
2
+ import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
3
3
  import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
4
4
  import { OS } from 'vscode/vscode/vs/base/common/platform';
5
5
  import { Schemas } from 'vscode/vscode/vs/base/common/network';
6
- import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
7
- import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService';
8
- import { IRemoteAgentService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteAgentService';
6
+ import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
7
+ import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService.service';
8
+ import { IRemoteAgentService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteAgentService.service';
9
9
 
10
10
  let TextResourcePropertiesService = class TextResourcePropertiesService {
11
11
  constructor(configurationService, remoteAgentService, environmentService, storageService) {
package/vscode/src/vs/workbench/services/workspaces/browser/abstractWorkspaceEditingService.js CHANGED
@@ -1,27 +1,30 @@
1
1
  import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
2
2
  import { localizeWithPath } from 'vscode/vscode/vs/nls';
3
- import { IWorkspaceContextService, WORKSPACE_FILTER, hasWorkspaceFileExtension, WORKSPACE_EXTENSION, isSavedWorkspace, isUntitledWorkspace, toWorkspaceIdentifier, isWorkspaceIdentifier } from 'vscode/vscode/vs/platform/workspace/common/workspace';
4
- import { IJSONEditingService } from 'vscode/vscode/vs/workbench/services/configuration/common/jsonEditing';
5
- import { IWorkspacesService, rewriteWorkspaceFileForNewLocation } from 'vscode/vscode/vs/platform/workspaces/common/workspaces';
3
+ import { WORKSPACE_FILTER, hasWorkspaceFileExtension, WORKSPACE_EXTENSION, isSavedWorkspace, isUntitledWorkspace, toWorkspaceIdentifier, isWorkspaceIdentifier } from 'vscode/vscode/vs/platform/workspace/common/workspace';
4
+ import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
5
+ import { IJSONEditingService } from 'vscode/vscode/vs/workbench/services/configuration/common/jsonEditing.service';
6
+ import { rewriteWorkspaceFileForNewLocation } from 'vscode/vscode/vs/platform/workspaces/common/workspaces';
7
+ import { IWorkspacesService } from 'vscode/vscode/vs/platform/workspaces/common/workspaces.service';
6
8
  import { Extensions } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
7
9
  import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
8
- import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands';
10
+ import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
9
11
  import { firstOrDefault, distinct } from 'vscode/vscode/vs/base/common/arrays';
10
12
  import { joinPath, basename, removeTrailingPathSeparator, isEqual } from 'vscode/vscode/vs/base/common/resources';
11
- import { INotificationService, Severity } from 'vscode/vscode/vs/platform/notification/common/notification';
12
- import { IFileService } from 'vscode/vscode/vs/platform/files/common/files';
13
- import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService';
14
- import '../../../../../../../override/vs/platform/dialogs/common/dialogs.js';
13
+ import 'vscode/vscode/vs/platform/notification/common/notification';
14
+ import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
15
+ import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
16
+ import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService.service';
17
+ import { IFileDialogService, IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
15
18
  import { mnemonicButtonLabel } from 'vscode/vscode/vs/base/common/labels';
16
- import { ITextFileService } from 'vscode/vscode/vs/workbench/services/textfile/common/textfiles';
17
- import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/host';
19
+ import { ITextFileService } from 'vscode/vscode/vs/workbench/services/textfile/common/textfiles.service';
20
+ import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/host.service';
18
21
  import { Schemas } from 'vscode/vscode/vs/base/common/network';
19
- import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity';
20
- import { IWorkspaceTrustManagementService } from 'vscode/vscode/vs/platform/workspace/common/workspaceTrust';
21
- import { IWorkbenchConfigurationService } from 'vscode/vscode/vs/workbench/services/configuration/common/configuration';
22
- import { IUserDataProfilesService } from 'vscode/vscode/vs/platform/userDataProfile/common/userDataProfile';
23
- import { IUserDataProfileService } from 'vscode/vscode/vs/workbench/services/userDataProfile/common/userDataProfile';
24
- import { IFileDialogService, IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
22
+ import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
23
+ import { IWorkspaceTrustManagementService } from 'vscode/vscode/vs/platform/workspace/common/workspaceTrust.service';
24
+ import { IWorkbenchConfigurationService } from 'vscode/vscode/vs/workbench/services/configuration/common/configuration.service';
25
+ import { IUserDataProfilesService } from 'vscode/vscode/vs/platform/userDataProfile/common/userDataProfile.service';
26
+ import { IUserDataProfileService } from 'vscode/vscode/vs/workbench/services/userDataProfile/common/userDataProfile.service';
27
+ import Severity$1 from 'vscode/vscode/vs/base/common/severity';
25
28
 
26
29
  let AbstractWorkspaceEditingService = class AbstractWorkspaceEditingService {
27
30
  constructor(jsonEditingService, contextService, configurationService, notificationService, commandService, fileService, textFileService, workspacesService, environmentService, fileDialogService, dialogService, hostService, uriIdentityService, workspaceTrustManagementService, userDataProfilesService, userDataProfileService) {
@@ -263,7 +266,7 @@ let AbstractWorkspaceEditingService = class AbstractWorkspaceEditingService {
263
266
  this.askToOpenWorkspaceConfigurationFile(message);
264
267
  }
265
268
  askToOpenWorkspaceConfigurationFile(message) {
266
- this.notificationService.prompt(Severity.Error, message, [{
269
+ this.notificationService.prompt(Severity$1.Error, message, [{
267
270
  label: ( localizeWithPath(
268
271
  'vs/workbench/services/workspaces/browser/abstractWorkspaceEditingService',
269
272
  'openWorkspaceConfigurationFile',
package/vscode/src/vs/workbench/services/workspaces/browser/workspacesService.js CHANGED
@@ -1,16 +1,18 @@
1
1
  import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
2
2
  import { restoreRecentlyOpened, isRecentFolder, isRecentWorkspace, isRecentFile, toStoreData, getStoredWorkspaceFolder } from 'vscode/vscode/vs/platform/workspaces/common/workspaces';
3
+ import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
3
4
  import { Emitter } from 'vscode/vscode/vs/base/common/event';
4
- import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
5
- import { isTemporaryWorkspace, WORKSPACE_EXTENSION, IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace';
6
- import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
5
+ import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
6
+ import { isTemporaryWorkspace, WORKSPACE_EXTENSION } from 'vscode/vscode/vs/platform/workspace/common/workspace';
7
+ import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
8
+ import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
7
9
  import { Disposable, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
8
10
  import { getWorkspaceIdentifier } from 'vscode/vscode/vs/workbench/services/workspaces/browser/workspaces';
9
- import { IFileService } from 'vscode/vscode/vs/platform/files/common/files';
10
- import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService';
11
+ import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
12
+ import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService.service';
11
13
  import { joinPath } from 'vscode/vscode/vs/base/common/resources';
12
14
  import { VSBuffer } from 'vscode/vscode/vs/base/common/buffer';
13
- import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity';
15
+ import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
14
16
  import { Schemas } from 'vscode/vscode/vs/base/common/network';
15
17
 
16
18
  var BrowserWorkspacesService_1;
package/override/vs/platform/dialogs/common/dialogs.js DELETED
@@ -1,10 +0,0 @@
1
- export { AbstractDialogHandler, IDialogService, IFileDialogService, getFileNamesMessage } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
2
-
3
- var ConfirmResult;
4
- ( (function(ConfirmResult) {
5
- ConfirmResult[ConfirmResult["SAVE"] = 0] = "SAVE";
6
- ConfirmResult[ConfirmResult["DONT_SAVE"] = 1] = "DONT_SAVE";
7
- ConfirmResult[ConfirmResult["CANCEL"] = 2] = "CANCEL";
8
- })(ConfirmResult || (ConfirmResult = {})));
9
-
10
- export { ConfirmResult };