@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
|
@@ -33,7 +33,15 @@ import { sendInlineCompletionsEndOfLifeTelemetry } from '@codingame/monaco-vscod
|
|
|
33
33
|
|
|
34
34
|
var MainThreadLanguageFeatures_1;
|
|
35
35
|
let MainThreadLanguageFeatures = MainThreadLanguageFeatures_1 = class MainThreadLanguageFeatures extends Disposable {
|
|
36
|
-
constructor(
|
|
36
|
+
constructor(
|
|
37
|
+
extHostContext,
|
|
38
|
+
_languageService,
|
|
39
|
+
_languageConfigurationService,
|
|
40
|
+
_languageFeaturesService,
|
|
41
|
+
_uriIdentService,
|
|
42
|
+
_instantiationService,
|
|
43
|
+
_inlineCompletionsUnificationService
|
|
44
|
+
) {
|
|
37
45
|
super();
|
|
38
46
|
this._languageService = _languageService;
|
|
39
47
|
this._languageConfigurationService = _languageConfigurationService;
|
|
@@ -58,17 +66,16 @@ let MainThreadLanguageFeatures = MainThreadLanguageFeatures_1 = class MainThread
|
|
|
58
66
|
}
|
|
59
67
|
this._proxy.$setWordDefinitions(wordDefinitionDtos);
|
|
60
68
|
};
|
|
61
|
-
this._register(this._languageConfigurationService.onDidChange(
|
|
69
|
+
this._register(this._languageConfigurationService.onDidChange(e => {
|
|
62
70
|
if (!e.languageId) {
|
|
63
71
|
updateAllWordDefinitions();
|
|
64
|
-
}
|
|
65
|
-
else {
|
|
72
|
+
} else {
|
|
66
73
|
const wordDefinition = this._languageConfigurationService.getLanguageConfiguration(e.languageId).getWordDefinition();
|
|
67
74
|
this._proxy.$setWordDefinitions([{
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
75
|
+
languageId: e.languageId,
|
|
76
|
+
regexSource: wordDefinition.source,
|
|
77
|
+
regexFlags: wordDefinition.flags
|
|
78
|
+
}]);
|
|
72
79
|
}
|
|
73
80
|
}));
|
|
74
81
|
updateAllWordDefinitions();
|
|
@@ -86,12 +93,10 @@ let MainThreadLanguageFeatures = MainThreadLanguageFeatures_1 = class MainThread
|
|
|
86
93
|
static _reviveLocationDto(data) {
|
|
87
94
|
if (!data) {
|
|
88
95
|
return data;
|
|
89
|
-
}
|
|
90
|
-
else if (Array.isArray(data)) {
|
|
96
|
+
} else if (Array.isArray(data)) {
|
|
91
97
|
data.forEach(l => MainThreadLanguageFeatures_1._reviveLocationDto(l));
|
|
92
98
|
return data;
|
|
93
|
-
}
|
|
94
|
-
else {
|
|
99
|
+
} else {
|
|
95
100
|
data.uri = URI.revive(data.uri);
|
|
96
101
|
return data;
|
|
97
102
|
}
|
|
@@ -99,12 +104,10 @@ let MainThreadLanguageFeatures = MainThreadLanguageFeatures_1 = class MainThread
|
|
|
99
104
|
static _reviveLocationLinkDto(data) {
|
|
100
105
|
if (!data) {
|
|
101
106
|
return data;
|
|
102
|
-
}
|
|
103
|
-
else if (Array.isArray(data)) {
|
|
107
|
+
} else if (Array.isArray(data)) {
|
|
104
108
|
data.forEach(l => MainThreadLanguageFeatures_1._reviveLocationLinkDto(l));
|
|
105
109
|
return data;
|
|
106
|
-
}
|
|
107
|
-
else {
|
|
110
|
+
} else {
|
|
108
111
|
data.uri = URI.revive(data.uri);
|
|
109
112
|
return data;
|
|
110
113
|
}
|
|
@@ -112,12 +115,10 @@ let MainThreadLanguageFeatures = MainThreadLanguageFeatures_1 = class MainThread
|
|
|
112
115
|
static _reviveWorkspaceSymbolDto(data) {
|
|
113
116
|
if (!data) {
|
|
114
117
|
return data;
|
|
115
|
-
}
|
|
116
|
-
else if (Array.isArray(data)) {
|
|
118
|
+
} else if (Array.isArray(data)) {
|
|
117
119
|
data.forEach(MainThreadLanguageFeatures_1._reviveWorkspaceSymbolDto);
|
|
118
120
|
return data;
|
|
119
|
-
}
|
|
120
|
-
else {
|
|
121
|
+
} else {
|
|
121
122
|
data.location = MainThreadLanguageFeatures_1._reviveLocationDto(data.location);
|
|
122
123
|
return data;
|
|
123
124
|
}
|
|
@@ -127,7 +128,7 @@ let MainThreadLanguageFeatures = MainThreadLanguageFeatures_1 = class MainThread
|
|
|
127
128
|
return data;
|
|
128
129
|
}
|
|
129
130
|
static _reviveLinkDTO(data) {
|
|
130
|
-
if (data.url && typeof data.url !==
|
|
131
|
+
if (data.url && typeof data.url !== "string") {
|
|
131
132
|
data.url = URI.revive(data.url);
|
|
132
133
|
}
|
|
133
134
|
return data;
|
|
@@ -145,12 +146,15 @@ let MainThreadLanguageFeatures = MainThreadLanguageFeatures_1 = class MainThread
|
|
|
145
146
|
return data;
|
|
146
147
|
}
|
|
147
148
|
$registerDocumentSymbolProvider(handle, selector, displayName) {
|
|
148
|
-
this._registrations.set(
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
149
|
+
this._registrations.set(
|
|
150
|
+
handle,
|
|
151
|
+
this._languageFeaturesService.documentSymbolProvider.register(selector, {
|
|
152
|
+
displayName,
|
|
153
|
+
provideDocumentSymbols: (model, token) => {
|
|
154
|
+
return this._proxy.$provideDocumentSymbols(handle, model.uri, token);
|
|
155
|
+
}
|
|
156
|
+
})
|
|
157
|
+
);
|
|
154
158
|
}
|
|
155
159
|
$registerCodeLensSupport(handle, selector, eventHandle) {
|
|
156
160
|
const provider = {
|
|
@@ -171,16 +175,19 @@ let MainThreadLanguageFeatures = MainThreadLanguageFeatures_1 = class MainThread
|
|
|
171
175
|
}
|
|
172
176
|
return {
|
|
173
177
|
...result,
|
|
174
|
-
range: model.validateRange(result.range)
|
|
178
|
+
range: model.validateRange(result.range)
|
|
175
179
|
};
|
|
176
180
|
}
|
|
177
181
|
};
|
|
178
|
-
if (typeof eventHandle ===
|
|
182
|
+
if (typeof eventHandle === "number") {
|
|
179
183
|
const emitter = ( new Emitter());
|
|
180
184
|
this._registrations.set(eventHandle, emitter);
|
|
181
185
|
provider.onDidChange = emitter.event;
|
|
182
186
|
}
|
|
183
|
-
this._registrations.set(
|
|
187
|
+
this._registrations.set(
|
|
188
|
+
handle,
|
|
189
|
+
this._languageFeaturesService.codeLensProvider.register(selector, provider)
|
|
190
|
+
);
|
|
184
191
|
}
|
|
185
192
|
$emitCodeLensEvent(eventHandle, event) {
|
|
186
193
|
const obj = this._registrations.get(eventHandle);
|
|
@@ -189,32 +196,44 @@ let MainThreadLanguageFeatures = MainThreadLanguageFeatures_1 = class MainThread
|
|
|
189
196
|
}
|
|
190
197
|
}
|
|
191
198
|
$registerDefinitionSupport(handle, selector) {
|
|
192
|
-
this._registrations.set(
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
199
|
+
this._registrations.set(
|
|
200
|
+
handle,
|
|
201
|
+
this._languageFeaturesService.definitionProvider.register(selector, {
|
|
202
|
+
provideDefinition: (model, position, token) => {
|
|
203
|
+
return this._proxy.$provideDefinition(handle, model.uri, position, token).then(MainThreadLanguageFeatures_1._reviveLocationLinkDto);
|
|
204
|
+
}
|
|
205
|
+
})
|
|
206
|
+
);
|
|
197
207
|
}
|
|
198
208
|
$registerDeclarationSupport(handle, selector) {
|
|
199
|
-
this._registrations.set(
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
209
|
+
this._registrations.set(
|
|
210
|
+
handle,
|
|
211
|
+
this._languageFeaturesService.declarationProvider.register(selector, {
|
|
212
|
+
provideDeclaration: (model, position, token) => {
|
|
213
|
+
return this._proxy.$provideDeclaration(handle, model.uri, position, token).then(MainThreadLanguageFeatures_1._reviveLocationLinkDto);
|
|
214
|
+
}
|
|
215
|
+
})
|
|
216
|
+
);
|
|
204
217
|
}
|
|
205
218
|
$registerImplementationSupport(handle, selector) {
|
|
206
|
-
this._registrations.set(
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
219
|
+
this._registrations.set(
|
|
220
|
+
handle,
|
|
221
|
+
this._languageFeaturesService.implementationProvider.register(selector, {
|
|
222
|
+
provideImplementation: (model, position, token) => {
|
|
223
|
+
return this._proxy.$provideImplementation(handle, model.uri, position, token).then(MainThreadLanguageFeatures_1._reviveLocationLinkDto);
|
|
224
|
+
}
|
|
225
|
+
})
|
|
226
|
+
);
|
|
211
227
|
}
|
|
212
228
|
$registerTypeDefinitionSupport(handle, selector) {
|
|
213
|
-
this._registrations.set(
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
229
|
+
this._registrations.set(
|
|
230
|
+
handle,
|
|
231
|
+
this._languageFeaturesService.typeDefinitionProvider.register(selector, {
|
|
232
|
+
provideTypeDefinition: (model, position, token) => {
|
|
233
|
+
return this._proxy.$provideTypeDefinition(handle, model.uri, position, token).then(MainThreadLanguageFeatures_1._reviveLocationLinkDto);
|
|
234
|
+
}
|
|
235
|
+
})
|
|
236
|
+
);
|
|
218
237
|
}
|
|
219
238
|
$registerHoverProvider(handle, selector) {
|
|
220
239
|
this._registrations.set(handle, this._languageFeaturesService.hoverProvider.register(selector, {
|
|
@@ -222,8 +241,10 @@ let MainThreadLanguageFeatures = MainThreadLanguageFeatures_1 = class MainThread
|
|
|
222
241
|
const serializedContext = {
|
|
223
242
|
verbosityRequest: context?.verbosityRequest ? {
|
|
224
243
|
verbosityDelta: context.verbosityRequest.verbosityDelta,
|
|
225
|
-
previousHover: {
|
|
226
|
-
|
|
244
|
+
previousHover: {
|
|
245
|
+
id: context.verbosityRequest.previousHover.id
|
|
246
|
+
}
|
|
247
|
+
} : undefined
|
|
227
248
|
};
|
|
228
249
|
const hover = await this._proxy.$provideHover(handle, model.uri, position, serializedContext, token);
|
|
229
250
|
return hover;
|
|
@@ -231,11 +252,14 @@ let MainThreadLanguageFeatures = MainThreadLanguageFeatures_1 = class MainThread
|
|
|
231
252
|
}));
|
|
232
253
|
}
|
|
233
254
|
$registerEvaluatableExpressionProvider(handle, selector) {
|
|
234
|
-
this._registrations.set(
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
255
|
+
this._registrations.set(
|
|
256
|
+
handle,
|
|
257
|
+
this._languageFeaturesService.evaluatableExpressionProvider.register(selector, {
|
|
258
|
+
provideEvaluatableExpression: (model, position, token) => {
|
|
259
|
+
return this._proxy.$provideEvaluatableExpression(handle, model.uri, position, token);
|
|
260
|
+
}
|
|
261
|
+
})
|
|
262
|
+
);
|
|
239
263
|
}
|
|
240
264
|
$registerInlineValuesProvider(handle, selector, eventHandle) {
|
|
241
265
|
const provider = {
|
|
@@ -243,12 +267,15 @@ let MainThreadLanguageFeatures = MainThreadLanguageFeatures_1 = class MainThread
|
|
|
243
267
|
return this._proxy.$provideInlineValues(handle, model.uri, viewPort, context, token);
|
|
244
268
|
}
|
|
245
269
|
};
|
|
246
|
-
if (typeof eventHandle ===
|
|
270
|
+
if (typeof eventHandle === "number") {
|
|
247
271
|
const emitter = ( new Emitter());
|
|
248
272
|
this._registrations.set(eventHandle, emitter);
|
|
249
273
|
provider.onDidChangeInlineValues = emitter.event;
|
|
250
274
|
}
|
|
251
|
-
this._registrations.set(
|
|
275
|
+
this._registrations.set(
|
|
276
|
+
handle,
|
|
277
|
+
this._languageFeaturesService.inlineValuesProvider.register(selector, provider)
|
|
278
|
+
);
|
|
252
279
|
}
|
|
253
280
|
$emitInlineValuesEvent(eventHandle, event) {
|
|
254
281
|
const obj = this._registrations.get(eventHandle);
|
|
@@ -257,55 +284,66 @@ let MainThreadLanguageFeatures = MainThreadLanguageFeatures_1 = class MainThread
|
|
|
257
284
|
}
|
|
258
285
|
}
|
|
259
286
|
$registerDocumentHighlightProvider(handle, selector) {
|
|
260
|
-
this._registrations.set(
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
287
|
+
this._registrations.set(
|
|
288
|
+
handle,
|
|
289
|
+
this._languageFeaturesService.documentHighlightProvider.register(selector, {
|
|
290
|
+
provideDocumentHighlights: (model, position, token) => {
|
|
291
|
+
return this._proxy.$provideDocumentHighlights(handle, model.uri, position, token);
|
|
292
|
+
}
|
|
293
|
+
})
|
|
294
|
+
);
|
|
265
295
|
}
|
|
266
296
|
$registerMultiDocumentHighlightProvider(handle, selector) {
|
|
267
|
-
this._registrations.set(
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
dto?.forEach(value => {
|
|
276
|
-
const uri = URI.revive(value.uri);
|
|
277
|
-
if (( result.has(uri))) {
|
|
278
|
-
result.get(uri).push(...value.highlights);
|
|
279
|
-
}
|
|
280
|
-
else {
|
|
281
|
-
result.set(uri, value.highlights);
|
|
297
|
+
this._registrations.set(
|
|
298
|
+
handle,
|
|
299
|
+
this._languageFeaturesService.multiDocumentHighlightProvider.register(selector, {
|
|
300
|
+
selector: selector,
|
|
301
|
+
provideMultiDocumentHighlights: (model, position, otherModels, token) => {
|
|
302
|
+
return this._proxy.$provideMultiDocumentHighlights(handle, model.uri, position, ( otherModels.map(model => model.uri)), token).then(dto => {
|
|
303
|
+
if (dto === undefined || dto === null) {
|
|
304
|
+
return undefined;
|
|
282
305
|
}
|
|
306
|
+
const result = ( new ResourceMap());
|
|
307
|
+
dto?.forEach(value => {
|
|
308
|
+
const uri = URI.revive(value.uri);
|
|
309
|
+
if (( result.has(uri))) {
|
|
310
|
+
result.get(uri).push(...value.highlights);
|
|
311
|
+
} else {
|
|
312
|
+
result.set(uri, value.highlights);
|
|
313
|
+
}
|
|
314
|
+
});
|
|
315
|
+
return result;
|
|
283
316
|
});
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
}));
|
|
317
|
+
}
|
|
318
|
+
})
|
|
319
|
+
);
|
|
288
320
|
}
|
|
289
321
|
$registerLinkedEditingRangeProvider(handle, selector) {
|
|
290
|
-
this._registrations.set(
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
322
|
+
this._registrations.set(
|
|
323
|
+
handle,
|
|
324
|
+
this._languageFeaturesService.linkedEditingRangeProvider.register(selector, {
|
|
325
|
+
provideLinkedEditingRanges: async (model, position, token) => {
|
|
326
|
+
const res = await this._proxy.$provideLinkedEditingRanges(handle, model.uri, position, token);
|
|
327
|
+
if (res) {
|
|
328
|
+
return {
|
|
329
|
+
ranges: res.ranges,
|
|
330
|
+
wordPattern: res.wordPattern ? MainThreadLanguageFeatures_1._reviveRegExp(res.wordPattern) : undefined
|
|
331
|
+
};
|
|
332
|
+
}
|
|
333
|
+
return undefined;
|
|
298
334
|
}
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
}));
|
|
335
|
+
})
|
|
336
|
+
);
|
|
302
337
|
}
|
|
303
338
|
$registerReferenceSupport(handle, selector) {
|
|
304
|
-
this._registrations.set(
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
|
|
339
|
+
this._registrations.set(
|
|
340
|
+
handle,
|
|
341
|
+
this._languageFeaturesService.referenceProvider.register(selector, {
|
|
342
|
+
provideReferences: (model, position, context, token) => {
|
|
343
|
+
return this._proxy.$provideReferences(handle, model.uri, position, context, token).then(MainThreadLanguageFeatures_1._reviveLocationDto);
|
|
344
|
+
}
|
|
345
|
+
})
|
|
346
|
+
);
|
|
309
347
|
}
|
|
310
348
|
$registerCodeActionSupport(handle, selector, metadata, displayName, extensionId, supportsResolve) {
|
|
311
349
|
const provider = {
|
|
@@ -317,7 +355,7 @@ let MainThreadLanguageFeatures = MainThreadLanguageFeatures_1 = class MainThread
|
|
|
317
355
|
return {
|
|
318
356
|
actions: MainThreadLanguageFeatures_1._reviveCodeActionDto(listDto.actions, this._uriIdentService),
|
|
319
357
|
dispose: () => {
|
|
320
|
-
if (typeof listDto.cacheId ===
|
|
358
|
+
if (typeof listDto.cacheId === "number") {
|
|
321
359
|
this._proxy.$releaseCodeActions(handle, listDto.cacheId);
|
|
322
360
|
}
|
|
323
361
|
}
|
|
@@ -326,7 +364,7 @@ let MainThreadLanguageFeatures = MainThreadLanguageFeatures_1 = class MainThread
|
|
|
326
364
|
providedCodeActionKinds: metadata.providedKinds,
|
|
327
365
|
documentation: metadata.documentation,
|
|
328
366
|
displayName,
|
|
329
|
-
extensionId
|
|
367
|
+
extensionId
|
|
330
368
|
};
|
|
331
369
|
if (supportsResolve) {
|
|
332
370
|
provider.resolveCodeAction = async (codeAction, token) => {
|
|
@@ -340,51 +378,64 @@ let MainThreadLanguageFeatures = MainThreadLanguageFeatures_1 = class MainThread
|
|
|
340
378
|
return codeAction;
|
|
341
379
|
};
|
|
342
380
|
}
|
|
343
|
-
this._registrations.set(
|
|
381
|
+
this._registrations.set(
|
|
382
|
+
handle,
|
|
383
|
+
this._languageFeaturesService.codeActionProvider.register(selector, provider)
|
|
384
|
+
);
|
|
344
385
|
}
|
|
345
386
|
$registerPasteEditProvider(handle, selector, metadata) {
|
|
346
387
|
const provider = ( new MainThreadPasteEditProvider(handle, this._proxy, metadata, this._uriIdentService));
|
|
347
388
|
this._pasteEditProviders.set(handle, provider);
|
|
348
|
-
this._registrations.set(handle, combinedDisposable(
|
|
389
|
+
this._registrations.set(handle, combinedDisposable(
|
|
390
|
+
this._languageFeaturesService.documentPasteEditProvider.register(selector, provider),
|
|
391
|
+
toDisposable(() => this._pasteEditProviders.delete(handle))
|
|
392
|
+
));
|
|
349
393
|
}
|
|
350
394
|
$resolvePasteFileData(handle, requestId, dataId) {
|
|
351
395
|
const provider = this._pasteEditProviders.get(handle);
|
|
352
396
|
if (!provider) {
|
|
353
|
-
throw ( new Error(
|
|
397
|
+
throw ( new Error("Could not find provider"));
|
|
354
398
|
}
|
|
355
399
|
return provider.resolveFileData(requestId, dataId);
|
|
356
400
|
}
|
|
357
401
|
$registerDocumentFormattingSupport(handle, selector, extensionId, displayName) {
|
|
358
|
-
this._registrations.set(
|
|
359
|
-
|
|
360
|
-
|
|
361
|
-
|
|
362
|
-
|
|
363
|
-
|
|
364
|
-
|
|
402
|
+
this._registrations.set(
|
|
403
|
+
handle,
|
|
404
|
+
this._languageFeaturesService.documentFormattingEditProvider.register(selector, {
|
|
405
|
+
extensionId,
|
|
406
|
+
displayName,
|
|
407
|
+
provideDocumentFormattingEdits: (model, options, token) => {
|
|
408
|
+
return this._proxy.$provideDocumentFormattingEdits(handle, model.uri, options, token);
|
|
409
|
+
}
|
|
410
|
+
})
|
|
411
|
+
);
|
|
365
412
|
}
|
|
366
413
|
$registerRangeFormattingSupport(handle, selector, extensionId, displayName, supportsRanges) {
|
|
367
|
-
this._registrations.set(
|
|
368
|
-
|
|
369
|
-
|
|
370
|
-
|
|
371
|
-
|
|
372
|
-
|
|
373
|
-
|
|
374
|
-
? undefined
|
|
375
|
-
: (model, ranges, options, token) => {
|
|
376
|
-
return this._proxy.$provideDocumentRangesFormattingEdits(handle, model.uri, ranges, options, token);
|
|
414
|
+
this._registrations.set(
|
|
415
|
+
handle,
|
|
416
|
+
this._languageFeaturesService.documentRangeFormattingEditProvider.register(selector, {
|
|
417
|
+
extensionId,
|
|
418
|
+
displayName,
|
|
419
|
+
provideDocumentRangeFormattingEdits: (model, range, options, token) => {
|
|
420
|
+
return this._proxy.$provideDocumentRangeFormattingEdits(handle, model.uri, range, options, token);
|
|
377
421
|
},
|
|
378
|
-
|
|
422
|
+
provideDocumentRangesFormattingEdits: !supportsRanges ? undefined : (model, ranges, options, token) => {
|
|
423
|
+
return this._proxy.$provideDocumentRangesFormattingEdits(handle, model.uri, ranges, options, token);
|
|
424
|
+
}
|
|
425
|
+
})
|
|
426
|
+
);
|
|
379
427
|
}
|
|
380
428
|
$registerOnTypeFormattingSupport(handle, selector, autoFormatTriggerCharacters, extensionId) {
|
|
381
|
-
this._registrations.set(
|
|
382
|
-
|
|
383
|
-
|
|
384
|
-
|
|
385
|
-
|
|
386
|
-
|
|
387
|
-
|
|
429
|
+
this._registrations.set(
|
|
430
|
+
handle,
|
|
431
|
+
this._languageFeaturesService.onTypeFormattingEditProvider.register(selector, {
|
|
432
|
+
extensionId,
|
|
433
|
+
autoFormatTriggerCharacters,
|
|
434
|
+
provideOnTypeFormattingEdits: (model, position, ch, options, token) => {
|
|
435
|
+
return this._proxy.$provideOnTypeFormattingEdits(handle, model.uri, position, ch, options, token);
|
|
436
|
+
}
|
|
437
|
+
})
|
|
438
|
+
);
|
|
388
439
|
}
|
|
389
440
|
$registerNavigateTypeSupport(handle, supportsResolve) {
|
|
390
441
|
let lastResultId;
|
|
@@ -411,27 +462,31 @@ let MainThreadLanguageFeatures = MainThreadLanguageFeatures_1 = class MainThread
|
|
|
411
462
|
provideRenameEdits: (model, position, newName, token) => {
|
|
412
463
|
return this._proxy.$provideRenameEdits(handle, model.uri, position, newName, token).then(data => reviveWorkspaceEditDto(data, this._uriIdentService));
|
|
413
464
|
},
|
|
414
|
-
resolveRenameLocation: supportResolveLocation
|
|
415
|
-
? (model, position, token) => this._proxy.$resolveRenameLocation(handle, model.uri, position, token)
|
|
416
|
-
: undefined
|
|
465
|
+
resolveRenameLocation: supportResolveLocation ? (model, position, token) => this._proxy.$resolveRenameLocation(handle, model.uri, position, token) : undefined
|
|
417
466
|
}));
|
|
418
467
|
}
|
|
419
468
|
$registerNewSymbolNamesProvider(handle, selector) {
|
|
420
|
-
this._registrations.set(
|
|
421
|
-
|
|
422
|
-
|
|
423
|
-
|
|
424
|
-
|
|
425
|
-
|
|
469
|
+
this._registrations.set(
|
|
470
|
+
handle,
|
|
471
|
+
this._languageFeaturesService.newSymbolNamesProvider.register(selector, {
|
|
472
|
+
supportsAutomaticNewSymbolNamesTriggerKind: this._proxy.$supportsAutomaticNewSymbolNamesTriggerKind(handle),
|
|
473
|
+
provideNewSymbolNames: (model, range, triggerKind, token) => {
|
|
474
|
+
return this._proxy.$provideNewSymbolNames(handle, model.uri, range, triggerKind, token);
|
|
475
|
+
}
|
|
476
|
+
})
|
|
477
|
+
);
|
|
426
478
|
}
|
|
427
479
|
$registerDocumentSemanticTokensProvider(handle, selector, legend, eventHandle) {
|
|
428
480
|
let event = undefined;
|
|
429
|
-
if (typeof eventHandle ===
|
|
481
|
+
if (typeof eventHandle === "number") {
|
|
430
482
|
const emitter = ( new Emitter());
|
|
431
483
|
this._registrations.set(eventHandle, emitter);
|
|
432
484
|
event = emitter.event;
|
|
433
485
|
}
|
|
434
|
-
this._registrations.set(
|
|
486
|
+
this._registrations.set(
|
|
487
|
+
handle,
|
|
488
|
+
this._languageFeaturesService.documentSemanticTokensProvider.register(selector, ( new MainThreadDocumentSemanticTokensProvider(this._proxy, handle, legend, event)))
|
|
489
|
+
);
|
|
435
490
|
}
|
|
436
491
|
$emitDocumentSemanticTokensEvent(eventHandle) {
|
|
437
492
|
const obj = this._registrations.get(eventHandle);
|
|
@@ -447,12 +502,15 @@ let MainThreadLanguageFeatures = MainThreadLanguageFeatures_1 = class MainThread
|
|
|
447
502
|
}
|
|
448
503
|
$registerDocumentRangeSemanticTokensProvider(handle, selector, legend, eventHandle) {
|
|
449
504
|
let event = undefined;
|
|
450
|
-
if (typeof eventHandle ===
|
|
505
|
+
if (typeof eventHandle === "number") {
|
|
451
506
|
const emitter = ( new Emitter());
|
|
452
507
|
this._registrations.set(eventHandle, emitter);
|
|
453
508
|
event = emitter.event;
|
|
454
509
|
}
|
|
455
|
-
this._registrations.set(
|
|
510
|
+
this._registrations.set(
|
|
511
|
+
handle,
|
|
512
|
+
this._languageFeaturesService.documentRangeSemanticTokensProvider.register(selector, ( new MainThreadDocumentRangeSemanticTokensProvider(this._proxy, handle, legend, event)))
|
|
513
|
+
);
|
|
456
514
|
}
|
|
457
515
|
static _inflateSuggestDto(defaultRange, data, extensionId) {
|
|
458
516
|
const label = data[ISuggestDataDtoField.label];
|
|
@@ -464,8 +522,8 @@ let MainThreadLanguageFeatures = MainThreadLanguageFeatures_1 = class MainThread
|
|
|
464
522
|
command = {
|
|
465
523
|
$ident: commandIdent,
|
|
466
524
|
id: commandId,
|
|
467
|
-
title:
|
|
468
|
-
arguments: commandIdent ? [commandIdent] : data[ISuggestDataDtoField.commandArguments]
|
|
525
|
+
title: "",
|
|
526
|
+
arguments: commandIdent ? [commandIdent] : data[ISuggestDataDtoField.commandArguments]
|
|
469
527
|
};
|
|
470
528
|
}
|
|
471
529
|
return {
|
|
@@ -478,19 +536,19 @@ let MainThreadLanguageFeatures = MainThreadLanguageFeatures_1 = class MainThread
|
|
|
478
536
|
sortText: data[ISuggestDataDtoField.sortText],
|
|
479
537
|
filterText: data[ISuggestDataDtoField.filterText],
|
|
480
538
|
preselect: data[ISuggestDataDtoField.preselect],
|
|
481
|
-
insertText: data[ISuggestDataDtoField.insertText] ?? (typeof label ===
|
|
539
|
+
insertText: data[ISuggestDataDtoField.insertText] ?? (typeof label === "string" ? label : label.label),
|
|
482
540
|
range: data[ISuggestDataDtoField.range] ?? defaultRange,
|
|
483
541
|
insertTextRules: data[ISuggestDataDtoField.insertTextRules],
|
|
484
542
|
commitCharacters: commitChars ? Array.from(commitChars) : undefined,
|
|
485
543
|
additionalTextEdits: data[ISuggestDataDtoField.additionalTextEdits],
|
|
486
544
|
command,
|
|
487
|
-
_id: data.x
|
|
545
|
+
_id: data.x
|
|
488
546
|
};
|
|
489
547
|
}
|
|
490
548
|
$registerCompletionsProvider(handle, selector, triggerCharacters, supportsResolveDetails, extensionId) {
|
|
491
549
|
const provider = {
|
|
492
550
|
triggerCharacters,
|
|
493
|
-
_debugDisplayName: `${extensionId.value}(${triggerCharacters.join(
|
|
551
|
+
_debugDisplayName: `${extensionId.value}(${triggerCharacters.join("")})`,
|
|
494
552
|
provideCompletionItems: async (model, position, context, token) => {
|
|
495
553
|
const result = await this._proxy.$provideCompletionItems(handle, model.uri, position, context, token);
|
|
496
554
|
if (!result) {
|
|
@@ -503,7 +561,7 @@ let MainThreadLanguageFeatures = MainThreadLanguageFeatures_1 = class MainThread
|
|
|
503
561
|
incomplete: result[ISuggestResultDtoField.isIncomplete] || false,
|
|
504
562
|
duration: result[ISuggestResultDtoField.duration],
|
|
505
563
|
dispose: () => {
|
|
506
|
-
if (typeof result.x ===
|
|
564
|
+
if (typeof result.x === "number") {
|
|
507
565
|
this._proxy.$releaseCompletionItems(handle, result.x);
|
|
508
566
|
}
|
|
509
567
|
}
|
|
@@ -521,17 +579,51 @@ let MainThreadLanguageFeatures = MainThreadLanguageFeatures_1 = class MainThread
|
|
|
521
579
|
});
|
|
522
580
|
};
|
|
523
581
|
}
|
|
524
|
-
this._registrations.set(
|
|
525
|
-
|
|
526
|
-
|
|
582
|
+
this._registrations.set(
|
|
583
|
+
handle,
|
|
584
|
+
this._languageFeaturesService.completionProvider.register(selector, provider)
|
|
585
|
+
);
|
|
586
|
+
}
|
|
587
|
+
$registerInlineCompletionsSupport(
|
|
588
|
+
handle,
|
|
589
|
+
selector,
|
|
590
|
+
supportsHandleEvents,
|
|
591
|
+
extensionId,
|
|
592
|
+
extensionVersion,
|
|
593
|
+
groupId,
|
|
594
|
+
yieldsToExtensionIds,
|
|
595
|
+
displayName,
|
|
596
|
+
debounceDelayMs,
|
|
597
|
+
excludesExtensionIds,
|
|
598
|
+
supportsOnDidChange,
|
|
599
|
+
supportsSetModelId,
|
|
600
|
+
initialModelInfo,
|
|
601
|
+
supportsOnDidChangeModelInfo
|
|
602
|
+
) {
|
|
527
603
|
const providerId = new ProviderId(extensionId, extensionVersion, groupId);
|
|
528
|
-
const provider = this._instantiationService.createInstance(
|
|
604
|
+
const provider = this._instantiationService.createInstance(
|
|
605
|
+
ExtensionBackedInlineCompletionsProvider,
|
|
606
|
+
handle,
|
|
607
|
+
groupId ?? extensionId,
|
|
608
|
+
providerId,
|
|
609
|
+
yieldsToExtensionIds,
|
|
610
|
+
excludesExtensionIds,
|
|
611
|
+
debounceDelayMs,
|
|
612
|
+
displayName,
|
|
613
|
+
initialModelInfo,
|
|
614
|
+
supportsHandleEvents,
|
|
615
|
+
supportsSetModelId,
|
|
616
|
+
supportsOnDidChange,
|
|
617
|
+
supportsOnDidChangeModelInfo,
|
|
618
|
+
selector,
|
|
619
|
+
this._proxy
|
|
620
|
+
);
|
|
529
621
|
this._registrations.set(handle, provider);
|
|
530
622
|
}
|
|
531
|
-
$emitInlineCompletionsChange(handle) {
|
|
623
|
+
$emitInlineCompletionsChange(handle, changeHint) {
|
|
532
624
|
const obj = this._registrations.get(handle);
|
|
533
625
|
if (obj instanceof ExtensionBackedInlineCompletionsProvider) {
|
|
534
|
-
obj._emitDidChange();
|
|
626
|
+
obj._emitDidChange(changeHint);
|
|
535
627
|
}
|
|
536
628
|
}
|
|
537
629
|
$emitInlineCompletionModelInfoChange(handle, data) {
|
|
@@ -541,22 +633,25 @@ let MainThreadLanguageFeatures = MainThreadLanguageFeatures_1 = class MainThread
|
|
|
541
633
|
}
|
|
542
634
|
}
|
|
543
635
|
$registerSignatureHelpProvider(handle, selector, metadata) {
|
|
544
|
-
this._registrations.set(
|
|
545
|
-
|
|
546
|
-
|
|
547
|
-
|
|
548
|
-
|
|
549
|
-
|
|
550
|
-
|
|
551
|
-
|
|
552
|
-
|
|
553
|
-
value: result,
|
|
554
|
-
dispose: () => {
|
|
555
|
-
this._proxy.$releaseSignatureHelp(handle, result.id);
|
|
636
|
+
this._registrations.set(
|
|
637
|
+
handle,
|
|
638
|
+
this._languageFeaturesService.signatureHelpProvider.register(selector, {
|
|
639
|
+
signatureHelpTriggerCharacters: metadata.triggerCharacters,
|
|
640
|
+
signatureHelpRetriggerCharacters: metadata.retriggerCharacters,
|
|
641
|
+
provideSignatureHelp: async (model, position, token, context) => {
|
|
642
|
+
const result = await this._proxy.$provideSignatureHelp(handle, model.uri, position, context, token);
|
|
643
|
+
if (!result) {
|
|
644
|
+
return undefined;
|
|
556
645
|
}
|
|
557
|
-
|
|
558
|
-
|
|
559
|
-
|
|
646
|
+
return {
|
|
647
|
+
value: result,
|
|
648
|
+
dispose: () => {
|
|
649
|
+
this._proxy.$releaseSignatureHelp(handle, result.id);
|
|
650
|
+
}
|
|
651
|
+
};
|
|
652
|
+
}
|
|
653
|
+
})
|
|
654
|
+
);
|
|
560
655
|
}
|
|
561
656
|
$registerInlayHintsProvider(handle, selector, supportsResolve, eventHandle, displayName) {
|
|
562
657
|
const provider = {
|
|
@@ -597,12 +692,15 @@ let MainThreadLanguageFeatures = MainThreadLanguageFeatures_1 = class MainThread
|
|
|
597
692
|
};
|
|
598
693
|
};
|
|
599
694
|
}
|
|
600
|
-
if (typeof eventHandle ===
|
|
695
|
+
if (typeof eventHandle === "number") {
|
|
601
696
|
const emitter = ( new Emitter());
|
|
602
697
|
this._registrations.set(eventHandle, emitter);
|
|
603
698
|
provider.onDidChangeInlayHints = emitter.event;
|
|
604
699
|
}
|
|
605
|
-
this._registrations.set(
|
|
700
|
+
this._registrations.set(
|
|
701
|
+
handle,
|
|
702
|
+
this._languageFeaturesService.inlayHintsProvider.register(selector, provider)
|
|
703
|
+
);
|
|
606
704
|
}
|
|
607
705
|
$emitInlayHintsEvent(eventHandle) {
|
|
608
706
|
const obj = this._registrations.get(eventHandle);
|
|
@@ -620,7 +718,7 @@ let MainThreadLanguageFeatures = MainThreadLanguageFeatures_1 = class MainThread
|
|
|
620
718
|
return {
|
|
621
719
|
links: ( dto.links.map(MainThreadLanguageFeatures_1._reviveLinkDTO)),
|
|
622
720
|
dispose: () => {
|
|
623
|
-
if (typeof dto.cacheId ===
|
|
721
|
+
if (typeof dto.cacheId === "number") {
|
|
624
722
|
this._proxy.$releaseDocumentLinks(handle, dto.cacheId);
|
|
625
723
|
}
|
|
626
724
|
}
|
|
@@ -639,14 +737,16 @@ let MainThreadLanguageFeatures = MainThreadLanguageFeatures_1 = class MainThread
|
|
|
639
737
|
});
|
|
640
738
|
};
|
|
641
739
|
}
|
|
642
|
-
this._registrations.set(
|
|
740
|
+
this._registrations.set(
|
|
741
|
+
handle,
|
|
742
|
+
this._languageFeaturesService.linkProvider.register(selector, provider)
|
|
743
|
+
);
|
|
643
744
|
}
|
|
644
745
|
$registerDocumentColorProvider(handle, selector) {
|
|
645
746
|
const proxy = this._proxy;
|
|
646
747
|
this._registrations.set(handle, this._languageFeaturesService.colorProvider.register(selector, {
|
|
647
748
|
provideDocumentColors: (model, token) => {
|
|
648
|
-
return proxy.$provideDocumentColors(handle, model.uri, token)
|
|
649
|
-
.then(documentColors => {
|
|
749
|
+
return proxy.$provideDocumentColors(handle, model.uri, token).then(documentColors => {
|
|
650
750
|
return ( documentColors.map(documentColor => {
|
|
651
751
|
const [red, green, blue, alpha] = documentColor.color;
|
|
652
752
|
const color = {
|
|
@@ -664,7 +764,12 @@ let MainThreadLanguageFeatures = MainThreadLanguageFeatures_1 = class MainThread
|
|
|
664
764
|
},
|
|
665
765
|
provideColorPresentations: (model, colorInfo, token) => {
|
|
666
766
|
return proxy.$provideColorPresentations(handle, model.uri, {
|
|
667
|
-
color: [
|
|
767
|
+
color: [
|
|
768
|
+
colorInfo.color.red,
|
|
769
|
+
colorInfo.color.green,
|
|
770
|
+
colorInfo.color.blue,
|
|
771
|
+
colorInfo.color.alpha
|
|
772
|
+
],
|
|
668
773
|
range: colorInfo.range
|
|
669
774
|
}, token);
|
|
670
775
|
}
|
|
@@ -677,12 +782,15 @@ let MainThreadLanguageFeatures = MainThreadLanguageFeatures_1 = class MainThread
|
|
|
677
782
|
return this._proxy.$provideFoldingRanges(handle, model.uri, context, token);
|
|
678
783
|
}
|
|
679
784
|
};
|
|
680
|
-
if (typeof eventHandle ===
|
|
785
|
+
if (typeof eventHandle === "number") {
|
|
681
786
|
const emitter = ( new Emitter());
|
|
682
787
|
this._registrations.set(eventHandle, emitter);
|
|
683
788
|
provider.onDidChange = emitter.event;
|
|
684
789
|
}
|
|
685
|
-
this._registrations.set(
|
|
790
|
+
this._registrations.set(
|
|
791
|
+
handle,
|
|
792
|
+
this._languageFeaturesService.foldingRangeProvider.register(selector, provider)
|
|
793
|
+
);
|
|
686
794
|
}
|
|
687
795
|
$emitFoldingRangeEvent(eventHandle, event) {
|
|
688
796
|
const obj = this._registrations.get(eventHandle);
|
|
@@ -691,11 +799,14 @@ let MainThreadLanguageFeatures = MainThreadLanguageFeatures_1 = class MainThread
|
|
|
691
799
|
}
|
|
692
800
|
}
|
|
693
801
|
$registerSelectionRangeProvider(handle, selector) {
|
|
694
|
-
this._registrations.set(
|
|
695
|
-
|
|
696
|
-
|
|
697
|
-
|
|
698
|
-
|
|
802
|
+
this._registrations.set(
|
|
803
|
+
handle,
|
|
804
|
+
this._languageFeaturesService.selectionRangeProvider.register(selector, {
|
|
805
|
+
provideSelectionRanges: (model, positions, token) => {
|
|
806
|
+
return this._proxy.$provideSelectionRanges(handle, model.uri, positions, token);
|
|
807
|
+
}
|
|
808
|
+
})
|
|
809
|
+
);
|
|
699
810
|
}
|
|
700
811
|
$registerCallHierarchyProvider(handle, selector) {
|
|
701
812
|
this._registrations.set(handle, CallHierarchyProviderRegistry.register(selector, {
|
|
@@ -743,7 +854,7 @@ let MainThreadLanguageFeatures = MainThreadLanguageFeatures_1 = class MainThread
|
|
|
743
854
|
decreaseIndentPattern: MainThreadLanguageFeatures_1._reviveRegExp(indentationRule.decreaseIndentPattern),
|
|
744
855
|
increaseIndentPattern: MainThreadLanguageFeatures_1._reviveRegExp(indentationRule.increaseIndentPattern),
|
|
745
856
|
indentNextLinePattern: indentationRule.indentNextLinePattern ? MainThreadLanguageFeatures_1._reviveRegExp(indentationRule.indentNextLinePattern) : undefined,
|
|
746
|
-
unIndentedLinePattern: indentationRule.unIndentedLinePattern ? MainThreadLanguageFeatures_1._reviveRegExp(indentationRule.unIndentedLinePattern) : undefined
|
|
857
|
+
unIndentedLinePattern: indentationRule.unIndentedLinePattern ? MainThreadLanguageFeatures_1._reviveRegExp(indentationRule.unIndentedLinePattern) : undefined
|
|
747
858
|
};
|
|
748
859
|
}
|
|
749
860
|
static _reviveOnEnterRule(onEnterRule) {
|
|
@@ -770,8 +881,7 @@ let MainThreadLanguageFeatures = MainThreadLanguageFeatures_1 = class MainThread
|
|
|
770
881
|
};
|
|
771
882
|
if (_configuration.autoClosingPairs) {
|
|
772
883
|
configuration.autoClosingPairs = _configuration.autoClosingPairs;
|
|
773
|
-
}
|
|
774
|
-
else if (_configuration.__characterPairSupport) {
|
|
884
|
+
} else if (_configuration.__characterPairSupport) {
|
|
775
885
|
configuration.autoClosingPairs = _configuration.__characterPairSupport.autoClosingPairs;
|
|
776
886
|
}
|
|
777
887
|
if (_configuration.__electricCharacterSupport && _configuration.__electricCharacterSupport.docComment) {
|
|
@@ -783,7 +893,10 @@ let MainThreadLanguageFeatures = MainThreadLanguageFeatures_1 = class MainThread
|
|
|
783
893
|
};
|
|
784
894
|
}
|
|
785
895
|
if (this._languageService.isRegisteredLanguageId(languageId)) {
|
|
786
|
-
this._registrations.set(
|
|
896
|
+
this._registrations.set(
|
|
897
|
+
handle,
|
|
898
|
+
this._languageConfigurationService.register(languageId, configuration, 100)
|
|
899
|
+
);
|
|
787
900
|
}
|
|
788
901
|
}
|
|
789
902
|
$registerTypeHierarchyProvider(handle, selector) {
|
|
@@ -821,12 +934,15 @@ let MainThreadLanguageFeatures = MainThreadLanguageFeatures_1 = class MainThread
|
|
|
821
934
|
$registerDocumentOnDropEditProvider(handle, selector, metadata) {
|
|
822
935
|
const provider = ( new MainThreadDocumentOnDropEditProvider(handle, this._proxy, metadata, this._uriIdentService));
|
|
823
936
|
this._documentOnDropEditProviders.set(handle, provider);
|
|
824
|
-
this._registrations.set(handle, combinedDisposable(
|
|
937
|
+
this._registrations.set(handle, combinedDisposable(
|
|
938
|
+
this._languageFeaturesService.documentDropEditProvider.register(selector, provider),
|
|
939
|
+
toDisposable(() => this._documentOnDropEditProviders.delete(handle))
|
|
940
|
+
));
|
|
825
941
|
}
|
|
826
942
|
async $resolveDocumentOnDropFileData(handle, requestId, dataId) {
|
|
827
943
|
const provider = this._documentOnDropEditProviders.get(handle);
|
|
828
944
|
if (!provider) {
|
|
829
|
-
throw ( new Error(
|
|
945
|
+
throw ( new Error("Could not find provider"));
|
|
830
946
|
}
|
|
831
947
|
return provider.resolveDocumentOnDropFileData(requestId, dataId);
|
|
832
948
|
}
|
|
@@ -876,26 +992,31 @@ let MainThreadPasteEditProvider = class MainThreadPasteEditProvider {
|
|
|
876
992
|
}
|
|
877
993
|
const edits = await this._proxy.$providePasteEdits(this._handle, request.id, model.uri, selections, dataTransferDto, {
|
|
878
994
|
only: context.only?.value,
|
|
879
|
-
triggerKind: context.triggerKind
|
|
995
|
+
triggerKind: context.triggerKind
|
|
880
996
|
}, token);
|
|
881
997
|
if (!edits) {
|
|
882
998
|
return;
|
|
883
999
|
}
|
|
884
1000
|
return {
|
|
885
|
-
edits: ( edits.map(
|
|
1001
|
+
edits: ( edits.map(edit => {
|
|
886
1002
|
return {
|
|
887
1003
|
...edit,
|
|
888
|
-
kind: edit.kind ? ( new HierarchicalKind(edit.kind.value)) : ( new HierarchicalKind(
|
|
889
|
-
yieldTo: edit.yieldTo?.map(x => ({
|
|
890
|
-
|
|
1004
|
+
kind: edit.kind ? ( new HierarchicalKind(edit.kind.value)) : ( new HierarchicalKind("")),
|
|
1005
|
+
yieldTo: edit.yieldTo?.map(x => ({
|
|
1006
|
+
kind: ( new HierarchicalKind(x))
|
|
1007
|
+
})),
|
|
1008
|
+
additionalEdit: edit.additionalEdit ? reviveWorkspaceEditDto(
|
|
1009
|
+
edit.additionalEdit,
|
|
1010
|
+
this._uriIdentService,
|
|
1011
|
+
dataId => this.resolveFileData(request.id, dataId)
|
|
1012
|
+
) : undefined
|
|
891
1013
|
};
|
|
892
1014
|
})),
|
|
893
1015
|
dispose: () => {
|
|
894
1016
|
this._proxy.$releasePasteEdits(this._handle, request.id);
|
|
895
|
-
}
|
|
1017
|
+
}
|
|
896
1018
|
};
|
|
897
|
-
}
|
|
898
|
-
finally {
|
|
1019
|
+
} finally {
|
|
899
1020
|
request.dispose();
|
|
900
1021
|
}
|
|
901
1022
|
};
|
|
@@ -903,7 +1024,7 @@ let MainThreadPasteEditProvider = class MainThreadPasteEditProvider {
|
|
|
903
1024
|
if (metadata.supportsResolve) {
|
|
904
1025
|
this.resolveDocumentPasteEdit = async (edit, token) => {
|
|
905
1026
|
const resolved = await this._proxy.$resolvePasteEdit(this._handle, edit._cacheId, token);
|
|
906
|
-
if (typeof resolved.insertText !==
|
|
1027
|
+
if (typeof resolved.insertText !== "undefined") {
|
|
907
1028
|
edit.insertText = resolved.insertText;
|
|
908
1029
|
}
|
|
909
1030
|
if (resolved.additionalEdit) {
|
|
@@ -917,16 +1038,14 @@ let MainThreadPasteEditProvider = class MainThreadPasteEditProvider {
|
|
|
917
1038
|
return this.dataTransfers.resolveFileData(requestId, dataId);
|
|
918
1039
|
}
|
|
919
1040
|
};
|
|
920
|
-
MainThreadPasteEditProvider = ( __decorate([
|
|
921
|
-
( __param(3, IUriIdentityService))
|
|
922
|
-
], MainThreadPasteEditProvider));
|
|
1041
|
+
MainThreadPasteEditProvider = ( __decorate([( __param(3, IUriIdentityService))], MainThreadPasteEditProvider));
|
|
923
1042
|
let MainThreadDocumentOnDropEditProvider = class MainThreadDocumentOnDropEditProvider {
|
|
924
1043
|
constructor(_handle, _proxy, metadata, _uriIdentService) {
|
|
925
1044
|
this._handle = _handle;
|
|
926
1045
|
this._proxy = _proxy;
|
|
927
1046
|
this._uriIdentService = _uriIdentService;
|
|
928
1047
|
this.dataTransfers = ( new DataTransferFileCache());
|
|
929
|
-
this.dropMimeTypes = metadata?.dropMimeTypes ?? [
|
|
1048
|
+
this.dropMimeTypes = metadata?.dropMimeTypes ?? ["*/*"];
|
|
930
1049
|
this.providedDropEditKinds = metadata?.providedDropKinds?.map(kind => ( new HierarchicalKind(kind)));
|
|
931
1050
|
if (metadata?.supportsResolve) {
|
|
932
1051
|
this.resolveDocumentDropEdit = async (edit, token) => {
|
|
@@ -953,17 +1072,22 @@ let MainThreadDocumentOnDropEditProvider = class MainThreadDocumentOnDropEditPro
|
|
|
953
1072
|
edits: ( edits.map(edit => {
|
|
954
1073
|
return {
|
|
955
1074
|
...edit,
|
|
956
|
-
yieldTo: edit.yieldTo?.map(x => ({
|
|
1075
|
+
yieldTo: edit.yieldTo?.map(x => ({
|
|
1076
|
+
kind: ( new HierarchicalKind(x))
|
|
1077
|
+
})),
|
|
957
1078
|
kind: edit.kind ? ( new HierarchicalKind(edit.kind)) : undefined,
|
|
958
|
-
additionalEdit: reviveWorkspaceEditDto(
|
|
1079
|
+
additionalEdit: reviveWorkspaceEditDto(
|
|
1080
|
+
edit.additionalEdit,
|
|
1081
|
+
this._uriIdentService,
|
|
1082
|
+
dataId => this.resolveDocumentOnDropFileData(request.id, dataId)
|
|
1083
|
+
)
|
|
959
1084
|
};
|
|
960
1085
|
})),
|
|
961
1086
|
dispose: () => {
|
|
962
1087
|
this._proxy.$releaseDocumentOnDropEdits(this._handle, request.id);
|
|
963
|
-
}
|
|
1088
|
+
}
|
|
964
1089
|
};
|
|
965
|
-
}
|
|
966
|
-
finally {
|
|
1090
|
+
} finally {
|
|
967
1091
|
request.dispose();
|
|
968
1092
|
}
|
|
969
1093
|
}
|
|
@@ -971,9 +1095,7 @@ let MainThreadDocumentOnDropEditProvider = class MainThreadDocumentOnDropEditPro
|
|
|
971
1095
|
return this.dataTransfers.resolveFileData(requestId, dataId);
|
|
972
1096
|
}
|
|
973
1097
|
};
|
|
974
|
-
MainThreadDocumentOnDropEditProvider = ( __decorate([
|
|
975
|
-
( __param(3, IUriIdentityService))
|
|
976
|
-
], MainThreadDocumentOnDropEditProvider));
|
|
1098
|
+
MainThreadDocumentOnDropEditProvider = ( __decorate([( __param(3, IUriIdentityService))], MainThreadDocumentOnDropEditProvider));
|
|
977
1099
|
class MainThreadDocumentSemanticTokensProvider {
|
|
978
1100
|
constructor(_proxy, _handle, _legend, onDidChange) {
|
|
979
1101
|
this._proxy = _proxy;
|
|
@@ -999,7 +1121,7 @@ class MainThreadDocumentSemanticTokensProvider {
|
|
|
999
1121
|
return null;
|
|
1000
1122
|
}
|
|
1001
1123
|
const dto = decodeSemanticTokensDto(encodedDto);
|
|
1002
|
-
if (dto.type ===
|
|
1124
|
+
if (dto.type === "full") {
|
|
1003
1125
|
return {
|
|
1004
1126
|
resultId: String(dto.id),
|
|
1005
1127
|
data: dto.data
|
|
@@ -1030,7 +1152,7 @@ class MainThreadDocumentRangeSemanticTokensProvider {
|
|
|
1030
1152
|
return null;
|
|
1031
1153
|
}
|
|
1032
1154
|
const dto = decodeSemanticTokensDto(encodedDto);
|
|
1033
|
-
if (dto.type ===
|
|
1155
|
+
if (dto.type === "full") {
|
|
1034
1156
|
return {
|
|
1035
1157
|
resultId: String(dto.id),
|
|
1036
1158
|
data: dto.data
|
|
@@ -1040,7 +1162,25 @@ class MainThreadDocumentRangeSemanticTokensProvider {
|
|
|
1040
1162
|
}
|
|
1041
1163
|
}
|
|
1042
1164
|
let ExtensionBackedInlineCompletionsProvider = class ExtensionBackedInlineCompletionsProvider extends Disposable {
|
|
1043
|
-
constructor(
|
|
1165
|
+
constructor(
|
|
1166
|
+
handle,
|
|
1167
|
+
groupId,
|
|
1168
|
+
providerId,
|
|
1169
|
+
yieldsToGroupIds,
|
|
1170
|
+
excludesGroupIds,
|
|
1171
|
+
debounceDelayMs,
|
|
1172
|
+
displayName,
|
|
1173
|
+
modelInfo,
|
|
1174
|
+
_supportsHandleEvents,
|
|
1175
|
+
_supportsSetModelId,
|
|
1176
|
+
_supportsOnDidChange,
|
|
1177
|
+
_supportsOnDidChangeModelInfo,
|
|
1178
|
+
_selector,
|
|
1179
|
+
_proxy,
|
|
1180
|
+
_languageFeaturesService,
|
|
1181
|
+
_aiEditTelemetryService,
|
|
1182
|
+
_instantiationService
|
|
1183
|
+
) {
|
|
1044
1184
|
super();
|
|
1045
1185
|
this.handle = handle;
|
|
1046
1186
|
this.groupId = groupId;
|
|
@@ -1061,12 +1201,14 @@ let ExtensionBackedInlineCompletionsProvider = class ExtensionBackedInlineComple
|
|
|
1061
1201
|
this._instantiationService = _instantiationService;
|
|
1062
1202
|
this._onDidChangeEmitter = ( new Emitter());
|
|
1063
1203
|
this._onDidChangeModelInfoEmitter = ( new Emitter());
|
|
1064
|
-
this.setModelId = this._supportsSetModelId ? async
|
|
1204
|
+
this.setModelId = this._supportsSetModelId ? async modelId => {
|
|
1065
1205
|
await this._proxy.$handleInlineCompletionSetCurrentModelId(this.handle, modelId);
|
|
1066
1206
|
} : undefined;
|
|
1067
1207
|
this.onDidChangeInlineCompletions = this._supportsOnDidChange ? this._onDidChangeEmitter.event : undefined;
|
|
1068
1208
|
this.onDidChangeModelInfo = this._supportsOnDidChangeModelInfo ? this._onDidChangeModelInfoEmitter.event : undefined;
|
|
1069
|
-
this._register(
|
|
1209
|
+
this._register(
|
|
1210
|
+
this._languageFeaturesService.inlineCompletionsProvider.register(this._selector, this)
|
|
1211
|
+
);
|
|
1070
1212
|
}
|
|
1071
1213
|
_setModelInfo(newModelInfo) {
|
|
1072
1214
|
this.modelInfo = newModelInfo;
|
|
@@ -1074,9 +1216,9 @@ let ExtensionBackedInlineCompletionsProvider = class ExtensionBackedInlineComple
|
|
|
1074
1216
|
this._onDidChangeModelInfoEmitter.fire();
|
|
1075
1217
|
}
|
|
1076
1218
|
}
|
|
1077
|
-
_emitDidChange() {
|
|
1219
|
+
_emitDidChange(changeHint) {
|
|
1078
1220
|
if (this._supportsOnDidChange) {
|
|
1079
|
-
this._onDidChangeEmitter.fire();
|
|
1221
|
+
this._onDidChangeEmitter.fire(changeHint);
|
|
1080
1222
|
}
|
|
1081
1223
|
}
|
|
1082
1224
|
async provideInlineCompletions(model, position, context, token) {
|
|
@@ -1087,13 +1229,13 @@ let ExtensionBackedInlineCompletionsProvider = class ExtensionBackedInlineComple
|
|
|
1087
1229
|
if (item.suggestionId === undefined) {
|
|
1088
1230
|
item.suggestionId = this._aiEditTelemetryService.createSuggestionId({
|
|
1089
1231
|
applyCodeBlockSuggestionId: undefined,
|
|
1090
|
-
feature:
|
|
1232
|
+
feature: "inlineSuggestion",
|
|
1091
1233
|
source: this.providerId,
|
|
1092
1234
|
languageId: completions.languageId,
|
|
1093
1235
|
editDeltaInfo: editDeltaInfo,
|
|
1094
1236
|
modeId: undefined,
|
|
1095
1237
|
modelId: undefined,
|
|
1096
|
-
presentation: item.isInlineEdit ?
|
|
1238
|
+
presentation: item.isInlineEdit ? "nextEditSuggestion" : "inlineCompletion"
|
|
1097
1239
|
});
|
|
1098
1240
|
}
|
|
1099
1241
|
if (this._supportsHandleEvents) {
|
|
@@ -1110,27 +1252,35 @@ let ExtensionBackedInlineCompletionsProvider = class ExtensionBackedInlineComple
|
|
|
1110
1252
|
if (reason.kind === InlineCompletionEndOfLifeReasonKind.Ignored) {
|
|
1111
1253
|
return {
|
|
1112
1254
|
...reason,
|
|
1113
|
-
supersededBy: reason.supersededBy ? f(reason.supersededBy) : undefined
|
|
1255
|
+
supersededBy: reason.supersededBy ? f(reason.supersededBy) : undefined
|
|
1114
1256
|
};
|
|
1115
1257
|
}
|
|
1116
1258
|
return reason;
|
|
1117
1259
|
}
|
|
1118
1260
|
if (this._supportsHandleEvents) {
|
|
1119
|
-
await this._proxy.$handleInlineCompletionEndOfLifetime(this.handle, completions.pid, item.idx, mapReason(reason, i => ({
|
|
1261
|
+
await this._proxy.$handleInlineCompletionEndOfLifetime(this.handle, completions.pid, item.idx, mapReason(reason, i => ({
|
|
1262
|
+
pid: completions.pid,
|
|
1263
|
+
idx: i.idx
|
|
1264
|
+
})));
|
|
1120
1265
|
}
|
|
1121
1266
|
if (reason.kind === InlineCompletionEndOfLifeReasonKind.Accepted) {
|
|
1122
1267
|
if (item.suggestionId !== undefined) {
|
|
1123
1268
|
this._aiEditTelemetryService.handleCodeAccepted({
|
|
1124
1269
|
suggestionId: item.suggestionId,
|
|
1125
|
-
feature:
|
|
1270
|
+
feature: "inlineSuggestion",
|
|
1126
1271
|
source: this.providerId,
|
|
1127
1272
|
languageId: completions.languageId,
|
|
1128
|
-
editDeltaInfo: EditDeltaInfo.tryCreate(
|
|
1273
|
+
editDeltaInfo: EditDeltaInfo.tryCreate(
|
|
1274
|
+
lifetimeSummary.lineCountModified,
|
|
1275
|
+
lifetimeSummary.lineCountOriginal,
|
|
1276
|
+
lifetimeSummary.characterCountModified,
|
|
1277
|
+
lifetimeSummary.characterCountOriginal
|
|
1278
|
+
),
|
|
1129
1279
|
modeId: undefined,
|
|
1130
1280
|
modelId: undefined,
|
|
1131
|
-
presentation: item.isInlineEdit ?
|
|
1132
|
-
acceptanceMethod:
|
|
1133
|
-
applyCodeBlockSuggestionId: undefined
|
|
1281
|
+
presentation: item.isInlineEdit ? "nextEditSuggestion" : "inlineCompletion",
|
|
1282
|
+
acceptanceMethod: "accept",
|
|
1283
|
+
applyCodeBlockSuggestionId: undefined
|
|
1134
1284
|
});
|
|
1135
1285
|
}
|
|
1136
1286
|
}
|
|
@@ -1171,9 +1321,7 @@ let ExtensionBackedInlineCompletionsProvider = class ExtensionBackedInlineComple
|
|
|
1171
1321
|
partiallyAcceptedRatioSinceOriginal: lifetimeSummary.partiallyAcceptedRatioSinceOriginal,
|
|
1172
1322
|
partiallyAcceptedCharactersSinceOriginal: lifetimeSummary.partiallyAcceptedCharactersSinceOriginal,
|
|
1173
1323
|
superseded: reason.kind === InlineCompletionEndOfLifeReasonKind$1.Ignored && !!reason.supersededBy,
|
|
1174
|
-
reason: reason.kind === InlineCompletionEndOfLifeReasonKind$1.Accepted ?
|
|
1175
|
-
: reason.kind === InlineCompletionEndOfLifeReasonKind$1.Rejected ? 'rejected'
|
|
1176
|
-
: reason.kind === InlineCompletionEndOfLifeReasonKind$1.Ignored ? 'ignored' : undefined,
|
|
1324
|
+
reason: reason.kind === InlineCompletionEndOfLifeReasonKind$1.Accepted ? "accepted" : reason.kind === InlineCompletionEndOfLifeReasonKind$1.Rejected ? "rejected" : reason.kind === InlineCompletionEndOfLifeReasonKind$1.Ignored ? "ignored" : undefined,
|
|
1177
1325
|
acceptedAlternativeAction: reason.kind === InlineCompletionEndOfLifeReasonKind$1.Accepted && reason.alternativeAction,
|
|
1178
1326
|
noSuggestionReason: undefined,
|
|
1179
1327
|
notShownReason: lifetimeSummary.notShownReason,
|
|
@@ -1185,7 +1333,7 @@ let ExtensionBackedInlineCompletionsProvider = class ExtensionBackedInlineComple
|
|
|
1185
1333
|
editKind: lifetimeSummary.editKind,
|
|
1186
1334
|
longDistanceHintVisible: lifetimeSummary.longDistanceHintVisible,
|
|
1187
1335
|
longDistanceHintDistance: lifetimeSummary.longDistanceHintDistance,
|
|
1188
|
-
...forwardToChannelIf(isCopilotLikeExtension(this.providerId.extensionId))
|
|
1336
|
+
...forwardToChannelIf(isCopilotLikeExtension(this.providerId.extensionId))
|
|
1189
1337
|
};
|
|
1190
1338
|
const dataChannelForwardingTelemetryService = this._instantiationService.createInstance(DataChannelForwardingTelemetryService);
|
|
1191
1339
|
sendInlineCompletionsEndOfLifeTelemetry(dataChannelForwardingTelemetryService, endOfLifeSummary);
|
|
@@ -1202,23 +1350,18 @@ let ExtensionBackedInlineCompletionsProvider = class ExtensionBackedInlineComple
|
|
|
1202
1350
|
return `InlineCompletionsProvider(${( this.providerId.toString())})`;
|
|
1203
1351
|
}
|
|
1204
1352
|
};
|
|
1205
|
-
ExtensionBackedInlineCompletionsProvider = ( __decorate([
|
|
1206
|
-
( __param(14, ILanguageFeaturesService)),
|
|
1207
|
-
( __param(15, IAiEditTelemetryService)),
|
|
1208
|
-
( __param(16, IInstantiationService))
|
|
1209
|
-
], ExtensionBackedInlineCompletionsProvider));
|
|
1353
|
+
ExtensionBackedInlineCompletionsProvider = ( __decorate([( __param(14, ILanguageFeaturesService)), ( __param(15, IAiEditTelemetryService)), ( __param(16, IInstantiationService))], ExtensionBackedInlineCompletionsProvider));
|
|
1210
1354
|
function extractEngineFromCorrelationId(correlationId) {
|
|
1211
1355
|
if (!correlationId) {
|
|
1212
1356
|
return undefined;
|
|
1213
1357
|
}
|
|
1214
1358
|
try {
|
|
1215
1359
|
const parsed = JSON.parse(correlationId);
|
|
1216
|
-
if (typeof parsed ===
|
|
1360
|
+
if (typeof parsed === "object" && parsed !== null && typeof parsed.engine === "string") {
|
|
1217
1361
|
return parsed.engine;
|
|
1218
1362
|
}
|
|
1219
1363
|
return undefined;
|
|
1220
|
-
}
|
|
1221
|
-
catch {
|
|
1364
|
+
} catch {
|
|
1222
1365
|
return undefined;
|
|
1223
1366
|
}
|
|
1224
1367
|
}
|