@codingame/monaco-vscode-configuration-service-override 1.85.6 → 2.0.0-v2.1
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.
- package/configuration.js +19 -19
- package/index.js +1 -1
- package/package.json +11 -11
- package/vscode/src/vs/editor/common/services/textResourceConfigurationService.js +6 -6
- package/vscode/src/vs/workbench/api/common/configurationExtensionPoint.js +52 -52
- package/vscode/src/vs/workbench/services/configuration/browser/configuration.js +14 -14
- package/vscode/src/vs/workbench/services/configuration/browser/configurationService.js +22 -22
- package/vscode/src/vs/workbench/services/configuration/common/configurationCache.js +3 -3
- package/vscode/src/vs/workbench/services/configuration/common/configurationEditing.js +58 -58
- package/vscode/src/vs/workbench/services/configuration/common/configurationModels.js +5 -5
- package/vscode/src/vs/workbench/services/label/common/labelService.js +15 -15
- package/vscode/src/vs/workbench/services/textresourceProperties/common/textResourcePropertiesService.js +4 -4
- package/vscode/src/vs/workbench/services/workspaces/browser/abstractWorkspaceEditingService.js +14 -14
- package/vscode/src/vs/workbench/services/workspaces/browser/workspacesService.js +10 -10
- package/vscode/src/vs/platform/configuration/common/configurationRegistry.js +0 -11
package/configuration.js
CHANGED
|
@@ -1,34 +1,34 @@
|
|
|
1
1
|
import { __decorate, __param } from './external/tslib/tslib.es6.js';
|
|
2
|
-
import { StandaloneServices } from '
|
|
2
|
+
import { StandaloneServices } from 'vscode/vscode/vs/editor/standalone/browser/standaloneServices';
|
|
3
3
|
import { WorkspaceService } from './vscode/src/vs/workbench/services/configuration/browser/configurationService.js';
|
|
4
|
-
import { IConfigurationService } from '
|
|
5
|
-
import { ITextResourceConfigurationService, ITextResourcePropertiesService } from '
|
|
4
|
+
import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
|
|
5
|
+
import { ITextResourceConfigurationService, ITextResourcePropertiesService } from 'vscode/vscode/vs/editor/common/services/textResourceConfiguration';
|
|
6
6
|
import { TextResourceConfigurationService } from './vscode/src/vs/editor/common/services/textResourceConfigurationService.js';
|
|
7
|
-
import { SyncDescriptor } from '
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
import { Registry } from '
|
|
11
|
-
import { VSBuffer } from '
|
|
12
|
-
import { IFileService } from '
|
|
13
|
-
import { ILogService } from '
|
|
14
|
-
import { IUserDataProfilesService } from '
|
|
15
|
-
import { IPolicyService } from '
|
|
16
|
-
import { IInstantiationService } from '
|
|
7
|
+
import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
|
|
8
|
+
import { Extensions } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
|
|
9
|
+
export { ConfigurationScope } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
|
|
10
|
+
import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
|
|
11
|
+
import { VSBuffer } from 'vscode/vscode/vs/base/common/buffer';
|
|
12
|
+
import { IFileService } from 'vscode/vscode/vs/platform/files/common/files';
|
|
13
|
+
import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
|
|
14
|
+
import { IUserDataProfilesService } from 'vscode/vscode/vs/platform/userDataProfile/common/userDataProfile';
|
|
15
|
+
import { IPolicyService } from 'vscode/vscode/vs/platform/policy/common/policy';
|
|
16
|
+
import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
|
|
17
17
|
import { IUserDataProfileService } from 'vscode/vscode/vs/workbench/services/userDataProfile/common/userDataProfile';
|
|
18
18
|
import { IRemoteAgentService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteAgentService';
|
|
19
|
-
import { IUriIdentityService } from '
|
|
19
|
+
import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity';
|
|
20
20
|
import { ConfigurationCache } from './vscode/src/vs/workbench/services/configuration/common/configurationCache.js';
|
|
21
|
-
import { Schemas } from '
|
|
21
|
+
import { Schemas } from 'vscode/vscode/vs/base/common/network';
|
|
22
22
|
import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService';
|
|
23
|
-
import { IWorkspaceContextService } from '
|
|
23
|
+
import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace';
|
|
24
24
|
import { LabelService } from './vscode/src/vs/workbench/services/label/common/labelService.js';
|
|
25
|
-
import { ILabelService } from '
|
|
26
|
-
import { generateUuid } from '
|
|
25
|
+
import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
|
|
26
|
+
import { generateUuid } from 'vscode/vscode/vs/base/common/uuid';
|
|
27
27
|
import { IWorkspacesService } from 'vscode/vscode/vs/platform/workspaces/common/workspaces';
|
|
28
28
|
import { BrowserWorkspacesService } from './vscode/src/vs/workbench/services/workspaces/browser/workspacesService.js';
|
|
29
29
|
import { IWorkspaceEditingService } from 'vscode/vscode/vs/workbench/services/workspaces/common/workspaceEditing';
|
|
30
30
|
import { AbstractWorkspaceEditingService } from './vscode/src/vs/workbench/services/workspaces/browser/abstractWorkspaceEditingService.js';
|
|
31
|
-
import { URI } from '
|
|
31
|
+
import { URI } from 'vscode/vscode/vs/base/common/uri';
|
|
32
32
|
import './vscode/src/vs/workbench/api/common/configurationExtensionPoint.js';
|
|
33
33
|
import { TextResourcePropertiesService } from './vscode/src/vs/workbench/services/textresourceProperties/common/textResourcePropertiesService.js';
|
|
34
34
|
import getServiceOverride$1, { initFile } from '@codingame/monaco-vscode-files-service-override';
|
package/index.js
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export { configurationRegistry, default, defaultUserConfigurationFile, getUserConfiguration, initUserConfiguration, onUserConfigurationChange, reinitializeWorkspace, updateUserConfiguration } from './configuration.js';
|
|
2
|
-
export { ConfigurationScope } from '
|
|
2
|
+
export { ConfigurationScope } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@codingame/monaco-vscode-configuration-service-override",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "2.0.0-v2.1",
|
|
4
4
|
"keywords": [],
|
|
5
5
|
"author": {
|
|
6
6
|
"name": "CodinGame",
|
|
@@ -9,7 +9,7 @@
|
|
|
9
9
|
"license": "MIT",
|
|
10
10
|
"repository": {
|
|
11
11
|
"type": "git",
|
|
12
|
-
"url": "git
|
|
12
|
+
"url": "git@github.com:CodinGame/monaco-vscode-api.git"
|
|
13
13
|
},
|
|
14
14
|
"type": "module",
|
|
15
15
|
"private": false,
|
|
@@ -18,14 +18,14 @@
|
|
|
18
18
|
"module": "index.js",
|
|
19
19
|
"types": "index.d.ts",
|
|
20
20
|
"dependencies": {
|
|
21
|
-
"vscode": "npm:@codingame/monaco-vscode-api@
|
|
22
|
-
"
|
|
23
|
-
"@codingame/monaco-vscode-files-service-override": "
|
|
24
|
-
"@codingame/monaco-vscode-quickaccess-service-override": "
|
|
25
|
-
"@codingame/monaco-vscode-extensions-service-override": "
|
|
26
|
-
"@codingame/monaco-vscode-environment-service-override": "
|
|
27
|
-
"@codingame/monaco-vscode-layout-service-override": "
|
|
28
|
-
"@codingame/monaco-vscode-host-service-override": "
|
|
29
|
-
"@codingame/monaco-vscode-base-service-override": "
|
|
21
|
+
"vscode": "npm:@codingame/monaco-vscode-api@2.0.0-v2.1",
|
|
22
|
+
"vscode-marked": "npm:marked@=3.0.2",
|
|
23
|
+
"@codingame/monaco-vscode-files-service-override": "2.0.0-v2.1",
|
|
24
|
+
"@codingame/monaco-vscode-quickaccess-service-override": "2.0.0-v2.1",
|
|
25
|
+
"@codingame/monaco-vscode-extensions-service-override": "2.0.0-v2.1",
|
|
26
|
+
"@codingame/monaco-vscode-environment-service-override": "2.0.0-v2.1",
|
|
27
|
+
"@codingame/monaco-vscode-layout-service-override": "2.0.0-v2.1",
|
|
28
|
+
"@codingame/monaco-vscode-host-service-override": "2.0.0-v2.1",
|
|
29
|
+
"@codingame/monaco-vscode-base-service-override": "2.0.0-v2.1"
|
|
30
30
|
}
|
|
31
31
|
}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
|
|
2
|
-
import { Emitter } from '
|
|
3
|
-
import { Disposable } from '
|
|
4
|
-
import { Position } from '
|
|
5
|
-
import { ILanguageService } from '
|
|
6
|
-
import { IModelService } from '
|
|
7
|
-
import { IConfigurationService } from '
|
|
2
|
+
import { Emitter } from 'vscode/vscode/vs/base/common/event';
|
|
3
|
+
import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
|
|
4
|
+
import { Position } from 'vscode/vscode/vs/editor/common/core/position';
|
|
5
|
+
import { ILanguageService } from 'vscode/vscode/vs/editor/common/languages/language';
|
|
6
|
+
import { IModelService } from 'vscode/vscode/vs/editor/common/services/model';
|
|
7
|
+
import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
|
|
8
8
|
|
|
9
9
|
let TextResourceConfigurationService = class TextResourceConfigurationService extends Disposable {
|
|
10
10
|
constructor(configurationService, modelService, languageService) {
|
|
@@ -1,12 +1,12 @@
|
|
|
1
|
-
import
|
|
2
|
-
import
|
|
3
|
-
import { Registry } from '
|
|
1
|
+
import { localizeWithPath } from 'vscode/vscode/vs/nls';
|
|
2
|
+
import { deepClone } from 'vscode/vscode/vs/base/common/objects';
|
|
3
|
+
import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
|
|
4
4
|
import { ExtensionsRegistry } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionsRegistry';
|
|
5
|
-
import { Extensions as Extensions$1, configurationDefaultsSchemaId, OVERRIDE_PROPERTY_REGEX, validateProperty } from '
|
|
6
|
-
import { Extensions } from '
|
|
5
|
+
import { Extensions as Extensions$1, configurationDefaultsSchemaId, OVERRIDE_PROPERTY_REGEX, validateProperty } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
|
|
6
|
+
import { Extensions } from 'vscode/vscode/vs/platform/jsonschemas/common/jsonContributionRegistry';
|
|
7
7
|
import { workspaceSettingsSchemaId, launchSchemaId, tasksSchemaId } from 'vscode/vscode/vs/workbench/services/configuration/common/configuration';
|
|
8
|
-
import { isObject } from '
|
|
9
|
-
import { ExtensionIdentifierMap } from '
|
|
8
|
+
import { isObject } from 'vscode/vscode/vs/base/common/types';
|
|
9
|
+
import { ExtensionIdentifierMap } from 'vscode/vscode/vs/platform/extensions/common/extensions';
|
|
10
10
|
|
|
11
11
|
const jsonRegistry = ( Registry.as(Extensions.JSONContribution));
|
|
12
12
|
const configurationRegistry = ( Registry.as(Extensions$1.Configuration));
|
|
@@ -15,7 +15,7 @@ const configurationEntrySchema = {
|
|
|
15
15
|
defaultSnippets: [{ body: { title: '', properties: {} } }],
|
|
16
16
|
properties: {
|
|
17
17
|
title: {
|
|
18
|
-
description: (
|
|
18
|
+
description: ( localizeWithPath(
|
|
19
19
|
'vs/workbench/api/common/configurationExtensionPoint',
|
|
20
20
|
'vscode.extension.contributes.configuration.title',
|
|
21
21
|
'A title for the current category of settings. This label will be rendered in the Settings editor as a subheading. If the title is the same as the extension display name, then the category will be grouped under the main extension heading.'
|
|
@@ -23,7 +23,7 @@ const configurationEntrySchema = {
|
|
|
23
23
|
type: 'string'
|
|
24
24
|
},
|
|
25
25
|
order: {
|
|
26
|
-
description: (
|
|
26
|
+
description: ( localizeWithPath(
|
|
27
27
|
'vs/workbench/api/common/configurationExtensionPoint',
|
|
28
28
|
'vscode.extension.contributes.configuration.order',
|
|
29
29
|
'When specified, gives the order of this category of settings relative to other categories.'
|
|
@@ -31,7 +31,7 @@ const configurationEntrySchema = {
|
|
|
31
31
|
type: 'integer'
|
|
32
32
|
},
|
|
33
33
|
properties: {
|
|
34
|
-
description: (
|
|
34
|
+
description: ( localizeWithPath(
|
|
35
35
|
'vs/workbench/api/common/configurationExtensionPoint',
|
|
36
36
|
'vscode.extension.contributes.configuration.properties',
|
|
37
37
|
'Description of the configuration properties.'
|
|
@@ -39,7 +39,7 @@ const configurationEntrySchema = {
|
|
|
39
39
|
type: 'object',
|
|
40
40
|
propertyNames: {
|
|
41
41
|
pattern: '\\S+',
|
|
42
|
-
patternErrorMessage: (
|
|
42
|
+
patternErrorMessage: ( localizeWithPath(
|
|
43
43
|
'vs/workbench/api/common/configurationExtensionPoint',
|
|
44
44
|
'vscode.extension.contributes.configuration.property.empty',
|
|
45
45
|
'Property should not be empty.'
|
|
@@ -48,7 +48,7 @@ const configurationEntrySchema = {
|
|
|
48
48
|
additionalProperties: {
|
|
49
49
|
anyOf: [
|
|
50
50
|
{
|
|
51
|
-
title: (
|
|
51
|
+
title: ( localizeWithPath(
|
|
52
52
|
'vs/workbench/api/common/configurationExtensionPoint',
|
|
53
53
|
'vscode.extension.contributes.configuration.properties.schema',
|
|
54
54
|
'Schema of the configuration property.'
|
|
@@ -63,38 +63,38 @@ const configurationEntrySchema = {
|
|
|
63
63
|
enum: ['application', 'machine', 'window', 'resource', 'language-overridable', 'machine-overridable'],
|
|
64
64
|
default: 'window',
|
|
65
65
|
enumDescriptions: [
|
|
66
|
-
(
|
|
66
|
+
( localizeWithPath(
|
|
67
67
|
'vs/workbench/api/common/configurationExtensionPoint',
|
|
68
68
|
'scope.application.description',
|
|
69
69
|
"Configuration that can be configured only in the user settings."
|
|
70
70
|
)),
|
|
71
|
-
(
|
|
71
|
+
( localizeWithPath(
|
|
72
72
|
'vs/workbench/api/common/configurationExtensionPoint',
|
|
73
73
|
'scope.machine.description',
|
|
74
74
|
"Configuration that can be configured only in the user settings or only in the remote settings."
|
|
75
75
|
)),
|
|
76
|
-
(
|
|
76
|
+
( localizeWithPath(
|
|
77
77
|
'vs/workbench/api/common/configurationExtensionPoint',
|
|
78
78
|
'scope.window.description',
|
|
79
79
|
"Configuration that can be configured in the user, remote or workspace settings."
|
|
80
80
|
)),
|
|
81
|
-
(
|
|
81
|
+
( localizeWithPath(
|
|
82
82
|
'vs/workbench/api/common/configurationExtensionPoint',
|
|
83
83
|
'scope.resource.description',
|
|
84
84
|
"Configuration that can be configured in the user, remote, workspace or folder settings."
|
|
85
85
|
)),
|
|
86
|
-
(
|
|
86
|
+
( localizeWithPath(
|
|
87
87
|
'vs/workbench/api/common/configurationExtensionPoint',
|
|
88
88
|
'scope.language-overridable.description',
|
|
89
89
|
"Resource configuration that can be configured in language specific settings."
|
|
90
90
|
)),
|
|
91
|
-
(
|
|
91
|
+
( localizeWithPath(
|
|
92
92
|
'vs/workbench/api/common/configurationExtensionPoint',
|
|
93
93
|
'scope.machine-overridable.description',
|
|
94
94
|
"Machine configuration that can be configured also in workspace or folder settings."
|
|
95
95
|
))
|
|
96
96
|
],
|
|
97
|
-
markdownDescription: (
|
|
97
|
+
markdownDescription: ( localizeWithPath(
|
|
98
98
|
'vs/workbench/api/common/configurationExtensionPoint',
|
|
99
99
|
'scope.description',
|
|
100
100
|
"Scope in which the configuration is applicable. Available scopes are `application`, `machine`, `window`, `resource`, and `machine-overridable`."
|
|
@@ -105,7 +105,7 @@ const configurationEntrySchema = {
|
|
|
105
105
|
items: {
|
|
106
106
|
type: 'string',
|
|
107
107
|
},
|
|
108
|
-
description: (
|
|
108
|
+
description: ( localizeWithPath(
|
|
109
109
|
'vs/workbench/api/common/configurationExtensionPoint',
|
|
110
110
|
'scope.enumDescriptions',
|
|
111
111
|
'Descriptions for enum values'
|
|
@@ -116,7 +116,7 @@ const configurationEntrySchema = {
|
|
|
116
116
|
items: {
|
|
117
117
|
type: 'string',
|
|
118
118
|
},
|
|
119
|
-
description: (
|
|
119
|
+
description: ( localizeWithPath(
|
|
120
120
|
'vs/workbench/api/common/configurationExtensionPoint',
|
|
121
121
|
'scope.markdownEnumDescriptions',
|
|
122
122
|
'Descriptions for enum values in the markdown format.'
|
|
@@ -127,7 +127,7 @@ const configurationEntrySchema = {
|
|
|
127
127
|
items: {
|
|
128
128
|
type: 'string'
|
|
129
129
|
},
|
|
130
|
-
markdownDescription: (
|
|
130
|
+
markdownDescription: ( localizeWithPath(
|
|
131
131
|
'vs/workbench/api/common/configurationExtensionPoint',
|
|
132
132
|
'scope.enumItemLabels',
|
|
133
133
|
'Labels for enum values to be displayed in the Settings editor. When specified, the {0} values still show after the labels, but less prominently.',
|
|
@@ -136,7 +136,7 @@ const configurationEntrySchema = {
|
|
|
136
136
|
},
|
|
137
137
|
markdownDescription: {
|
|
138
138
|
type: 'string',
|
|
139
|
-
description: (
|
|
139
|
+
description: ( localizeWithPath(
|
|
140
140
|
'vs/workbench/api/common/configurationExtensionPoint',
|
|
141
141
|
'scope.markdownDescription',
|
|
142
142
|
'The description in the markdown format.'
|
|
@@ -144,7 +144,7 @@ const configurationEntrySchema = {
|
|
|
144
144
|
},
|
|
145
145
|
deprecationMessage: {
|
|
146
146
|
type: 'string',
|
|
147
|
-
description: (
|
|
147
|
+
description: ( localizeWithPath(
|
|
148
148
|
'vs/workbench/api/common/configurationExtensionPoint',
|
|
149
149
|
'scope.deprecationMessage',
|
|
150
150
|
'If set, the property is marked as deprecated and the given message is shown as an explanation.'
|
|
@@ -152,7 +152,7 @@ const configurationEntrySchema = {
|
|
|
152
152
|
},
|
|
153
153
|
markdownDeprecationMessage: {
|
|
154
154
|
type: 'string',
|
|
155
|
-
description: (
|
|
155
|
+
description: ( localizeWithPath(
|
|
156
156
|
'vs/workbench/api/common/configurationExtensionPoint',
|
|
157
157
|
'scope.markdownDeprecationMessage',
|
|
158
158
|
'If set, the property is marked as deprecated and the given message is shown as an explanation in the markdown format.'
|
|
@@ -162,19 +162,19 @@ const configurationEntrySchema = {
|
|
|
162
162
|
type: 'string',
|
|
163
163
|
enum: ['singlelineText', 'multilineText'],
|
|
164
164
|
enumDescriptions: [
|
|
165
|
-
(
|
|
165
|
+
( localizeWithPath(
|
|
166
166
|
'vs/workbench/api/common/configurationExtensionPoint',
|
|
167
167
|
'scope.singlelineText.description',
|
|
168
168
|
'The value will be shown in an inputbox.'
|
|
169
169
|
)),
|
|
170
|
-
(
|
|
170
|
+
( localizeWithPath(
|
|
171
171
|
'vs/workbench/api/common/configurationExtensionPoint',
|
|
172
172
|
'scope.multilineText.description',
|
|
173
173
|
'The value will be shown in a textarea.'
|
|
174
174
|
))
|
|
175
175
|
],
|
|
176
176
|
default: 'singlelineText',
|
|
177
|
-
description: (
|
|
177
|
+
description: ( localizeWithPath(
|
|
178
178
|
'vs/workbench/api/common/configurationExtensionPoint',
|
|
179
179
|
'scope.editPresentation',
|
|
180
180
|
'When specified, controls the presentation format of the string setting.'
|
|
@@ -182,7 +182,7 @@ const configurationEntrySchema = {
|
|
|
182
182
|
},
|
|
183
183
|
order: {
|
|
184
184
|
type: 'integer',
|
|
185
|
-
description: (
|
|
185
|
+
description: ( localizeWithPath(
|
|
186
186
|
'vs/workbench/api/common/configurationExtensionPoint',
|
|
187
187
|
'scope.order',
|
|
188
188
|
'When specified, gives the order of this setting relative to other settings within the same category. Settings with an order property will be placed before settings without this property set.'
|
|
@@ -190,7 +190,7 @@ const configurationEntrySchema = {
|
|
|
190
190
|
},
|
|
191
191
|
ignoreSync: {
|
|
192
192
|
type: 'boolean',
|
|
193
|
-
description: (
|
|
193
|
+
description: ( localizeWithPath(
|
|
194
194
|
'vs/workbench/api/common/configurationExtensionPoint',
|
|
195
195
|
'scope.ignoreSync',
|
|
196
196
|
'When enabled, Settings Sync will not sync the user value of this configuration by default.'
|
|
@@ -223,7 +223,7 @@ defaultConfigurationExtPoint.setHandler((extensions, { added, removed }) => {
|
|
|
223
223
|
});
|
|
224
224
|
if (removed.length) {
|
|
225
225
|
const removedDefaultConfigurations = ( removed.map(
|
|
226
|
-
extension => ({ overrides:
|
|
226
|
+
extension => ({ overrides: deepClone(extension.value), source: { id: extension.description.identifier.value, displayName: extension.description.displayName } })
|
|
227
227
|
));
|
|
228
228
|
_configDelta.removedDefaults = removedDefaultConfigurations;
|
|
229
229
|
}
|
|
@@ -231,12 +231,12 @@ defaultConfigurationExtPoint.setHandler((extensions, { added, removed }) => {
|
|
|
231
231
|
const registeredProperties = configurationRegistry.getConfigurationProperties();
|
|
232
232
|
const allowedScopes = [6 , 3 , 4 , 5 ];
|
|
233
233
|
const addedDefaultConfigurations = ( added.map(extension => {
|
|
234
|
-
const overrides =
|
|
234
|
+
const overrides = deepClone(extension.value);
|
|
235
235
|
for (const key of ( Object.keys(overrides))) {
|
|
236
236
|
if (!OVERRIDE_PROPERTY_REGEX.test(key)) {
|
|
237
237
|
const registeredPropertyScheme = registeredProperties[key];
|
|
238
238
|
if (registeredPropertyScheme?.scope && !allowedScopes.includes(registeredPropertyScheme.scope)) {
|
|
239
|
-
extension.collector.warn((
|
|
239
|
+
extension.collector.warn(( localizeWithPath(
|
|
240
240
|
'vs/workbench/api/common/configurationExtensionPoint',
|
|
241
241
|
'config.property.defaultConfiguration.warning',
|
|
242
242
|
"Cannot register configuration defaults for '{0}'. Only defaults for machine-overridable, window, resource and language overridable scoped settings are supported.",
|
|
@@ -255,7 +255,7 @@ const configurationExtPoint = ( ExtensionsRegistry.registerExtensionPoint({
|
|
|
255
255
|
extensionPoint: 'configuration',
|
|
256
256
|
deps: [defaultConfigurationExtPoint],
|
|
257
257
|
jsonSchema: {
|
|
258
|
-
description: (
|
|
258
|
+
description: ( localizeWithPath(
|
|
259
259
|
'vs/workbench/api/common/configurationExtensionPoint',
|
|
260
260
|
'vscode.extension.contributes.configuration',
|
|
261
261
|
'Contributes configuration settings.'
|
|
@@ -283,9 +283,9 @@ configurationExtPoint.setHandler((extensions, { added, removed }) => {
|
|
|
283
283
|
const seenProperties = ( new Set());
|
|
284
284
|
function handleConfiguration(node, extension) {
|
|
285
285
|
const configurations = [];
|
|
286
|
-
const configuration =
|
|
286
|
+
const configuration = deepClone(node);
|
|
287
287
|
if (configuration.title && (typeof configuration.title !== 'string')) {
|
|
288
|
-
extension.collector.error((
|
|
288
|
+
extension.collector.error(( localizeWithPath(
|
|
289
289
|
'vs/workbench/api/common/configurationExtensionPoint',
|
|
290
290
|
'invalid.title',
|
|
291
291
|
"'configuration.title' must be a string"
|
|
@@ -303,7 +303,7 @@ configurationExtPoint.setHandler((extensions, { added, removed }) => {
|
|
|
303
303
|
const properties = configuration.properties;
|
|
304
304
|
if (properties) {
|
|
305
305
|
if (typeof properties !== 'object') {
|
|
306
|
-
extension.collector.error((
|
|
306
|
+
extension.collector.error(( localizeWithPath(
|
|
307
307
|
'vs/workbench/api/common/configurationExtensionPoint',
|
|
308
308
|
'invalid.properties',
|
|
309
309
|
"'configuration.properties' must be an object"
|
|
@@ -320,7 +320,7 @@ configurationExtPoint.setHandler((extensions, { added, removed }) => {
|
|
|
320
320
|
}
|
|
321
321
|
if (( seenProperties.has(key))) {
|
|
322
322
|
delete properties[key];
|
|
323
|
-
extension.collector.warn((
|
|
323
|
+
extension.collector.warn(( localizeWithPath(
|
|
324
324
|
'vs/workbench/api/common/configurationExtensionPoint',
|
|
325
325
|
'config.property.duplicate',
|
|
326
326
|
"Cannot register '{0}'. This property is already registered.",
|
|
@@ -330,7 +330,7 @@ configurationExtPoint.setHandler((extensions, { added, removed }) => {
|
|
|
330
330
|
}
|
|
331
331
|
if (!isObject(propertyConfiguration)) {
|
|
332
332
|
delete properties[key];
|
|
333
|
-
extension.collector.error((
|
|
333
|
+
extension.collector.error(( localizeWithPath(
|
|
334
334
|
'vs/workbench/api/common/configurationExtensionPoint',
|
|
335
335
|
'invalid.property',
|
|
336
336
|
"configuration.properties property '{0}' must be an object",
|
|
@@ -366,7 +366,7 @@ configurationExtPoint.setHandler((extensions, { added, removed }) => {
|
|
|
366
366
|
}
|
|
367
367
|
const subNodes = configuration.allOf;
|
|
368
368
|
if (subNodes) {
|
|
369
|
-
extension.collector.error((
|
|
369
|
+
extension.collector.error(( localizeWithPath(
|
|
370
370
|
'vs/workbench/api/common/configurationExtensionPoint',
|
|
371
371
|
'invalid.allOf',
|
|
372
372
|
"'configuration.allOf' is deprecated and should no longer be used. Instead, pass multiple configuration sections as an array to the 'configuration' contribution point."
|
|
@@ -411,7 +411,7 @@ jsonRegistry.registerSchema('vscode://schemas/workspaceConfig', {
|
|
|
411
411
|
'folders': {
|
|
412
412
|
minItems: 0,
|
|
413
413
|
uniqueItems: true,
|
|
414
|
-
description: (
|
|
414
|
+
description: ( localizeWithPath(
|
|
415
415
|
'vs/workbench/api/common/configurationExtensionPoint',
|
|
416
416
|
'workspaceConfig.folders.description',
|
|
417
417
|
"List of folders to be loaded in the workspace."
|
|
@@ -423,7 +423,7 @@ jsonRegistry.registerSchema('vscode://schemas/workspaceConfig', {
|
|
|
423
423
|
properties: {
|
|
424
424
|
path: {
|
|
425
425
|
type: 'string',
|
|
426
|
-
description: (
|
|
426
|
+
description: ( localizeWithPath(
|
|
427
427
|
'vs/workbench/api/common/configurationExtensionPoint',
|
|
428
428
|
'workspaceConfig.path.description',
|
|
429
429
|
"A file path. e.g. `/root/folderA` or `./folderA` for a relative path that will be resolved against the location of the workspace file."
|
|
@@ -431,7 +431,7 @@ jsonRegistry.registerSchema('vscode://schemas/workspaceConfig', {
|
|
|
431
431
|
},
|
|
432
432
|
name: {
|
|
433
433
|
type: 'string',
|
|
434
|
-
description: (
|
|
434
|
+
description: ( localizeWithPath(
|
|
435
435
|
'vs/workbench/api/common/configurationExtensionPoint',
|
|
436
436
|
'workspaceConfig.name.description',
|
|
437
437
|
"An optional name for the folder. "
|
|
@@ -443,7 +443,7 @@ jsonRegistry.registerSchema('vscode://schemas/workspaceConfig', {
|
|
|
443
443
|
properties: {
|
|
444
444
|
uri: {
|
|
445
445
|
type: 'string',
|
|
446
|
-
description: (
|
|
446
|
+
description: ( localizeWithPath(
|
|
447
447
|
'vs/workbench/api/common/configurationExtensionPoint',
|
|
448
448
|
'workspaceConfig.uri.description',
|
|
449
449
|
"URI of the folder"
|
|
@@ -451,7 +451,7 @@ jsonRegistry.registerSchema('vscode://schemas/workspaceConfig', {
|
|
|
451
451
|
},
|
|
452
452
|
name: {
|
|
453
453
|
type: 'string',
|
|
454
|
-
description: (
|
|
454
|
+
description: ( localizeWithPath(
|
|
455
455
|
'vs/workbench/api/common/configurationExtensionPoint',
|
|
456
456
|
'workspaceConfig.name.description',
|
|
457
457
|
"An optional name for the folder. "
|
|
@@ -465,7 +465,7 @@ jsonRegistry.registerSchema('vscode://schemas/workspaceConfig', {
|
|
|
465
465
|
'settings': {
|
|
466
466
|
type: 'object',
|
|
467
467
|
default: {},
|
|
468
|
-
description: (
|
|
468
|
+
description: ( localizeWithPath(
|
|
469
469
|
'vs/workbench/api/common/configurationExtensionPoint',
|
|
470
470
|
'workspaceConfig.settings.description',
|
|
471
471
|
"Workspace settings"
|
|
@@ -475,7 +475,7 @@ jsonRegistry.registerSchema('vscode://schemas/workspaceConfig', {
|
|
|
475
475
|
'launch': {
|
|
476
476
|
type: 'object',
|
|
477
477
|
default: { configurations: [], compounds: [] },
|
|
478
|
-
description: (
|
|
478
|
+
description: ( localizeWithPath(
|
|
479
479
|
'vs/workbench/api/common/configurationExtensionPoint',
|
|
480
480
|
'workspaceConfig.launch.description',
|
|
481
481
|
"Workspace launch configurations"
|
|
@@ -485,7 +485,7 @@ jsonRegistry.registerSchema('vscode://schemas/workspaceConfig', {
|
|
|
485
485
|
'tasks': {
|
|
486
486
|
type: 'object',
|
|
487
487
|
default: { version: '2.0.0', tasks: [] },
|
|
488
|
-
description: (
|
|
488
|
+
description: ( localizeWithPath(
|
|
489
489
|
'vs/workbench/api/common/configurationExtensionPoint',
|
|
490
490
|
'workspaceConfig.tasks.description',
|
|
491
491
|
"Workspace task configurations"
|
|
@@ -495,7 +495,7 @@ jsonRegistry.registerSchema('vscode://schemas/workspaceConfig', {
|
|
|
495
495
|
'extensions': {
|
|
496
496
|
type: 'object',
|
|
497
497
|
default: {},
|
|
498
|
-
description: (
|
|
498
|
+
description: ( localizeWithPath(
|
|
499
499
|
'vs/workbench/api/common/configurationExtensionPoint',
|
|
500
500
|
'workspaceConfig.extensions.description',
|
|
501
501
|
"Workspace extensions"
|
|
@@ -505,7 +505,7 @@ jsonRegistry.registerSchema('vscode://schemas/workspaceConfig', {
|
|
|
505
505
|
'remoteAuthority': {
|
|
506
506
|
type: 'string',
|
|
507
507
|
doNotSuggest: true,
|
|
508
|
-
description: (
|
|
508
|
+
description: ( localizeWithPath(
|
|
509
509
|
'vs/workbench/api/common/configurationExtensionPoint',
|
|
510
510
|
'workspaceConfig.remoteAuthority',
|
|
511
511
|
"The remote server where the workspace is located."
|
|
@@ -514,14 +514,14 @@ jsonRegistry.registerSchema('vscode://schemas/workspaceConfig', {
|
|
|
514
514
|
'transient': {
|
|
515
515
|
type: 'boolean',
|
|
516
516
|
doNotSuggest: true,
|
|
517
|
-
description: (
|
|
517
|
+
description: ( localizeWithPath(
|
|
518
518
|
'vs/workbench/api/common/configurationExtensionPoint',
|
|
519
519
|
'workspaceConfig.transient',
|
|
520
520
|
"A transient workspace will disappear when restarting or reloading."
|
|
521
521
|
)),
|
|
522
522
|
}
|
|
523
523
|
},
|
|
524
|
-
errorMessage: (
|
|
524
|
+
errorMessage: ( localizeWithPath(
|
|
525
525
|
'vs/workbench/api/common/configurationExtensionPoint',
|
|
526
526
|
'unknownWorkspaceProperty',
|
|
527
527
|
"Unknown workspace configuration property"
|
|
@@ -1,18 +1,18 @@
|
|
|
1
|
-
import { Emitter, Event } from '
|
|
2
|
-
import
|
|
3
|
-
import { Disposable, MutableDisposable, combinedDisposable, toDisposable, DisposableStore, dispose } from '
|
|
4
|
-
import { RunOnceScheduler } from '
|
|
5
|
-
import { whenProviderRegistered } from '
|
|
6
|
-
import { UserSettings, ConfigurationModelParser, ConfigurationModel } from '
|
|
1
|
+
import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
|
|
2
|
+
import { getErrorMessage } from 'vscode/vscode/vs/base/common/errors';
|
|
3
|
+
import { Disposable, MutableDisposable, combinedDisposable, toDisposable, DisposableStore, dispose } from 'vscode/vscode/vs/base/common/lifecycle';
|
|
4
|
+
import { RunOnceScheduler } from 'vscode/vscode/vs/base/common/async';
|
|
5
|
+
import { whenProviderRegistered } from 'vscode/vscode/vs/platform/files/common/files';
|
|
6
|
+
import { UserSettings, ConfigurationModelParser, ConfigurationModel } from 'vscode/vscode/vs/platform/configuration/common/configurationModels';
|
|
7
7
|
import { StandaloneConfigurationModelParser, WorkspaceConfigurationModelParser } from '../common/configurationModels.js';
|
|
8
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';
|
|
9
|
-
import { Extensions, OVERRIDE_PROPERTY_REGEX } from '
|
|
10
|
-
import { equals } from '
|
|
11
|
-
import { hash } from '
|
|
12
|
-
import { joinPath } from '
|
|
13
|
-
import { Registry } from '
|
|
14
|
-
import { isEmptyObject, isObject } from '
|
|
15
|
-
import { DefaultConfiguration as DefaultConfiguration$1 } from '
|
|
9
|
+
import { Extensions, OVERRIDE_PROPERTY_REGEX } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
|
|
10
|
+
import { equals } from 'vscode/vscode/vs/base/common/objects';
|
|
11
|
+
import { hash } from 'vscode/vscode/vs/base/common/hash';
|
|
12
|
+
import { joinPath } from 'vscode/vscode/vs/base/common/resources';
|
|
13
|
+
import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
|
|
14
|
+
import { isEmptyObject, isObject } from 'vscode/vscode/vs/base/common/types';
|
|
15
|
+
import { DefaultConfiguration as DefaultConfiguration$1 } from 'vscode/vscode/vs/platform/configuration/common/configurations';
|
|
16
16
|
|
|
17
17
|
class DefaultConfiguration extends DefaultConfiguration$1 {
|
|
18
18
|
static { this.DEFAULT_OVERRIDES_CACHE_EXISTS_KEY = 'DefaultOverridesCacheExists'; }
|
|
@@ -202,7 +202,7 @@ class FileServiceBasedConfiguration extends Disposable {
|
|
|
202
202
|
return ( content.value.toString());
|
|
203
203
|
}
|
|
204
204
|
catch (error) {
|
|
205
|
-
this.logService.trace(`Error while resolving configuration file '${( resource.toString())}': ${
|
|
205
|
+
this.logService.trace(`Error while resolving configuration file '${( resource.toString())}': ${getErrorMessage(error)}`);
|
|
206
206
|
if (error.fileOperationResult !== 1
|
|
207
207
|
&& error.fileOperationResult !== 9 ) {
|
|
208
208
|
this.logService.error(error);
|
|
@@ -1,38 +1,38 @@
|
|
|
1
1
|
import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
|
|
2
|
-
import { URI } from '
|
|
3
|
-
import { Event, Emitter } from '
|
|
4
|
-
import { ResourceMap } from '
|
|
5
|
-
import { equals } from '
|
|
6
|
-
import { Disposable, DisposableStore } from '
|
|
7
|
-
import { Delayer, Barrier, Queue, Promises } from '
|
|
8
|
-
import { Extensions as Extensions$2 } from '
|
|
9
|
-
import { IWorkspaceContextService, isWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, isWorkspaceFolder, toWorkspaceFolder, Workspace as Workspace$1 } from '
|
|
10
|
-
import { ConfigurationModel, mergeChanges, ConfigurationChangeEvent } from '
|
|
11
|
-
import { isConfigurationOverrides, isConfigurationUpdateOverrides, ConfigurationTargetToString } from '
|
|
12
|
-
import { NullPolicyConfiguration, PolicyConfiguration } from '
|
|
2
|
+
import { URI } from 'vscode/vscode/vs/base/common/uri';
|
|
3
|
+
import { Event, Emitter } from 'vscode/vscode/vs/base/common/event';
|
|
4
|
+
import { ResourceMap } from 'vscode/vscode/vs/base/common/map';
|
|
5
|
+
import { equals } from 'vscode/vscode/vs/base/common/objects';
|
|
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';
|
|
10
|
+
import { ConfigurationModel, mergeChanges, ConfigurationChangeEvent } from 'vscode/vscode/vs/platform/configuration/common/configurationModels';
|
|
11
|
+
import { isConfigurationOverrides, isConfigurationUpdateOverrides, ConfigurationTargetToString } from 'vscode/vscode/vs/platform/configuration/common/configuration';
|
|
12
|
+
import { NullPolicyConfiguration, PolicyConfiguration } from 'vscode/vscode/vs/platform/configuration/common/configurations';
|
|
13
13
|
import { Configuration } from '../common/configurationModels.js';
|
|
14
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';
|
|
15
|
-
import { Registry } from '
|
|
16
|
-
import { Extensions as Extensions$1, allSettings, applicationSettings, windowSettings, resourceSettings, machineSettings, machineOverridableSettings, OVERRIDE_PROPERTY_PATTERN, resourceLanguageSettingsSchemaId, configurationDefaultsSchemaId, keyFromOverrideIdentifiers } from '
|
|
15
|
+
import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
|
|
16
|
+
import { Extensions as Extensions$1, allSettings, applicationSettings, windowSettings, resourceSettings, machineSettings, machineOverridableSettings, OVERRIDE_PROPERTY_PATTERN, resourceLanguageSettingsSchemaId, configurationDefaultsSchemaId, keyFromOverrideIdentifiers } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
|
|
17
17
|
import { isStoredWorkspaceFolder, toWorkspaceFolders, getStoredWorkspaceFolder } from 'vscode/vscode/vs/platform/workspaces/common/workspaces';
|
|
18
18
|
import { ConfigurationEditing } from '../common/configurationEditing.js';
|
|
19
19
|
import { DefaultConfiguration, UserConfiguration, RemoteUserConfiguration, WorkspaceConfiguration, ApplicationConfiguration, FolderConfiguration } from './configuration.js';
|
|
20
|
-
import { mark } from '
|
|
20
|
+
import { mark } from 'vscode/vscode/vs/base/common/performance';
|
|
21
21
|
import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService';
|
|
22
22
|
import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
|
|
23
23
|
import { ILifecycleService } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
|
|
24
|
-
import { toErrorMessage } from '
|
|
25
|
-
import { IWorkspaceTrustManagementService } from '
|
|
26
|
-
import { distinct, delta, equals as equals$1 } from '
|
|
24
|
+
import { toErrorMessage } from 'vscode/vscode/vs/base/common/errorMessage';
|
|
25
|
+
import { IWorkspaceTrustManagementService } from 'vscode/vscode/vs/platform/workspace/common/workspaceTrust';
|
|
26
|
+
import { distinct, delta, equals as equals$1 } from 'vscode/vscode/vs/base/common/arrays';
|
|
27
27
|
import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
|
|
28
28
|
import { IWorkbenchAssignmentService } from 'vscode/vscode/vs/workbench/services/assignment/common/assignmentService';
|
|
29
|
-
import { isUndefined } from '
|
|
30
|
-
import { localizeWithPath } from '
|
|
31
|
-
import { NullPolicyService } from '
|
|
29
|
+
import { isUndefined } from 'vscode/vscode/vs/base/common/types';
|
|
30
|
+
import { localizeWithPath } from 'vscode/vscode/vs/nls';
|
|
31
|
+
import { NullPolicyService } from 'vscode/vscode/vs/platform/policy/common/policy';
|
|
32
32
|
import { IJSONEditingService } from 'vscode/vscode/vs/workbench/services/configuration/common/jsonEditing';
|
|
33
33
|
import { workbenchConfigurationNodeBase } from 'vscode/vscode/vs/workbench/common/configuration';
|
|
34
|
-
import { mainWindow } from '
|
|
35
|
-
import { runWhenWindowIdle } from '
|
|
34
|
+
import { mainWindow } from 'vscode/vscode/vs/base/browser/window';
|
|
35
|
+
import { runWhenWindowIdle } from 'vscode/vscode/vs/base/browser/dom';
|
|
36
36
|
|
|
37
37
|
function getLocalUserConfigurationScopes(userDataProfile, hasRemote) {
|
|
38
38
|
return (userDataProfile.isDefault || userDataProfile.useDefaultFlags?.settings)
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { joinPath } from '
|
|
2
|
-
import { VSBuffer } from '
|
|
3
|
-
import { Queue } from '
|
|
1
|
+
import { joinPath } from 'vscode/vscode/vs/base/common/resources';
|
|
2
|
+
import { VSBuffer } from 'vscode/vscode/vs/base/common/buffer';
|
|
3
|
+
import { Queue } from 'vscode/vscode/vs/base/common/async';
|
|
4
4
|
|
|
5
5
|
class ConfigurationCache {
|
|
6
6
|
constructor(donotCacheResourcesWithSchemes, environmentService, fileService) {
|
|
@@ -1,25 +1,25 @@
|
|
|
1
1
|
import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
|
|
2
|
-
import
|
|
3
|
-
import
|
|
2
|
+
import { localizeWithPath } from 'vscode/vscode/vs/nls';
|
|
3
|
+
import { parse } from 'vscode/vscode/vs/base/common/json';
|
|
4
4
|
import { setProperty } from 'vscode/vscode/vs/base/common/jsonEdit';
|
|
5
|
-
import { Queue } from '
|
|
6
|
-
import { Registry } from '
|
|
7
|
-
import { IWorkspaceContextService } from '
|
|
5
|
+
import { Queue } from 'vscode/vscode/vs/base/common/async';
|
|
6
|
+
import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
|
|
7
|
+
import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace';
|
|
8
8
|
import { ITextFileService } from 'vscode/vscode/vs/workbench/services/textfile/common/textfiles';
|
|
9
9
|
import { TASKS_CONFIGURATION_KEY, LAUNCH_CONFIGURATION_KEY, TASKS_DEFAULT, FOLDER_SCOPES, FOLDER_SETTINGS_PATH, IWorkbenchConfigurationService, USER_STANDALONE_CONFIGURATIONS, WORKSPACE_STANDALONE_CONFIGURATIONS } from 'vscode/vscode/vs/workbench/services/configuration/common/configuration';
|
|
10
|
-
import { IFileService } from '
|
|
11
|
-
import { ITextModelService } from '
|
|
12
|
-
import { Extensions, OVERRIDE_PROPERTY_REGEX, keyFromOverrideIdentifiers } from '
|
|
10
|
+
import { IFileService } from 'vscode/vscode/vs/platform/files/common/files';
|
|
11
|
+
import { ITextModelService } from 'vscode/vscode/vs/editor/common/services/resolverService';
|
|
12
|
+
import { Extensions, OVERRIDE_PROPERTY_REGEX, keyFromOverrideIdentifiers } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
|
|
13
13
|
import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
|
|
14
|
-
import { Severity, INotificationService } from '
|
|
14
|
+
import { Severity, INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification';
|
|
15
15
|
import { IPreferencesService } from 'vscode/vscode/vs/workbench/services/preferences/common/preferences';
|
|
16
|
-
import { IUriIdentityService } from '
|
|
17
|
-
import { Range } from '
|
|
18
|
-
import { EditOperation } from '
|
|
19
|
-
import { Selection } from '
|
|
16
|
+
import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity';
|
|
17
|
+
import { Range } from 'vscode/vscode/vs/editor/common/core/range';
|
|
18
|
+
import { EditOperation } from 'vscode/vscode/vs/editor/common/core/editOperation';
|
|
19
|
+
import { Selection } from 'vscode/vscode/vs/editor/common/core/selection';
|
|
20
20
|
import { IUserDataProfileService } from 'vscode/vscode/vs/workbench/services/userDataProfile/common/userDataProfile';
|
|
21
|
-
import { IUserDataProfilesService } from '
|
|
22
|
-
import { ErrorNoTelemetry } from '
|
|
21
|
+
import { IUserDataProfilesService } from 'vscode/vscode/vs/platform/userDataProfile/common/userDataProfile';
|
|
22
|
+
import { ErrorNoTelemetry } from 'vscode/vscode/vs/base/common/errors';
|
|
23
23
|
|
|
24
24
|
class ConfigurationEditingError extends ErrorNoTelemetry {
|
|
25
25
|
constructor(message, code) {
|
|
@@ -96,7 +96,7 @@ let ConfigurationEditing = class ConfigurationEditing {
|
|
|
96
96
|
if (error.fileOperationResult === 3 ) {
|
|
97
97
|
throw this.toConfigurationEditingError(10 , operation.target, operation);
|
|
98
98
|
}
|
|
99
|
-
throw new ConfigurationEditingError(
|
|
99
|
+
throw new ConfigurationEditingError(localizeWithPath('vs/workbench/services/configuration/common/configurationEditing', 'fsError', "Error while writing to {0}. {1}", this.stringifyTarget(operation.target), error.message), 13 );
|
|
100
100
|
}
|
|
101
101
|
}
|
|
102
102
|
applyEditsToBuffer(edit, model) {
|
|
@@ -152,12 +152,12 @@ let ConfigurationEditing = class ConfigurationEditing {
|
|
|
152
152
|
}
|
|
153
153
|
}
|
|
154
154
|
onInvalidConfigurationError(error, operation) {
|
|
155
|
-
const openStandAloneConfigurationActionLabel = operation.workspaceStandAloneConfigurationKey === TASKS_CONFIGURATION_KEY ? (
|
|
155
|
+
const openStandAloneConfigurationActionLabel = operation.workspaceStandAloneConfigurationKey === TASKS_CONFIGURATION_KEY ? ( localizeWithPath(
|
|
156
156
|
'vs/workbench/services/configuration/common/configurationEditing',
|
|
157
157
|
'openTasksConfiguration',
|
|
158
158
|
"Open Tasks Configuration"
|
|
159
159
|
))
|
|
160
|
-
: operation.workspaceStandAloneConfigurationKey === LAUNCH_CONFIGURATION_KEY ? (
|
|
160
|
+
: operation.workspaceStandAloneConfigurationKey === LAUNCH_CONFIGURATION_KEY ? ( localizeWithPath(
|
|
161
161
|
'vs/workbench/services/configuration/common/configurationEditing',
|
|
162
162
|
'openLaunchConfiguration',
|
|
163
163
|
"Open Launch Configuration"
|
|
@@ -171,7 +171,7 @@ let ConfigurationEditing = class ConfigurationEditing {
|
|
|
171
171
|
}
|
|
172
172
|
else {
|
|
173
173
|
this.notificationService.prompt(Severity.Error, error.message, [{
|
|
174
|
-
label: (
|
|
174
|
+
label: ( localizeWithPath(
|
|
175
175
|
'vs/workbench/services/configuration/common/configurationEditing',
|
|
176
176
|
'open',
|
|
177
177
|
"Open Settings"
|
|
@@ -181,12 +181,12 @@ let ConfigurationEditing = class ConfigurationEditing {
|
|
|
181
181
|
}
|
|
182
182
|
}
|
|
183
183
|
onConfigurationFileDirtyError(error, operation, scopes) {
|
|
184
|
-
const openStandAloneConfigurationActionLabel = operation.workspaceStandAloneConfigurationKey === TASKS_CONFIGURATION_KEY ? (
|
|
184
|
+
const openStandAloneConfigurationActionLabel = operation.workspaceStandAloneConfigurationKey === TASKS_CONFIGURATION_KEY ? ( localizeWithPath(
|
|
185
185
|
'vs/workbench/services/configuration/common/configurationEditing',
|
|
186
186
|
'openTasksConfiguration',
|
|
187
187
|
"Open Tasks Configuration"
|
|
188
188
|
))
|
|
189
|
-
: operation.workspaceStandAloneConfigurationKey === LAUNCH_CONFIGURATION_KEY ? (
|
|
189
|
+
: operation.workspaceStandAloneConfigurationKey === LAUNCH_CONFIGURATION_KEY ? ( localizeWithPath(
|
|
190
190
|
'vs/workbench/services/configuration/common/configurationEditing',
|
|
191
191
|
'openLaunchConfiguration',
|
|
192
192
|
"Open Launch Configuration"
|
|
@@ -194,7 +194,7 @@ let ConfigurationEditing = class ConfigurationEditing {
|
|
|
194
194
|
: null;
|
|
195
195
|
if (openStandAloneConfigurationActionLabel) {
|
|
196
196
|
this.notificationService.prompt(Severity.Error, error.message, [{
|
|
197
|
-
label: (
|
|
197
|
+
label: ( localizeWithPath(
|
|
198
198
|
'vs/workbench/services/configuration/common/configurationEditing',
|
|
199
199
|
'saveAndRetry',
|
|
200
200
|
"Save and Retry"
|
|
@@ -211,7 +211,7 @@ let ConfigurationEditing = class ConfigurationEditing {
|
|
|
211
211
|
}
|
|
212
212
|
else {
|
|
213
213
|
this.notificationService.prompt(Severity.Error, error.message, [{
|
|
214
|
-
label: (
|
|
214
|
+
label: ( localizeWithPath(
|
|
215
215
|
'vs/workbench/services/configuration/common/configurationEditing',
|
|
216
216
|
'saveAndRetry',
|
|
217
217
|
"Save and Retry"
|
|
@@ -219,7 +219,7 @@ let ConfigurationEditing = class ConfigurationEditing {
|
|
|
219
219
|
run: () => this.writeConfiguration(operation.target, { key: operation.key, value: operation.value }, { handleDirtyFile: 'save', scopes })
|
|
220
220
|
},
|
|
221
221
|
{
|
|
222
|
-
label: (
|
|
222
|
+
label: ( localizeWithPath(
|
|
223
223
|
'vs/workbench/services/configuration/common/configurationEditing',
|
|
224
224
|
'open',
|
|
225
225
|
"Open Settings"
|
|
@@ -259,61 +259,61 @@ let ConfigurationEditing = class ConfigurationEditing {
|
|
|
259
259
|
}
|
|
260
260
|
toErrorMessage(error, target, operation) {
|
|
261
261
|
switch (error) {
|
|
262
|
-
case 12 : return (
|
|
262
|
+
case 12 : return ( localizeWithPath(
|
|
263
263
|
'vs/workbench/services/configuration/common/configurationEditing',
|
|
264
264
|
'errorPolicyConfiguration',
|
|
265
265
|
"Unable to write {0} because it is configured in system policy.",
|
|
266
266
|
operation.key
|
|
267
267
|
));
|
|
268
|
-
case 0 : return (
|
|
268
|
+
case 0 : return ( localizeWithPath(
|
|
269
269
|
'vs/workbench/services/configuration/common/configurationEditing',
|
|
270
270
|
'errorUnknownKey',
|
|
271
271
|
"Unable to write to {0} because {1} is not a registered configuration.",
|
|
272
272
|
this.stringifyTarget(target),
|
|
273
273
|
operation.key
|
|
274
274
|
));
|
|
275
|
-
case 1 : return (
|
|
275
|
+
case 1 : return ( localizeWithPath(
|
|
276
276
|
'vs/workbench/services/configuration/common/configurationEditing',
|
|
277
277
|
'errorInvalidWorkspaceConfigurationApplication',
|
|
278
278
|
"Unable to write {0} to Workspace Settings. This setting can be written only into User settings.",
|
|
279
279
|
operation.key
|
|
280
280
|
));
|
|
281
|
-
case 2 : return (
|
|
281
|
+
case 2 : return ( localizeWithPath(
|
|
282
282
|
'vs/workbench/services/configuration/common/configurationEditing',
|
|
283
283
|
'errorInvalidWorkspaceConfigurationMachine',
|
|
284
284
|
"Unable to write {0} to Workspace Settings. This setting can be written only into User settings.",
|
|
285
285
|
operation.key
|
|
286
286
|
));
|
|
287
|
-
case 3 : return (
|
|
287
|
+
case 3 : return ( localizeWithPath(
|
|
288
288
|
'vs/workbench/services/configuration/common/configurationEditing',
|
|
289
289
|
'errorInvalidFolderConfiguration',
|
|
290
290
|
"Unable to write to Folder Settings because {0} does not support the folder resource scope.",
|
|
291
291
|
operation.key
|
|
292
292
|
));
|
|
293
|
-
case 4 : return (
|
|
293
|
+
case 4 : return ( localizeWithPath(
|
|
294
294
|
'vs/workbench/services/configuration/common/configurationEditing',
|
|
295
295
|
'errorInvalidUserTarget',
|
|
296
296
|
"Unable to write to User Settings because {0} does not support for global scope.",
|
|
297
297
|
operation.key
|
|
298
298
|
));
|
|
299
|
-
case 5 : return (
|
|
299
|
+
case 5 : return ( localizeWithPath(
|
|
300
300
|
'vs/workbench/services/configuration/common/configurationEditing',
|
|
301
301
|
'errorInvalidWorkspaceTarget',
|
|
302
302
|
"Unable to write to Workspace Settings because {0} does not support for workspace scope in a multi folder workspace.",
|
|
303
303
|
operation.key
|
|
304
304
|
));
|
|
305
|
-
case 6 : return (
|
|
305
|
+
case 6 : return ( localizeWithPath(
|
|
306
306
|
'vs/workbench/services/configuration/common/configurationEditing',
|
|
307
307
|
'errorInvalidFolderTarget',
|
|
308
308
|
"Unable to write to Folder Settings because no resource is provided."
|
|
309
309
|
));
|
|
310
|
-
case 7 : return (
|
|
310
|
+
case 7 : return ( localizeWithPath(
|
|
311
311
|
'vs/workbench/services/configuration/common/configurationEditing',
|
|
312
312
|
'errorInvalidResourceLanguageConfiguration',
|
|
313
313
|
"Unable to write to Language Settings because {0} is not a resource language setting.",
|
|
314
314
|
operation.key
|
|
315
315
|
));
|
|
316
|
-
case 8 : return (
|
|
316
|
+
case 8 : return ( localizeWithPath(
|
|
317
317
|
'vs/workbench/services/configuration/common/configurationEditing',
|
|
318
318
|
'errorNoWorkspaceOpened',
|
|
319
319
|
"Unable to write to {0} because no workspace is opened. Please open a workspace first and try again.",
|
|
@@ -321,14 +321,14 @@ let ConfigurationEditing = class ConfigurationEditing {
|
|
|
321
321
|
));
|
|
322
322
|
case 11 : {
|
|
323
323
|
if (operation.workspaceStandAloneConfigurationKey === TASKS_CONFIGURATION_KEY) {
|
|
324
|
-
return (
|
|
324
|
+
return ( localizeWithPath(
|
|
325
325
|
'vs/workbench/services/configuration/common/configurationEditing',
|
|
326
326
|
'errorInvalidTaskConfiguration',
|
|
327
327
|
"Unable to write into the tasks configuration file. Please open it to correct errors/warnings in it and try again."
|
|
328
328
|
));
|
|
329
329
|
}
|
|
330
330
|
if (operation.workspaceStandAloneConfigurationKey === LAUNCH_CONFIGURATION_KEY) {
|
|
331
|
-
return (
|
|
331
|
+
return ( localizeWithPath(
|
|
332
332
|
'vs/workbench/services/configuration/common/configurationEditing',
|
|
333
333
|
'errorInvalidLaunchConfiguration',
|
|
334
334
|
"Unable to write into the launch configuration file. Please open it to correct errors/warnings in it and try again."
|
|
@@ -336,19 +336,19 @@ let ConfigurationEditing = class ConfigurationEditing {
|
|
|
336
336
|
}
|
|
337
337
|
switch (target) {
|
|
338
338
|
case 1 :
|
|
339
|
-
return (
|
|
339
|
+
return ( localizeWithPath(
|
|
340
340
|
'vs/workbench/services/configuration/common/configurationEditing',
|
|
341
341
|
'errorInvalidConfiguration',
|
|
342
342
|
"Unable to write into user settings. Please open the user settings to correct errors/warnings in it and try again."
|
|
343
343
|
));
|
|
344
344
|
case 2 :
|
|
345
|
-
return (
|
|
345
|
+
return ( localizeWithPath(
|
|
346
346
|
'vs/workbench/services/configuration/common/configurationEditing',
|
|
347
347
|
'errorInvalidRemoteConfiguration',
|
|
348
348
|
"Unable to write into remote user settings. Please open the remote user settings to correct errors/warnings in it and try again."
|
|
349
349
|
));
|
|
350
350
|
case 3 :
|
|
351
|
-
return (
|
|
351
|
+
return ( localizeWithPath(
|
|
352
352
|
'vs/workbench/services/configuration/common/configurationEditing',
|
|
353
353
|
'errorInvalidConfigurationWorkspace',
|
|
354
354
|
"Unable to write into workspace settings. Please open the workspace settings to correct errors/warnings in the file and try again."
|
|
@@ -361,7 +361,7 @@ let ConfigurationEditing = class ConfigurationEditing {
|
|
|
361
361
|
workspaceFolderName = folder.name;
|
|
362
362
|
}
|
|
363
363
|
}
|
|
364
|
-
return (
|
|
364
|
+
return ( localizeWithPath(
|
|
365
365
|
'vs/workbench/services/configuration/common/configurationEditing',
|
|
366
366
|
'errorInvalidConfigurationFolder',
|
|
367
367
|
"Unable to write into folder settings. Please open the '{0}' folder settings to correct errors/warnings in it and try again.",
|
|
@@ -374,14 +374,14 @@ let ConfigurationEditing = class ConfigurationEditing {
|
|
|
374
374
|
}
|
|
375
375
|
case 9 : {
|
|
376
376
|
if (operation.workspaceStandAloneConfigurationKey === TASKS_CONFIGURATION_KEY) {
|
|
377
|
-
return (
|
|
377
|
+
return ( localizeWithPath(
|
|
378
378
|
'vs/workbench/services/configuration/common/configurationEditing',
|
|
379
379
|
'errorTasksConfigurationFileDirty',
|
|
380
380
|
"Unable to write into tasks configuration file because the file has unsaved changes. Please save it first and then try again."
|
|
381
381
|
));
|
|
382
382
|
}
|
|
383
383
|
if (operation.workspaceStandAloneConfigurationKey === LAUNCH_CONFIGURATION_KEY) {
|
|
384
|
-
return (
|
|
384
|
+
return ( localizeWithPath(
|
|
385
385
|
'vs/workbench/services/configuration/common/configurationEditing',
|
|
386
386
|
'errorLaunchConfigurationFileDirty',
|
|
387
387
|
"Unable to write into launch configuration file because the file has unsaved changes. Please save it first and then try again."
|
|
@@ -389,19 +389,19 @@ let ConfigurationEditing = class ConfigurationEditing {
|
|
|
389
389
|
}
|
|
390
390
|
switch (target) {
|
|
391
391
|
case 1 :
|
|
392
|
-
return (
|
|
392
|
+
return ( localizeWithPath(
|
|
393
393
|
'vs/workbench/services/configuration/common/configurationEditing',
|
|
394
394
|
'errorConfigurationFileDirty',
|
|
395
395
|
"Unable to write into user settings because the file has unsaved changes. Please save the user settings file first and then try again."
|
|
396
396
|
));
|
|
397
397
|
case 2 :
|
|
398
|
-
return (
|
|
398
|
+
return ( localizeWithPath(
|
|
399
399
|
'vs/workbench/services/configuration/common/configurationEditing',
|
|
400
400
|
'errorRemoteConfigurationFileDirty',
|
|
401
401
|
"Unable to write into remote user settings because the file has unsaved changes. Please save the remote user settings file first and then try again."
|
|
402
402
|
));
|
|
403
403
|
case 3 :
|
|
404
|
-
return (
|
|
404
|
+
return ( localizeWithPath(
|
|
405
405
|
'vs/workbench/services/configuration/common/configurationEditing',
|
|
406
406
|
'errorConfigurationFileDirtyWorkspace',
|
|
407
407
|
"Unable to write into workspace settings because the file has unsaved changes. Please save the workspace settings file first and then try again."
|
|
@@ -414,7 +414,7 @@ let ConfigurationEditing = class ConfigurationEditing {
|
|
|
414
414
|
workspaceFolderName = folder.name;
|
|
415
415
|
}
|
|
416
416
|
}
|
|
417
|
-
return (
|
|
417
|
+
return ( localizeWithPath(
|
|
418
418
|
'vs/workbench/services/configuration/common/configurationEditing',
|
|
419
419
|
'errorConfigurationFileDirtyFolder',
|
|
420
420
|
"Unable to write into folder settings because the file has unsaved changes. Please save the '{0}' folder settings file first and then try again.",
|
|
@@ -427,14 +427,14 @@ let ConfigurationEditing = class ConfigurationEditing {
|
|
|
427
427
|
}
|
|
428
428
|
case 10 :
|
|
429
429
|
if (operation.workspaceStandAloneConfigurationKey === TASKS_CONFIGURATION_KEY) {
|
|
430
|
-
return (
|
|
430
|
+
return ( localizeWithPath(
|
|
431
431
|
'vs/workbench/services/configuration/common/configurationEditing',
|
|
432
432
|
'errorTasksConfigurationFileModifiedSince',
|
|
433
433
|
"Unable to write into tasks configuration file because the content of the file is newer."
|
|
434
434
|
));
|
|
435
435
|
}
|
|
436
436
|
if (operation.workspaceStandAloneConfigurationKey === LAUNCH_CONFIGURATION_KEY) {
|
|
437
|
-
return (
|
|
437
|
+
return ( localizeWithPath(
|
|
438
438
|
'vs/workbench/services/configuration/common/configurationEditing',
|
|
439
439
|
'errorLaunchConfigurationFileModifiedSince',
|
|
440
440
|
"Unable to write into launch configuration file because the content of the file is newer."
|
|
@@ -442,31 +442,31 @@ let ConfigurationEditing = class ConfigurationEditing {
|
|
|
442
442
|
}
|
|
443
443
|
switch (target) {
|
|
444
444
|
case 1 :
|
|
445
|
-
return (
|
|
445
|
+
return ( localizeWithPath(
|
|
446
446
|
'vs/workbench/services/configuration/common/configurationEditing',
|
|
447
447
|
'errorConfigurationFileModifiedSince',
|
|
448
448
|
"Unable to write into user settings because the content of the file is newer."
|
|
449
449
|
));
|
|
450
450
|
case 2 :
|
|
451
|
-
return (
|
|
451
|
+
return ( localizeWithPath(
|
|
452
452
|
'vs/workbench/services/configuration/common/configurationEditing',
|
|
453
453
|
'errorRemoteConfigurationFileModifiedSince',
|
|
454
454
|
"Unable to write into remote user settings because the content of the file is newer."
|
|
455
455
|
));
|
|
456
456
|
case 3 :
|
|
457
|
-
return (
|
|
457
|
+
return ( localizeWithPath(
|
|
458
458
|
'vs/workbench/services/configuration/common/configurationEditing',
|
|
459
459
|
'errorConfigurationFileModifiedSinceWorkspace',
|
|
460
460
|
"Unable to write into workspace settings because the content of the file is newer."
|
|
461
461
|
));
|
|
462
462
|
case 4 :
|
|
463
|
-
return (
|
|
463
|
+
return ( localizeWithPath(
|
|
464
464
|
'vs/workbench/services/configuration/common/configurationEditing',
|
|
465
465
|
'errorConfigurationFileModifiedSinceFolder',
|
|
466
466
|
"Unable to write into folder settings because the content of the file is newer."
|
|
467
467
|
));
|
|
468
468
|
}
|
|
469
|
-
case 13 : return (
|
|
469
|
+
case 13 : return ( localizeWithPath(
|
|
470
470
|
'vs/workbench/services/configuration/common/configurationEditing',
|
|
471
471
|
'errorUnknown',
|
|
472
472
|
"Unable to write to {0} because of an internal error.",
|
|
@@ -477,25 +477,25 @@ let ConfigurationEditing = class ConfigurationEditing {
|
|
|
477
477
|
stringifyTarget(target) {
|
|
478
478
|
switch (target) {
|
|
479
479
|
case 1 :
|
|
480
|
-
return (
|
|
480
|
+
return ( localizeWithPath(
|
|
481
481
|
'vs/workbench/services/configuration/common/configurationEditing',
|
|
482
482
|
'userTarget',
|
|
483
483
|
"User Settings"
|
|
484
484
|
));
|
|
485
485
|
case 2 :
|
|
486
|
-
return (
|
|
486
|
+
return ( localizeWithPath(
|
|
487
487
|
'vs/workbench/services/configuration/common/configurationEditing',
|
|
488
488
|
'remoteUserTarget',
|
|
489
489
|
"Remote User Settings"
|
|
490
490
|
));
|
|
491
491
|
case 3 :
|
|
492
|
-
return (
|
|
492
|
+
return ( localizeWithPath(
|
|
493
493
|
'vs/workbench/services/configuration/common/configurationEditing',
|
|
494
494
|
'workspaceTarget',
|
|
495
495
|
"Workspace Settings"
|
|
496
496
|
));
|
|
497
497
|
case 4 :
|
|
498
|
-
return (
|
|
498
|
+
return ( localizeWithPath(
|
|
499
499
|
'vs/workbench/services/configuration/common/configurationEditing',
|
|
500
500
|
'folderTarget',
|
|
501
501
|
"Folder Settings"
|
|
@@ -524,7 +524,7 @@ let ConfigurationEditing = class ConfigurationEditing {
|
|
|
524
524
|
return false;
|
|
525
525
|
}
|
|
526
526
|
const parseErrors = [];
|
|
527
|
-
|
|
527
|
+
parse(content, parseErrors, { allowTrailingComma: true, allowEmptyContent: true });
|
|
528
528
|
return parseErrors.length > 0;
|
|
529
529
|
}
|
|
530
530
|
async validate(target, operation, checkDirty, overrides) {
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { equals } from '
|
|
2
|
-
import { toValuesTree } from '
|
|
3
|
-
import { Configuration as Configuration$1, ConfigurationModelParser, ConfigurationModel } from '
|
|
4
|
-
import { isBoolean } from '
|
|
5
|
-
import { distinct } from '
|
|
1
|
+
import { equals } from 'vscode/vscode/vs/base/common/objects';
|
|
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';
|
|
4
|
+
import { isBoolean } from 'vscode/vscode/vs/base/common/types';
|
|
5
|
+
import { distinct } from 'vscode/vscode/vs/base/common/arrays';
|
|
6
6
|
|
|
7
7
|
class WorkspaceConfigurationModelParser extends ConfigurationModelParser {
|
|
8
8
|
constructor(name) {
|
|
@@ -1,27 +1,27 @@
|
|
|
1
1
|
import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
|
|
2
|
-
import { localizeWithPath } from '
|
|
3
|
-
import { URI } from '
|
|
4
|
-
import { dispose, Disposable } from '
|
|
5
|
-
import { sep, posix, win32 } from '
|
|
6
|
-
import { Emitter } from '
|
|
2
|
+
import { localizeWithPath } from 'vscode/vscode/vs/nls';
|
|
3
|
+
import { URI } from 'vscode/vscode/vs/base/common/uri';
|
|
4
|
+
import { dispose, Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
|
|
5
|
+
import { sep, posix, win32 } from 'vscode/vscode/vs/base/common/path';
|
|
6
|
+
import { Emitter } from 'vscode/vscode/vs/base/common/event';
|
|
7
7
|
import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
|
|
8
|
-
import { Registry } from '
|
|
8
|
+
import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
|
|
9
9
|
import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService';
|
|
10
|
-
import { isWorkspace, toWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier, isUntitledWorkspace, isTemporaryWorkspace, WORKSPACE_EXTENSION, IWorkspaceContextService } from '
|
|
11
|
-
import { basenameOrAuthority, basename, joinPath, dirname } from '
|
|
12
|
-
import { getPathLabel, tildify } from '
|
|
13
|
-
import { ILabelService } from '
|
|
10
|
+
import { isWorkspace, toWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier, isUntitledWorkspace, isTemporaryWorkspace, WORKSPACE_EXTENSION, IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace';
|
|
11
|
+
import { basenameOrAuthority, basename, joinPath, dirname } from 'vscode/vscode/vs/base/common/resources';
|
|
12
|
+
import { getPathLabel, tildify } from 'vscode/vscode/vs/base/common/labels';
|
|
13
|
+
import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
|
|
14
14
|
import { ExtensionsRegistry } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionsRegistry';
|
|
15
|
-
import { match } from '
|
|
15
|
+
import { match } from 'vscode/vscode/vs/base/common/glob';
|
|
16
16
|
import { ILifecycleService } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
|
|
17
17
|
import { IPathService } from 'vscode/vscode/vs/workbench/services/path/common/pathService';
|
|
18
18
|
import { isProposedApiEnabled } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
|
|
19
|
-
import { OS } from '
|
|
19
|
+
import { OS } from 'vscode/vscode/vs/base/common/platform';
|
|
20
20
|
import { IRemoteAgentService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteAgentService';
|
|
21
|
-
import { Schemas } from '
|
|
22
|
-
import { IStorageService } from '
|
|
21
|
+
import { Schemas } from 'vscode/vscode/vs/base/common/network';
|
|
22
|
+
import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
|
|
23
23
|
import { Memento } from 'vscode/vscode/vs/workbench/common/memento';
|
|
24
|
-
import { firstOrDefault } from '
|
|
24
|
+
import { firstOrDefault } from 'vscode/vscode/vs/base/common/arrays';
|
|
25
25
|
|
|
26
26
|
const resourceLabelFormattersExtPoint = ( ExtensionsRegistry.registerExtensionPoint({
|
|
27
27
|
extensionPoint: 'resourceLabelFormatters',
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
|
|
2
|
-
import { IConfigurationService } from '
|
|
3
|
-
import { OS } from '
|
|
4
|
-
import { Schemas } from '
|
|
5
|
-
import { IStorageService } from '
|
|
2
|
+
import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
|
|
3
|
+
import { OS } from 'vscode/vscode/vs/base/common/platform';
|
|
4
|
+
import { Schemas } from 'vscode/vscode/vs/base/common/network';
|
|
5
|
+
import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
|
|
6
6
|
import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService';
|
|
7
7
|
import { IRemoteAgentService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteAgentService';
|
|
8
8
|
|
package/vscode/src/vs/workbench/services/workspaces/browser/abstractWorkspaceEditingService.js
CHANGED
|
@@ -1,25 +1,25 @@
|
|
|
1
1
|
import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
|
|
2
|
-
import { localizeWithPath } from '
|
|
3
|
-
import { WORKSPACE_FILTER, hasWorkspaceFileExtension, WORKSPACE_EXTENSION, isSavedWorkspace, isUntitledWorkspace, toWorkspaceIdentifier, isWorkspaceIdentifier, IWorkspaceContextService } from '
|
|
2
|
+
import { localizeWithPath } from 'vscode/vscode/vs/nls';
|
|
3
|
+
import { WORKSPACE_FILTER, hasWorkspaceFileExtension, WORKSPACE_EXTENSION, isSavedWorkspace, isUntitledWorkspace, toWorkspaceIdentifier, isWorkspaceIdentifier, IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace';
|
|
4
4
|
import { IJSONEditingService } from 'vscode/vscode/vs/workbench/services/configuration/common/jsonEditing';
|
|
5
5
|
import { rewriteWorkspaceFileForNewLocation, IWorkspacesService } from 'vscode/vscode/vs/platform/workspaces/common/workspaces';
|
|
6
|
-
import { Extensions } from '
|
|
7
|
-
import { Registry } from '
|
|
8
|
-
import { ICommandService } from '
|
|
9
|
-
import { firstOrDefault, distinct } from '
|
|
10
|
-
import { joinPath, basename, removeTrailingPathSeparator, isEqual } from '
|
|
11
|
-
import { Severity, INotificationService } from '
|
|
12
|
-
import { IFileService } from '
|
|
6
|
+
import { Extensions } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
|
|
7
|
+
import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
|
|
8
|
+
import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands';
|
|
9
|
+
import { firstOrDefault, distinct } from 'vscode/vscode/vs/base/common/arrays';
|
|
10
|
+
import { joinPath, basename, removeTrailingPathSeparator, isEqual } from 'vscode/vscode/vs/base/common/resources';
|
|
11
|
+
import { Severity, INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification';
|
|
12
|
+
import { IFileService } from 'vscode/vscode/vs/platform/files/common/files';
|
|
13
13
|
import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService';
|
|
14
14
|
import '../../../../../../../override/vs/platform/dialogs/common/dialogs.js';
|
|
15
|
-
import { mnemonicButtonLabel } from '
|
|
15
|
+
import { mnemonicButtonLabel } from 'vscode/vscode/vs/base/common/labels';
|
|
16
16
|
import { ITextFileService } from 'vscode/vscode/vs/workbench/services/textfile/common/textfiles';
|
|
17
17
|
import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/host';
|
|
18
|
-
import { Schemas } from '
|
|
19
|
-
import { IUriIdentityService } from '
|
|
20
|
-
import { IWorkspaceTrustManagementService } from '
|
|
18
|
+
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
21
|
import { IWorkbenchConfigurationService } from 'vscode/vscode/vs/workbench/services/configuration/common/configuration';
|
|
22
|
-
import { IUserDataProfilesService } from '
|
|
22
|
+
import { IUserDataProfilesService } from 'vscode/vscode/vs/platform/userDataProfile/common/userDataProfile';
|
|
23
23
|
import { IUserDataProfileService } from 'vscode/vscode/vs/workbench/services/userDataProfile/common/userDataProfile';
|
|
24
24
|
import { IFileDialogService, IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
|
|
25
25
|
|
|
@@ -1,17 +1,17 @@
|
|
|
1
1
|
import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
|
|
2
2
|
import { restoreRecentlyOpened, isRecentFolder, isRecentWorkspace, isRecentFile, toStoreData, getStoredWorkspaceFolder } from 'vscode/vscode/vs/platform/workspaces/common/workspaces';
|
|
3
|
-
import { Emitter } from '
|
|
4
|
-
import { IStorageService } from '
|
|
5
|
-
import { isTemporaryWorkspace, WORKSPACE_EXTENSION, IWorkspaceContextService } from '
|
|
6
|
-
import { ILogService } from '
|
|
7
|
-
import { Disposable, DisposableStore } from '
|
|
3
|
+
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';
|
|
7
|
+
import { Disposable, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
|
|
8
8
|
import { getWorkspaceIdentifier } from 'vscode/vscode/vs/workbench/services/workspaces/browser/workspaces';
|
|
9
|
-
import { IFileService } from '
|
|
9
|
+
import { IFileService } from 'vscode/vscode/vs/platform/files/common/files';
|
|
10
10
|
import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService';
|
|
11
|
-
import { joinPath } from '
|
|
12
|
-
import { VSBuffer } from '
|
|
13
|
-
import { IUriIdentityService } from '
|
|
14
|
-
import { Schemas } from '
|
|
11
|
+
import { joinPath } from 'vscode/vscode/vs/base/common/resources';
|
|
12
|
+
import { VSBuffer } from 'vscode/vscode/vs/base/common/buffer';
|
|
13
|
+
import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity';
|
|
14
|
+
import { Schemas } from 'vscode/vscode/vs/base/common/network';
|
|
15
15
|
|
|
16
16
|
var BrowserWorkspacesService_1;
|
|
17
17
|
let BrowserWorkspacesService = class BrowserWorkspacesService extends Disposable {
|
|
@@ -1,11 +0,0 @@
|
|
|
1
|
-
var ConfigurationScope;
|
|
2
|
-
( (function(ConfigurationScope) {
|
|
3
|
-
ConfigurationScope[ConfigurationScope["APPLICATION"] = 1] = "APPLICATION";
|
|
4
|
-
ConfigurationScope[ConfigurationScope["MACHINE"] = 2] = "MACHINE";
|
|
5
|
-
ConfigurationScope[ConfigurationScope["WINDOW"] = 3] = "WINDOW";
|
|
6
|
-
ConfigurationScope[ConfigurationScope["RESOURCE"] = 4] = "RESOURCE";
|
|
7
|
-
ConfigurationScope[ConfigurationScope["LANGUAGE_OVERRIDABLE"] = 5] = "LANGUAGE_OVERRIDABLE";
|
|
8
|
-
ConfigurationScope[ConfigurationScope["MACHINE_OVERRIDABLE"] = 6] = "MACHINE_OVERRIDABLE";
|
|
9
|
-
})(ConfigurationScope || (ConfigurationScope = {})));
|
|
10
|
-
|
|
11
|
-
export { ConfigurationScope };
|