@codingame/monaco-vscode-base-service-override 9.0.2 → 10.0.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.
- package/package.json +2 -2
- package/vscode/src/vs/platform/url/common/urlService.js +0 -2
- package/vscode/src/vs/workbench/services/configuration/common/jsonEditing.js +1 -5
- package/vscode/src/vs/workbench/services/configuration/common/jsonEditingService.js +4 -5
- package/vscode/src/vs/workbench/services/decorations/browser/decorationsService.js +1 -2
- package/vscode/src/vs/workbench/services/label/common/labelService.js +26 -31
- package/vscode/src/vs/workbench/services/path/browser/pathService.js +1 -3
- package/vscode/src/vs/workbench/services/path/common/pathService.js +4 -4
- package/vscode/src/vs/workbench/services/request/browser/requestService.js +24 -7
- package/vscode/src/vs/workbench/services/url/browser/urlService.js +0 -1
- package/vscode/src/vs/workbench/services/userActivity/common/userActivityService.js +0 -1
- package/vscode/src/vs/workbench/services/workingCopy/common/workingCopyFileService.js +6 -8
- package/vscode/src/vs/workbench/services/workspaces/common/canonicalUriService.js +0 -1
- package/vscode/src/vs/platform/request/browser/requestService.js +0 -36
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@codingame/monaco-vscode-base-service-override",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "10.0.0",
|
|
4
4
|
"keywords": [],
|
|
5
5
|
"author": {
|
|
6
6
|
"name": "CodinGame",
|
|
@@ -26,6 +26,6 @@
|
|
|
26
26
|
}
|
|
27
27
|
},
|
|
28
28
|
"dependencies": {
|
|
29
|
-
"vscode": "npm:@codingame/monaco-vscode-api@
|
|
29
|
+
"vscode": "npm:@codingame/monaco-vscode-api@10.0.0"
|
|
30
30
|
}
|
|
31
31
|
}
|
|
@@ -1,7 +1,5 @@
|
|
|
1
1
|
import { first } from 'vscode/vscode/vs/base/common/async';
|
|
2
2
|
import { Disposable, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
|
|
3
|
-
import 'vscode/vscode/vs/base/common/charCode';
|
|
4
|
-
import 'vscode/vscode/vs/base/common/marshallingIds';
|
|
5
3
|
import 'vscode/vscode/vs/base/common/path';
|
|
6
4
|
import 'vscode/vscode/vs/base/common/platform';
|
|
7
5
|
import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
|
|
@@ -1,7 +1,3 @@
|
|
|
1
|
-
var JSONEditingErrorCode;
|
|
2
|
-
( (function(JSONEditingErrorCode) {
|
|
3
|
-
JSONEditingErrorCode[JSONEditingErrorCode["ERROR_INVALID_FILE"] = 0] = "ERROR_INVALID_FILE";
|
|
4
|
-
})(JSONEditingErrorCode || (JSONEditingErrorCode = {})));
|
|
5
1
|
class JSONEditingError extends Error {
|
|
6
2
|
constructor(message, code) {
|
|
7
3
|
super(message);
|
|
@@ -9,4 +5,4 @@ class JSONEditingError extends Error {
|
|
|
9
5
|
}
|
|
10
6
|
}
|
|
11
7
|
|
|
12
|
-
export { JSONEditingError
|
|
8
|
+
export { JSONEditingError };
|
|
@@ -9,9 +9,8 @@ import { Selection } from 'vscode/vscode/vs/editor/common/core/selection';
|
|
|
9
9
|
import { ITextFileService } from 'vscode/vscode/vs/workbench/services/textfile/common/textfiles.service';
|
|
10
10
|
import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
|
|
11
11
|
import { ITextModelService } from 'vscode/vscode/vs/editor/common/services/resolverService';
|
|
12
|
-
import {
|
|
12
|
+
import { JSONEditingError } from './jsonEditing.js';
|
|
13
13
|
import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
|
|
14
|
-
import 'vscode/vscode/vs/platform/instantiation/common/extensions';
|
|
15
14
|
|
|
16
15
|
let JSONEditingService = class JSONEditingService {
|
|
17
16
|
constructor(fileService, textModelResolverService, textFileService) {
|
|
@@ -95,7 +94,7 @@ let JSONEditingService = class JSONEditingService {
|
|
|
95
94
|
const model = reference.object.textEditorModel;
|
|
96
95
|
if (this.hasParseErrors(model)) {
|
|
97
96
|
reference.dispose();
|
|
98
|
-
return this.reject(
|
|
97
|
+
return this.reject(0 );
|
|
99
98
|
}
|
|
100
99
|
return reference;
|
|
101
100
|
}
|
|
@@ -105,9 +104,9 @@ let JSONEditingService = class JSONEditingService {
|
|
|
105
104
|
}
|
|
106
105
|
toErrorMessage(error) {
|
|
107
106
|
switch (error) {
|
|
108
|
-
case
|
|
107
|
+
case 0 : {
|
|
109
108
|
return ( localize(
|
|
110
|
-
|
|
109
|
+
870,
|
|
111
110
|
"Unable to write into the file. Please open the file to correct errors/warnings in the file and try again."
|
|
112
111
|
));
|
|
113
112
|
}
|
|
@@ -12,7 +12,6 @@ import { isFalsyOrWhitespace } from 'vscode/vscode/vs/base/common/strings';
|
|
|
12
12
|
import { localize } from 'vscode/vscode/vs/nls';
|
|
13
13
|
import { isCancellationError } from 'vscode/vscode/vs/base/common/errors';
|
|
14
14
|
import { CancellationTokenSource } from 'vscode/vscode/vs/base/common/cancellation';
|
|
15
|
-
import 'vscode/vscode/vs/platform/instantiation/common/extensions';
|
|
16
15
|
import { hash } from 'vscode/vscode/vs/base/common/hash';
|
|
17
16
|
import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
|
|
18
17
|
import { distinct, asArray } from 'vscode/vscode/vs/base/common/arrays';
|
|
@@ -159,7 +158,7 @@ class DecorationStyles {
|
|
|
159
158
|
const strikethrough = ( (data.some(d => d.strikethrough)));
|
|
160
159
|
if (onlyChildren) {
|
|
161
160
|
badgeClassName = rule.bubbleBadgeClassName;
|
|
162
|
-
tooltip = ( localize(
|
|
161
|
+
tooltip = ( localize(871, "Contains emphasized items"));
|
|
163
162
|
}
|
|
164
163
|
return {
|
|
165
164
|
labelClassName,
|
|
@@ -11,27 +11,22 @@ import { isWorkspace, toWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier,
|
|
|
11
11
|
import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
|
|
12
12
|
import { basenameOrAuthority, basename, joinPath, dirname } from 'vscode/vscode/vs/base/common/resources';
|
|
13
13
|
import { getPathLabel, tildify } from 'vscode/vscode/vs/base/common/labels';
|
|
14
|
-
import { Verbosity } from 'vscode/vscode/vs/platform/label/common/label';
|
|
15
14
|
import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label.service';
|
|
16
15
|
import { ExtensionsRegistry } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionsRegistry';
|
|
17
16
|
import { match } from 'vscode/vscode/vs/base/common/glob';
|
|
18
|
-
import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
|
|
19
17
|
import { ILifecycleService } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle.service';
|
|
20
|
-
import 'vscode/vscode/vs/platform/instantiation/common/extensions';
|
|
21
18
|
import { IPathService } from 'vscode/vscode/vs/workbench/services/path/common/pathService.service';
|
|
22
19
|
import { isProposedApiEnabled } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
|
|
23
|
-
import { OS
|
|
20
|
+
import { OS } from 'vscode/vscode/vs/base/common/platform';
|
|
24
21
|
import { IRemoteAgentService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteAgentService.service';
|
|
25
22
|
import { Schemas } from 'vscode/vscode/vs/base/common/network';
|
|
26
|
-
import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
|
|
27
23
|
import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
|
|
28
24
|
import { Memento } from 'vscode/vscode/vs/workbench/common/memento';
|
|
29
|
-
import { firstOrDefault } from 'vscode/vscode/vs/base/common/arrays';
|
|
30
25
|
|
|
31
26
|
const resourceLabelFormattersExtPoint = ExtensionsRegistry.registerExtensionPoint({
|
|
32
27
|
extensionPoint: 'resourceLabelFormatters',
|
|
33
28
|
jsonSchema: {
|
|
34
|
-
description: ( localize(
|
|
29
|
+
description: ( localize(872, 'Contributes resource label formatting rules.')),
|
|
35
30
|
type: 'array',
|
|
36
31
|
items: {
|
|
37
32
|
type: 'object',
|
|
@@ -40,52 +35,52 @@ const resourceLabelFormattersExtPoint = ExtensionsRegistry.registerExtensionPoin
|
|
|
40
35
|
scheme: {
|
|
41
36
|
type: 'string',
|
|
42
37
|
description: ( localize(
|
|
43
|
-
|
|
38
|
+
873,
|
|
44
39
|
'URI scheme on which to match the formatter on. For example "file". Simple glob patterns are supported.'
|
|
45
40
|
)),
|
|
46
41
|
},
|
|
47
42
|
authority: {
|
|
48
43
|
type: 'string',
|
|
49
44
|
description: ( localize(
|
|
50
|
-
|
|
45
|
+
874,
|
|
51
46
|
'URI authority on which to match the formatter on. Simple glob patterns are supported.'
|
|
52
47
|
)),
|
|
53
48
|
},
|
|
54
49
|
formatting: {
|
|
55
|
-
description: ( localize(
|
|
50
|
+
description: ( localize(875, "Rules for formatting uri resource labels.")),
|
|
56
51
|
type: 'object',
|
|
57
52
|
properties: {
|
|
58
53
|
label: {
|
|
59
54
|
type: 'string',
|
|
60
55
|
description: ( localize(
|
|
61
|
-
|
|
56
|
+
876,
|
|
62
57
|
"Label rules to display. For example: myLabel:/${path}. ${path}, ${scheme}, ${authority} and ${authoritySuffix} are supported as variables."
|
|
63
58
|
))
|
|
64
59
|
},
|
|
65
60
|
separator: {
|
|
66
61
|
type: 'string',
|
|
67
62
|
description: ( localize(
|
|
68
|
-
|
|
63
|
+
877,
|
|
69
64
|
"Separator to be used in the uri label display. '/' or '\' as an example."
|
|
70
65
|
))
|
|
71
66
|
},
|
|
72
67
|
stripPathStartingSeparator: {
|
|
73
68
|
type: 'boolean',
|
|
74
69
|
description: ( localize(
|
|
75
|
-
|
|
70
|
+
878,
|
|
76
71
|
"Controls whether `${path}` substitutions should have starting separator characters stripped."
|
|
77
72
|
))
|
|
78
73
|
},
|
|
79
74
|
tildify: {
|
|
80
75
|
type: 'boolean',
|
|
81
76
|
description: ( localize(
|
|
82
|
-
|
|
77
|
+
879,
|
|
83
78
|
"Controls if the start of the uri label should be tildified when possible."
|
|
84
79
|
))
|
|
85
80
|
},
|
|
86
81
|
workspaceSuffix: {
|
|
87
82
|
type: 'string',
|
|
88
|
-
description: ( localize(
|
|
83
|
+
description: ( localize(880, "Suffix appended to the workspace label."))
|
|
89
84
|
}
|
|
90
85
|
}
|
|
91
86
|
}
|
|
@@ -128,7 +123,7 @@ let ResourceLabelFormattersHandler = class ResourceLabelFormattersHandler {
|
|
|
128
123
|
ResourceLabelFormattersHandler = ( (__decorate([
|
|
129
124
|
( (__param(0, ILabelService)))
|
|
130
125
|
], ResourceLabelFormattersHandler)));
|
|
131
|
-
( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(ResourceLabelFormattersHandler,
|
|
126
|
+
( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(ResourceLabelFormattersHandler, 3 );
|
|
132
127
|
const FORMATTER_CACHE_SIZE = 50;
|
|
133
128
|
let LabelService = class LabelService extends Disposable {
|
|
134
129
|
constructor(environmentService, contextService, pathService, remoteAgentService, storageService, lifecycleService) {
|
|
@@ -142,7 +137,7 @@ let LabelService = class LabelService extends Disposable {
|
|
|
142
137
|
this.os = OS;
|
|
143
138
|
this.userHome = pathService.defaultUriScheme === Schemas.file ? this.pathService.userHome({ preferLocal: true }) : undefined;
|
|
144
139
|
const memento = this.storedFormattersMemento = ( (new Memento('cachedResourceLabelFormatters2', storageService)));
|
|
145
|
-
this.storedFormatters = memento.getMemento(
|
|
140
|
+
this.storedFormatters = memento.getMemento(0 , 1 );
|
|
146
141
|
this.formatters = this.storedFormatters?.formatters?.slice() || [];
|
|
147
142
|
this.resolveRemoteEnvironment();
|
|
148
143
|
}
|
|
@@ -200,7 +195,7 @@ let LabelService = class LabelService extends Disposable {
|
|
|
200
195
|
let folder = this.contextService.getWorkspaceFolder(resource);
|
|
201
196
|
if (!folder) {
|
|
202
197
|
const workspace = this.contextService.getWorkspace();
|
|
203
|
-
const firstFolder =
|
|
198
|
+
const firstFolder = workspace.folders.at(0);
|
|
204
199
|
if (firstFolder && resource.scheme !== firstFolder.uri.scheme && resource.path.startsWith(posix.sep)) {
|
|
205
200
|
folder = this.contextService.getWorkspaceFolder(firstFolder.uri.with({ path: resource.path }));
|
|
206
201
|
}
|
|
@@ -239,7 +234,7 @@ let LabelService = class LabelService extends Disposable {
|
|
|
239
234
|
pathLib = posix;
|
|
240
235
|
}
|
|
241
236
|
else {
|
|
242
|
-
pathLib = (this.os ===
|
|
237
|
+
pathLib = ((this.os === 1) ) ? win32 : posix;
|
|
243
238
|
}
|
|
244
239
|
return pathLib.basename(label);
|
|
245
240
|
}
|
|
@@ -264,10 +259,10 @@ let LabelService = class LabelService extends Disposable {
|
|
|
264
259
|
}
|
|
265
260
|
doGetWorkspaceLabel(workspaceUri, options) {
|
|
266
261
|
if (isUntitledWorkspace(workspaceUri, this.environmentService)) {
|
|
267
|
-
return ( localize(
|
|
262
|
+
return ( localize(881, "Untitled (Workspace)"));
|
|
268
263
|
}
|
|
269
264
|
if (isTemporaryWorkspace(workspaceUri)) {
|
|
270
|
-
return ( localize(
|
|
265
|
+
return ( localize(882, "Workspace"));
|
|
271
266
|
}
|
|
272
267
|
let filename = basename(workspaceUri);
|
|
273
268
|
if (filename.endsWith(WORKSPACE_EXTENSION)) {
|
|
@@ -275,22 +270,22 @@ let LabelService = class LabelService extends Disposable {
|
|
|
275
270
|
}
|
|
276
271
|
let label;
|
|
277
272
|
switch (options?.verbose) {
|
|
278
|
-
case
|
|
273
|
+
case 0 :
|
|
279
274
|
label = filename;
|
|
280
275
|
break;
|
|
281
|
-
case
|
|
276
|
+
case 2 :
|
|
282
277
|
label = ( localize(
|
|
283
|
-
|
|
278
|
+
883,
|
|
284
279
|
"{0} (Workspace)",
|
|
285
280
|
this.getUriLabel(joinPath(dirname(workspaceUri), filename))
|
|
286
281
|
));
|
|
287
282
|
break;
|
|
288
|
-
case
|
|
283
|
+
case 1 :
|
|
289
284
|
default:
|
|
290
|
-
label = ( localize(
|
|
285
|
+
label = ( localize(884, "{0} (Workspace)", filename));
|
|
291
286
|
break;
|
|
292
287
|
}
|
|
293
|
-
if (options?.verbose ===
|
|
288
|
+
if (options?.verbose === 0 ) {
|
|
294
289
|
return label;
|
|
295
290
|
}
|
|
296
291
|
return this.appendWorkspaceSuffix(label, workspaceUri);
|
|
@@ -298,16 +293,16 @@ let LabelService = class LabelService extends Disposable {
|
|
|
298
293
|
doGetSingleFolderWorkspaceLabel(folderUri, options) {
|
|
299
294
|
let label;
|
|
300
295
|
switch (options?.verbose) {
|
|
301
|
-
case
|
|
296
|
+
case 2 :
|
|
302
297
|
label = this.getUriLabel(folderUri);
|
|
303
298
|
break;
|
|
304
|
-
case
|
|
305
|
-
case
|
|
299
|
+
case 0 :
|
|
300
|
+
case 1 :
|
|
306
301
|
default:
|
|
307
302
|
label = basename(folderUri) || posix.sep;
|
|
308
303
|
break;
|
|
309
304
|
}
|
|
310
|
-
if (options?.verbose ===
|
|
305
|
+
if (options?.verbose === 0 ) {
|
|
311
306
|
return label;
|
|
312
307
|
}
|
|
313
308
|
return this.appendWorkspaceSuffix(label, folderUri);
|
|
@@ -1,13 +1,11 @@
|
|
|
1
|
-
import 'vscode/vscode/vs/platform/instantiation/common/extensions';
|
|
2
1
|
import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
|
|
3
2
|
import { AbstractPathService } from '../common/pathService.js';
|
|
4
3
|
import { URI } from 'vscode/vscode/vs/base/common/uri';
|
|
5
|
-
import { firstOrDefault } from 'vscode/vscode/vs/base/common/arrays';
|
|
6
4
|
import { dirname } from 'vscode/vscode/vs/base/common/resources';
|
|
7
5
|
|
|
8
6
|
function guessLocalUserHome(environmentService, contextService) {
|
|
9
7
|
const workspace = contextService.getWorkspace();
|
|
10
|
-
const firstFolder =
|
|
8
|
+
const firstFolder = workspace.folders.at(0);
|
|
11
9
|
if (firstFolder) {
|
|
12
10
|
return firstFolder.uri;
|
|
13
11
|
}
|
|
@@ -2,7 +2,7 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
|
|
|
2
2
|
import { isValidBasename } from 'vscode/vscode/vs/base/common/extpath';
|
|
3
3
|
import { Schemas } from 'vscode/vscode/vs/base/common/network';
|
|
4
4
|
import { win32, posix } from 'vscode/vscode/vs/base/common/path';
|
|
5
|
-
import { OS
|
|
5
|
+
import { OS } from 'vscode/vscode/vs/base/common/platform';
|
|
6
6
|
import { basename } from 'vscode/vscode/vs/base/common/resources';
|
|
7
7
|
import { URI } from 'vscode/vscode/vs/base/common/uri';
|
|
8
8
|
import { getVirtualWorkspaceScheme } from 'vscode/vscode/vs/platform/workspace/common/virtualWorkspace';
|
|
@@ -35,7 +35,7 @@ let AbstractPathService = AbstractPathService_1 = class AbstractPathService {
|
|
|
35
35
|
}
|
|
36
36
|
doHasValidBasename(resource, os, name) {
|
|
37
37
|
if (resource.scheme === Schemas.file || resource.scheme === Schemas.vscodeRemote) {
|
|
38
|
-
return isValidBasename(name ?? basename(resource), os ===
|
|
38
|
+
return isValidBasename(name ?? basename(resource), os === 1 );
|
|
39
39
|
}
|
|
40
40
|
return true;
|
|
41
41
|
}
|
|
@@ -68,7 +68,7 @@ let AbstractPathService = AbstractPathService_1 = class AbstractPathService {
|
|
|
68
68
|
}
|
|
69
69
|
get path() {
|
|
70
70
|
return this.resolveOS.then(os => {
|
|
71
|
-
return os ===
|
|
71
|
+
return os === 1 ?
|
|
72
72
|
win32 :
|
|
73
73
|
posix;
|
|
74
74
|
});
|
|
@@ -76,7 +76,7 @@ let AbstractPathService = AbstractPathService_1 = class AbstractPathService {
|
|
|
76
76
|
async fileURI(_path) {
|
|
77
77
|
let authority = '';
|
|
78
78
|
const os = await this.resolveOS;
|
|
79
|
-
if (os ===
|
|
79
|
+
if (os === 1 ) {
|
|
80
80
|
_path = _path.replace(/\\/g, '/');
|
|
81
81
|
}
|
|
82
82
|
if (_path[0] === '/' && _path[1] === '/') {
|
|
@@ -1,19 +1,24 @@
|
|
|
1
1
|
import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
|
|
2
2
|
import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
|
|
3
|
-
import { ILoggerService } from 'vscode/vscode/vs/platform/log/common/log.service';
|
|
4
3
|
import { RequestChannelClient } from '../../../../platform/request/common/requestIpc.js';
|
|
5
4
|
import { IRemoteAgentService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteAgentService.service';
|
|
6
|
-
import { RequestService } from '../../../../platform/request/browser/requestService.js';
|
|
7
5
|
import { CommandsRegistry } from 'vscode/vscode/vs/platform/commands/common/commands';
|
|
6
|
+
import { AbstractRequestService } from 'vscode/vscode/vs/platform/request/common/request';
|
|
7
|
+
import { request } from '../../../../base/parts/request/browser/request.js';
|
|
8
|
+
import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
|
|
8
9
|
|
|
9
|
-
let BrowserRequestService = class BrowserRequestService extends
|
|
10
|
-
constructor(remoteAgentService, configurationService,
|
|
11
|
-
super(
|
|
10
|
+
let BrowserRequestService = class BrowserRequestService extends AbstractRequestService {
|
|
11
|
+
constructor(remoteAgentService, configurationService, logService) {
|
|
12
|
+
super(logService);
|
|
12
13
|
this.remoteAgentService = remoteAgentService;
|
|
14
|
+
this.configurationService = configurationService;
|
|
13
15
|
}
|
|
14
16
|
async request(options, token) {
|
|
15
17
|
try {
|
|
16
|
-
|
|
18
|
+
if (!options.proxyAuthorization) {
|
|
19
|
+
options.proxyAuthorization = this.configurationService.getValue('http.proxyAuthorization');
|
|
20
|
+
}
|
|
21
|
+
const context = await this.logAndRequest(options, () => request(options, token));
|
|
17
22
|
const connection = this.remoteAgentService.getConnection();
|
|
18
23
|
if (connection && context.res.statusCode === 405) {
|
|
19
24
|
return this._makeRemoteRequest(connection, options, token);
|
|
@@ -28,6 +33,18 @@ let BrowserRequestService = class BrowserRequestService extends RequestService {
|
|
|
28
33
|
throw error;
|
|
29
34
|
}
|
|
30
35
|
}
|
|
36
|
+
async resolveProxy(url) {
|
|
37
|
+
return undefined;
|
|
38
|
+
}
|
|
39
|
+
async lookupAuthorization(authInfo) {
|
|
40
|
+
return undefined;
|
|
41
|
+
}
|
|
42
|
+
async lookupKerberosAuthorization(url) {
|
|
43
|
+
return undefined;
|
|
44
|
+
}
|
|
45
|
+
async loadCertificates() {
|
|
46
|
+
return [];
|
|
47
|
+
}
|
|
31
48
|
_makeRemoteRequest(connection, options, token) {
|
|
32
49
|
return connection.withChannel('request', channel => ( new RequestChannelClient(channel)).request(options, token));
|
|
33
50
|
}
|
|
@@ -35,7 +52,7 @@ let BrowserRequestService = class BrowserRequestService extends RequestService {
|
|
|
35
52
|
BrowserRequestService = ( __decorate([
|
|
36
53
|
( __param(0, IRemoteAgentService)),
|
|
37
54
|
( __param(1, IConfigurationService)),
|
|
38
|
-
( __param(2,
|
|
55
|
+
( __param(2, ILogService))
|
|
39
56
|
], BrowserRequestService));
|
|
40
57
|
CommandsRegistry.registerCommand('_workbench.fetchJSON', async function (accessor, url, method) {
|
|
41
58
|
const result = await fetch(url, { method, headers: { Accept: 'application/json' } });
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
|
|
2
2
|
import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
|
|
3
3
|
import { URI } from 'vscode/vscode/vs/base/common/uri';
|
|
4
|
-
import 'vscode/vscode/vs/platform/instantiation/common/extensions';
|
|
5
4
|
import { AbstractURLService } from '../../../../platform/url/common/urlService.js';
|
|
6
5
|
import { IBrowserWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/browser/environmentService.service';
|
|
7
6
|
import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener.service';
|
|
@@ -2,7 +2,6 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
|
|
|
2
2
|
import { RunOnceScheduler, runWhenGlobalIdle, disposableTimeout } from 'vscode/vscode/vs/base/common/async';
|
|
3
3
|
import { Emitter } from 'vscode/vscode/vs/base/common/event';
|
|
4
4
|
import { Disposable, DisposableStore, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
|
|
5
|
-
import 'vscode/vscode/vs/platform/instantiation/common/extensions';
|
|
6
5
|
import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
|
|
7
6
|
import { userActivityRegistry } from './userActivityRegistry.js';
|
|
8
7
|
|
|
@@ -1,11 +1,9 @@
|
|
|
1
1
|
import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
|
|
2
2
|
import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
|
|
3
|
-
import 'vscode/vscode/vs/platform/instantiation/common/extensions';
|
|
4
3
|
import { AsyncEmitter } from 'vscode/vscode/vs/base/common/event';
|
|
5
4
|
import { Promises } from 'vscode/vscode/vs/base/common/async';
|
|
6
5
|
import { insert } from 'vscode/vscode/vs/base/common/arrays';
|
|
7
6
|
import { Disposable, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
|
|
8
|
-
import { FileOperation } from 'vscode/vscode/vs/platform/files/common/files';
|
|
9
7
|
import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
|
|
10
8
|
import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
|
|
11
9
|
import { IWorkingCopyService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyService.service';
|
|
@@ -59,8 +57,8 @@ let WorkingCopyFileService = class WorkingCopyFileService extends Disposable {
|
|
|
59
57
|
}
|
|
60
58
|
}
|
|
61
59
|
const files = ( operations.map(operation => ({ target: operation.resource })));
|
|
62
|
-
await this.runFileOperationParticipants(files,
|
|
63
|
-
const event = { correlationId: this.correlationIds++, operation:
|
|
60
|
+
await this.runFileOperationParticipants(files, 0 , undoInfo, token);
|
|
61
|
+
const event = { correlationId: this.correlationIds++, operation: 0 , files };
|
|
64
62
|
await this._onWillRunWorkingCopyFileOperation.fireAsync(event, CancellationToken.None );
|
|
65
63
|
let stats;
|
|
66
64
|
try {
|
|
@@ -95,8 +93,8 @@ let WorkingCopyFileService = class WorkingCopyFileService extends Disposable {
|
|
|
95
93
|
}
|
|
96
94
|
}
|
|
97
95
|
const files = ( operations.map(o => o.file));
|
|
98
|
-
await this.runFileOperationParticipants(files, move ?
|
|
99
|
-
const event = { correlationId: this.correlationIds++, operation: move ?
|
|
96
|
+
await this.runFileOperationParticipants(files, move ? 2 : 3 , undoInfo, token);
|
|
97
|
+
const event = { correlationId: this.correlationIds++, operation: move ? 2 : 3 , files };
|
|
100
98
|
await this._onWillRunWorkingCopyFileOperation.fireAsync(event, CancellationToken.None );
|
|
101
99
|
try {
|
|
102
100
|
for (const { file: { source, target }, overwrite } of operations) {
|
|
@@ -127,8 +125,8 @@ let WorkingCopyFileService = class WorkingCopyFileService extends Disposable {
|
|
|
127
125
|
}
|
|
128
126
|
}
|
|
129
127
|
const files = ( operations.map(operation => ({ target: operation.resource })));
|
|
130
|
-
await this.runFileOperationParticipants(files,
|
|
131
|
-
const event = { correlationId: this.correlationIds++, operation:
|
|
128
|
+
await this.runFileOperationParticipants(files, 1 , undoInfo, token);
|
|
129
|
+
const event = { correlationId: this.correlationIds++, operation: 1 , files };
|
|
132
130
|
await this._onWillRunWorkingCopyFileOperation.fireAsync(event, CancellationToken.None );
|
|
133
131
|
for (const operation of operations) {
|
|
134
132
|
const dirtyWorkingCopies = this.getDirty(operation.resource);
|
|
@@ -1,36 +0,0 @@
|
|
|
1
|
-
import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
|
|
2
|
-
import { request } from '../../../base/parts/request/browser/request.js';
|
|
3
|
-
import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
|
|
4
|
-
import { ILoggerService } from 'vscode/vscode/vs/platform/log/common/log.service';
|
|
5
|
-
import { AbstractRequestService } from 'vscode/vscode/vs/platform/request/common/request';
|
|
6
|
-
|
|
7
|
-
let RequestService = class RequestService extends AbstractRequestService {
|
|
8
|
-
constructor(configurationService, loggerService) {
|
|
9
|
-
super(loggerService);
|
|
10
|
-
this.configurationService = configurationService;
|
|
11
|
-
}
|
|
12
|
-
async request(options, token) {
|
|
13
|
-
if (!options.proxyAuthorization) {
|
|
14
|
-
options.proxyAuthorization = this.configurationService.getValue('http.proxyAuthorization');
|
|
15
|
-
}
|
|
16
|
-
return this.logAndRequest('browser', options, () => request(options, token));
|
|
17
|
-
}
|
|
18
|
-
async resolveProxy(url) {
|
|
19
|
-
return undefined;
|
|
20
|
-
}
|
|
21
|
-
async lookupAuthorization(authInfo) {
|
|
22
|
-
return undefined;
|
|
23
|
-
}
|
|
24
|
-
async lookupKerberosAuthorization(url) {
|
|
25
|
-
return undefined;
|
|
26
|
-
}
|
|
27
|
-
async loadCertificates() {
|
|
28
|
-
return [];
|
|
29
|
-
}
|
|
30
|
-
};
|
|
31
|
-
RequestService = ( __decorate([
|
|
32
|
-
( __param(0, IConfigurationService)),
|
|
33
|
-
( __param(1, ILoggerService))
|
|
34
|
-
], RequestService));
|
|
35
|
-
|
|
36
|
-
export { RequestService };
|