@codingame/monaco-vscode-base-service-override 28.4.1 → 29.1.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/download/common/downloadService.d.ts +1 -1
- package/vscode/src/vs/platform/download/common/downloadService.js +3 -2
- package/vscode/src/vs/platform/request/common/requestIpc.d.ts +2 -1
- package/vscode/src/vs/platform/request/common/requestIpc.js +2 -0
- package/vscode/src/vs/workbench/services/configuration/common/jsonEditingService.js +1 -1
- package/vscode/src/vs/workbench/services/decorations/browser/decorationsService.js +1 -1
- package/vscode/src/vs/workbench/services/label/common/labelService.js +14 -14
- package/vscode/src/vs/workbench/services/request/browser/requestService.js +1 -1
- package/vscode/src/vs/workbench/services/workingCopy/common/storedFileWorkingCopySaveParticipant.js +2 -2
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@codingame/monaco-vscode-base-service-override",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "29.1.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "VSCode public API plugged on the monaco editor - base service-override",
|
|
6
6
|
"keywords": [],
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
},
|
|
16
16
|
"type": "module",
|
|
17
17
|
"dependencies": {
|
|
18
|
-
"@codingame/monaco-vscode-api": "
|
|
18
|
+
"@codingame/monaco-vscode-api": "29.1.0"
|
|
19
19
|
},
|
|
20
20
|
"main": "index.js",
|
|
21
21
|
"module": "index.js",
|
|
@@ -8,5 +8,5 @@ export declare class DownloadService implements IDownloadService {
|
|
|
8
8
|
private readonly fileService;
|
|
9
9
|
readonly _serviceBrand: undefined;
|
|
10
10
|
constructor(requestService: IRequestService, fileService: IFileService);
|
|
11
|
-
download(resource: URI, target: URI, cancellationToken?: CancellationToken): Promise<void>;
|
|
11
|
+
download(resource: URI, target: URI, callSite: string, cancellationToken?: CancellationToken): Promise<void>;
|
|
12
12
|
}
|
|
@@ -11,14 +11,15 @@ let DownloadService = class DownloadService {
|
|
|
11
11
|
this.requestService = requestService;
|
|
12
12
|
this.fileService = fileService;
|
|
13
13
|
}
|
|
14
|
-
async download(resource, target, cancellationToken = CancellationToken.None) {
|
|
14
|
+
async download(resource, target, callSite, cancellationToken = CancellationToken.None) {
|
|
15
15
|
if (resource.scheme === Schemas.file || resource.scheme === Schemas.vscodeRemote) {
|
|
16
16
|
await this.fileService.copy(resource, target);
|
|
17
17
|
return;
|
|
18
18
|
}
|
|
19
19
|
const options = {
|
|
20
20
|
type: "GET",
|
|
21
|
-
url: ( resource.toString(true))
|
|
21
|
+
url: ( resource.toString(true)),
|
|
22
|
+
callSite
|
|
22
23
|
};
|
|
23
24
|
const context = await this.requestService.request(options, cancellationToken);
|
|
24
25
|
if (context.res.statusCode === 200) {
|
|
@@ -2,7 +2,7 @@ import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/c
|
|
|
2
2
|
import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
|
|
3
3
|
import { IChannel, IServerChannel } from "@codingame/monaco-vscode-api/vscode/vs/base/parts/ipc/common/ipc";
|
|
4
4
|
import { IRequestContext, IRequestOptions } from "@codingame/monaco-vscode-api/vscode/vs/base/parts/request/common/request";
|
|
5
|
-
import { AuthInfo, Credentials } from "@codingame/monaco-vscode-api/vscode/vs/platform/request/common/request";
|
|
5
|
+
import { AuthInfo, Credentials, IRequestCompleteEvent } from "@codingame/monaco-vscode-api/vscode/vs/platform/request/common/request";
|
|
6
6
|
import { IRequestService } from "@codingame/monaco-vscode-api/vscode/vs/platform/request/common/request.service";
|
|
7
7
|
export declare class RequestChannel implements IServerChannel {
|
|
8
8
|
private readonly service;
|
|
@@ -13,6 +13,7 @@ export declare class RequestChannel implements IServerChannel {
|
|
|
13
13
|
export declare class RequestChannelClient implements IRequestService {
|
|
14
14
|
private readonly channel;
|
|
15
15
|
readonly _serviceBrand: undefined;
|
|
16
|
+
readonly onDidCompleteRequest: Event<IRequestCompleteEvent>;
|
|
16
17
|
constructor(channel: IChannel);
|
|
17
18
|
request(options: IRequestOptions, token: CancellationToken): Promise<IRequestContext>;
|
|
18
19
|
resolveProxy(url: string): Promise<string | undefined>;
|
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
|
|
2
2
|
import { bufferToStream } from '@codingame/monaco-vscode-api/vscode/vs/base/common/buffer';
|
|
3
3
|
import '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
|
|
4
|
+
import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
|
|
4
5
|
|
|
5
6
|
class RequestChannelClient {
|
|
6
7
|
constructor(channel) {
|
|
7
8
|
this.channel = channel;
|
|
9
|
+
this.onDidCompleteRequest = Event.None;
|
|
8
10
|
}
|
|
9
11
|
async request(options, token) {
|
|
10
12
|
const [res, buffer] = await this.channel.call("request", [options], token);
|
|
@@ -137,7 +137,7 @@ let JSONEditingService = class JSONEditingService {
|
|
|
137
137
|
case JSONEditingErrorCode.ERROR_INVALID_FILE:
|
|
138
138
|
{
|
|
139
139
|
return localize(
|
|
140
|
-
|
|
140
|
+
15800,
|
|
141
141
|
"Unable to write into the file. Please open the file to correct errors/warnings in the file and try again."
|
|
142
142
|
);
|
|
143
143
|
}
|
|
@@ -181,7 +181,7 @@ class DecorationStyles {
|
|
|
181
181
|
const strikethrough = ( data.some(d => d.strikethrough));
|
|
182
182
|
if (onlyChildren) {
|
|
183
183
|
badgeClassName = rule.bubbleBadgeClassName;
|
|
184
|
-
tooltip = ( localize(
|
|
184
|
+
tooltip = ( localize(15839, "Contains emphasized items"));
|
|
185
185
|
}
|
|
186
186
|
return {
|
|
187
187
|
labelClassName,
|
|
@@ -31,7 +31,7 @@ import { Memento } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common
|
|
|
31
31
|
const resourceLabelFormattersExtPoint = ExtensionsRegistry.registerExtensionPoint({
|
|
32
32
|
extensionPoint: "resourceLabelFormatters",
|
|
33
33
|
jsonSchema: {
|
|
34
|
-
description: ( localize(
|
|
34
|
+
description: ( localize(16144, "Contributes resource label formatting rules.")),
|
|
35
35
|
type: "array",
|
|
36
36
|
items: {
|
|
37
37
|
type: "object",
|
|
@@ -40,52 +40,52 @@ const resourceLabelFormattersExtPoint = ExtensionsRegistry.registerExtensionPoin
|
|
|
40
40
|
scheme: {
|
|
41
41
|
type: "string",
|
|
42
42
|
description: ( localize(
|
|
43
|
-
|
|
43
|
+
16145,
|
|
44
44
|
"URI scheme on which to match the formatter on. For example \"file\". Simple glob patterns are supported."
|
|
45
45
|
))
|
|
46
46
|
},
|
|
47
47
|
authority: {
|
|
48
48
|
type: "string",
|
|
49
49
|
description: ( localize(
|
|
50
|
-
|
|
50
|
+
16146,
|
|
51
51
|
"URI authority on which to match the formatter on. Simple glob patterns are supported."
|
|
52
52
|
))
|
|
53
53
|
},
|
|
54
54
|
formatting: {
|
|
55
|
-
description: ( localize(
|
|
55
|
+
description: ( localize(16147, "Rules for formatting uri resource labels.")),
|
|
56
56
|
type: "object",
|
|
57
57
|
properties: {
|
|
58
58
|
label: {
|
|
59
59
|
type: "string",
|
|
60
60
|
description: ( localize(
|
|
61
|
-
|
|
61
|
+
16148,
|
|
62
62
|
"Label rules to display. For example: myLabel:/${path}. ${path}, ${scheme}, ${authority} and ${authoritySuffix} are supported as variables."
|
|
63
63
|
))
|
|
64
64
|
},
|
|
65
65
|
separator: {
|
|
66
66
|
type: "string",
|
|
67
67
|
description: ( localize(
|
|
68
|
-
|
|
68
|
+
16149,
|
|
69
69
|
"Separator to be used in the uri label display. '/' or '' as an example."
|
|
70
70
|
))
|
|
71
71
|
},
|
|
72
72
|
stripPathStartingSeparator: {
|
|
73
73
|
type: "boolean",
|
|
74
74
|
description: ( localize(
|
|
75
|
-
|
|
75
|
+
16150,
|
|
76
76
|
"Controls whether `${path}` substitutions should have starting separator characters stripped."
|
|
77
77
|
))
|
|
78
78
|
},
|
|
79
79
|
tildify: {
|
|
80
80
|
type: "boolean",
|
|
81
81
|
description: ( localize(
|
|
82
|
-
|
|
82
|
+
16151,
|
|
83
83
|
"Controls if the start of the uri label should be tildified when possible."
|
|
84
84
|
))
|
|
85
85
|
},
|
|
86
86
|
workspaceSuffix: {
|
|
87
87
|
type: "string",
|
|
88
|
-
description: ( localize(
|
|
88
|
+
description: ( localize(16152, "Suffix appended to the workspace label."))
|
|
89
89
|
}
|
|
90
90
|
}
|
|
91
91
|
}
|
|
@@ -114,7 +114,7 @@ let ResourceLabelFormattersHandler = class ResourceLabelFormattersHandler {
|
|
|
114
114
|
if (typeof formatter.formatting.separator !== `string`) {
|
|
115
115
|
formatter.formatting.separator = sep;
|
|
116
116
|
}
|
|
117
|
-
if (!isProposedApiEnabled(added.description
|
|
117
|
+
if (!isProposedApiEnabled(added.description) && formatter.formatting.workspaceTooltip) {
|
|
118
118
|
formatter.formatting.workspaceTooltip = undefined;
|
|
119
119
|
}
|
|
120
120
|
this.formattersDisposables.set(formatter, labelService.registerFormatter(formatter));
|
|
@@ -281,10 +281,10 @@ let LabelService = class LabelService extends Disposable {
|
|
|
281
281
|
}
|
|
282
282
|
doGetWorkspaceLabel(workspaceUri, options) {
|
|
283
283
|
if (isUntitledWorkspace(workspaceUri, this.environmentService)) {
|
|
284
|
-
return localize(
|
|
284
|
+
return localize(16153, "Untitled (Workspace)");
|
|
285
285
|
}
|
|
286
286
|
if (isTemporaryWorkspace(workspaceUri)) {
|
|
287
|
-
return localize(
|
|
287
|
+
return localize(16154, "Workspace");
|
|
288
288
|
}
|
|
289
289
|
let filename = basename(workspaceUri);
|
|
290
290
|
if (filename.endsWith(WORKSPACE_EXTENSION)) {
|
|
@@ -297,14 +297,14 @@ let LabelService = class LabelService extends Disposable {
|
|
|
297
297
|
break;
|
|
298
298
|
case Verbosity.LONG:
|
|
299
299
|
label = ( localize(
|
|
300
|
-
|
|
300
|
+
16155,
|
|
301
301
|
"{0} (Workspace)",
|
|
302
302
|
this.getUriLabel(joinPath(dirname(workspaceUri), filename))
|
|
303
303
|
));
|
|
304
304
|
break;
|
|
305
305
|
case Verbosity.MEDIUM:
|
|
306
306
|
default:
|
|
307
|
-
label = ( localize(
|
|
307
|
+
label = ( localize(16156, "{0} (Workspace)", filename));
|
|
308
308
|
break;
|
|
309
309
|
}
|
|
310
310
|
if (options?.verbose === Verbosity.SHORT) {
|
|
@@ -15,7 +15,7 @@ import { mainWindow } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/
|
|
|
15
15
|
let BrowserRequestService = class BrowserRequestService extends AbstractRequestService {
|
|
16
16
|
constructor(remoteAgentService, configurationService, loggerService) {
|
|
17
17
|
const logger = loggerService.createLogger(`network`, {
|
|
18
|
-
name: ( localize(
|
|
18
|
+
name: ( localize(16263, "Network")),
|
|
19
19
|
group: windowLogGroup
|
|
20
20
|
});
|
|
21
21
|
const logService = ( new LogService(logger));
|
package/vscode/src/vs/workbench/services/workingCopy/common/storedFileWorkingCopySaveParticipant.js
CHANGED
|
@@ -29,13 +29,13 @@ let StoredFileWorkingCopySaveParticipant = class StoredFileWorkingCopySavePartic
|
|
|
29
29
|
const cts = ( new CancellationTokenSource(token));
|
|
30
30
|
workingCopy.model?.pushStackElement();
|
|
31
31
|
progress.report({
|
|
32
|
-
message: ( localize(
|
|
32
|
+
message: ( localize(16664, "Running Code Actions and Formatters..."))
|
|
33
33
|
});
|
|
34
34
|
let bubbleCancel = false;
|
|
35
35
|
await this.progressService.withProgress({
|
|
36
36
|
priority: NotificationPriority.URGENT,
|
|
37
37
|
location: ProgressLocation.Notification,
|
|
38
|
-
cancellable: ( localize(
|
|
38
|
+
cancellable: ( localize(16665, "Skip")),
|
|
39
39
|
delay: workingCopy.isDirty() ? 5000 : 3000
|
|
40
40
|
}, async progress => {
|
|
41
41
|
const participants = Array.from(this.saveParticipants).sort((a, b) => {
|