@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
|
@@ -20,6 +20,7 @@ import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/in
|
|
|
20
20
|
import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
|
|
21
21
|
import { isITextModel } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model';
|
|
22
22
|
import { equals as equals$1 } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
|
|
23
|
+
import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
|
|
23
24
|
import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
|
|
24
25
|
import { constObservable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/constObservable';
|
|
25
26
|
import { observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableFromEvent';
|
|
@@ -27,9 +28,22 @@ import { derived, derivedOpts } from '@codingame/monaco-vscode-api/vscode/vs/bas
|
|
|
27
28
|
|
|
28
29
|
var MainThreadTextEditors_1;
|
|
29
30
|
let MainThreadTextEditors = class MainThreadTextEditors {
|
|
30
|
-
static {
|
|
31
|
-
|
|
32
|
-
|
|
31
|
+
static {
|
|
32
|
+
MainThreadTextEditors_1 = this;
|
|
33
|
+
}
|
|
34
|
+
static {
|
|
35
|
+
this.INSTANCE_COUNT = 0;
|
|
36
|
+
}
|
|
37
|
+
constructor(
|
|
38
|
+
_editorLocator,
|
|
39
|
+
extHostContext,
|
|
40
|
+
_codeEditorService,
|
|
41
|
+
_editorService,
|
|
42
|
+
_editorGroupService,
|
|
43
|
+
_configurationService,
|
|
44
|
+
_quickDiffModelService,
|
|
45
|
+
_uriIdentityService
|
|
46
|
+
) {
|
|
33
47
|
this._editorLocator = _editorLocator;
|
|
34
48
|
this._codeEditorService = _codeEditorService;
|
|
35
49
|
this._editorService = _editorService;
|
|
@@ -42,13 +56,19 @@ let MainThreadTextEditors = class MainThreadTextEditors {
|
|
|
42
56
|
this._proxy = ( extHostContext.getProxy(ExtHostContext.ExtHostEditors));
|
|
43
57
|
this._textEditorsListenersMap = Object.create(null);
|
|
44
58
|
this._editorPositionData = null;
|
|
45
|
-
this._toDispose.add(
|
|
46
|
-
|
|
47
|
-
|
|
59
|
+
this._toDispose.add(
|
|
60
|
+
this._editorService.onDidVisibleEditorsChange(() => this._updateActiveAndVisibleTextEditors())
|
|
61
|
+
);
|
|
62
|
+
this._toDispose.add(
|
|
63
|
+
this._editorGroupService.onDidRemoveGroup(() => this._updateActiveAndVisibleTextEditors())
|
|
64
|
+
);
|
|
65
|
+
this._toDispose.add(
|
|
66
|
+
this._editorGroupService.onDidMoveGroup(() => this._updateActiveAndVisibleTextEditors())
|
|
67
|
+
);
|
|
48
68
|
this._registeredDecorationTypes = Object.create(null);
|
|
49
69
|
}
|
|
50
70
|
dispose() {
|
|
51
|
-
( Object.keys(this._textEditorsListenersMap)).forEach(
|
|
71
|
+
( Object.keys(this._textEditorsListenersMap)).forEach(editorId => {
|
|
52
72
|
dispose(this._textEditorsListenersMap[editorId]);
|
|
53
73
|
});
|
|
54
74
|
this._textEditorsListenersMap = Object.create(null);
|
|
@@ -61,7 +81,7 @@ let MainThreadTextEditors = class MainThreadTextEditors {
|
|
|
61
81
|
handleTextEditorAdded(textEditor) {
|
|
62
82
|
const id = textEditor.getId();
|
|
63
83
|
const toDispose = [];
|
|
64
|
-
toDispose.push(textEditor.onPropertiesChanged(
|
|
84
|
+
toDispose.push(textEditor.onPropertiesChanged(data => {
|
|
65
85
|
this._proxy.$acceptEditorPropertiesChanged(id, data);
|
|
66
86
|
}));
|
|
67
87
|
const diffInformationObs = this._getTextEditorDiffInformation(textEditor, toDispose);
|
|
@@ -97,54 +117,71 @@ let MainThreadTextEditors = class MainThreadTextEditors {
|
|
|
97
117
|
if (!codeEditor) {
|
|
98
118
|
return constObservable(undefined);
|
|
99
119
|
}
|
|
100
|
-
const [diffEditor] = this._codeEditorService.listDiffEditors()
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
const editorModelObs = diffEditor
|
|
104
|
-
? observableFromEvent(this, diffEditor.onDidChangeModel, () => diffEditor.getModel())
|
|
105
|
-
: observableFromEvent(this, codeEditor.onDidChangeModel, () => codeEditor.getModel());
|
|
120
|
+
const [diffEditor] = this._codeEditorService.listDiffEditors().filter(
|
|
121
|
+
d => d.getOriginalEditor().getId() === codeEditor.getId() || d.getModifiedEditor().getId() === codeEditor.getId()
|
|
122
|
+
);
|
|
123
|
+
const editorModelObs = diffEditor ? observableFromEvent(this, diffEditor.onDidChangeModel, () => diffEditor.getModel()) : observableFromEvent(this, codeEditor.onDidChangeModel, () => codeEditor.getModel());
|
|
106
124
|
const editorChangesObs = derived(reader => {
|
|
107
125
|
const editorModel = editorModelObs.read(reader);
|
|
108
|
-
|
|
109
|
-
if (!editorModel || !editorModelUri) {
|
|
126
|
+
if (!editorModel) {
|
|
110
127
|
return constObservable(undefined);
|
|
111
128
|
}
|
|
112
|
-
let quickDiffModelRef;
|
|
113
129
|
if (isITextModel(editorModel)) {
|
|
114
|
-
quickDiffModelRef = this._quickDiffModelService.createQuickDiffModelReference(
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
130
|
+
const quickDiffModelRef = this._quickDiffModelService.createQuickDiffModelReference(editorModel.uri);
|
|
131
|
+
if (!quickDiffModelRef) {
|
|
132
|
+
return constObservable(undefined);
|
|
133
|
+
}
|
|
134
|
+
toDispose.push(quickDiffModelRef);
|
|
135
|
+
return observableFromEvent(this, quickDiffModelRef.object.onDidChange, () => {
|
|
136
|
+
return ( quickDiffModelRef.object.getQuickDiffResults().map(result => ({
|
|
137
|
+
original: result.original,
|
|
138
|
+
modified: result.modified,
|
|
139
|
+
changes: result.changes2
|
|
140
|
+
})));
|
|
141
|
+
});
|
|
119
142
|
}
|
|
143
|
+
const diffAlgorithm = this._configurationService.getValue("diffEditor.diffAlgorithm");
|
|
144
|
+
const quickDiffModelRef = this._quickDiffModelService.createQuickDiffModelReference(editorModel.modified.uri, {
|
|
145
|
+
algorithm: diffAlgorithm
|
|
146
|
+
});
|
|
120
147
|
if (!quickDiffModelRef) {
|
|
121
148
|
return constObservable(undefined);
|
|
122
149
|
}
|
|
123
150
|
toDispose.push(quickDiffModelRef);
|
|
124
|
-
return observableFromEvent(
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
151
|
+
return observableFromEvent(
|
|
152
|
+
Event.any(quickDiffModelRef.object.onDidChange, diffEditor.onDidUpdateDiff),
|
|
153
|
+
() => {
|
|
154
|
+
const diffChanges = diffEditor.getDiffComputationResult()?.changes2 ?? [];
|
|
155
|
+
const diffInformation = [{
|
|
156
|
+
original: editorModel.original.uri,
|
|
157
|
+
modified: editorModel.modified.uri,
|
|
158
|
+
changes: ( diffChanges.map(change => change))
|
|
159
|
+
}];
|
|
160
|
+
const quickDiffInformation = ( quickDiffModelRef.object.getQuickDiffResults().filter(result => result.providerKind !== "primary").map(result => ({
|
|
161
|
+
original: result.original,
|
|
162
|
+
modified: result.modified,
|
|
163
|
+
changes: result.changes2
|
|
164
|
+
})));
|
|
165
|
+
return diffInformation.concat(quickDiffInformation);
|
|
166
|
+
}
|
|
167
|
+
);
|
|
132
168
|
});
|
|
133
169
|
return derivedOpts({
|
|
134
170
|
owner: this,
|
|
135
|
-
equalsFn: (diff1, diff2) => equals$1(
|
|
171
|
+
equalsFn: (diff1, diff2) => equals$1(
|
|
172
|
+
diff1,
|
|
173
|
+
diff2,
|
|
174
|
+
(a, b) => isTextEditorDiffInformationEqual(this._uriIdentityService, a, b)
|
|
175
|
+
)
|
|
136
176
|
}, reader => {
|
|
137
177
|
const editorModel = editorModelObs.read(reader);
|
|
138
178
|
const editorChanges = editorChangesObs.read(reader).read(reader);
|
|
139
179
|
if (!editorModel || !editorChanges) {
|
|
140
180
|
return undefined;
|
|
141
181
|
}
|
|
142
|
-
const documentVersion = isITextModel(editorModel)
|
|
143
|
-
? editorModel.getVersionId()
|
|
144
|
-
: editorModel.modified.getVersionId();
|
|
182
|
+
const documentVersion = isITextModel(editorModel) ? editorModel.getVersionId() : editorModel.modified.getVersionId();
|
|
145
183
|
return ( editorChanges.map(change => {
|
|
146
|
-
const changes = ( change.changes
|
|
147
|
-
.map(change => [
|
|
184
|
+
const changes = ( change.changes.map(change => [
|
|
148
185
|
change.original.startLineNumber,
|
|
149
186
|
change.original.endLineNumberExclusive,
|
|
150
187
|
change.modified.startLineNumber,
|
|
@@ -172,7 +209,10 @@ let MainThreadTextEditors = class MainThreadTextEditors {
|
|
|
172
209
|
resource: uri,
|
|
173
210
|
options: editorOptions
|
|
174
211
|
};
|
|
175
|
-
const editor = await this._editorService.openEditor(
|
|
212
|
+
const editor = await this._editorService.openEditor(
|
|
213
|
+
input,
|
|
214
|
+
columnToEditorGroup(this._editorGroupService, this._configurationService, options.position)
|
|
215
|
+
);
|
|
176
216
|
if (!editor) {
|
|
177
217
|
return undefined;
|
|
178
218
|
}
|
|
@@ -186,7 +226,9 @@ let MainThreadTextEditors = class MainThreadTextEditors {
|
|
|
186
226
|
const model = mainThreadEditor.getModel();
|
|
187
227
|
await this._editorService.openEditor({
|
|
188
228
|
resource: model.uri,
|
|
189
|
-
options: {
|
|
229
|
+
options: {
|
|
230
|
+
preserveFocus: false
|
|
231
|
+
}
|
|
190
232
|
}, columnToEditorGroup(this._editorGroupService, this._configurationService, position));
|
|
191
233
|
return;
|
|
192
234
|
}
|
|
@@ -272,15 +314,17 @@ let MainThreadTextEditors = class MainThreadTextEditors {
|
|
|
272
314
|
$getDiffInformation(id) {
|
|
273
315
|
const editor = this._editorLocator.getEditor(id);
|
|
274
316
|
if (!editor) {
|
|
275
|
-
return Promise.reject(( new Error(
|
|
317
|
+
return Promise.reject(( new Error("No such TextEditor")));
|
|
276
318
|
}
|
|
277
319
|
const codeEditor = editor.getCodeEditor();
|
|
278
320
|
if (!codeEditor) {
|
|
279
|
-
return Promise.reject(( new Error(
|
|
321
|
+
return Promise.reject(( new Error("No such CodeEditor")));
|
|
280
322
|
}
|
|
281
323
|
const codeEditorId = codeEditor.getId();
|
|
282
324
|
const diffEditors = this._codeEditorService.listDiffEditors();
|
|
283
|
-
const [diffEditor] = diffEditors.filter(
|
|
325
|
+
const [diffEditor] = diffEditors.filter(
|
|
326
|
+
d => d.getOriginalEditor().getId() === codeEditorId || d.getModifiedEditor().getId() === codeEditorId
|
|
327
|
+
);
|
|
284
328
|
if (diffEditor) {
|
|
285
329
|
return Promise.resolve(diffEditor.getLineChanges() || []);
|
|
286
330
|
}
|
|
@@ -292,31 +336,25 @@ let MainThreadTextEditors = class MainThreadTextEditors {
|
|
|
292
336
|
return Promise.resolve([]);
|
|
293
337
|
}
|
|
294
338
|
try {
|
|
295
|
-
const primaryQuickDiff = quickDiffModelRef.object.quickDiffs.find(quickDiff => quickDiff.kind ===
|
|
339
|
+
const primaryQuickDiff = quickDiffModelRef.object.quickDiffs.find(quickDiff => quickDiff.kind === "primary");
|
|
296
340
|
const primaryQuickDiffChanges = quickDiffModelRef.object.changes.filter(change => change.providerId === primaryQuickDiff?.id);
|
|
297
341
|
return Promise.resolve(( primaryQuickDiffChanges.map(change => change.change)) ?? []);
|
|
298
|
-
}
|
|
299
|
-
finally {
|
|
342
|
+
} finally {
|
|
300
343
|
quickDiffModelRef.dispose();
|
|
301
344
|
}
|
|
302
345
|
}
|
|
303
346
|
};
|
|
304
|
-
MainThreadTextEditors = MainThreadTextEditors_1 = ( __decorate([
|
|
305
|
-
|
|
306
|
-
( __param(3, IEditorService)),
|
|
307
|
-
( __param(4, IEditorGroupsService)),
|
|
308
|
-
( __param(5, IConfigurationService)),
|
|
309
|
-
( __param(6, IQuickDiffModelService)),
|
|
310
|
-
( __param(7, IUriIdentityService))
|
|
311
|
-
], MainThreadTextEditors));
|
|
312
|
-
CommandsRegistry.registerCommand('_workbench.revertAllDirty', async function (accessor) {
|
|
347
|
+
MainThreadTextEditors = MainThreadTextEditors_1 = ( __decorate([( __param(2, ICodeEditorService)), ( __param(3, IEditorService)), ( __param(4, IEditorGroupsService)), ( __param(5, IConfigurationService)), ( __param(6, IQuickDiffModelService)), ( __param(7, IUriIdentityService))], MainThreadTextEditors));
|
|
348
|
+
CommandsRegistry.registerCommand("_workbench.revertAllDirty", async function(accessor) {
|
|
313
349
|
const environmentService = accessor.get(IEnvironmentService);
|
|
314
350
|
if (!environmentService.extensionTestsLocationURI) {
|
|
315
|
-
throw ( new Error(
|
|
351
|
+
throw ( new Error("Command is only available when running extension tests."));
|
|
316
352
|
}
|
|
317
353
|
const workingCopyService = accessor.get(IWorkingCopyService);
|
|
318
354
|
for (const workingCopy of workingCopyService.dirtyWorkingCopies) {
|
|
319
|
-
await workingCopy.revert({
|
|
355
|
+
await workingCopy.revert({
|
|
356
|
+
soft: true
|
|
357
|
+
});
|
|
320
358
|
}
|
|
321
359
|
});
|
|
322
360
|
|
|
@@ -7,7 +7,7 @@ import { createDecorator } from '@codingame/monaco-vscode-api/vscode/vs/platform
|
|
|
7
7
|
import { ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
|
|
8
8
|
import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
|
|
9
9
|
|
|
10
|
-
const IEmbeddingsService = ( createDecorator(
|
|
10
|
+
const IEmbeddingsService = ( createDecorator("embeddingsService"));
|
|
11
11
|
class EmbeddingsService {
|
|
12
12
|
constructor() {
|
|
13
13
|
this._onDidChange = ( new Emitter());
|
|
@@ -31,8 +31,7 @@ class EmbeddingsService {
|
|
|
31
31
|
const provider = this.providers.get(id);
|
|
32
32
|
if (provider) {
|
|
33
33
|
return provider.provideEmbeddings(input, token);
|
|
34
|
-
}
|
|
35
|
-
else {
|
|
34
|
+
} else {
|
|
36
35
|
return Promise.reject(( new Error(`No embeddings provider registered with id: ${id}`)));
|
|
37
36
|
}
|
|
38
37
|
}
|
|
@@ -66,9 +65,6 @@ let MainThreadEmbeddings = class MainThreadEmbeddings {
|
|
|
66
65
|
return this.embeddingsService.computeEmbeddings(embeddingsModel, input, token);
|
|
67
66
|
}
|
|
68
67
|
};
|
|
69
|
-
MainThreadEmbeddings = __decorate([
|
|
70
|
-
extHostNamedCustomer(MainContext.MainThreadEmbeddings),
|
|
71
|
-
( __param(1, IEmbeddingsService))
|
|
72
|
-
], MainThreadEmbeddings);
|
|
68
|
+
MainThreadEmbeddings = __decorate([extHostNamedCustomer(MainContext.MainThreadEmbeddings), ( __param(1, IEmbeddingsService))], MainThreadEmbeddings);
|
|
73
69
|
|
|
74
70
|
export { MainThreadEmbeddings };
|
|
@@ -23,7 +23,17 @@ import { IHostService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/s
|
|
|
23
23
|
import { ITimerService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/timer/browser/timerService.service';
|
|
24
24
|
|
|
25
25
|
let MainThreadExtensionService = class MainThreadExtensionService {
|
|
26
|
-
constructor(
|
|
26
|
+
constructor(
|
|
27
|
+
extHostContext,
|
|
28
|
+
_extensionService,
|
|
29
|
+
_notificationService,
|
|
30
|
+
_extensionsWorkbenchService,
|
|
31
|
+
_hostService,
|
|
32
|
+
_extensionEnablementService,
|
|
33
|
+
_timerService,
|
|
34
|
+
_commandService,
|
|
35
|
+
_environmentService
|
|
36
|
+
) {
|
|
27
37
|
this._extensionService = _extensionService;
|
|
28
38
|
this._notificationService = _notificationService;
|
|
29
39
|
this._extensionsWorkbenchService = _extensionsWorkbenchService;
|
|
@@ -36,10 +46,9 @@ let MainThreadExtensionService = class MainThreadExtensionService {
|
|
|
36
46
|
const internalExtHostContext = extHostContext;
|
|
37
47
|
this._internalExtensionService = internalExtHostContext.internalExtensionService;
|
|
38
48
|
internalExtHostContext._setExtensionHostProxy(( new ExtensionHostProxy(( extHostContext.getProxy(ExtHostContext.ExtHostExtensionService)))));
|
|
39
|
-
internalExtHostContext._setAllMainProxyIdentifiers(( ( Object.keys(MainContext)).map(
|
|
40
|
-
}
|
|
41
|
-
dispose() {
|
|
49
|
+
internalExtHostContext._setAllMainProxyIdentifiers(( ( Object.keys(MainContext)).map(key => MainContext[key])));
|
|
42
50
|
}
|
|
51
|
+
dispose() {}
|
|
43
52
|
$getExtension(extensionId) {
|
|
44
53
|
return this._extensionService.getExtension(extensionId);
|
|
45
54
|
}
|
|
@@ -49,8 +58,20 @@ let MainThreadExtensionService = class MainThreadExtensionService {
|
|
|
49
58
|
async $onWillActivateExtension(extensionId) {
|
|
50
59
|
this._internalExtensionService._onWillActivateExtension(extensionId);
|
|
51
60
|
}
|
|
52
|
-
$onDidActivateExtension(
|
|
53
|
-
|
|
61
|
+
$onDidActivateExtension(
|
|
62
|
+
extensionId,
|
|
63
|
+
codeLoadingTime,
|
|
64
|
+
activateCallTime,
|
|
65
|
+
activateResolvedTime,
|
|
66
|
+
activationReason
|
|
67
|
+
) {
|
|
68
|
+
this._internalExtensionService._onDidActivateExtension(
|
|
69
|
+
extensionId,
|
|
70
|
+
codeLoadingTime,
|
|
71
|
+
activateCallTime,
|
|
72
|
+
activateResolvedTime,
|
|
73
|
+
activationReason
|
|
74
|
+
);
|
|
54
75
|
}
|
|
55
76
|
$onExtensionRuntimeError(extensionId, data) {
|
|
56
77
|
const error = transformErrorFromSerialization(data);
|
|
@@ -65,12 +86,13 @@ let MainThreadExtensionService = class MainThreadExtensionService {
|
|
|
65
86
|
const extension = await this._extensionService.getExtension(extensionId.value);
|
|
66
87
|
if (extension) {
|
|
67
88
|
const local = await this._extensionsWorkbenchService.queryLocal();
|
|
68
|
-
const installedDependency = local.find(i => areSameExtensions(i.identifier, {
|
|
89
|
+
const installedDependency = local.find(i => areSameExtensions(i.identifier, {
|
|
90
|
+
id: missingExtensionDependency.dependency
|
|
91
|
+
}));
|
|
69
92
|
if (installedDependency?.local) {
|
|
70
93
|
await this._handleMissingInstalledDependency(extension, installedDependency.local);
|
|
71
94
|
return;
|
|
72
|
-
}
|
|
73
|
-
else {
|
|
95
|
+
} else {
|
|
74
96
|
await this._handleMissingNotInstalledDependency(extension, missingExtensionDependency.dependency);
|
|
75
97
|
return;
|
|
76
98
|
}
|
|
@@ -89,70 +111,78 @@ let MainThreadExtensionService = class MainThreadExtensionService {
|
|
|
89
111
|
this._notificationService.notify({
|
|
90
112
|
severity: Severity.Error,
|
|
91
113
|
message: ( localize(
|
|
92
|
-
|
|
114
|
+
2507,
|
|
93
115
|
"Cannot activate the '{0}' extension because it depends on the '{1}' extension, which is not loaded. Would you like to reload the window to load the extension?",
|
|
94
116
|
extName,
|
|
95
117
|
missingInstalledDependency.manifest.displayName || missingInstalledDependency.manifest.name
|
|
96
118
|
)),
|
|
97
119
|
actions: {
|
|
98
|
-
primary: [toAction({
|
|
120
|
+
primary: [toAction({
|
|
121
|
+
id: "reload",
|
|
122
|
+
label: ( localize(2508, "Reload Window")),
|
|
123
|
+
run: () => this._hostService.reload()
|
|
124
|
+
})]
|
|
99
125
|
}
|
|
100
126
|
});
|
|
101
|
-
}
|
|
102
|
-
else {
|
|
127
|
+
} else {
|
|
103
128
|
const enablementState = this._extensionEnablementService.getEnablementState(missingInstalledDependency);
|
|
104
129
|
if (enablementState === EnablementState.DisabledByVirtualWorkspace) {
|
|
105
130
|
this._notificationService.notify({
|
|
106
131
|
severity: Severity.Error,
|
|
107
132
|
message: ( localize(
|
|
108
|
-
|
|
133
|
+
2509,
|
|
109
134
|
"Cannot activate the '{0}' extension because it depends on the '{1}' extension which is not supported in the current workspace",
|
|
110
135
|
extName,
|
|
111
136
|
missingInstalledDependency.manifest.displayName || missingInstalledDependency.manifest.name
|
|
112
|
-
))
|
|
137
|
+
))
|
|
113
138
|
});
|
|
114
|
-
}
|
|
115
|
-
else if (enablementState === EnablementState.DisabledByTrustRequirement) {
|
|
139
|
+
} else if (enablementState === EnablementState.DisabledByTrustRequirement) {
|
|
116
140
|
this._notificationService.notify({
|
|
117
141
|
severity: Severity.Error,
|
|
118
142
|
message: ( localize(
|
|
119
|
-
|
|
143
|
+
2510,
|
|
120
144
|
"Cannot activate the '{0}' extension because it depends on the '{1}' extension which is not supported in Restricted Mode",
|
|
121
145
|
extName,
|
|
122
146
|
missingInstalledDependency.manifest.displayName || missingInstalledDependency.manifest.name
|
|
123
147
|
)),
|
|
124
148
|
actions: {
|
|
125
|
-
primary: [toAction({
|
|
149
|
+
primary: [toAction({
|
|
150
|
+
id: "manageWorkspaceTrust",
|
|
151
|
+
label: ( localize(2511, "Manage Workspace Trust")),
|
|
152
|
+
run: () => this._commandService.executeCommand("workbench.trust.manage")
|
|
153
|
+
})]
|
|
126
154
|
}
|
|
127
155
|
});
|
|
128
|
-
}
|
|
129
|
-
else if (this._extensionEnablementService.canChangeEnablement(missingInstalledDependency)) {
|
|
156
|
+
} else if (this._extensionEnablementService.canChangeEnablement(missingInstalledDependency)) {
|
|
130
157
|
this._notificationService.notify({
|
|
131
158
|
severity: Severity.Error,
|
|
132
159
|
message: ( localize(
|
|
133
|
-
|
|
160
|
+
2512,
|
|
134
161
|
"Cannot activate the '{0}' extension because it depends on the '{1}' extension which is disabled. Would you like to enable the extension and reload the window?",
|
|
135
162
|
extName,
|
|
136
163
|
missingInstalledDependency.manifest.displayName || missingInstalledDependency.manifest.name
|
|
137
164
|
)),
|
|
138
165
|
actions: {
|
|
139
166
|
primary: [toAction({
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
167
|
+
id: "enable",
|
|
168
|
+
label: ( localize(2513, "Enable and Reload")),
|
|
169
|
+
enabled: true,
|
|
170
|
+
run: () => this._extensionEnablementService.setEnablement(
|
|
171
|
+
[missingInstalledDependency],
|
|
172
|
+
enablementState === EnablementState.DisabledGlobally ? EnablementState.EnabledGlobally : EnablementState.EnabledWorkspace
|
|
173
|
+
).then(() => this._hostService.reload(), e => this._notificationService.error(e))
|
|
174
|
+
})]
|
|
144
175
|
}
|
|
145
176
|
});
|
|
146
|
-
}
|
|
147
|
-
else {
|
|
177
|
+
} else {
|
|
148
178
|
this._notificationService.notify({
|
|
149
179
|
severity: Severity.Error,
|
|
150
180
|
message: ( localize(
|
|
151
|
-
|
|
181
|
+
2514,
|
|
152
182
|
"Cannot activate the '{0}' extension because it depends on the '{1}' extension which is disabled.",
|
|
153
183
|
extName,
|
|
154
184
|
missingInstalledDependency.manifest.displayName || missingInstalledDependency.manifest.name
|
|
155
|
-
))
|
|
185
|
+
))
|
|
156
186
|
});
|
|
157
187
|
}
|
|
158
188
|
}
|
|
@@ -161,15 +191,15 @@ let MainThreadExtensionService = class MainThreadExtensionService {
|
|
|
161
191
|
const extName = extension.displayName || extension.name;
|
|
162
192
|
let dependencyExtension = null;
|
|
163
193
|
try {
|
|
164
|
-
dependencyExtension = (await this._extensionsWorkbenchService.getExtensions([{
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
}
|
|
194
|
+
dependencyExtension = (await this._extensionsWorkbenchService.getExtensions([{
|
|
195
|
+
id: missingDependency
|
|
196
|
+
}], CancellationToken.None))[0];
|
|
197
|
+
} catch (err) {}
|
|
168
198
|
if (dependencyExtension) {
|
|
169
199
|
this._notificationService.notify({
|
|
170
200
|
severity: Severity.Error,
|
|
171
201
|
message: ( localize(
|
|
172
|
-
|
|
202
|
+
2515,
|
|
173
203
|
"Cannot activate the '{0}' extension because it depends on the '{1}' extension from '{2}', which is not installed. Would you like to install the extension and reload the window?",
|
|
174
204
|
extName,
|
|
175
205
|
dependencyExtension.displayName,
|
|
@@ -177,17 +207,15 @@ let MainThreadExtensionService = class MainThreadExtensionService {
|
|
|
177
207
|
)),
|
|
178
208
|
actions: {
|
|
179
209
|
primary: [toAction({
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
})]
|
|
210
|
+
id: "install",
|
|
211
|
+
label: ( localize(2516, "Install and Reload")),
|
|
212
|
+
run: () => this._extensionsWorkbenchService.install(dependencyExtension).then(() => this._hostService.reload(), e => this._notificationService.error(e))
|
|
213
|
+
})]
|
|
185
214
|
}
|
|
186
215
|
});
|
|
187
|
-
}
|
|
188
|
-
else {
|
|
216
|
+
} else {
|
|
189
217
|
this._notificationService.error(( localize(
|
|
190
|
-
|
|
218
|
+
2517,
|
|
191
219
|
"Cannot activate the '{0}' extension because it depends on an unknown '{1}' extension.",
|
|
192
220
|
extName,
|
|
193
221
|
missingDependency
|
|
@@ -196,23 +224,21 @@ let MainThreadExtensionService = class MainThreadExtensionService {
|
|
|
196
224
|
}
|
|
197
225
|
async $setPerformanceMarks(marks) {
|
|
198
226
|
if (this._extensionHostKind === ExtensionHostKind.LocalProcess) {
|
|
199
|
-
this._timerService.setPerformanceMarks(
|
|
200
|
-
}
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
else {
|
|
205
|
-
this._timerService.setPerformanceMarks('remoteExtHost', marks);
|
|
227
|
+
this._timerService.setPerformanceMarks("localExtHost", marks);
|
|
228
|
+
} else if (this._extensionHostKind === ExtensionHostKind.LocalWebWorker) {
|
|
229
|
+
this._timerService.setPerformanceMarks("workerExtHost", marks);
|
|
230
|
+
} else {
|
|
231
|
+
this._timerService.setPerformanceMarks("remoteExtHost", marks);
|
|
206
232
|
}
|
|
207
233
|
}
|
|
208
234
|
async $asBrowserUri(uri) {
|
|
209
235
|
return FileAccess.uriToBrowserUri(URI.revive(uri));
|
|
210
236
|
}
|
|
211
237
|
async $getAllStaticBrowserUris() {
|
|
212
|
-
return Array.from(
|
|
213
|
-
|
|
214
|
-
FileAccess.uriToBrowserUri(uri)
|
|
215
|
-
|
|
238
|
+
return Array.from(
|
|
239
|
+
FileAccess.getRegisteredBrowserUris(),
|
|
240
|
+
uri => [uri, FileAccess.uriToBrowserUri(uri)]
|
|
241
|
+
);
|
|
216
242
|
}
|
|
217
243
|
};
|
|
218
244
|
MainThreadExtensionService = __decorate([
|
|
@@ -270,23 +296,22 @@ class ExtensionHostProxy {
|
|
|
270
296
|
}
|
|
271
297
|
}
|
|
272
298
|
function reviveResolveAuthorityResult(result) {
|
|
273
|
-
if (result.type ===
|
|
299
|
+
if (result.type === "ok") {
|
|
274
300
|
return {
|
|
275
|
-
type:
|
|
301
|
+
type: "ok",
|
|
276
302
|
value: {
|
|
277
303
|
...result.value,
|
|
278
|
-
authority: reviveResolvedAuthority(result.value.authority)
|
|
304
|
+
authority: reviveResolvedAuthority(result.value.authority)
|
|
279
305
|
}
|
|
280
306
|
};
|
|
281
|
-
}
|
|
282
|
-
else {
|
|
307
|
+
} else {
|
|
283
308
|
return result;
|
|
284
309
|
}
|
|
285
310
|
}
|
|
286
311
|
function reviveResolvedAuthority(resolvedAuthority) {
|
|
287
312
|
return {
|
|
288
313
|
...resolvedAuthority,
|
|
289
|
-
connectTo: reviveConnection(resolvedAuthority.connectTo)
|
|
314
|
+
connectTo: reviveConnection(resolvedAuthority.connectTo)
|
|
290
315
|
};
|
|
291
316
|
}
|
|
292
317
|
function reviveConnection(connection) {
|