@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
|
@@ -39,9 +39,16 @@ let MainThreadDebugService = class MainThreadDebugService {
|
|
|
39
39
|
store = ( new DisposableStore());
|
|
40
40
|
sessionListeners.set(session, store);
|
|
41
41
|
}
|
|
42
|
-
store.add(session.onDidCustomEvent(
|
|
42
|
+
store.add(session.onDidCustomEvent(
|
|
43
|
+
event => this._proxy.$acceptDebugSessionCustomEvent(this.getSessionDto(session), event)
|
|
44
|
+
));
|
|
43
45
|
}));
|
|
44
|
-
this._toDispose.add(debugService.onDidEndSession((
|
|
46
|
+
this._toDispose.add(debugService.onDidEndSession((
|
|
47
|
+
{
|
|
48
|
+
session,
|
|
49
|
+
restart
|
|
50
|
+
}
|
|
51
|
+
) => {
|
|
45
52
|
this._proxy.$acceptDebugSessionTerminated(this.getSessionDto(session));
|
|
46
53
|
this._extHostKnownSessions.delete(session.getId());
|
|
47
54
|
if (!restart) {
|
|
@@ -58,7 +65,7 @@ let MainThreadDebugService = class MainThreadDebugService {
|
|
|
58
65
|
}));
|
|
59
66
|
this._toDispose.add(toDisposable(() => {
|
|
60
67
|
for (const [handle, da] of this._debugAdapters) {
|
|
61
|
-
da.fireError(handle, ( new Error(
|
|
68
|
+
da.fireError(handle, ( new Error("Extension host shut down")));
|
|
62
69
|
}
|
|
63
70
|
}));
|
|
64
71
|
this._debugAdapters = ( new Map());
|
|
@@ -66,28 +73,28 @@ let MainThreadDebugService = class MainThreadDebugService {
|
|
|
66
73
|
this._debugAdapterDescriptorFactories = ( new Map());
|
|
67
74
|
this._extHostKnownSessions = ( new Set());
|
|
68
75
|
const viewModel = this.debugService.getViewModel();
|
|
69
|
-
this._toDispose.add(
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
}
|
|
90
|
-
|
|
76
|
+
this._toDispose.add(
|
|
77
|
+
Event.any(viewModel.onDidFocusStackFrame, viewModel.onDidFocusThread)(() => {
|
|
78
|
+
const stackFrame = viewModel.focusedStackFrame;
|
|
79
|
+
const thread = viewModel.focusedThread;
|
|
80
|
+
if (stackFrame) {
|
|
81
|
+
this._proxy.$acceptStackFrameFocus({
|
|
82
|
+
kind: "stackFrame",
|
|
83
|
+
threadId: stackFrame.thread.threadId,
|
|
84
|
+
frameId: stackFrame.frameId,
|
|
85
|
+
sessionId: stackFrame.thread.session.getId()
|
|
86
|
+
});
|
|
87
|
+
} else if (thread) {
|
|
88
|
+
this._proxy.$acceptStackFrameFocus({
|
|
89
|
+
kind: "thread",
|
|
90
|
+
threadId: thread.threadId,
|
|
91
|
+
sessionId: thread.session.getId()
|
|
92
|
+
});
|
|
93
|
+
} else {
|
|
94
|
+
this._proxy.$acceptStackFrameFocus(undefined);
|
|
95
|
+
}
|
|
96
|
+
})
|
|
97
|
+
);
|
|
91
98
|
this.sendBreakpointsAndListen();
|
|
92
99
|
}
|
|
93
100
|
$registerDebugVisualizerTree(treeId, canEdit) {
|
|
@@ -109,7 +116,7 @@ let MainThreadDebugService = class MainThreadDebugService {
|
|
|
109
116
|
disposeDebugVisualizers: ids => this._proxy.$disposeDebugVisualizers(ids),
|
|
110
117
|
executeDebugVisualizerCommand: id => this._proxy.$executeDebugVisualizerCommand(id),
|
|
111
118
|
provideDebugVisualizers: (context, token) => this._proxy.$provideDebugVisualizers(extensionId, id, context, token).then(r => ( r.map(IDebugVisualization.deserialize))),
|
|
112
|
-
resolveDebugVisualizer: (viz, token) => this._proxy.$resolveDebugVisualizer(viz.id, token)
|
|
119
|
+
resolveDebugVisualizer: (viz, token) => this._proxy.$resolveDebugVisualizer(viz.id, token)
|
|
113
120
|
});
|
|
114
121
|
this._visualizerHandles.set(`${extensionId}/${id}`, handle);
|
|
115
122
|
}
|
|
@@ -161,12 +168,14 @@ let MainThreadDebugService = class MainThreadDebugService {
|
|
|
161
168
|
return this._proxy.$runInTerminal(args, sessionId);
|
|
162
169
|
}
|
|
163
170
|
$registerDebugTypes(debugTypes) {
|
|
164
|
-
this._toDispose.add(
|
|
171
|
+
this._toDispose.add(
|
|
172
|
+
this.debugService.getAdapterManager().registerDebugAdapterFactory(debugTypes, this)
|
|
173
|
+
);
|
|
165
174
|
}
|
|
166
175
|
$registerBreakpoints(DTOs) {
|
|
167
176
|
for (const dto of DTOs) {
|
|
168
|
-
if (dto.type ===
|
|
169
|
-
const rawbps = ( dto.lines.map(
|
|
177
|
+
if (dto.type === "sourceMulti") {
|
|
178
|
+
const rawbps = ( dto.lines.map(l => ({
|
|
170
179
|
id: l.id,
|
|
171
180
|
enabled: l.enabled,
|
|
172
181
|
lineNumber: l.line + 1,
|
|
@@ -174,11 +183,10 @@ let MainThreadDebugService = class MainThreadDebugService {
|
|
|
174
183
|
condition: l.condition,
|
|
175
184
|
hitCondition: l.hitCondition,
|
|
176
185
|
logMessage: l.logMessage,
|
|
177
|
-
mode: l.mode
|
|
186
|
+
mode: l.mode
|
|
178
187
|
})));
|
|
179
188
|
this.debugService.addBreakpoints(URI.revive(dto.uri), rawbps);
|
|
180
|
-
}
|
|
181
|
-
else if (dto.type === 'function') {
|
|
189
|
+
} else if (dto.type === "function") {
|
|
182
190
|
this.debugService.addFunctionBreakpoint({
|
|
183
191
|
name: dto.functionName,
|
|
184
192
|
mode: dto.mode,
|
|
@@ -187,11 +195,13 @@ let MainThreadDebugService = class MainThreadDebugService {
|
|
|
187
195
|
enabled: dto.enabled,
|
|
188
196
|
logMessage: dto.logMessage
|
|
189
197
|
}, dto.id);
|
|
190
|
-
}
|
|
191
|
-
else if (dto.type === 'data') {
|
|
198
|
+
} else if (dto.type === "data") {
|
|
192
199
|
this.debugService.addDataBreakpoint({
|
|
193
200
|
description: dto.label,
|
|
194
|
-
src: {
|
|
201
|
+
src: {
|
|
202
|
+
type: DataBreakpointSetType.Variable,
|
|
203
|
+
dataId: dto.dataId
|
|
204
|
+
},
|
|
195
205
|
canPersist: dto.canPersist,
|
|
196
206
|
accessTypes: dto.accessTypes,
|
|
197
207
|
accessType: dto.accessType,
|
|
@@ -207,7 +217,14 @@ let MainThreadDebugService = class MainThreadDebugService {
|
|
|
207
217
|
dataBreakpointIds.forEach(id => this.debugService.removeDataBreakpoints(id));
|
|
208
218
|
return Promise.resolve();
|
|
209
219
|
}
|
|
210
|
-
$registerDebugConfigurationProvider(
|
|
220
|
+
$registerDebugConfigurationProvider(
|
|
221
|
+
debugType,
|
|
222
|
+
providerTriggerKind,
|
|
223
|
+
hasProvide,
|
|
224
|
+
hasResolve,
|
|
225
|
+
hasResolve2,
|
|
226
|
+
handle
|
|
227
|
+
) {
|
|
211
228
|
const provider = {
|
|
212
229
|
type: debugType,
|
|
213
230
|
triggerKind: providerTriggerKind
|
|
@@ -228,7 +245,9 @@ let MainThreadDebugService = class MainThreadDebugService {
|
|
|
228
245
|
};
|
|
229
246
|
}
|
|
230
247
|
this._debugConfigurationProviders.set(handle, provider);
|
|
231
|
-
this._toDispose.add(
|
|
248
|
+
this._toDispose.add(
|
|
249
|
+
this.debugService.getConfigurationManager().registerDebugConfigurationProvider(provider)
|
|
250
|
+
);
|
|
232
251
|
return Promise.resolve(undefined);
|
|
233
252
|
}
|
|
234
253
|
$unregisterDebugConfigurationProvider(handle) {
|
|
@@ -246,7 +265,9 @@ let MainThreadDebugService = class MainThreadDebugService {
|
|
|
246
265
|
}
|
|
247
266
|
};
|
|
248
267
|
this._debugAdapterDescriptorFactories.set(handle, provider);
|
|
249
|
-
this._toDispose.add(
|
|
268
|
+
this._toDispose.add(
|
|
269
|
+
this.debugService.getAdapterManager().registerDebugAdapterDescriptorFactory(provider)
|
|
270
|
+
);
|
|
250
271
|
return Promise.resolve(undefined);
|
|
251
272
|
}
|
|
252
273
|
$unregisterDebugAdapterDescriptorFactory(handle) {
|
|
@@ -266,7 +287,7 @@ let MainThreadDebugService = class MainThreadDebugService {
|
|
|
266
287
|
const folderUri = folder ? URI.revive(folder) : undefined;
|
|
267
288
|
const launch = this.debugService.getConfigurationManager().getLaunch(folderUri);
|
|
268
289
|
const parentSession = this.getSession(options.parentSessionID);
|
|
269
|
-
const saveBeforeStart = typeof options.suppressSaveBeforeStart ===
|
|
290
|
+
const saveBeforeStart = typeof options.suppressSaveBeforeStart === "boolean" ? !options.suppressSaveBeforeStart : undefined;
|
|
270
291
|
const debugOptions = {
|
|
271
292
|
noDebug: options.noDebug,
|
|
272
293
|
parentSession,
|
|
@@ -278,13 +299,12 @@ let MainThreadDebugService = class MainThreadDebugService {
|
|
|
278
299
|
testRun: options.testRun,
|
|
279
300
|
suppressDebugStatusbar: options.suppressDebugStatusbar,
|
|
280
301
|
suppressDebugToolbar: options.suppressDebugToolbar,
|
|
281
|
-
suppressDebugView: options.suppressDebugView
|
|
302
|
+
suppressDebugView: options.suppressDebugView
|
|
282
303
|
};
|
|
283
304
|
try {
|
|
284
305
|
return this.debugService.startDebugging(launch, nameOrConfig, debugOptions, saveBeforeStart);
|
|
285
|
-
}
|
|
286
|
-
|
|
287
|
-
throw ( new ErrorNoTelemetry(err && err.message ? err.message : 'cannot start debugging'));
|
|
306
|
+
} catch (err) {
|
|
307
|
+
throw ( new ErrorNoTelemetry(err && err.message ? err.message : "cannot start debugging"));
|
|
288
308
|
}
|
|
289
309
|
}
|
|
290
310
|
$setDebugSessionName(sessionId, name) {
|
|
@@ -297,20 +317,19 @@ let MainThreadDebugService = class MainThreadDebugService {
|
|
|
297
317
|
return session.customRequest(request, args).then(response => {
|
|
298
318
|
if (response && response.success) {
|
|
299
319
|
return response.body;
|
|
300
|
-
}
|
|
301
|
-
|
|
302
|
-
return Promise.reject(( new ErrorNoTelemetry(response ? response.message : 'custom request failed')));
|
|
320
|
+
} else {
|
|
321
|
+
return Promise.reject(( new ErrorNoTelemetry(response ? response.message : "custom request failed")));
|
|
303
322
|
}
|
|
304
323
|
});
|
|
305
324
|
}
|
|
306
|
-
return Promise.reject(( new ErrorNoTelemetry(
|
|
325
|
+
return Promise.reject(( new ErrorNoTelemetry("debug session not found")));
|
|
307
326
|
}
|
|
308
327
|
$getDebugProtocolBreakpoint(sessionId, breakpoinId) {
|
|
309
328
|
const session = this.debugService.getModel().getSession(sessionId, true);
|
|
310
329
|
if (session) {
|
|
311
330
|
return Promise.resolve(session.getDebugProtocolBreakpoint(breakpoinId));
|
|
312
331
|
}
|
|
313
|
-
return Promise.reject(( new ErrorNoTelemetry(
|
|
332
|
+
return Promise.reject(( new ErrorNoTelemetry("debug session not found")));
|
|
314
333
|
}
|
|
315
334
|
$stopDebugging(sessionId) {
|
|
316
335
|
if (sessionId) {
|
|
@@ -318,15 +337,17 @@ let MainThreadDebugService = class MainThreadDebugService {
|
|
|
318
337
|
if (session) {
|
|
319
338
|
return this.debugService.stopSession(session, isSessionAttach(session));
|
|
320
339
|
}
|
|
321
|
-
}
|
|
322
|
-
else {
|
|
340
|
+
} else {
|
|
323
341
|
return this.debugService.stopSession(undefined);
|
|
324
342
|
}
|
|
325
|
-
return Promise.reject(( new ErrorNoTelemetry(
|
|
343
|
+
return Promise.reject(( new ErrorNoTelemetry("debug session not found")));
|
|
326
344
|
}
|
|
327
345
|
$appendDebugConsole(value) {
|
|
328
346
|
const session = this.debugService.getViewModel().focusedSession;
|
|
329
|
-
session?.appendToRepl({
|
|
347
|
+
session?.appendToRepl({
|
|
348
|
+
output: value,
|
|
349
|
+
sev: Severity.Warning
|
|
350
|
+
});
|
|
330
351
|
}
|
|
331
352
|
$acceptDAMessage(handle, message) {
|
|
332
353
|
this.getDebugAdapter(handle).acceptMessage(convertToVSCPaths(message, false));
|
|
@@ -340,7 +361,7 @@ let MainThreadDebugService = class MainThreadDebugService {
|
|
|
340
361
|
getDebugAdapter(handle) {
|
|
341
362
|
const adapter = this._debugAdapters.get(handle);
|
|
342
363
|
if (!adapter) {
|
|
343
|
-
throw ( new Error(
|
|
364
|
+
throw ( new Error("Invalid debug adapter"));
|
|
344
365
|
}
|
|
345
366
|
return adapter;
|
|
346
367
|
}
|
|
@@ -352,15 +373,14 @@ let MainThreadDebugService = class MainThreadDebugService {
|
|
|
352
373
|
const sessionID = session.getId();
|
|
353
374
|
if (( this._extHostKnownSessions.has(sessionID))) {
|
|
354
375
|
return sessionID;
|
|
355
|
-
}
|
|
356
|
-
else {
|
|
376
|
+
} else {
|
|
357
377
|
return {
|
|
358
378
|
id: sessionID,
|
|
359
379
|
type: session.configuration.type,
|
|
360
380
|
name: session.name,
|
|
361
381
|
folderUri: session.root ? session.root.uri : undefined,
|
|
362
382
|
configuration: session.configuration,
|
|
363
|
-
parent: session.parentSession?.getId()
|
|
383
|
+
parent: session.parentSession?.getId()
|
|
364
384
|
};
|
|
365
385
|
}
|
|
366
386
|
}
|
|
@@ -368,10 +388,10 @@ let MainThreadDebugService = class MainThreadDebugService {
|
|
|
368
388
|
}
|
|
369
389
|
convertToDto(bps) {
|
|
370
390
|
return ( bps.map(bp => {
|
|
371
|
-
if (
|
|
391
|
+
if ("name" in bp) {
|
|
372
392
|
const fbp = bp;
|
|
373
393
|
return {
|
|
374
|
-
type:
|
|
394
|
+
type: "function",
|
|
375
395
|
id: fbp.getId(),
|
|
376
396
|
enabled: fbp.enabled,
|
|
377
397
|
condition: fbp.condition,
|
|
@@ -379,11 +399,10 @@ let MainThreadDebugService = class MainThreadDebugService {
|
|
|
379
399
|
logMessage: fbp.logMessage,
|
|
380
400
|
functionName: fbp.name
|
|
381
401
|
};
|
|
382
|
-
}
|
|
383
|
-
else if ('src' in bp) {
|
|
402
|
+
} else if ("src" in bp) {
|
|
384
403
|
const dbp = bp;
|
|
385
404
|
return {
|
|
386
|
-
type:
|
|
405
|
+
type: "data",
|
|
387
406
|
id: dbp.getId(),
|
|
388
407
|
dataId: dbp.src.type === DataBreakpointSetType.Variable ? dbp.src.dataId : dbp.src.address,
|
|
389
408
|
enabled: dbp.enabled,
|
|
@@ -394,11 +413,10 @@ let MainThreadDebugService = class MainThreadDebugService {
|
|
|
394
413
|
label: dbp.description,
|
|
395
414
|
canPersist: dbp.canPersist
|
|
396
415
|
};
|
|
397
|
-
}
|
|
398
|
-
else if ('uri' in bp) {
|
|
416
|
+
} else if ("uri" in bp) {
|
|
399
417
|
const sbp = bp;
|
|
400
418
|
return {
|
|
401
|
-
type:
|
|
419
|
+
type: "source",
|
|
402
420
|
id: sbp.getId(),
|
|
403
421
|
enabled: sbp.enabled,
|
|
404
422
|
condition: sbp.condition,
|
|
@@ -406,20 +424,15 @@ let MainThreadDebugService = class MainThreadDebugService {
|
|
|
406
424
|
logMessage: sbp.logMessage,
|
|
407
425
|
uri: sbp.uri,
|
|
408
426
|
line: sbp.lineNumber > 0 ? sbp.lineNumber - 1 : 0,
|
|
409
|
-
character: (typeof sbp.column ===
|
|
427
|
+
character: (typeof sbp.column === "number" && sbp.column > 0) ? sbp.column - 1 : 0
|
|
410
428
|
};
|
|
411
|
-
}
|
|
412
|
-
else {
|
|
429
|
+
} else {
|
|
413
430
|
return undefined;
|
|
414
431
|
}
|
|
415
432
|
})).filter(isDefined);
|
|
416
433
|
}
|
|
417
434
|
};
|
|
418
|
-
MainThreadDebugService = __decorate([
|
|
419
|
-
extHostNamedCustomer(MainContext.MainThreadDebugService),
|
|
420
|
-
( __param(1, IDebugService)),
|
|
421
|
-
( __param(2, IDebugVisualizerService))
|
|
422
|
-
], MainThreadDebugService);
|
|
435
|
+
MainThreadDebugService = __decorate([extHostNamedCustomer(MainContext.MainThreadDebugService), ( __param(1, IDebugService)), ( __param(2, IDebugVisualizerService))], MainThreadDebugService);
|
|
423
436
|
class ExtensionHostDebugAdapter extends AbstractDebugAdapter {
|
|
424
437
|
constructor(_ds, _handle, _proxy, session) {
|
|
425
438
|
super();
|
|
@@ -435,7 +448,9 @@ class ExtensionHostDebugAdapter extends AbstractDebugAdapter {
|
|
|
435
448
|
this._onExit.fire(code);
|
|
436
449
|
}
|
|
437
450
|
startSession() {
|
|
438
|
-
return Promise.resolve(
|
|
451
|
+
return Promise.resolve(
|
|
452
|
+
this._proxy.$startDASession(this._handle, this._ds.getSessionDto(this.session))
|
|
453
|
+
);
|
|
439
454
|
}
|
|
440
455
|
sendMessage(message) {
|
|
441
456
|
this._proxy.$sendDAMessage(this._handle, convertToDAPaths(message, true));
|
|
@@ -21,7 +21,10 @@ class DecorationRequestsQueue {
|
|
|
21
21
|
enqueue(uri, token) {
|
|
22
22
|
const id = ++this._idPool;
|
|
23
23
|
const defer = ( new DeferredPromise());
|
|
24
|
-
this._requests.set(id, {
|
|
24
|
+
this._requests.set(id, {
|
|
25
|
+
id,
|
|
26
|
+
uri
|
|
27
|
+
});
|
|
25
28
|
this._resolver.set(id, defer);
|
|
26
29
|
this._processQueue();
|
|
27
30
|
const sub = token.onCancellationRequested(() => {
|
|
@@ -97,9 +100,6 @@ let MainThreadDecorations = class MainThreadDecorations {
|
|
|
97
100
|
}
|
|
98
101
|
}
|
|
99
102
|
};
|
|
100
|
-
MainThreadDecorations = __decorate([
|
|
101
|
-
extHostNamedCustomer(MainContext.MainThreadDecorations),
|
|
102
|
-
( __param(1, IDecorationsService))
|
|
103
|
-
], MainThreadDecorations);
|
|
103
|
+
MainThreadDecorations = __decorate([extHostNamedCustomer(MainContext.MainThreadDecorations), ( __param(1, IDecorationsService))], MainThreadDecorations);
|
|
104
104
|
|
|
105
105
|
export { MainThreadDecorations };
|
|
@@ -9,8 +9,12 @@ import { ResourceMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/
|
|
|
9
9
|
|
|
10
10
|
var MainThreadDiagnostics_1;
|
|
11
11
|
let MainThreadDiagnostics = class MainThreadDiagnostics {
|
|
12
|
-
static {
|
|
13
|
-
|
|
12
|
+
static {
|
|
13
|
+
MainThreadDiagnostics_1 = this;
|
|
14
|
+
}
|
|
15
|
+
static {
|
|
16
|
+
this.ExtHostCounter = 1;
|
|
17
|
+
}
|
|
14
18
|
constructor(extHostContext, _markerService, _uriIdentService) {
|
|
15
19
|
this._markerService = _markerService;
|
|
16
20
|
this._uriIdentService = _uriIdentService;
|
|
@@ -23,7 +27,9 @@ let MainThreadDiagnostics = class MainThreadDiagnostics {
|
|
|
23
27
|
this._markerListener.dispose();
|
|
24
28
|
for (const owner of this._activeOwners) {
|
|
25
29
|
const markersData = ( new ResourceMap());
|
|
26
|
-
for (const marker of this._markerService.read({
|
|
30
|
+
for (const marker of this._markerService.read({
|
|
31
|
+
owner
|
|
32
|
+
})) {
|
|
27
33
|
let data = markersData.get(marker.resource);
|
|
28
34
|
if (data === undefined) {
|
|
29
35
|
data = [];
|
|
@@ -42,11 +48,13 @@ let MainThreadDiagnostics = class MainThreadDiagnostics {
|
|
|
42
48
|
_forwardMarkers(resources) {
|
|
43
49
|
const data = [];
|
|
44
50
|
for (const resource of resources) {
|
|
45
|
-
const allMarkerData = this._markerService.read({
|
|
51
|
+
const allMarkerData = this._markerService.read({
|
|
52
|
+
resource,
|
|
53
|
+
ignoreResourceFilters: true
|
|
54
|
+
});
|
|
46
55
|
if (allMarkerData.length === 0) {
|
|
47
56
|
data.push([resource, []]);
|
|
48
|
-
}
|
|
49
|
-
else {
|
|
57
|
+
} else {
|
|
50
58
|
const foreignMarkerData = allMarkerData.filter(marker => marker?.origin !== this.extHostId);
|
|
51
59
|
if (foreignMarkerData.length > 0) {
|
|
52
60
|
data.push([resource, foreignMarkerData]);
|
|
@@ -67,7 +75,7 @@ let MainThreadDiagnostics = class MainThreadDiagnostics {
|
|
|
67
75
|
relatedInformation.resource = URI.revive(relatedInformation.resource);
|
|
68
76
|
}
|
|
69
77
|
}
|
|
70
|
-
if (marker.code && typeof marker.code !==
|
|
78
|
+
if (marker.code && typeof marker.code !== "string") {
|
|
71
79
|
marker.code.target = URI.revive(marker.code.target);
|
|
72
80
|
}
|
|
73
81
|
if (marker.origin === undefined) {
|
|
@@ -84,10 +92,6 @@ let MainThreadDiagnostics = class MainThreadDiagnostics {
|
|
|
84
92
|
this._activeOwners.delete(owner);
|
|
85
93
|
}
|
|
86
94
|
};
|
|
87
|
-
MainThreadDiagnostics = MainThreadDiagnostics_1 = __decorate([
|
|
88
|
-
extHostNamedCustomer(MainContext.MainThreadDiagnostics),
|
|
89
|
-
( __param(1, IMarkerService)),
|
|
90
|
-
( __param(2, IUriIdentityService))
|
|
91
|
-
], MainThreadDiagnostics);
|
|
95
|
+
MainThreadDiagnostics = MainThreadDiagnostics_1 = __decorate([extHostNamedCustomer(MainContext.MainThreadDiagnostics), ( __param(1, IMarkerService)), ( __param(2, IUriIdentityService))], MainThreadDiagnostics);
|
|
92
96
|
|
|
93
97
|
export { MainThreadDiagnostics };
|
|
@@ -10,8 +10,7 @@ let MainThreadDialogs = MainThreadDialogs_1 = class MainThreadDialogs {
|
|
|
10
10
|
constructor(context, _fileDialogService) {
|
|
11
11
|
this._fileDialogService = _fileDialogService;
|
|
12
12
|
}
|
|
13
|
-
dispose() {
|
|
14
|
-
}
|
|
13
|
+
dispose() {}
|
|
15
14
|
async $showOpenDialog(options) {
|
|
16
15
|
const convertedOptions = MainThreadDialogs_1._convertOpenOptions(options);
|
|
17
16
|
if (!convertedOptions.defaultUri) {
|
|
@@ -39,7 +38,10 @@ let MainThreadDialogs = MainThreadDialogs_1 = class MainThreadDialogs {
|
|
|
39
38
|
if (options?.filters) {
|
|
40
39
|
result.filters = [];
|
|
41
40
|
for (const [key, value] of Object.entries(options.filters)) {
|
|
42
|
-
result.filters.push({
|
|
41
|
+
result.filters.push({
|
|
42
|
+
name: key,
|
|
43
|
+
extensions: value
|
|
44
|
+
});
|
|
43
45
|
}
|
|
44
46
|
}
|
|
45
47
|
return result;
|
|
@@ -53,15 +55,15 @@ let MainThreadDialogs = MainThreadDialogs_1 = class MainThreadDialogs {
|
|
|
53
55
|
if (options?.filters) {
|
|
54
56
|
result.filters = [];
|
|
55
57
|
for (const [key, value] of Object.entries(options.filters)) {
|
|
56
|
-
result.filters.push({
|
|
58
|
+
result.filters.push({
|
|
59
|
+
name: key,
|
|
60
|
+
extensions: value
|
|
61
|
+
});
|
|
57
62
|
}
|
|
58
63
|
}
|
|
59
64
|
return result;
|
|
60
65
|
}
|
|
61
66
|
};
|
|
62
|
-
MainThreadDialogs = MainThreadDialogs_1 = __decorate([
|
|
63
|
-
extHostNamedCustomer(MainContext.MainThreadDialogs),
|
|
64
|
-
( __param(1, IFileDialogService))
|
|
65
|
-
], MainThreadDialogs);
|
|
67
|
+
MainThreadDialogs = MainThreadDialogs_1 = __decorate([extHostNamedCustomer(MainContext.MainThreadDialogs), ( __param(1, IFileDialogService))], MainThreadDialogs);
|
|
66
68
|
|
|
67
69
|
export { MainThreadDialogs };
|
|
@@ -14,7 +14,13 @@ import { ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode
|
|
|
14
14
|
import { CancellationTokenSource } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
|
|
15
15
|
|
|
16
16
|
let MainThreadDocumentContentProviders = class MainThreadDocumentContentProviders {
|
|
17
|
-
constructor(
|
|
17
|
+
constructor(
|
|
18
|
+
extHostContext,
|
|
19
|
+
_textModelResolverService,
|
|
20
|
+
_languageService,
|
|
21
|
+
_modelService,
|
|
22
|
+
_editorWorkerService
|
|
23
|
+
) {
|
|
18
24
|
this._textModelResolverService = _textModelResolverService;
|
|
19
25
|
this._languageService = _languageService;
|
|
20
26
|
this._modelService = _modelService;
|
|
@@ -29,9 +35,9 @@ let MainThreadDocumentContentProviders = class MainThreadDocumentContentProvider
|
|
|
29
35
|
}
|
|
30
36
|
$registerTextContentProvider(handle, scheme) {
|
|
31
37
|
const registration = this._textModelResolverService.registerTextModelContentProvider(scheme, {
|
|
32
|
-
provideTextContent:
|
|
38
|
+
provideTextContent: uri => {
|
|
33
39
|
return this._proxy.$provideTextDocumentContent(handle, uri).then(value => {
|
|
34
|
-
if (typeof value ===
|
|
40
|
+
if (typeof value === "string") {
|
|
35
41
|
const firstLineText = value.substr(0, 1 + value.search(/\r?\n/));
|
|
36
42
|
const languageSelection = this._languageService.createByFilepathOrFirstLine(uri, firstLineText);
|
|
37
43
|
return this._modelService.createModel(value, languageSelection, uri);
|
|
@@ -55,7 +61,10 @@ let MainThreadDocumentContentProviders = class MainThreadDocumentContentProvider
|
|
|
55
61
|
const myToken = ( new CancellationTokenSource());
|
|
56
62
|
this._pendingUpdate.set(model.id, myToken);
|
|
57
63
|
try {
|
|
58
|
-
const edits = await this._editorWorkerService.computeMoreMinimalEdits(model.uri, [{
|
|
64
|
+
const edits = await this._editorWorkerService.computeMoreMinimalEdits(model.uri, [{
|
|
65
|
+
text: value,
|
|
66
|
+
range: model.getFullModelRange()
|
|
67
|
+
}]);
|
|
59
68
|
this._pendingUpdate.delete(model.id);
|
|
60
69
|
if (myToken.token.isCancellationRequested) {
|
|
61
70
|
return;
|
|
@@ -66,8 +75,7 @@ let MainThreadDocumentContentProviders = class MainThreadDocumentContentProvider
|
|
|
66
75
|
if (edits && edits.length > 0) {
|
|
67
76
|
model.applyEdits(( edits.map(edit => EditOperation.replace(Range.lift(edit.range), edit.text))));
|
|
68
77
|
}
|
|
69
|
-
}
|
|
70
|
-
catch (error) {
|
|
78
|
+
} catch (error) {
|
|
71
79
|
onUnexpectedError(error);
|
|
72
80
|
}
|
|
73
81
|
}
|