@codingame/monaco-vscode-extensions-service-override 9.0.3 → 10.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/_virtual/semver.js +5 -0
- package/assets/webWorkerExtensionHostIframe.esm.html +8 -4
- package/extensions.js +14 -5
- package/override/vs/workbench/browser/parts/editor/textEditor.weak.js +1 -1
- package/package.json +3 -3
- package/vscode/src/vs/base/common/console.js +0 -2
- package/vscode/src/vs/platform/extensionManagement/common/extensionManagementCLI.js +35 -35
- package/vscode/src/vs/platform/extensionResourceLoader/browser/extensionResourceLoaderService.js +0 -1
- package/vscode/src/vs/workbench/api/browser/mainThreadAuthentication.js +54 -31
- package/vscode/src/vs/workbench/api/browser/mainThreadBulkEdits.js +1 -2
- package/vscode/src/vs/workbench/api/browser/mainThreadCLICommands.js +1 -1
- package/vscode/src/vs/workbench/api/browser/mainThreadChatAgents2.js +4 -5
- package/vscode/src/vs/workbench/api/browser/mainThreadChatCodeMapper.js +57 -0
- package/vscode/src/vs/workbench/api/browser/mainThreadComments.js +9 -10
- package/vscode/src/vs/workbench/api/browser/mainThreadConfiguration.js +9 -11
- package/vscode/src/vs/workbench/api/browser/mainThreadCustomEditors.js +16 -33
- package/vscode/src/vs/workbench/api/browser/mainThreadDebugService.js +4 -4
- package/vscode/src/vs/workbench/api/browser/mainThreadDocuments.js +2 -3
- package/vscode/src/vs/workbench/api/browser/mainThreadDocumentsAndEditors.js +6 -12
- package/vscode/src/vs/workbench/api/browser/mainThreadEditSessionIdentityParticipant.js +1 -1
- package/vscode/src/vs/workbench/api/browser/mainThreadEditor.js +16 -14
- package/vscode/src/vs/workbench/api/browser/mainThreadEditorTabs.js +38 -38
- package/vscode/src/vs/workbench/api/browser/mainThreadEmbeddings.js +2 -2
- package/vscode/src/vs/workbench/api/browser/mainThreadExtensionService.js +17 -19
- package/vscode/src/vs/workbench/api/browser/mainThreadFileSystem.js +5 -5
- package/vscode/src/vs/workbench/api/browser/mainThreadFileSystemEventService.js +39 -80
- package/vscode/src/vs/workbench/api/browser/mainThreadLanguageFeatures.js +23 -24
- package/vscode/src/vs/workbench/api/browser/mainThreadLanguageModelTools.js +8 -6
- package/vscode/src/vs/workbench/api/browser/mainThreadLanguageModels.js +1 -1
- package/vscode/src/vs/workbench/api/browser/mainThreadManagedSockets.js +2 -4
- package/vscode/src/vs/workbench/api/browser/mainThreadMessageService.js +4 -4
- package/vscode/src/vs/workbench/api/browser/mainThreadNotebookDocumentsAndEditors.js +2 -1
- package/vscode/src/vs/workbench/api/browser/mainThreadNotebookDto.js +1 -2
- package/vscode/src/vs/workbench/api/browser/mainThreadNotebookKernels.js +14 -11
- package/vscode/src/vs/workbench/api/browser/mainThreadNotebookSaveParticipant.js +1 -1
- package/vscode/src/vs/workbench/api/browser/mainThreadProgress.js +3 -4
- package/vscode/src/vs/workbench/api/browser/mainThreadSCM.js +77 -42
- package/vscode/src/vs/workbench/api/browser/mainThreadSaveParticipant.js +1 -1
- package/vscode/src/vs/workbench/api/browser/mainThreadSearch.js +23 -6
- package/vscode/src/vs/workbench/api/browser/mainThreadStatusBar.js +3 -4
- package/vscode/src/vs/workbench/api/browser/mainThreadStorage.js +1 -2
- package/vscode/src/vs/workbench/api/browser/mainThreadTask.js +17 -17
- package/vscode/src/vs/workbench/api/browser/mainThreadTelemetry.js +2 -2
- package/vscode/src/vs/workbench/api/browser/mainThreadTerminalService.js +3 -4
- package/vscode/src/vs/workbench/api/browser/mainThreadTerminalShellIntegration.js +4 -5
- package/vscode/src/vs/workbench/api/browser/mainThreadTesting.js +5 -5
- package/vscode/src/vs/workbench/api/browser/mainThreadTunnelService.js +14 -10
- package/vscode/src/vs/workbench/api/browser/mainThreadUriOpeners.js +2 -2
- package/vscode/src/vs/workbench/api/browser/mainThreadWebviewPanels.js +3 -3
- package/vscode/src/vs/workbench/api/browser/mainThreadWebviews.js +1 -1
- package/vscode/src/vs/workbench/api/browser/mainThreadWorkspace.js +11 -11
- package/vscode/src/vs/workbench/contrib/customEditor/common/customTextEditorModel.js +22 -10
- package/vscode/src/vs/workbench/contrib/externalUriOpener/common/contributedOpeners.js +1 -2
- package/vscode/src/vs/workbench/services/extensionManagement/browser/extensionBisect.js +30 -33
- package/vscode/src/vs/workbench/services/extensions/browser/extensionService.js +19 -24
- package/vscode/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.js +11 -15
- package/vscode/src/vs/workbench/services/extensions/browser/webWorkerFileSystemProvider.js +2 -2
- package/vscode/src/vs/workbench/services/extensions/common/abstractExtensionService.js +32 -32
- package/vscode/src/vs/workbench/services/extensions/common/extensionHostManager.js +7 -8
- package/vscode/src/vs/workbench/services/extensions/common/extensionRunningLocationTracker.js +12 -12
- package/vscode/src/vs/workbench/services/extensions/common/extensionStorageMigration.js +2 -3
- package/vscode/src/vs/workbench/services/extensions/common/extensionsProposedApi.js +1 -1
- package/vscode/src/vs/workbench/services/extensions/common/extensionsUtil.js +5 -5
- package/vscode/src/vs/workbench/services/extensions/common/lazyCreateExtensionHostManager.js +2 -2
- package/vscode/src/vs/workbench/services/extensions/common/remoteExtensionHost.js +7 -9
|
@@ -2,18 +2,17 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
|
|
|
2
2
|
import { Barrier } from 'vscode/vscode/vs/base/common/async';
|
|
3
3
|
import { URI } from 'vscode/vscode/vs/base/common/uri';
|
|
4
4
|
import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
|
|
5
|
-
import {
|
|
6
|
-
import { derived } from 'vscode/vscode/vs/base/common/observableInternal/derived';
|
|
5
|
+
import { observableValueOpts } from 'vscode/vscode/vs/base/common/observableInternal/api';
|
|
7
6
|
import 'vscode/vscode/vs/base/common/observableInternal/autorun';
|
|
8
|
-
import 'vscode/vscode/vs/base/common/observableInternal/
|
|
7
|
+
import { observableValue, transaction } from 'vscode/vscode/vs/base/common/observableInternal/base';
|
|
8
|
+
import 'vscode/vscode/vs/base/common/observableInternal/derived';
|
|
9
9
|
import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
|
|
10
|
-
import 'vscode/vscode/vs/base/common/
|
|
11
|
-
import { observableValueOpts } from 'vscode/vscode/vs/base/common/observableInternal/api';
|
|
10
|
+
import { structuralEquals } from 'vscode/vscode/vs/base/common/equals';
|
|
12
11
|
import { Disposable, DisposableStore, dispose, combinedDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
|
|
12
|
+
import 'vscode/vscode/vs/base/common/observableInternal/utils';
|
|
13
13
|
import { ISCMService, ISCMViewService } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm.service';
|
|
14
14
|
import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
|
|
15
15
|
import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
|
|
16
|
-
import { MarshalledId } from 'vscode/vscode/vs/base/common/marshallingIds';
|
|
17
16
|
import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
|
|
18
17
|
import { IQuickDiffService } from 'vscode/vscode/vs/workbench/contrib/scm/common/quickDiff.service';
|
|
19
18
|
import { ResourceTree } from 'vscode/vscode/vs/base/common/resourceTree';
|
|
@@ -24,6 +23,7 @@ import { ILanguageService } from 'vscode/vscode/vs/editor/common/languages/langu
|
|
|
24
23
|
import { IModelService } from 'vscode/vscode/vs/editor/common/services/model';
|
|
25
24
|
import { ITextModelService } from 'vscode/vscode/vs/editor/common/services/resolverService';
|
|
26
25
|
import { Schemas } from 'vscode/vscode/vs/base/common/network';
|
|
26
|
+
import { historyItemRefColor, historyItemRemoteRefColor, historyItemBaseRefColor } from 'vscode/vscode/vs/workbench/contrib/scm/browser/scmHistory';
|
|
27
27
|
|
|
28
28
|
function getIconFromIconDto(iconDto) {
|
|
29
29
|
if (iconDto === undefined) {
|
|
@@ -41,9 +41,16 @@ function getIconFromIconDto(iconDto) {
|
|
|
41
41
|
}
|
|
42
42
|
}
|
|
43
43
|
function toISCMHistoryItem(historyItemDto) {
|
|
44
|
-
const
|
|
45
|
-
|
|
46
|
-
|
|
44
|
+
const references = historyItemDto.references?.map(r => ({
|
|
45
|
+
...r, icon: getIconFromIconDto(r.icon)
|
|
46
|
+
}));
|
|
47
|
+
const newLineIndex = historyItemDto.message.indexOf('\n');
|
|
48
|
+
const subject = newLineIndex === -1 ?
|
|
49
|
+
historyItemDto.message : `${historyItemDto.message.substring(0, newLineIndex)}\u2026`;
|
|
50
|
+
return { ...historyItemDto, subject, references };
|
|
51
|
+
}
|
|
52
|
+
function toISCMHistoryItemRef(historyItemRefDto, color) {
|
|
53
|
+
return historyItemRefDto ? { ...historyItemRefDto, icon: getIconFromIconDto(historyItemRefDto.icon), color: color } : undefined;
|
|
47
54
|
}
|
|
48
55
|
class SCMInputBoxContentProvider extends Disposable {
|
|
49
56
|
constructor(textModelService, modelService, languageService) {
|
|
@@ -89,7 +96,7 @@ class MainThreadSCMResourceGroup {
|
|
|
89
96
|
}
|
|
90
97
|
toJSON() {
|
|
91
98
|
return {
|
|
92
|
-
$mid:
|
|
99
|
+
$mid: 4 ,
|
|
93
100
|
sourceControlHandle: this.sourceControlHandle,
|
|
94
101
|
groupHandle: this.handle
|
|
95
102
|
};
|
|
@@ -127,7 +134,7 @@ class MainThreadSCMResource {
|
|
|
127
134
|
}
|
|
128
135
|
toJSON() {
|
|
129
136
|
return {
|
|
130
|
-
$mid:
|
|
137
|
+
$mid: 3 ,
|
|
131
138
|
sourceControlHandle: this.sourceControlHandle,
|
|
132
139
|
groupHandle: this.groupHandle,
|
|
133
140
|
handle: this.handle
|
|
@@ -135,35 +142,38 @@ class MainThreadSCMResource {
|
|
|
135
142
|
}
|
|
136
143
|
}
|
|
137
144
|
class MainThreadSCMHistoryProvider {
|
|
138
|
-
get
|
|
145
|
+
get historyItemRef() { return this._historyItemRef; }
|
|
146
|
+
get historyItemRemoteRef() { return this._historyItemRemoteRef; }
|
|
147
|
+
get historyItemBaseRef() { return this._historyItemBaseRef; }
|
|
148
|
+
get historyItemRefChanges() { return this._historyItemRefChanges; }
|
|
139
149
|
constructor(proxy, handle) {
|
|
140
150
|
this.proxy = proxy;
|
|
141
151
|
this.handle = handle;
|
|
142
|
-
this.
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
this.
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
return
|
|
158
|
-
}
|
|
159
|
-
async
|
|
160
|
-
const
|
|
152
|
+
this._historyItemRef = observableValueOpts({
|
|
153
|
+
owner: this,
|
|
154
|
+
equalsFn: structuralEquals
|
|
155
|
+
}, undefined);
|
|
156
|
+
this._historyItemRemoteRef = observableValueOpts({
|
|
157
|
+
owner: this,
|
|
158
|
+
equalsFn: structuralEquals
|
|
159
|
+
}, undefined);
|
|
160
|
+
this._historyItemBaseRef = observableValueOpts({
|
|
161
|
+
owner: this,
|
|
162
|
+
equalsFn: structuralEquals
|
|
163
|
+
}, undefined);
|
|
164
|
+
this._historyItemRefChanges = observableValue(this, { added: [], modified: [], removed: [], silent: false });
|
|
165
|
+
}
|
|
166
|
+
async resolveHistoryItemRefsCommonAncestor(historyItemRefs) {
|
|
167
|
+
return this.proxy.$resolveHistoryItemRefsCommonAncestor(this.handle, historyItemRefs, CancellationToken.None);
|
|
168
|
+
}
|
|
169
|
+
async provideHistoryItemRefs(historyItemsRefs) {
|
|
170
|
+
const historyItemRefs = await this.proxy.$provideHistoryItemRefs(this.handle, historyItemsRefs, CancellationToken.None);
|
|
171
|
+
return historyItemRefs?.map(ref => ({ ...ref, icon: getIconFromIconDto(ref.icon) }));
|
|
172
|
+
}
|
|
173
|
+
async provideHistoryItems(options) {
|
|
174
|
+
const historyItems = await this.proxy.$provideHistoryItems(this.handle, options, CancellationToken.None);
|
|
161
175
|
return historyItems?.map(historyItem => toISCMHistoryItem(historyItem));
|
|
162
176
|
}
|
|
163
|
-
async provideHistoryItemSummary(historyItemId, historyItemParentId) {
|
|
164
|
-
const historyItem = await this.proxy.$provideHistoryItemSummary(this.handle, historyItemId, historyItemParentId, CancellationToken.None);
|
|
165
|
-
return historyItem ? toISCMHistoryItem(historyItem) : undefined;
|
|
166
|
-
}
|
|
167
177
|
async provideHistoryItemChanges(historyItemId, historyItemParentId) {
|
|
168
178
|
const changes = await this.proxy.$provideHistoryItemChanges(this.handle, historyItemId, historyItemParentId, CancellationToken.None);
|
|
169
179
|
return changes?.map(change => ({
|
|
@@ -173,8 +183,18 @@ class MainThreadSCMHistoryProvider {
|
|
|
173
183
|
renameUri: change.renameUri && URI.revive(change.renameUri)
|
|
174
184
|
}));
|
|
175
185
|
}
|
|
176
|
-
$
|
|
177
|
-
|
|
186
|
+
$onDidChangeCurrentHistoryItemRefs(historyItemRef, historyItemRemoteRef, historyItemBaseRef) {
|
|
187
|
+
transaction(tx => {
|
|
188
|
+
this._historyItemRef.set(toISCMHistoryItemRef(historyItemRef, historyItemRefColor), tx);
|
|
189
|
+
this._historyItemRemoteRef.set(toISCMHistoryItemRef(historyItemRemoteRef, historyItemRemoteRefColor), tx);
|
|
190
|
+
this._historyItemBaseRef.set(toISCMHistoryItemRef(historyItemBaseRef, historyItemBaseRefColor), tx);
|
|
191
|
+
});
|
|
192
|
+
}
|
|
193
|
+
$onDidChangeHistoryItemRefs(historyItemRefs) {
|
|
194
|
+
const added = ( historyItemRefs.added.map(ref => toISCMHistoryItemRef(ref)));
|
|
195
|
+
const modified = ( historyItemRefs.modified.map(ref => toISCMHistoryItemRef(ref)));
|
|
196
|
+
const removed = ( historyItemRefs.removed.map(ref => toISCMHistoryItemRef(ref)));
|
|
197
|
+
this._historyItemRefChanges.set({ added, modified, removed, silent: historyItemRefs.silent }, undefined);
|
|
178
198
|
}
|
|
179
199
|
}
|
|
180
200
|
class MainThreadSCMProvider {
|
|
@@ -347,15 +367,21 @@ class MainThreadSCMProvider {
|
|
|
347
367
|
const result = await this.proxy.$provideOriginalResource(this.handle, uri, CancellationToken.None);
|
|
348
368
|
return result && URI.revive(result);
|
|
349
369
|
}
|
|
350
|
-
$
|
|
370
|
+
$onDidChangeHistoryProviderCurrentHistoryItemRefs(historyItemRef, historyItemRemoteRef, historyItemBaseRef) {
|
|
351
371
|
if (!this.historyProvider.get()) {
|
|
352
372
|
return;
|
|
353
373
|
}
|
|
354
|
-
this._historyProvider.get()?.$
|
|
374
|
+
this._historyProvider.get()?.$onDidChangeCurrentHistoryItemRefs(historyItemRef, historyItemRemoteRef, historyItemBaseRef);
|
|
375
|
+
}
|
|
376
|
+
$onDidChangeHistoryProviderHistoryItemRefs(historyItemRefs) {
|
|
377
|
+
if (!this.historyProvider.get()) {
|
|
378
|
+
return;
|
|
379
|
+
}
|
|
380
|
+
this._historyProvider.get()?.$onDidChangeHistoryItemRefs(historyItemRefs);
|
|
355
381
|
}
|
|
356
382
|
toJSON() {
|
|
357
383
|
return {
|
|
358
|
-
$mid:
|
|
384
|
+
$mid: 5 ,
|
|
359
385
|
handle: this.handle
|
|
360
386
|
};
|
|
361
387
|
}
|
|
@@ -535,14 +561,23 @@ let MainThreadSCM = class MainThreadSCM {
|
|
|
535
561
|
repository.input.validateInput = async () => undefined;
|
|
536
562
|
}
|
|
537
563
|
}
|
|
538
|
-
async $
|
|
564
|
+
async $onDidChangeHistoryProviderCurrentHistoryItemRefs(sourceControlHandle, historyItemRef, historyItemRemoteRef, historyItemBaseRef) {
|
|
565
|
+
await this._repositoryBarriers.get(sourceControlHandle)?.wait();
|
|
566
|
+
const repository = this._repositories.get(sourceControlHandle);
|
|
567
|
+
if (!repository) {
|
|
568
|
+
return;
|
|
569
|
+
}
|
|
570
|
+
const provider = repository.provider;
|
|
571
|
+
provider.$onDidChangeHistoryProviderCurrentHistoryItemRefs(historyItemRef, historyItemRemoteRef, historyItemBaseRef);
|
|
572
|
+
}
|
|
573
|
+
async $onDidChangeHistoryProviderHistoryItemRefs(sourceControlHandle, historyItemRefs) {
|
|
539
574
|
await this._repositoryBarriers.get(sourceControlHandle)?.wait();
|
|
540
575
|
const repository = this._repositories.get(sourceControlHandle);
|
|
541
576
|
if (!repository) {
|
|
542
577
|
return;
|
|
543
578
|
}
|
|
544
579
|
const provider = repository.provider;
|
|
545
|
-
provider.$
|
|
580
|
+
provider.$onDidChangeHistoryProviderHistoryItemRefs(historyItemRefs);
|
|
546
581
|
}
|
|
547
582
|
};
|
|
548
583
|
MainThreadSCM = __decorate([
|
|
@@ -16,7 +16,7 @@ class ExtHostSaveParticipant {
|
|
|
16
16
|
return undefined;
|
|
17
17
|
}
|
|
18
18
|
const p = ( (new Promise((resolve, reject) => {
|
|
19
|
-
setTimeout(() => reject(( (new Error(( localize(
|
|
19
|
+
setTimeout(() => reject(( (new Error(( localize(4869, "Aborted onWillSaveTextDocument-event after 1750ms")))))), 1750);
|
|
20
20
|
this._proxy.$participateInSave(editorModel.resource, context.reason).then(values => {
|
|
21
21
|
if (!values.every(success => success)) {
|
|
22
22
|
return Promise.reject(( (new Error('listener failed'))));
|
|
@@ -5,7 +5,6 @@ import { URI } from 'vscode/vscode/vs/base/common/uri';
|
|
|
5
5
|
import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
|
|
6
6
|
import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
|
|
7
7
|
import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
|
|
8
|
-
import { SearchProviderType, QueryType } from 'vscode/vscode/vs/workbench/services/search/common/search';
|
|
9
8
|
import { ISearchService } from 'vscode/vscode/vs/workbench/services/search/common/search.service';
|
|
10
9
|
import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
|
|
11
10
|
import { revive } from 'vscode/vscode/vs/base/common/marshalling';
|
|
@@ -26,20 +25,32 @@ let MainThreadSearch = class MainThreadSearch {
|
|
|
26
25
|
this._searchProvider.clear();
|
|
27
26
|
}
|
|
28
27
|
$registerTextSearchProvider(handle, scheme) {
|
|
29
|
-
this._searchProvider.set(handle, ( new RemoteSearchProvider(
|
|
28
|
+
this._searchProvider.set(handle, ( new RemoteSearchProvider(
|
|
29
|
+
this._searchService,
|
|
30
|
+
1 ,
|
|
31
|
+
scheme,
|
|
32
|
+
handle,
|
|
33
|
+
this._proxy
|
|
34
|
+
)));
|
|
30
35
|
}
|
|
31
36
|
$registerAITextSearchProvider(handle, scheme) {
|
|
32
37
|
SearchContext.hasAIResultProvider.bindTo(this.contextKeyService).set(true);
|
|
33
38
|
this._searchProvider.set(handle, ( new RemoteSearchProvider(
|
|
34
39
|
this._searchService,
|
|
35
|
-
|
|
40
|
+
2 ,
|
|
36
41
|
scheme,
|
|
37
42
|
handle,
|
|
38
43
|
this._proxy
|
|
39
44
|
)));
|
|
40
45
|
}
|
|
41
46
|
$registerFileSearchProvider(handle, scheme) {
|
|
42
|
-
this._searchProvider.set(handle, ( new RemoteSearchProvider(
|
|
47
|
+
this._searchProvider.set(handle, ( new RemoteSearchProvider(
|
|
48
|
+
this._searchService,
|
|
49
|
+
0 ,
|
|
50
|
+
scheme,
|
|
51
|
+
handle,
|
|
52
|
+
this._proxy
|
|
53
|
+
)));
|
|
43
54
|
}
|
|
44
55
|
$unregisterProvider(handle) {
|
|
45
56
|
dispose(this._searchProvider.get(handle));
|
|
@@ -99,6 +110,12 @@ class RemoteSearchProvider {
|
|
|
99
110
|
this._searches = ( new Map());
|
|
100
111
|
this._registrations.add(searchService.registerSearchResultProvider(this._scheme, type, this));
|
|
101
112
|
}
|
|
113
|
+
async getAIName() {
|
|
114
|
+
if (this.cachedAIName === undefined) {
|
|
115
|
+
this.cachedAIName = await this._proxy.$getAIName(this._handle);
|
|
116
|
+
}
|
|
117
|
+
return this.cachedAIName;
|
|
118
|
+
}
|
|
102
119
|
dispose() {
|
|
103
120
|
this._registrations.dispose();
|
|
104
121
|
}
|
|
@@ -144,9 +161,9 @@ class RemoteSearchProvider {
|
|
|
144
161
|
}
|
|
145
162
|
_provideSearchResults(query, session, token) {
|
|
146
163
|
switch (query.type) {
|
|
147
|
-
case
|
|
164
|
+
case 1 :
|
|
148
165
|
return this._proxy.$provideFileSearchResults(this._handle, session, query, token);
|
|
149
|
-
case
|
|
166
|
+
case 2 :
|
|
150
167
|
return this._proxy.$provideTextSearchResults(this._handle, session, query, token);
|
|
151
168
|
default:
|
|
152
169
|
return this._proxy.$provideAITextSearchResults(this._handle, session, query, token);
|
|
@@ -2,8 +2,7 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
|
|
|
2
2
|
import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
|
|
3
3
|
import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
|
|
4
4
|
import { DisposableStore, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
|
|
5
|
-
import {
|
|
6
|
-
import { StatusbarAlignment } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar';
|
|
5
|
+
import { IExtensionStatusBarItemService } from 'vscode/vscode/vs/workbench/api/browser/statusBarService';
|
|
7
6
|
|
|
8
7
|
let MainThreadStatusBar = class MainThreadStatusBar {
|
|
9
8
|
constructor(extHostContext, statusbarService) {
|
|
@@ -28,7 +27,7 @@ let MainThreadStatusBar = class MainThreadStatusBar {
|
|
|
28
27
|
tooltip: item.entry.tooltip,
|
|
29
28
|
command: typeof item.entry.command === 'string' ? item.entry.command : typeof item.entry.command === 'object' ? item.entry.command.id : undefined,
|
|
30
29
|
priority: item.priority,
|
|
31
|
-
alignLeft: item.alignment ===
|
|
30
|
+
alignLeft: item.alignment === 0 ,
|
|
32
31
|
accessibilityInformation: item.entry.ariaLabel ? { label: item.entry.ariaLabel, role: item.entry.role } : undefined
|
|
33
32
|
};
|
|
34
33
|
}
|
|
@@ -38,7 +37,7 @@ let MainThreadStatusBar = class MainThreadStatusBar {
|
|
|
38
37
|
}
|
|
39
38
|
$setEntry(entryId, id, extensionId, name, text, tooltip, command, color, backgroundColor, alignLeft, priority, accessibilityInformation) {
|
|
40
39
|
const kind = this.statusbarService.setOrUpdateEntry(entryId, id, extensionId, name, text, tooltip, command, color, backgroundColor, alignLeft, priority, accessibilityInformation);
|
|
41
|
-
if (kind ===
|
|
40
|
+
if (kind === 0 ) {
|
|
42
41
|
this._store.add(toDisposable(() => this.statusbarService.unsetEntry(entryId)));
|
|
43
42
|
}
|
|
44
43
|
}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
|
|
2
|
-
import { StorageScope } from 'vscode/vscode/vs/platform/storage/common/storage';
|
|
3
2
|
import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
|
|
4
3
|
import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
|
|
5
4
|
import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
|
|
@@ -19,7 +18,7 @@ let MainThreadStorage = class MainThreadStorage {
|
|
|
19
18
|
this._storageListener = ( new DisposableStore());
|
|
20
19
|
this._sharedStorageKeysToWatch = ( new Map());
|
|
21
20
|
this._proxy = ( extHostContext.getProxy(ExtHostContext.ExtHostStorage));
|
|
22
|
-
this._storageListener.add(this._storageService.onDidChangeValue(
|
|
21
|
+
this._storageListener.add(this._storageService.onDidChangeValue(0 , undefined, this._storageListener)(e => {
|
|
23
22
|
if (( this._sharedStorageKeysToWatch.has(e.key))) {
|
|
24
23
|
const rawState = this._extensionStorageService.getExtensionStateRaw(e.key, true);
|
|
25
24
|
if (typeof rawState === 'string') {
|
|
@@ -3,10 +3,10 @@ import { localize } from 'vscode/vscode/vs/nls';
|
|
|
3
3
|
import { URI } from 'vscode/vscode/vs/base/common/uri';
|
|
4
4
|
import { generateUuid } from 'vscode/vscode/vs/base/common/uuid';
|
|
5
5
|
import { isString } from 'vscode/vscode/vs/base/common/types';
|
|
6
|
-
import { platform
|
|
6
|
+
import { platform } from 'vscode/vscode/vs/base/common/platform';
|
|
7
7
|
import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
|
|
8
8
|
import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
|
|
9
|
-
import { TaskDefinition, PresentationOptions, RunOptions, CommandOptions, RuntimeType, TaskSourceKind,
|
|
9
|
+
import { TaskDefinition, PresentationOptions, RunOptions, CommandOptions, RuntimeType, TaskSourceKind, CustomTask, ContributedTask, ConfiguringTask } from 'vscode/vscode/vs/workbench/contrib/tasks/common/tasks';
|
|
10
10
|
import { ITaskService } from 'vscode/vscode/vs/workbench/contrib/tasks/common/taskService.service';
|
|
11
11
|
import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
|
|
12
12
|
import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
|
|
@@ -267,7 +267,7 @@ var TaskSourceDTO;
|
|
|
267
267
|
}
|
|
268
268
|
else if (value.kind === TaskSourceKind.Workspace) {
|
|
269
269
|
result.extensionId = '$core';
|
|
270
|
-
result.scope = value.config.workspaceFolder ? value.config.workspaceFolder.uri :
|
|
270
|
+
result.scope = value.config.workspaceFolder ? value.config.workspaceFolder.uri : 1 ;
|
|
271
271
|
}
|
|
272
272
|
return result;
|
|
273
273
|
}
|
|
@@ -275,13 +275,13 @@ var TaskSourceDTO;
|
|
|
275
275
|
function to(value, workspace) {
|
|
276
276
|
let scope;
|
|
277
277
|
let workspaceFolder;
|
|
278
|
-
if ((value.scope === undefined) || ((typeof value.scope === 'number') && (value.scope !==
|
|
278
|
+
if ((value.scope === undefined) || ((typeof value.scope === 'number') && ((value.scope !== 1) ))) {
|
|
279
279
|
if (workspace.getWorkspace().folders.length === 0) {
|
|
280
|
-
scope =
|
|
280
|
+
scope = 1 ;
|
|
281
281
|
workspaceFolder = undefined;
|
|
282
282
|
}
|
|
283
283
|
else {
|
|
284
|
-
scope =
|
|
284
|
+
scope = 3 ;
|
|
285
285
|
workspaceFolder = workspace.getWorkspace().folders[0];
|
|
286
286
|
}
|
|
287
287
|
}
|
|
@@ -289,7 +289,7 @@ var TaskSourceDTO;
|
|
|
289
289
|
scope = value.scope;
|
|
290
290
|
}
|
|
291
291
|
else {
|
|
292
|
-
scope =
|
|
292
|
+
scope = 3 ;
|
|
293
293
|
workspaceFolder = workspace.getWorkspaceFolder(URI.revive(value.scope)) ?? undefined;
|
|
294
294
|
}
|
|
295
295
|
const result = {
|
|
@@ -377,7 +377,7 @@ var TaskDTO;
|
|
|
377
377
|
}
|
|
378
378
|
command.presentation = TaskPresentationOptionsDTO.to(task.presentationOptions);
|
|
379
379
|
const source = TaskSourceDTO.to(task.source, workspace);
|
|
380
|
-
const label = ( localize(
|
|
380
|
+
const label = ( localize(4880, '{0}: {1}', source.label, task.name));
|
|
381
381
|
const definition = TaskDefinitionDTO.to(task.definition, executeOnly);
|
|
382
382
|
const id = (CustomExecutionDTO.is(task.execution) && task._id) ? task._id : `${task.source.extensionId}.${definition._key}`;
|
|
383
383
|
const result = ( (new
|
|
@@ -438,11 +438,11 @@ let MainThreadTask = class MainThreadTask extends Disposable {
|
|
|
438
438
|
this._proxy = ( (extHostContext.getProxy(ExtHostContext.ExtHostTask)));
|
|
439
439
|
this._providers = ( (new Map()));
|
|
440
440
|
this._register(this._taskService.onDidStateChange(async (event) => {
|
|
441
|
-
if (event.kind ===
|
|
441
|
+
if (event.kind === "changed" ) {
|
|
442
442
|
return;
|
|
443
443
|
}
|
|
444
444
|
const task = event.__task;
|
|
445
|
-
if (event.kind ===
|
|
445
|
+
if (event.kind === "start" ) {
|
|
446
446
|
const execution = TaskExecutionDTO.from(task.getTaskExecution());
|
|
447
447
|
let resolvedDefinition = execution.task.definition;
|
|
448
448
|
if (execution.task?.execution && CustomExecutionDTO.is(execution.task.execution) && event.resolvedVariables) {
|
|
@@ -454,13 +454,13 @@ let MainThreadTask = class MainThreadTask extends Disposable {
|
|
|
454
454
|
}
|
|
455
455
|
this._proxy.$onDidStartTask(execution, event.terminalId, resolvedDefinition);
|
|
456
456
|
}
|
|
457
|
-
else if (event.kind ===
|
|
457
|
+
else if (event.kind === "processStarted" ) {
|
|
458
458
|
this._proxy.$onDidStartTaskProcess(TaskProcessStartedDTO.from(task.getTaskExecution(), event.processId));
|
|
459
459
|
}
|
|
460
|
-
else if (event.kind ===
|
|
460
|
+
else if (event.kind === "processEnded" ) {
|
|
461
461
|
this._proxy.$onDidEndTaskProcess(TaskProcessEndedDTO.from(task.getTaskExecution(), event.exitCode));
|
|
462
462
|
}
|
|
463
|
-
else if (event.kind ===
|
|
463
|
+
else if (event.kind === "end" ) {
|
|
464
464
|
this._proxy.$OnDidEndTask(TaskExecutionDTO.from(task.getTaskExecution()));
|
|
465
465
|
}
|
|
466
466
|
}));
|
|
@@ -671,16 +671,16 @@ let MainThreadTask = class MainThreadTask extends Disposable {
|
|
|
671
671
|
let platform$1;
|
|
672
672
|
switch (info.platform) {
|
|
673
673
|
case 'Web':
|
|
674
|
-
platform$1 =
|
|
674
|
+
platform$1 = 0 ;
|
|
675
675
|
break;
|
|
676
676
|
case 'win32':
|
|
677
|
-
platform$1 =
|
|
677
|
+
platform$1 = 3 ;
|
|
678
678
|
break;
|
|
679
679
|
case 'darwin':
|
|
680
|
-
platform$1 =
|
|
680
|
+
platform$1 = 1 ;
|
|
681
681
|
break;
|
|
682
682
|
case 'linux':
|
|
683
|
-
platform$1 =
|
|
683
|
+
platform$1 = 2 ;
|
|
684
684
|
break;
|
|
685
685
|
default:
|
|
686
686
|
platform$1 = platform;
|
|
@@ -3,7 +3,7 @@ import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
|
|
|
3
3
|
import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
|
|
4
4
|
import { IEnvironmentService } from 'vscode/vscode/vs/platform/environment/common/environment.service';
|
|
5
5
|
import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService.service';
|
|
6
|
-
import { TELEMETRY_SETTING_ID, TELEMETRY_OLD_SETTING_ID
|
|
6
|
+
import { TELEMETRY_SETTING_ID, TELEMETRY_OLD_SETTING_ID } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
|
|
7
7
|
import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
|
|
8
8
|
import { supportsTelemetry } from 'vscode/vscode/vs/platform/telemetry/common/telemetryUtils';
|
|
9
9
|
import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
|
|
@@ -31,7 +31,7 @@ let MainThreadTelemetry = class MainThreadTelemetry extends Disposable {
|
|
|
31
31
|
}
|
|
32
32
|
get telemetryLevel() {
|
|
33
33
|
if (!supportsTelemetry(this._productService, this._environmentService)) {
|
|
34
|
-
return
|
|
34
|
+
return 0 ;
|
|
35
35
|
}
|
|
36
36
|
return this._telemetryService.telemetryLevel;
|
|
37
37
|
}
|
|
@@ -5,7 +5,7 @@ import { extHostNamedCustomer } from '../../services/extensions/common/extHostCu
|
|
|
5
5
|
import { URI } from 'vscode/vscode/vs/base/common/uri';
|
|
6
6
|
import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
|
|
7
7
|
import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
|
|
8
|
-
import { TerminalLocation, TerminalExitReason
|
|
8
|
+
import { TerminalLocation, TerminalExitReason } from 'vscode/vscode/vs/platform/terminal/common/terminal';
|
|
9
9
|
import { TerminalDataBufferer } from 'vscode/vscode/vs/platform/terminal/common/terminalDataBuffering';
|
|
10
10
|
import { ITerminalService, ITerminalGroupService, ITerminalEditorService } from 'vscode/vscode/vs/workbench/contrib/terminal/browser/terminal.service';
|
|
11
11
|
import { TerminalProcessExtHostProxy } from 'vscode/vscode/vs/workbench/contrib/terminal/browser/terminalProcessExtHostProxy';
|
|
@@ -18,7 +18,6 @@ import { Promises } from 'vscode/vscode/vs/base/common/async';
|
|
|
18
18
|
import { ITerminalLinkProviderService } from 'vscode/vscode/vs/workbench/contrib/terminalContrib/links/browser/links.service';
|
|
19
19
|
import { TerminalQuickFixType } from 'vscode/vscode/vs/workbench/contrib/terminalContrib/quickFix/browser/quickFix';
|
|
20
20
|
import { ITerminalQuickFixService } from 'vscode/vscode/vs/workbench/contrib/terminalContrib/quickFix/browser/quickFix.service';
|
|
21
|
-
import { TerminalCapability } from 'vscode/vscode/vs/platform/terminal/common/capabilities/capabilities';
|
|
22
21
|
|
|
23
22
|
let MainThreadTerminalService = class MainThreadTerminalService {
|
|
24
23
|
constructor(_extHostContext, _terminalService, _terminalLinkProviderService, _terminalQuickFixService, _instantiationService, _environmentVariableService, _logService, _terminalProfileResolverService, remoteAgentService, _terminalGroupService, _terminalEditorService, _terminalProfileService) {
|
|
@@ -190,7 +189,7 @@ let MainThreadTerminalService = class MainThreadTerminalService {
|
|
|
190
189
|
if (this._sendCommandEventListener.value) {
|
|
191
190
|
return;
|
|
192
191
|
}
|
|
193
|
-
const multiplexer = this._terminalService.createOnInstanceCapabilityEvent(
|
|
192
|
+
const multiplexer = this._terminalService.createOnInstanceCapabilityEvent(2 , capability => capability.onCommandFinished);
|
|
194
193
|
const sub = multiplexer.event(e => {
|
|
195
194
|
this._onDidExecuteCommand(e.instance.instanceId, {
|
|
196
195
|
commandLine: e.data.command,
|
|
@@ -323,7 +322,7 @@ let MainThreadTerminalService = class MainThreadTerminalService {
|
|
|
323
322
|
this._terminalProcessProxies.get(terminalId)?.emitReady(pid, cwd, windowsPty);
|
|
324
323
|
}
|
|
325
324
|
$sendProcessProperty(terminalId, property) {
|
|
326
|
-
if (property.type ===
|
|
325
|
+
if (property.type === "title" ) {
|
|
327
326
|
const instance = this._terminalService.getInstanceFromId(terminalId);
|
|
328
327
|
instance?.rename(property.value);
|
|
329
328
|
}
|
|
@@ -2,7 +2,6 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
|
|
|
2
2
|
import { Event } from 'vscode/vscode/vs/base/common/event';
|
|
3
3
|
import { Disposable, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
|
|
4
4
|
import { URI } from 'vscode/vscode/vs/base/common/uri';
|
|
5
|
-
import { TerminalCapability } from 'vscode/vscode/vs/platform/terminal/common/capabilities/capabilities';
|
|
6
5
|
import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
|
|
7
6
|
import { ITerminalService } from 'vscode/vscode/vs/workbench/contrib/terminal/browser/terminal.service';
|
|
8
7
|
import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService.service';
|
|
@@ -22,11 +21,11 @@ let MainThreadTerminalShellIntegration = class MainThreadTerminalShellIntegratio
|
|
|
22
21
|
}));
|
|
23
22
|
const onDidAddCommandDetection = this._store.add(this._terminalService.createOnInstanceEvent(instance => {
|
|
24
23
|
return ( Event.map(Event.filter(instance.capabilities.onDidAddCapabilityType, e => {
|
|
25
|
-
return e ===
|
|
24
|
+
return e === 2 ;
|
|
26
25
|
}), () => instance));
|
|
27
26
|
})).event;
|
|
28
27
|
this._store.add(onDidAddCommandDetection(e => this._proxy.$shellIntegrationChange(e.instanceId)));
|
|
29
|
-
const commandDetectionStartEvent = this._store.add(this._terminalService.createOnInstanceCapabilityEvent(
|
|
28
|
+
const commandDetectionStartEvent = this._store.add(this._terminalService.createOnInstanceCapabilityEvent(2 , e => e.onCommandExecuted));
|
|
30
29
|
let currentCommand;
|
|
31
30
|
this._store.add(commandDetectionStartEvent.event(e => {
|
|
32
31
|
if (e.data === currentCommand) {
|
|
@@ -38,7 +37,7 @@ let MainThreadTerminalShellIntegration = class MainThreadTerminalShellIntegratio
|
|
|
38
37
|
instanceDataListeners.get(instanceId)?.dispose();
|
|
39
38
|
instanceDataListeners.set(instanceId, Event.accumulate(e.instance.onData, 50, this._store)(events => this._proxy.$shellExecutionData(instanceId, events.join(''))));
|
|
40
39
|
}));
|
|
41
|
-
const commandDetectionEndEvent = this._store.add(this._terminalService.createOnInstanceCapabilityEvent(
|
|
40
|
+
const commandDetectionEndEvent = this._store.add(this._terminalService.createOnInstanceCapabilityEvent(2 , e => e.onCommandFinished));
|
|
42
41
|
this._store.add(commandDetectionEndEvent.event(e => {
|
|
43
42
|
currentCommand = undefined;
|
|
44
43
|
const instanceId = e.instance.instanceId;
|
|
@@ -47,7 +46,7 @@ let MainThreadTerminalShellIntegration = class MainThreadTerminalShellIntegratio
|
|
|
47
46
|
this._proxy.$shellExecutionEnd(instanceId, e.data.command, convertToExtHostCommandLineConfidence(e.data), e.data.isTrusted, e.data.exitCode);
|
|
48
47
|
});
|
|
49
48
|
}));
|
|
50
|
-
const cwdChangeEvent = this._store.add(this._terminalService.createOnInstanceCapabilityEvent(
|
|
49
|
+
const cwdChangeEvent = this._store.add(this._terminalService.createOnInstanceCapabilityEvent(0 , e => e.onDidChangeCwd));
|
|
51
50
|
this._store.add(cwdChangeEvent.event(e => {
|
|
52
51
|
this._proxy.$cwdChange(e.instance.instanceId, this._convertCwdToUri(e.data));
|
|
53
52
|
}));
|
|
@@ -2,11 +2,11 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
|
|
|
2
2
|
import { Event } from 'vscode/vscode/vs/base/common/event';
|
|
3
3
|
import { Disposable, MutableDisposable, DisposableStore, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
|
|
4
4
|
import { transaction, observableValue } from 'vscode/vscode/vs/base/common/observableInternal/base';
|
|
5
|
-
import 'vscode/vscode/vs/base/common/
|
|
5
|
+
import 'vscode/vscode/vs/base/common/arrays';
|
|
6
6
|
import 'vscode/vscode/vs/base/common/observableInternal/autorun';
|
|
7
|
-
import 'vscode/vscode/vs/base/common/observableInternal/
|
|
7
|
+
import 'vscode/vscode/vs/base/common/observableInternal/derived';
|
|
8
8
|
import 'vscode/vscode/vs/base/common/cancellation';
|
|
9
|
-
import 'vscode/vscode/vs/base/common/
|
|
9
|
+
import 'vscode/vscode/vs/base/common/observableInternal/utils';
|
|
10
10
|
import { WellDefinedPrefixTree } from 'vscode/vscode/vs/base/common/prefixTree';
|
|
11
11
|
import { URI } from 'vscode/vscode/vs/base/common/uri';
|
|
12
12
|
import { Range } from 'vscode/vscode/vs/editor/common/core/range';
|
|
@@ -17,7 +17,7 @@ import { ITestProfileService } from 'vscode/vscode/vs/workbench/contrib/testing/
|
|
|
17
17
|
import { LiveTestResult } from 'vscode/vscode/vs/workbench/contrib/testing/common/testResult';
|
|
18
18
|
import { ITestResultService } from 'vscode/vscode/vs/workbench/contrib/testing/common/testResultService.service';
|
|
19
19
|
import { ITestService } from 'vscode/vscode/vs/workbench/contrib/testing/common/testService.service';
|
|
20
|
-
import {
|
|
20
|
+
import { ITestItem, IFileCoverage, CoverageDetails, ITestMessage, TestsDiffOp } from 'vscode/vscode/vs/workbench/contrib/testing/common/testTypes';
|
|
21
21
|
import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
|
|
22
22
|
import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
|
|
23
23
|
|
|
@@ -42,7 +42,7 @@ let MainThreadTesting = class MainThreadTesting extends Disposable {
|
|
|
42
42
|
}));
|
|
43
43
|
this._register(Event.debounce(testProfiles.onDidChange, (_last, e) => e)(() => {
|
|
44
44
|
const obj = {};
|
|
45
|
-
for (const group of [
|
|
45
|
+
for (const group of [2 , 4 , 8 ]) {
|
|
46
46
|
for (const profile of this.testProfiles.getGroupDefaultProfiles(group)) {
|
|
47
47
|
obj[profile.controllerId] ??= [];
|
|
48
48
|
obj[profile.controllerId].push(profile.profileId);
|