@codingame/monaco-vscode-extensions-service-override 25.1.2 → 26.0.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/index.js +7 -0
- package/package.json +3 -3
- package/vscode/src/vs/base/common/console.js +24 -15
- package/vscode/src/vs/platform/extensionManagement/common/extensionManagementCLI.d.ts +4 -1
- package/vscode/src/vs/platform/extensionManagement/common/extensionManagementCLI.js +149 -84
- package/vscode/src/vs/platform/extensionResourceLoader/browser/extensionResourceLoaderService.js +20 -12
- package/vscode/src/vs/platform/extensionResourceLoader/common/extensionResourceLoader.js +38 -21
- package/vscode/src/vs/platform/remote/common/managedSocket.js +7 -10
- package/vscode/src/vs/workbench/api/browser/mainThreadAiEmbeddingVector.js +5 -2
- package/vscode/src/vs/workbench/api/browser/mainThreadAiRelatedInformation.js +5 -2
- package/vscode/src/vs/workbench/api/browser/mainThreadAiSettingsSearch.js +4 -1
- package/vscode/src/vs/workbench/api/browser/mainThreadAuthentication.js +200 -143
- package/vscode/src/vs/workbench/api/browser/mainThreadBulkEdits.js +10 -14
- package/vscode/src/vs/workbench/api/browser/mainThreadCLICommands.js +41 -31
- package/vscode/src/vs/workbench/api/browser/mainThreadChatAgents2.d.ts +9 -12
- package/vscode/src/vs/workbench/api/browser/mainThreadChatAgents2.js +168 -115
- package/vscode/src/vs/workbench/api/browser/mainThreadChatCodeMapper.js +11 -13
- package/vscode/src/vs/workbench/api/browser/mainThreadChatContext.d.ts +5 -5
- package/vscode/src/vs/workbench/api/browser/mainThreadChatContext.js +42 -15
- package/vscode/src/vs/workbench/api/browser/mainThreadChatOutputRenderer.js +8 -7
- package/vscode/src/vs/workbench/api/browser/mainThreadChatSessions.d.ts +4 -2
- package/vscode/src/vs/workbench/api/browser/mainThreadChatSessions.js +170 -99
- package/vscode/src/vs/workbench/api/browser/mainThreadChatStatus.js +2 -5
- package/vscode/src/vs/workbench/api/browser/mainThreadClipboard.js +4 -9
- package/vscode/src/vs/workbench/api/browser/mainThreadCodeInsets.js +13 -12
- package/vscode/src/vs/workbench/api/browser/mainThreadCommands.js +16 -19
- package/vscode/src/vs/workbench/api/browser/mainThreadComments.js +127 -70
- package/vscode/src/vs/workbench/api/browser/mainThreadConfiguration.js +80 -26
- package/vscode/src/vs/workbench/api/browser/mainThreadConsole.js +5 -11
- package/vscode/src/vs/workbench/api/browser/mainThreadCustomEditors.js +199 -97
- package/vscode/src/vs/workbench/api/browser/mainThreadDataChannels.js +1 -4
- package/vscode/src/vs/workbench/api/browser/mainThreadDebugService.js +88 -73
- package/vscode/src/vs/workbench/api/browser/mainThreadDecorations.js +5 -5
- package/vscode/src/vs/workbench/api/browser/mainThreadDiagnostics.js +16 -12
- package/vscode/src/vs/workbench/api/browser/mainThreadDialogs.js +10 -8
- package/vscode/src/vs/workbench/api/browser/mainThreadDocumentContentProviders.js +14 -6
- package/vscode/src/vs/workbench/api/browser/mainThreadDocuments.js +52 -37
- package/vscode/src/vs/workbench/api/browser/mainThreadDocumentsAndEditors.js +78 -58
- package/vscode/src/vs/workbench/api/browser/mainThreadEditSessionIdentityParticipant.js +5 -7
- package/vscode/src/vs/workbench/api/browser/mainThreadEditor.js +75 -63
- package/vscode/src/vs/workbench/api/browser/mainThreadEditorTabs.js +99 -91
- package/vscode/src/vs/workbench/api/browser/mainThreadEditors.js +93 -55
- package/vscode/src/vs/workbench/api/browser/mainThreadEmbeddings.js +3 -7
- package/vscode/src/vs/workbench/api/browser/mainThreadExtensionService.js +85 -60
- package/vscode/src/vs/workbench/api/browser/mainThreadFileSystem.js +49 -45
- package/vscode/src/vs/workbench/api/browser/mainThreadFileSystemEventService.js +114 -72
- package/vscode/src/vs/workbench/api/browser/mainThreadInteractive.js +4 -7
- package/vscode/src/vs/workbench/api/browser/mainThreadLabelService.js +1 -4
- package/vscode/src/vs/workbench/api/browser/mainThreadLanguageFeatures.d.ts +2 -2
- package/vscode/src/vs/workbench/api/browser/mainThreadLanguageFeatures.js +381 -238
- package/vscode/src/vs/workbench/api/browser/mainThreadLanguageModelTools.d.ts +7 -3
- package/vscode/src/vs/workbench/api/browser/mainThreadLanguageModelTools.js +90 -13
- package/vscode/src/vs/workbench/api/browser/mainThreadLanguageModels.js +81 -58
- package/vscode/src/vs/workbench/api/browser/mainThreadLanguages.js +9 -10
- package/vscode/src/vs/workbench/api/browser/mainThreadLocalization.js +2 -7
- package/vscode/src/vs/workbench/api/browser/mainThreadLogService.js +6 -10
- package/vscode/src/vs/workbench/api/browser/mainThreadManagedSockets.js +12 -10
- package/vscode/src/vs/workbench/api/browser/mainThreadMcp.d.ts +3 -2
- package/vscode/src/vs/workbench/api/browser/mainThreadMcp.js +162 -97
- package/vscode/src/vs/workbench/api/browser/mainThreadMessageService.js +32 -26
- package/vscode/src/vs/workbench/api/browser/mainThreadNotebook.js +38 -32
- package/vscode/src/vs/workbench/api/browser/mainThreadNotebookDocuments.js +48 -46
- package/vscode/src/vs/workbench/api/browser/mainThreadNotebookDocumentsAndEditors.js +22 -18
- package/vscode/src/vs/workbench/api/browser/mainThreadNotebookDto.js +5 -8
- package/vscode/src/vs/workbench/api/browser/mainThreadNotebookEditors.js +35 -21
- package/vscode/src/vs/workbench/api/browser/mainThreadNotebookKernels.js +31 -28
- package/vscode/src/vs/workbench/api/browser/mainThreadNotebookSaveParticipant.js +5 -7
- package/vscode/src/vs/workbench/api/browser/mainThreadOutputService.js +47 -23
- package/vscode/src/vs/workbench/api/browser/mainThreadProfileContentHandlers.js +15 -12
- package/vscode/src/vs/workbench/api/browser/mainThreadProgress.js +17 -18
- package/vscode/src/vs/workbench/api/browser/mainThreadQuickDiff.js +6 -7
- package/vscode/src/vs/workbench/api/browser/mainThreadQuickOpen.js +83 -66
- package/vscode/src/vs/workbench/api/browser/mainThreadRemoteConnectionData.js +1 -5
- package/vscode/src/vs/workbench/api/browser/mainThreadSCM.js +250 -92
- package/vscode/src/vs/workbench/api/browser/mainThreadSaveParticipant.js +6 -8
- package/vscode/src/vs/workbench/api/browser/mainThreadSearch.js +37 -26
- package/vscode/src/vs/workbench/api/browser/mainThreadSecretState.js +34 -21
- package/vscode/src/vs/workbench/api/browser/mainThreadShare.js +3 -6
- package/vscode/src/vs/workbench/api/browser/mainThreadSpeech.js +19 -14
- package/vscode/src/vs/workbench/api/browser/mainThreadStatusBar.js +41 -16
- package/vscode/src/vs/workbench/api/browser/mainThreadStorage.js +18 -17
- package/vscode/src/vs/workbench/api/browser/mainThreadTask.js +145 -145
- package/vscode/src/vs/workbench/api/browser/mainThreadTelemetry.js +19 -11
- package/vscode/src/vs/workbench/api/browser/mainThreadTerminalService.js +176 -80
- package/vscode/src/vs/workbench/api/browser/mainThreadTerminalShellIntegration.js +52 -21
- package/vscode/src/vs/workbench/api/browser/mainThreadTesting.js +26 -24
- package/vscode/src/vs/workbench/api/browser/mainThreadTheming.js +1 -4
- package/vscode/src/vs/workbench/api/browser/mainThreadTimeline.js +5 -8
- package/vscode/src/vs/workbench/api/browser/mainThreadTreeViews.d.ts +4 -1
- package/vscode/src/vs/workbench/api/browser/mainThreadTreeViews.js +106 -46
- package/vscode/src/vs/workbench/api/browser/mainThreadTunnelService.js +83 -65
- package/vscode/src/vs/workbench/api/browser/mainThreadUriOpeners.js +20 -20
- package/vscode/src/vs/workbench/api/browser/mainThreadUrls.js +14 -9
- package/vscode/src/vs/workbench/api/browser/mainThreadWebviewManager.js +17 -9
- package/vscode/src/vs/workbench/api/browser/mainThreadWebviewPanels.js +49 -38
- package/vscode/src/vs/workbench/api/browser/mainThreadWebviewViews.js +10 -13
- package/vscode/src/vs/workbench/api/browser/mainThreadWebviews.js +38 -27
- package/vscode/src/vs/workbench/api/browser/mainThreadWindow.js +5 -11
- package/vscode/src/vs/workbench/api/browser/mainThreadWorkspace.d.ts +4 -1
- package/vscode/src/vs/workbench/api/browser/mainThreadWorkspace.js +73 -43
- package/vscode/src/vs/workbench/api/common/shared/dataTransferCache.js +2 -2
- package/vscode/src/vs/workbench/contrib/customEditor/common/customTextEditorModel.js +17 -10
- package/vscode/src/vs/workbench/contrib/externalUriOpener/common/contributedOpeners.js +17 -11
- package/vscode/src/vs/workbench/services/extensionManagement/browser/extensionBisect.js +107 -80
- package/vscode/src/vs/workbench/services/extensionManagement/browser/webExtensionsScannerService.js +336 -175
- package/vscode/src/vs/workbench/services/extensions/browser/extensionService.js +126 -71
- package/vscode/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.js +76 -54
- package/vscode/src/vs/workbench/services/extensions/browser/webWorkerFileSystemProvider.js +1 -2
- package/vscode/src/vs/workbench/services/extensions/common/abstractExtensionService.d.ts +2 -0
- package/vscode/src/vs/workbench/services/extensions/common/abstractExtensionService.js +343 -192
- package/vscode/src/vs/workbench/services/extensions/common/extHostCustomers.js +5 -3
- package/vscode/src/vs/workbench/services/extensions/common/extensionHostManager.d.ts +0 -1
- package/vscode/src/vs/workbench/services/extensions/common/extensionHostManager.js +75 -68
- package/vscode/src/vs/workbench/services/extensions/common/extensionRunningLocationTracker.js +135 -36
- package/vscode/src/vs/workbench/services/extensions/common/extensionsProposedApi.js +22 -18
- package/vscode/src/vs/workbench/services/extensions/common/extensionsUtil.js +14 -12
- package/vscode/src/vs/workbench/services/extensions/common/lazyCreateExtensionHostManager.js +21 -9
- package/vscode/src/vs/workbench/services/extensions/common/remoteExtensionHost.js +48 -25
- package/vscode/src/vs/workbench/services/themes/browser/cssExtensionPoint.d.ts +24 -0
- package/vscode/src/vs/workbench/services/themes/browser/cssExtensionPoint.js +300 -0
|
@@ -38,7 +38,10 @@ class MainThreadKernel {
|
|
|
38
38
|
this.implementsExecutionOrder = data.supportsExecutionOrder ?? false;
|
|
39
39
|
this.hasVariableProvider = data.hasVariableProvider ?? false;
|
|
40
40
|
this.localResourceRoot = URI.revive(data.extensionLocation);
|
|
41
|
-
this.preloads = data.preloads?.map(u => ({
|
|
41
|
+
this.preloads = data.preloads?.map(u => ({
|
|
42
|
+
uri: URI.revive(u.uri),
|
|
43
|
+
provides: u.provides
|
|
44
|
+
})) ?? [];
|
|
42
45
|
}
|
|
43
46
|
update(data) {
|
|
44
47
|
const event = Object.create(null);
|
|
@@ -79,7 +82,14 @@ class MainThreadKernelDetectionTask {
|
|
|
79
82
|
}
|
|
80
83
|
}
|
|
81
84
|
let MainThreadNotebookKernels = class MainThreadNotebookKernels {
|
|
82
|
-
constructor(
|
|
85
|
+
constructor(
|
|
86
|
+
extHostContext,
|
|
87
|
+
_languageService,
|
|
88
|
+
_notebookKernelService,
|
|
89
|
+
_notebookExecutionStateService,
|
|
90
|
+
_notebookService,
|
|
91
|
+
notebookEditorService
|
|
92
|
+
) {
|
|
83
93
|
this._languageService = _languageService;
|
|
84
94
|
this._notebookKernelService = _notebookKernelService;
|
|
85
95
|
this._notebookExecutionStateService = _notebookExecutionStateService;
|
|
@@ -105,11 +115,10 @@ let MainThreadNotebookKernels = class MainThreadNotebookKernels {
|
|
|
105
115
|
this._notebookExecutions.forEach(e => e.complete());
|
|
106
116
|
}));
|
|
107
117
|
this._disposables.add(this._notebookKernelService.onDidChangeSelectedNotebooks(e => {
|
|
108
|
-
for (const [handle, [kernel
|
|
118
|
+
for (const [handle, [kernel]] of this._kernels) {
|
|
109
119
|
if (e.oldKernel === kernel.id) {
|
|
110
120
|
this._proxy.$acceptNotebookAssociation(handle, e.notebook, false);
|
|
111
|
-
}
|
|
112
|
-
else if (e.newKernel === kernel.id) {
|
|
121
|
+
} else if (e.newKernel === kernel.id) {
|
|
113
122
|
this._proxy.$acceptNotebookAssociation(handle, e.notebook, true);
|
|
114
123
|
}
|
|
115
124
|
}
|
|
@@ -133,7 +142,9 @@ let MainThreadNotebookKernels = class MainThreadNotebookKernels {
|
|
|
133
142
|
if (!editor.hasModel()) {
|
|
134
143
|
return;
|
|
135
144
|
}
|
|
136
|
-
const {
|
|
145
|
+
const {
|
|
146
|
+
selected
|
|
147
|
+
} = this._notebookKernelService.getMatchingKernel(editor.textModel);
|
|
137
148
|
if (!selected) {
|
|
138
149
|
return;
|
|
139
150
|
}
|
|
@@ -152,7 +163,7 @@ let MainThreadNotebookKernels = class MainThreadNotebookKernels {
|
|
|
152
163
|
async $postMessage(handle, editorId, message) {
|
|
153
164
|
const tuple = this._kernels.get(handle);
|
|
154
165
|
if (!tuple) {
|
|
155
|
-
throw ( new Error(
|
|
166
|
+
throw ( new Error("kernel already disposed"));
|
|
156
167
|
}
|
|
157
168
|
const [kernel] = tuple;
|
|
158
169
|
let didSend = false;
|
|
@@ -166,8 +177,7 @@ let MainThreadNotebookKernels = class MainThreadNotebookKernels {
|
|
|
166
177
|
if (editorId === undefined) {
|
|
167
178
|
editor.postMessage(message);
|
|
168
179
|
didSend = true;
|
|
169
|
-
}
|
|
170
|
-
else if (editor.getId() === editorId) {
|
|
180
|
+
} else if (editor.getId() === editorId) {
|
|
171
181
|
editor.postMessage(message);
|
|
172
182
|
didSend = true;
|
|
173
183
|
break;
|
|
@@ -192,12 +202,11 @@ let MainThreadNotebookKernels = class MainThreadNotebookKernels {
|
|
|
192
202
|
}
|
|
193
203
|
provideVariables(notebookUri, parentId, kind, start, token) {
|
|
194
204
|
const requestId = `${handle}variables${that.variableRequestIndex++}`;
|
|
195
|
-
return ( new AsyncIterableProducer(async
|
|
205
|
+
return ( new AsyncIterableProducer(async emitter => {
|
|
196
206
|
that.variableRequestMap.set(requestId, emitter);
|
|
197
207
|
try {
|
|
198
208
|
await that._proxy.$provideVariables(handle, requestId, notebookUri, parentId, kind, start, token);
|
|
199
|
-
}
|
|
200
|
-
finally {
|
|
209
|
+
} finally {
|
|
201
210
|
that.variableRequestMap.delete(requestId);
|
|
202
211
|
}
|
|
203
212
|
}));
|
|
@@ -245,8 +254,7 @@ let MainThreadNotebookKernels = class MainThreadNotebookKernels {
|
|
|
245
254
|
try {
|
|
246
255
|
const execution = this._executions.get(handle);
|
|
247
256
|
execution?.update(( updates.map(NotebookDto.fromCellExecuteUpdateDto)));
|
|
248
|
-
}
|
|
249
|
-
catch (e) {
|
|
257
|
+
} catch (e) {
|
|
250
258
|
onUnexpectedError(e);
|
|
251
259
|
}
|
|
252
260
|
}
|
|
@@ -254,11 +262,9 @@ let MainThreadNotebookKernels = class MainThreadNotebookKernels {
|
|
|
254
262
|
try {
|
|
255
263
|
const execution = this._executions.get(handle);
|
|
256
264
|
execution?.complete(NotebookDto.fromCellExecuteCompleteDto(data.value));
|
|
257
|
-
}
|
|
258
|
-
catch (e) {
|
|
265
|
+
} catch (e) {
|
|
259
266
|
onUnexpectedError(e);
|
|
260
|
-
}
|
|
261
|
-
finally {
|
|
267
|
+
} finally {
|
|
262
268
|
this._executions.delete(handle);
|
|
263
269
|
}
|
|
264
270
|
}
|
|
@@ -280,8 +286,7 @@ let MainThreadNotebookKernels = class MainThreadNotebookKernels {
|
|
|
280
286
|
try {
|
|
281
287
|
const execution = this._notebookExecutions.get(handle);
|
|
282
288
|
execution?.begin();
|
|
283
|
-
}
|
|
284
|
-
catch (e) {
|
|
289
|
+
} catch (e) {
|
|
285
290
|
onUnexpectedError(e);
|
|
286
291
|
}
|
|
287
292
|
}
|
|
@@ -289,11 +294,9 @@ let MainThreadNotebookKernels = class MainThreadNotebookKernels {
|
|
|
289
294
|
try {
|
|
290
295
|
const execution = this._notebookExecutions.get(handle);
|
|
291
296
|
execution?.complete();
|
|
292
|
-
}
|
|
293
|
-
catch (e) {
|
|
297
|
+
} catch (e) {
|
|
294
298
|
onUnexpectedError(e);
|
|
295
|
-
}
|
|
296
|
-
finally {
|
|
299
|
+
} finally {
|
|
297
300
|
this._notebookExecutions.delete(handle);
|
|
298
301
|
}
|
|
299
302
|
}
|
|
@@ -316,7 +319,7 @@ let MainThreadNotebookKernels = class MainThreadNotebookKernels {
|
|
|
316
319
|
const actions = await this._proxy.$provideKernelSourceActions(handle, CancellationToken.None);
|
|
317
320
|
return ( actions.map(action => {
|
|
318
321
|
let documentation = action.documentation;
|
|
319
|
-
if (action.documentation && typeof action.documentation !==
|
|
322
|
+
if (action.documentation && typeof action.documentation !== "string") {
|
|
320
323
|
documentation = URI.revive(action.documentation);
|
|
321
324
|
}
|
|
322
325
|
return {
|
|
@@ -324,12 +327,12 @@ let MainThreadNotebookKernels = class MainThreadNotebookKernels {
|
|
|
324
327
|
command: action.command,
|
|
325
328
|
description: action.description,
|
|
326
329
|
detail: action.detail,
|
|
327
|
-
documentation
|
|
330
|
+
documentation
|
|
328
331
|
};
|
|
329
332
|
}));
|
|
330
333
|
}
|
|
331
334
|
};
|
|
332
|
-
if (typeof eventHandle ===
|
|
335
|
+
if (typeof eventHandle === "number") {
|
|
333
336
|
const emitter = ( new Emitter());
|
|
334
337
|
this._kernelSourceActionProvidersEventRegistrations.set(eventHandle, emitter);
|
|
335
338
|
kernelSourceActionProvider.onDidChangeSourceActions = emitter.event;
|
|
@@ -343,7 +346,7 @@ let MainThreadNotebookKernels = class MainThreadNotebookKernels {
|
|
|
343
346
|
tuple[1].dispose();
|
|
344
347
|
this._kernelSourceActionProviders.delete(handle);
|
|
345
348
|
}
|
|
346
|
-
if (typeof eventHandle ===
|
|
349
|
+
if (typeof eventHandle === "number") {
|
|
347
350
|
this._kernelSourceActionProvidersEventRegistrations.delete(eventHandle);
|
|
348
351
|
}
|
|
349
352
|
}
|
|
@@ -18,7 +18,7 @@ class ExtHostNotebookDocumentSaveParticipant {
|
|
|
18
18
|
}
|
|
19
19
|
let _warningTimeout;
|
|
20
20
|
const p = ( new Promise((resolve, reject) => {
|
|
21
|
-
_warningTimeout = setTimeout(() => reject(( new Error(( localize(
|
|
21
|
+
_warningTimeout = setTimeout(() => reject(( new Error(( localize(2550, "Aborted onWillSaveNotebookDocument-event after 1750ms"))))), 1750);
|
|
22
22
|
this._proxy.$participateInSave(workingCopy.resource, context.reason, token).then(_ => {
|
|
23
23
|
clearTimeout(_warningTimeout);
|
|
24
24
|
return undefined;
|
|
@@ -30,16 +30,14 @@ class ExtHostNotebookDocumentSaveParticipant {
|
|
|
30
30
|
let SaveParticipant = class SaveParticipant {
|
|
31
31
|
constructor(extHostContext, instantiationService, workingCopyFileService) {
|
|
32
32
|
this.workingCopyFileService = workingCopyFileService;
|
|
33
|
-
this._saveParticipantDisposable = this.workingCopyFileService.addSaveParticipant(
|
|
33
|
+
this._saveParticipantDisposable = this.workingCopyFileService.addSaveParticipant(
|
|
34
|
+
instantiationService.createInstance(ExtHostNotebookDocumentSaveParticipant, extHostContext)
|
|
35
|
+
);
|
|
34
36
|
}
|
|
35
37
|
dispose() {
|
|
36
38
|
this._saveParticipantDisposable.dispose();
|
|
37
39
|
}
|
|
38
40
|
};
|
|
39
|
-
SaveParticipant = __decorate([
|
|
40
|
-
extHostCustomer,
|
|
41
|
-
( __param(1, IInstantiationService)),
|
|
42
|
-
( __param(2, IWorkingCopyFileService))
|
|
43
|
-
], SaveParticipant);
|
|
41
|
+
SaveParticipant = __decorate([extHostCustomer, ( __param(1, IInstantiationService)), ( __param(2, IWorkingCopyFileService))], SaveParticipant);
|
|
44
42
|
|
|
45
43
|
export { SaveParticipant };
|
|
@@ -17,9 +17,19 @@ import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
|
|
|
17
17
|
|
|
18
18
|
var MainThreadOutputService_1;
|
|
19
19
|
let MainThreadOutputService = class MainThreadOutputService extends Disposable {
|
|
20
|
-
static {
|
|
21
|
-
|
|
22
|
-
|
|
20
|
+
static {
|
|
21
|
+
MainThreadOutputService_1 = this;
|
|
22
|
+
}
|
|
23
|
+
static {
|
|
24
|
+
this._extensionIdPool = ( new Map());
|
|
25
|
+
}
|
|
26
|
+
constructor(
|
|
27
|
+
extHostContext,
|
|
28
|
+
outputService,
|
|
29
|
+
viewsService,
|
|
30
|
+
configurationService,
|
|
31
|
+
statusbarService
|
|
32
|
+
) {
|
|
23
33
|
super();
|
|
24
34
|
this._outputStatusItem = this._register(( new MutableDisposable()));
|
|
25
35
|
this._outputService = outputService;
|
|
@@ -32,7 +42,14 @@ let MainThreadOutputService = class MainThreadOutputService extends Disposable {
|
|
|
32
42
|
this._proxy.$setVisibleChannel(visibleChannel ? visibleChannel.id : null);
|
|
33
43
|
this._outputStatusItem.value = undefined;
|
|
34
44
|
};
|
|
35
|
-
this._register(Event.any(
|
|
45
|
+
this._register(Event.any(
|
|
46
|
+
this._outputService.onActiveOutputChannel,
|
|
47
|
+
Event.filter(this._viewsService.onDidChangeViewVisibility, (
|
|
48
|
+
{
|
|
49
|
+
id
|
|
50
|
+
}
|
|
51
|
+
) => id === OUTPUT_VIEW_ID)
|
|
52
|
+
)(() => setVisibleChannel()));
|
|
36
53
|
setVisibleChannel();
|
|
37
54
|
}
|
|
38
55
|
async $register(label, file, languageId, extensionId) {
|
|
@@ -40,7 +57,16 @@ let MainThreadOutputService = class MainThreadOutputService extends Disposable {
|
|
|
40
57
|
MainThreadOutputService_1._extensionIdPool.set(extensionId, idCounter);
|
|
41
58
|
const id = `extension-output-${extensionId}-#${idCounter}-${label}`;
|
|
42
59
|
const resource = URI.revive(file);
|
|
43
|
-
( Registry.as(Extensions.OutputChannels)).registerChannel({
|
|
60
|
+
( Registry.as(Extensions.OutputChannels)).registerChannel({
|
|
61
|
+
id,
|
|
62
|
+
label,
|
|
63
|
+
source: {
|
|
64
|
+
resource
|
|
65
|
+
},
|
|
66
|
+
log: false,
|
|
67
|
+
languageId,
|
|
68
|
+
extensionId
|
|
69
|
+
});
|
|
44
70
|
this._register(toDisposable(() => this.$dispose(id)));
|
|
45
71
|
return id;
|
|
46
72
|
}
|
|
@@ -49,8 +75,7 @@ let MainThreadOutputService = class MainThreadOutputService extends Disposable {
|
|
|
49
75
|
if (channel) {
|
|
50
76
|
if (mode === OutputChannelUpdateMode.Append) {
|
|
51
77
|
channel.update(mode);
|
|
52
|
-
}
|
|
53
|
-
else if (isNumber(till)) {
|
|
78
|
+
} else if (isNumber(till)) {
|
|
54
79
|
channel.update(mode, till);
|
|
55
80
|
}
|
|
56
81
|
}
|
|
@@ -60,7 +85,7 @@ let MainThreadOutputService = class MainThreadOutputService extends Disposable {
|
|
|
60
85
|
if (!channel) {
|
|
61
86
|
return;
|
|
62
87
|
}
|
|
63
|
-
const viewsToShowQuietly = this._configurationService.getValue(
|
|
88
|
+
const viewsToShowQuietly = this._configurationService.getValue("workbench.view.showQuietly") ?? {};
|
|
64
89
|
if (!this._viewsService.isViewVisible(OUTPUT_VIEW_ID) && viewsToShowQuietly[OUTPUT_VIEW_ID]) {
|
|
65
90
|
this._showChannelQuietly(channel);
|
|
66
91
|
return;
|
|
@@ -69,17 +94,22 @@ let MainThreadOutputService = class MainThreadOutputService extends Disposable {
|
|
|
69
94
|
}
|
|
70
95
|
_showChannelQuietly(channel) {
|
|
71
96
|
const statusProperties = {
|
|
72
|
-
name: ( localize(
|
|
73
|
-
text:
|
|
74
|
-
ariaLabel: ( localize(
|
|
97
|
+
name: ( localize(2551, "Show Output")),
|
|
98
|
+
text: "$(output)",
|
|
99
|
+
ariaLabel: ( localize(2552, "Show {0} Output Channel", channel.label)),
|
|
75
100
|
command: `workbench.action.output.show.${channel.id}`,
|
|
76
|
-
tooltip: ( localize(
|
|
77
|
-
kind:
|
|
101
|
+
tooltip: ( localize(2553, "Show {0} Output Channel", channel.label)),
|
|
102
|
+
kind: "prominent"
|
|
78
103
|
};
|
|
79
104
|
if (!this._outputStatusItem.value) {
|
|
80
|
-
this._outputStatusItem.value = this._statusbarService.addEntry(statusProperties,
|
|
81
|
-
|
|
82
|
-
|
|
105
|
+
this._outputStatusItem.value = this._statusbarService.addEntry(statusProperties, "status.view.showQuietly", StatusbarAlignment.RIGHT, {
|
|
106
|
+
location: {
|
|
107
|
+
id: "status.notifications",
|
|
108
|
+
priority: Number.NEGATIVE_INFINITY
|
|
109
|
+
},
|
|
110
|
+
alignment: StatusbarAlignment.LEFT
|
|
111
|
+
});
|
|
112
|
+
} else {
|
|
83
113
|
this._outputStatusItem.value.update(statusProperties);
|
|
84
114
|
}
|
|
85
115
|
}
|
|
@@ -99,12 +129,6 @@ let MainThreadOutputService = class MainThreadOutputService extends Disposable {
|
|
|
99
129
|
return this._outputService.getChannel(channelId);
|
|
100
130
|
}
|
|
101
131
|
};
|
|
102
|
-
MainThreadOutputService = MainThreadOutputService_1 = __decorate([
|
|
103
|
-
extHostNamedCustomer(MainContext.MainThreadOutputService),
|
|
104
|
-
( __param(1, IOutputService)),
|
|
105
|
-
( __param(2, IViewsService)),
|
|
106
|
-
( __param(3, IConfigurationService)),
|
|
107
|
-
( __param(4, IStatusbarService))
|
|
108
|
-
], MainThreadOutputService);
|
|
132
|
+
MainThreadOutputService = MainThreadOutputService_1 = __decorate([extHostNamedCustomer(MainContext.MainThreadOutputService), ( __param(1, IOutputService)), ( __param(2, IViewsService)), ( __param(3, IConfigurationService)), ( __param(4, IStatusbarService))], MainThreadOutputService);
|
|
109
133
|
|
|
110
134
|
export { MainThreadOutputService };
|
|
@@ -14,18 +14,21 @@ let MainThreadProfileContentHandlers = class MainThreadProfileContentHandlers ex
|
|
|
14
14
|
this.proxy = ( context.getProxy(ExtHostContext.ExtHostProfileContentHandlers));
|
|
15
15
|
}
|
|
16
16
|
async $registerProfileContentHandler(id, name, description, extensionId) {
|
|
17
|
-
this.registeredHandlers.set(
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
17
|
+
this.registeredHandlers.set(
|
|
18
|
+
id,
|
|
19
|
+
this.userDataProfileImportExportService.registerProfileContentHandler(id, {
|
|
20
|
+
name,
|
|
21
|
+
description,
|
|
22
|
+
extensionId,
|
|
23
|
+
saveProfile: async (name, content, token) => {
|
|
24
|
+
const result = await this.proxy.$saveProfile(id, name, content, token);
|
|
25
|
+
return result ? revive(result) : null;
|
|
26
|
+
},
|
|
27
|
+
readProfile: async (uri, token) => {
|
|
28
|
+
return this.proxy.$readProfile(id, uri, token);
|
|
29
|
+
}
|
|
30
|
+
})
|
|
31
|
+
);
|
|
29
32
|
}
|
|
30
33
|
async $unregisterProfileContentHandler(id) {
|
|
31
34
|
this.registeredHandlers.deleteAndDispose(id);
|
|
@@ -12,11 +12,12 @@ import { NotificationPriority } from '@codingame/monaco-vscode-api/vscode/vs/pla
|
|
|
12
12
|
|
|
13
13
|
var MainThreadProgress_1;
|
|
14
14
|
let MainThreadProgress = class MainThreadProgress {
|
|
15
|
-
static {
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
15
|
+
static {
|
|
16
|
+
MainThreadProgress_1 = this;
|
|
17
|
+
}
|
|
18
|
+
static {
|
|
19
|
+
this.URGENT_PROGRESS_SOURCES = ["vscode.github-authentication", "vscode.microsoft-authentication"];
|
|
20
|
+
}
|
|
20
21
|
constructor(extHostContext, progressService, _commandService) {
|
|
21
22
|
this._commandService = _commandService;
|
|
22
23
|
this._progress = ( new Map());
|
|
@@ -36,17 +37,16 @@ let MainThreadProgress = class MainThreadProgress {
|
|
|
36
37
|
priority: sourceIsUrgent ? NotificationPriority.URGENT : NotificationPriority.DEFAULT,
|
|
37
38
|
location: ProgressLocation.Notification,
|
|
38
39
|
secondaryActions: [toAction({
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
40
|
+
id: extensionId,
|
|
41
|
+
label: ( localize(2554, "Manage Extension")),
|
|
42
|
+
run: () => this._commandService.executeCommand("_extensions.manage", extensionId)
|
|
43
|
+
})]
|
|
43
44
|
};
|
|
44
45
|
options = notificationOptions;
|
|
45
46
|
}
|
|
46
47
|
try {
|
|
47
48
|
this._progressService.withProgress(options, task, () => this._proxy.$acceptProgressCanceled(handle));
|
|
48
|
-
}
|
|
49
|
-
catch (err) {
|
|
49
|
+
} catch (err) {
|
|
50
50
|
onUnexpectedExternalError(err);
|
|
51
51
|
}
|
|
52
52
|
}
|
|
@@ -62,17 +62,16 @@ let MainThreadProgress = class MainThreadProgress {
|
|
|
62
62
|
}
|
|
63
63
|
}
|
|
64
64
|
_createTask(handle) {
|
|
65
|
-
return
|
|
65
|
+
return progress => {
|
|
66
66
|
return ( new Promise(resolve => {
|
|
67
|
-
this._progress.set(handle, {
|
|
67
|
+
this._progress.set(handle, {
|
|
68
|
+
resolve,
|
|
69
|
+
progress
|
|
70
|
+
});
|
|
68
71
|
}));
|
|
69
72
|
};
|
|
70
73
|
}
|
|
71
74
|
};
|
|
72
|
-
MainThreadProgress = MainThreadProgress_1 = __decorate([
|
|
73
|
-
extHostNamedCustomer(MainContext.MainThreadProgress),
|
|
74
|
-
( __param(1, IProgressService)),
|
|
75
|
-
( __param(2, ICommandService))
|
|
76
|
-
], MainThreadProgress);
|
|
75
|
+
MainThreadProgress = MainThreadProgress_1 = __decorate([extHostNamedCustomer(MainContext.MainThreadProgress), ( __param(1, IProgressService)), ( __param(2, ICommandService))], MainThreadProgress);
|
|
77
76
|
|
|
78
77
|
export { MainThreadProgress };
|
|
@@ -19,9 +19,11 @@ let MainThreadQuickDiff = class MainThreadQuickDiff {
|
|
|
19
19
|
label,
|
|
20
20
|
rootUri: URI.revive(rootUri),
|
|
21
21
|
selector,
|
|
22
|
-
kind:
|
|
23
|
-
getOriginalResource: async
|
|
24
|
-
return URI.revive(
|
|
22
|
+
kind: "contributed",
|
|
23
|
+
getOriginalResource: async uri => {
|
|
24
|
+
return URI.revive(
|
|
25
|
+
await this.proxy.$provideOriginalResource(handle, uri, CancellationToken.None)
|
|
26
|
+
);
|
|
25
27
|
}
|
|
26
28
|
};
|
|
27
29
|
const disposable = this.quickDiffService.addQuickDiffProvider(provider);
|
|
@@ -36,9 +38,6 @@ let MainThreadQuickDiff = class MainThreadQuickDiff {
|
|
|
36
38
|
this.providerDisposables.dispose();
|
|
37
39
|
}
|
|
38
40
|
};
|
|
39
|
-
MainThreadQuickDiff = __decorate([
|
|
40
|
-
extHostNamedCustomer(MainContext.MainThreadQuickDiff),
|
|
41
|
-
( __param(1, IQuickDiffService))
|
|
42
|
-
], MainThreadQuickDiff);
|
|
41
|
+
MainThreadQuickDiff = __decorate([extHostNamedCustomer(MainContext.MainThreadQuickDiff), ( __param(1, IQuickDiffService))], MainThreadQuickDiff);
|
|
43
42
|
|
|
44
43
|
export { MainThreadQuickDiff };
|