@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
|
@@ -14,7 +14,13 @@ import { SearchContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/
|
|
|
14
14
|
import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
|
|
15
15
|
|
|
16
16
|
let MainThreadSearch = class MainThreadSearch {
|
|
17
|
-
constructor(
|
|
17
|
+
constructor(
|
|
18
|
+
extHostContext,
|
|
19
|
+
_searchService,
|
|
20
|
+
_telemetryService,
|
|
21
|
+
_configurationService,
|
|
22
|
+
contextKeyService
|
|
23
|
+
) {
|
|
18
24
|
this._searchService = _searchService;
|
|
19
25
|
this._telemetryService = _telemetryService;
|
|
20
26
|
this.contextKeyService = contextKeyService;
|
|
@@ -56,21 +62,21 @@ let MainThreadSearch = class MainThreadSearch {
|
|
|
56
62
|
$handleFileMatch(handle, session, data) {
|
|
57
63
|
const provider = this._searchProvider.get(handle);
|
|
58
64
|
if (!provider) {
|
|
59
|
-
throw ( new Error(
|
|
65
|
+
throw ( new Error("Got result for unknown provider"));
|
|
60
66
|
}
|
|
61
67
|
provider.handleFindMatch(session, data);
|
|
62
68
|
}
|
|
63
69
|
$handleTextMatch(handle, session, data) {
|
|
64
70
|
const provider = this._searchProvider.get(handle);
|
|
65
71
|
if (!provider) {
|
|
66
|
-
throw ( new Error(
|
|
72
|
+
throw ( new Error("Got result for unknown provider"));
|
|
67
73
|
}
|
|
68
74
|
provider.handleFindMatch(session, data);
|
|
69
75
|
}
|
|
70
76
|
$handleKeywordResult(handle, session, data) {
|
|
71
77
|
const provider = this._searchProvider.get(handle);
|
|
72
78
|
if (!provider) {
|
|
73
|
-
throw ( new Error(
|
|
79
|
+
throw ( new Error("Got result for unknown provider"));
|
|
74
80
|
}
|
|
75
81
|
provider.handleKeywordResult(session, data);
|
|
76
82
|
}
|
|
@@ -78,16 +84,17 @@ let MainThreadSearch = class MainThreadSearch {
|
|
|
78
84
|
this._telemetryService.publicLog(eventName, data);
|
|
79
85
|
}
|
|
80
86
|
};
|
|
81
|
-
MainThreadSearch = __decorate([
|
|
82
|
-
extHostNamedCustomer(MainContext.MainThreadSearch),
|
|
83
|
-
( __param(1, ISearchService)),
|
|
84
|
-
( __param(2, ITelemetryService)),
|
|
85
|
-
( __param(3, IConfigurationService)),
|
|
86
|
-
( __param(4, IContextKeyService))
|
|
87
|
-
], MainThreadSearch);
|
|
87
|
+
MainThreadSearch = __decorate([extHostNamedCustomer(MainContext.MainThreadSearch), ( __param(1, ISearchService)), ( __param(2, ITelemetryService)), ( __param(3, IConfigurationService)), ( __param(4, IContextKeyService))], MainThreadSearch);
|
|
88
88
|
class SearchOperation {
|
|
89
|
-
static {
|
|
90
|
-
|
|
89
|
+
static {
|
|
90
|
+
this._idPool = 0;
|
|
91
|
+
}
|
|
92
|
+
constructor(
|
|
93
|
+
progress,
|
|
94
|
+
id = ++SearchOperation._idPool,
|
|
95
|
+
matches = ( new Map()),
|
|
96
|
+
keywords = []
|
|
97
|
+
) {
|
|
91
98
|
this.progress = progress;
|
|
92
99
|
this.id = id;
|
|
93
100
|
this.matches = matches;
|
|
@@ -99,8 +106,7 @@ class SearchOperation {
|
|
|
99
106
|
if (existingMatch.results && match.results) {
|
|
100
107
|
existingMatch.results.push(...match.results);
|
|
101
108
|
}
|
|
102
|
-
}
|
|
103
|
-
else {
|
|
109
|
+
} else {
|
|
104
110
|
this.matches.set(( match.resource.toString()), match);
|
|
105
111
|
}
|
|
106
112
|
this.progress?.(match);
|
|
@@ -136,14 +142,20 @@ class RemoteSearchProvider {
|
|
|
136
142
|
}
|
|
137
143
|
doSearch(query, onProgress, token = CancellationToken.None) {
|
|
138
144
|
if (!query.folderQueries.length) {
|
|
139
|
-
throw ( new Error(
|
|
145
|
+
throw ( new Error("Empty folderQueries"));
|
|
140
146
|
}
|
|
141
147
|
const search = ( new SearchOperation(onProgress));
|
|
142
148
|
this._searches.set(search.id, search);
|
|
143
149
|
const searchP = this._provideSearchResults(query, search.id, token);
|
|
144
|
-
return Promise.resolve(searchP).then(
|
|
150
|
+
return Promise.resolve(searchP).then(result => {
|
|
145
151
|
this._searches.delete(search.id);
|
|
146
|
-
return {
|
|
152
|
+
return {
|
|
153
|
+
results: Array.from(( search.matches.values())),
|
|
154
|
+
aiKeywords: Array.from(search.keywords),
|
|
155
|
+
stats: result.stats,
|
|
156
|
+
limitHit: result.limitHit,
|
|
157
|
+
messages: result.messages
|
|
158
|
+
};
|
|
147
159
|
}, err => {
|
|
148
160
|
this._searches.delete(search.id);
|
|
149
161
|
return Promise.reject(err);
|
|
@@ -160,8 +172,7 @@ class RemoteSearchProvider {
|
|
|
160
172
|
dataOrUri.forEach(result => {
|
|
161
173
|
if (result.results) {
|
|
162
174
|
searchOp.addMatch(revive(result));
|
|
163
|
-
}
|
|
164
|
-
else {
|
|
175
|
+
} else {
|
|
165
176
|
searchOp.addMatch({
|
|
166
177
|
resource: URI.revive(result)
|
|
167
178
|
});
|
|
@@ -177,12 +188,12 @@ class RemoteSearchProvider {
|
|
|
177
188
|
}
|
|
178
189
|
_provideSearchResults(query, session, token) {
|
|
179
190
|
switch (query.type) {
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
191
|
+
case QueryType.File:
|
|
192
|
+
return this._proxy.$provideFileSearchResults(this._handle, session, query, token);
|
|
193
|
+
case QueryType.Text:
|
|
194
|
+
return this._proxy.$provideTextSearchResults(this._handle, session, query, token);
|
|
195
|
+
default:
|
|
196
|
+
return this._proxy.$provideAITextSearchResults(this._handle, session, query, token);
|
|
186
197
|
}
|
|
187
198
|
}
|
|
188
199
|
}
|
|
@@ -15,7 +15,7 @@ let MainThreadSecretState = class MainThreadSecretState extends Disposable {
|
|
|
15
15
|
this.logService = logService;
|
|
16
16
|
this._sequencer = ( new SequencerByKey());
|
|
17
17
|
this._proxy = ( extHostContext.getProxy(ExtHostContext.ExtHostSecretState));
|
|
18
|
-
this._register(this.secretStorageService.onDidChangeSecret(
|
|
18
|
+
this._register(this.secretStorageService.onDidChangeSecret(e => {
|
|
19
19
|
const parsedKey = this.parseKey(e);
|
|
20
20
|
if (parsedKey) {
|
|
21
21
|
this._proxy.$onDidChangePassword(parsedKey);
|
|
@@ -23,32 +23,45 @@ let MainThreadSecretState = class MainThreadSecretState extends Disposable {
|
|
|
23
23
|
}));
|
|
24
24
|
}
|
|
25
25
|
$getPassword(extensionId, key) {
|
|
26
|
-
this.logService.trace(
|
|
26
|
+
this.logService.trace(
|
|
27
|
+
`[mainThreadSecretState] Getting password for ${extensionId} extension: `,
|
|
28
|
+
key
|
|
29
|
+
);
|
|
27
30
|
return this._sequencer.queue(extensionId, () => this.doGetPassword(extensionId, key));
|
|
28
31
|
}
|
|
29
32
|
async doGetPassword(extensionId, key) {
|
|
30
33
|
const fullKey = this.getKey(extensionId, key);
|
|
31
34
|
const password = await this.secretStorageService.get(fullKey);
|
|
32
|
-
this.logService.trace(
|
|
35
|
+
this.logService.trace(
|
|
36
|
+
`[mainThreadSecretState] ${password ? "P" : "No p"}assword found for: `,
|
|
37
|
+
extensionId,
|
|
38
|
+
key
|
|
39
|
+
);
|
|
33
40
|
return password;
|
|
34
41
|
}
|
|
35
42
|
$setPassword(extensionId, key, value) {
|
|
36
|
-
this.logService.trace(
|
|
43
|
+
this.logService.trace(
|
|
44
|
+
`[mainThreadSecretState] Setting password for ${extensionId} extension: `,
|
|
45
|
+
key
|
|
46
|
+
);
|
|
37
47
|
return this._sequencer.queue(extensionId, () => this.doSetPassword(extensionId, key, value));
|
|
38
48
|
}
|
|
39
49
|
async doSetPassword(extensionId, key, value) {
|
|
40
50
|
const fullKey = this.getKey(extensionId, key);
|
|
41
51
|
await this.secretStorageService.set(fullKey, value);
|
|
42
|
-
this.logService.trace(
|
|
52
|
+
this.logService.trace("[mainThreadSecretState] Password set for: ", extensionId, key);
|
|
43
53
|
}
|
|
44
54
|
$deletePassword(extensionId, key) {
|
|
45
|
-
this.logService.trace(
|
|
55
|
+
this.logService.trace(
|
|
56
|
+
`[mainThreadSecretState] Deleting password for ${extensionId} extension: `,
|
|
57
|
+
key
|
|
58
|
+
);
|
|
46
59
|
return this._sequencer.queue(extensionId, () => this.doDeletePassword(extensionId, key));
|
|
47
60
|
}
|
|
48
61
|
async doDeletePassword(extensionId, key) {
|
|
49
62
|
const fullKey = this.getKey(extensionId, key);
|
|
50
63
|
await this.secretStorageService.delete(fullKey);
|
|
51
|
-
this.logService.trace(
|
|
64
|
+
this.logService.trace("[mainThreadSecretState] Password deleted for: ", extensionId, key);
|
|
52
65
|
}
|
|
53
66
|
$getKeys(extensionId) {
|
|
54
67
|
this.logService.trace(`[mainThreadSecretState] Getting keys for ${extensionId} extension: `);
|
|
@@ -56,33 +69,33 @@ let MainThreadSecretState = class MainThreadSecretState extends Disposable {
|
|
|
56
69
|
}
|
|
57
70
|
async doGetKeys(extensionId) {
|
|
58
71
|
if (!this.secretStorageService.keys) {
|
|
59
|
-
throw ( new Error(
|
|
72
|
+
throw ( new Error("Secret storage service does not support keys() method"));
|
|
60
73
|
}
|
|
61
74
|
const allKeys = await ( this.secretStorageService.keys());
|
|
62
|
-
const keys = ( ( allKeys
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
75
|
+
const keys = ( ( allKeys.map(key => this.parseKey(key))).filter(
|
|
76
|
+
parsedKey => parsedKey !== undefined && parsedKey.extensionId === extensionId
|
|
77
|
+
).map((
|
|
78
|
+
{
|
|
79
|
+
key
|
|
80
|
+
}
|
|
81
|
+
) => key));
|
|
66
82
|
this.logService.trace(`[mainThreadSecretState] Got ${keys.length}key(s) for: `, extensionId);
|
|
67
83
|
return keys;
|
|
68
84
|
}
|
|
69
85
|
getKey(extensionId, key) {
|
|
70
|
-
return JSON.stringify({
|
|
86
|
+
return JSON.stringify({
|
|
87
|
+
extensionId,
|
|
88
|
+
key
|
|
89
|
+
});
|
|
71
90
|
}
|
|
72
91
|
parseKey(key) {
|
|
73
92
|
try {
|
|
74
93
|
return JSON.parse(key);
|
|
75
|
-
}
|
|
76
|
-
catch {
|
|
94
|
+
} catch {
|
|
77
95
|
return undefined;
|
|
78
96
|
}
|
|
79
97
|
}
|
|
80
98
|
};
|
|
81
|
-
MainThreadSecretState = __decorate([
|
|
82
|
-
extHostNamedCustomer(MainContext.MainThreadSecretState),
|
|
83
|
-
( __param(1, ISecretStorageService)),
|
|
84
|
-
( __param(2, ILogService)),
|
|
85
|
-
( __param(3, IBrowserWorkbenchEnvironmentService))
|
|
86
|
-
], MainThreadSecretState);
|
|
99
|
+
MainThreadSecretState = __decorate([extHostNamedCustomer(MainContext.MainThreadSecretState), ( __param(1, ISecretStorageService)), ( __param(2, ILogService)), ( __param(3, IBrowserWorkbenchEnvironmentService))], MainThreadSecretState);
|
|
87
100
|
|
|
88
101
|
export { MainThreadSecretState };
|
|
@@ -20,9 +20,9 @@ let MainThreadShare = class MainThreadShare {
|
|
|
20
20
|
label,
|
|
21
21
|
selector,
|
|
22
22
|
priority,
|
|
23
|
-
provideShare: async
|
|
23
|
+
provideShare: async item => {
|
|
24
24
|
const result = await this.proxy.$provideShare(handle, item, CancellationToken.None);
|
|
25
|
-
return typeof result ===
|
|
25
|
+
return typeof result === "string" ? result : URI.revive(result);
|
|
26
26
|
}
|
|
27
27
|
};
|
|
28
28
|
this.providers.set(handle, provider);
|
|
@@ -39,9 +39,6 @@ let MainThreadShare = class MainThreadShare {
|
|
|
39
39
|
this.providerDisposables.clear();
|
|
40
40
|
}
|
|
41
41
|
};
|
|
42
|
-
MainThreadShare = __decorate([
|
|
43
|
-
extHostNamedCustomer(MainContext.MainThreadShare),
|
|
44
|
-
( __param(1, IShareService))
|
|
45
|
-
], MainThreadShare);
|
|
42
|
+
MainThreadShare = __decorate([extHostNamedCustomer(MainContext.MainThreadShare), ( __param(1, IShareService))], MainThreadShare);
|
|
46
43
|
|
|
47
44
|
export { MainThreadShare };
|
|
@@ -20,7 +20,7 @@ let MainThreadSpeech = class MainThreadSpeech {
|
|
|
20
20
|
this.proxy = ( extHostContext.getProxy(ExtHostContext.ExtHostSpeech));
|
|
21
21
|
}
|
|
22
22
|
$registerProvider(handle, identifier, metadata) {
|
|
23
|
-
this.logService.trace(
|
|
23
|
+
this.logService.trace("[Speech] extension registered provider", metadata.extension.value);
|
|
24
24
|
const registration = this.speechService.registerSpeechProvider(identifier, {
|
|
25
25
|
metadata,
|
|
26
26
|
createSpeechToTextSession: (token, options) => {
|
|
@@ -33,7 +33,9 @@ let MainThreadSpeech = class MainThreadSpeech {
|
|
|
33
33
|
const session = Math.random();
|
|
34
34
|
this.proxy.$createSpeechToTextSession(handle, session, options?.language);
|
|
35
35
|
const onDidChange = disposables.add(( new Emitter()));
|
|
36
|
-
this.speechToTextSessions.set(session, {
|
|
36
|
+
this.speechToTextSessions.set(session, {
|
|
37
|
+
onDidChange
|
|
38
|
+
});
|
|
37
39
|
disposables.add(token.onCancellationRequested(() => {
|
|
38
40
|
this.proxy.$cancelSpeechToTextSession(session);
|
|
39
41
|
this.speechToTextSessions.delete(session);
|
|
@@ -47,14 +49,16 @@ let MainThreadSpeech = class MainThreadSpeech {
|
|
|
47
49
|
if (token.isCancellationRequested) {
|
|
48
50
|
return {
|
|
49
51
|
onDidChange: Event.None,
|
|
50
|
-
synthesize: async () => {
|
|
52
|
+
synthesize: async () => {}
|
|
51
53
|
};
|
|
52
54
|
}
|
|
53
55
|
const disposables = ( new DisposableStore());
|
|
54
56
|
const session = Math.random();
|
|
55
57
|
this.proxy.$createTextToSpeechSession(handle, session, options?.language);
|
|
56
58
|
const onDidChange = disposables.add(( new Emitter()));
|
|
57
|
-
this.textToSpeechSessions.set(session, {
|
|
59
|
+
this.textToSpeechSessions.set(session, {
|
|
60
|
+
onDidChange
|
|
61
|
+
});
|
|
58
62
|
disposables.add(token.onCancellationRequested(() => {
|
|
59
63
|
this.proxy.$cancelTextToSpeechSession(session);
|
|
60
64
|
this.textToSpeechSessions.delete(session);
|
|
@@ -62,13 +66,16 @@ let MainThreadSpeech = class MainThreadSpeech {
|
|
|
62
66
|
}));
|
|
63
67
|
return {
|
|
64
68
|
onDidChange: onDidChange.event,
|
|
65
|
-
synthesize: async
|
|
69
|
+
synthesize: async text => {
|
|
66
70
|
await this.proxy.$synthesizeSpeech(session, text);
|
|
67
71
|
const disposable = ( new DisposableStore());
|
|
68
72
|
try {
|
|
69
|
-
await raceCancellation(Event.toPromise(Event.filter(
|
|
70
|
-
|
|
71
|
-
|
|
73
|
+
await raceCancellation(Event.toPromise(Event.filter(
|
|
74
|
+
onDidChange.event,
|
|
75
|
+
e => e.status === TextToSpeechStatus.Stopped,
|
|
76
|
+
disposable
|
|
77
|
+
), disposable), token);
|
|
78
|
+
} finally {
|
|
72
79
|
disposable.dispose();
|
|
73
80
|
}
|
|
74
81
|
}
|
|
@@ -84,7 +91,9 @@ let MainThreadSpeech = class MainThreadSpeech {
|
|
|
84
91
|
const session = Math.random();
|
|
85
92
|
this.proxy.$createKeywordRecognitionSession(handle, session);
|
|
86
93
|
const onDidChange = disposables.add(( new Emitter()));
|
|
87
|
-
this.keywordRecognitionSessions.set(session, {
|
|
94
|
+
this.keywordRecognitionSessions.set(session, {
|
|
95
|
+
onDidChange
|
|
96
|
+
});
|
|
88
97
|
disposables.add(token.onCancellationRequested(() => {
|
|
89
98
|
this.proxy.$cancelKeywordRecognitionSession(session);
|
|
90
99
|
this.keywordRecognitionSessions.delete(session);
|
|
@@ -131,10 +140,6 @@ let MainThreadSpeech = class MainThreadSpeech {
|
|
|
131
140
|
this.keywordRecognitionSessions.clear();
|
|
132
141
|
}
|
|
133
142
|
};
|
|
134
|
-
MainThreadSpeech = __decorate([
|
|
135
|
-
extHostNamedCustomer(MainContext.MainThreadSpeech),
|
|
136
|
-
( __param(1, ISpeechService)),
|
|
137
|
-
( __param(2, ILogService))
|
|
138
|
-
], MainThreadSpeech);
|
|
143
|
+
MainThreadSpeech = __decorate([extHostNamedCustomer(MainContext.MainThreadSpeech), ( __param(1, ISpeechService)), ( __param(2, ILogService))], MainThreadSpeech);
|
|
139
144
|
|
|
140
145
|
export { MainThreadSpeech };
|
|
@@ -28,23 +28,51 @@ let MainThreadStatusBar = class MainThreadStatusBar extends Disposable {
|
|
|
28
28
|
name: item.entry.name,
|
|
29
29
|
text: item.entry.text,
|
|
30
30
|
tooltip: item.entry.tooltip,
|
|
31
|
-
command: typeof item.entry.command ===
|
|
31
|
+
command: typeof item.entry.command === "string" ? item.entry.command : typeof item.entry.command === "object" ? item.entry.command.id : undefined,
|
|
32
32
|
priority: item.priority,
|
|
33
33
|
alignLeft: item.alignment === StatusbarAlignment.LEFT,
|
|
34
|
-
accessibilityInformation: item.entry.ariaLabel ? {
|
|
34
|
+
accessibilityInformation: item.entry.ariaLabel ? {
|
|
35
|
+
label: item.entry.ariaLabel,
|
|
36
|
+
role: item.entry.role
|
|
37
|
+
} : undefined
|
|
35
38
|
};
|
|
36
39
|
}
|
|
37
40
|
}
|
|
38
|
-
$setEntry(
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
41
|
+
$setEntry(
|
|
42
|
+
entryId,
|
|
43
|
+
id,
|
|
44
|
+
extensionId,
|
|
45
|
+
name,
|
|
46
|
+
text,
|
|
47
|
+
tooltip,
|
|
48
|
+
hasTooltipProvider,
|
|
49
|
+
command,
|
|
50
|
+
color,
|
|
51
|
+
backgroundColor,
|
|
52
|
+
alignLeft,
|
|
53
|
+
priority,
|
|
54
|
+
accessibilityInformation
|
|
55
|
+
) {
|
|
56
|
+
const tooltipOrTooltipProvider = hasTooltipProvider ? {
|
|
57
|
+
markdown: cancellation => {
|
|
58
|
+
return this._proxy.$provideTooltip(entryId, cancellation);
|
|
59
|
+
},
|
|
60
|
+
markdownNotSupportedFallback: undefined
|
|
61
|
+
} : tooltip;
|
|
62
|
+
const kind = this.statusbarService.setOrUpdateEntry(
|
|
63
|
+
entryId,
|
|
64
|
+
id,
|
|
65
|
+
extensionId,
|
|
66
|
+
name,
|
|
67
|
+
text,
|
|
68
|
+
tooltipOrTooltipProvider,
|
|
69
|
+
command,
|
|
70
|
+
color,
|
|
71
|
+
backgroundColor,
|
|
72
|
+
alignLeft,
|
|
73
|
+
priority,
|
|
74
|
+
accessibilityInformation
|
|
75
|
+
);
|
|
48
76
|
if (kind === StatusBarUpdateKind.DidDefine) {
|
|
49
77
|
const disposable = toDisposable(() => this.statusbarService.unsetEntry(entryId));
|
|
50
78
|
this._entryDisposables.set(entryId, disposable);
|
|
@@ -54,9 +82,6 @@ let MainThreadStatusBar = class MainThreadStatusBar extends Disposable {
|
|
|
54
82
|
this._entryDisposables.deleteAndDispose(entryId);
|
|
55
83
|
}
|
|
56
84
|
};
|
|
57
|
-
MainThreadStatusBar = __decorate([
|
|
58
|
-
extHostNamedCustomer(MainContext.MainThreadStatusBar),
|
|
59
|
-
( __param(1, IExtensionStatusBarItemService))
|
|
60
|
-
], MainThreadStatusBar);
|
|
85
|
+
MainThreadStatusBar = __decorate([extHostNamedCustomer(MainContext.MainThreadStatusBar), ( __param(1, IExtensionStatusBarItemService))], MainThreadStatusBar);
|
|
61
86
|
|
|
62
87
|
export { MainThreadStatusBar };
|
|
@@ -12,7 +12,13 @@ import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
|
|
|
12
12
|
import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
|
|
13
13
|
|
|
14
14
|
let MainThreadStorage = class MainThreadStorage {
|
|
15
|
-
constructor(
|
|
15
|
+
constructor(
|
|
16
|
+
extHostContext,
|
|
17
|
+
_extensionStorageService,
|
|
18
|
+
_storageService,
|
|
19
|
+
_instantiationService,
|
|
20
|
+
_logService
|
|
21
|
+
) {
|
|
16
22
|
this._extensionStorageService = _extensionStorageService;
|
|
17
23
|
this._storageService = _storageService;
|
|
18
24
|
this._instantiationService = _instantiationService;
|
|
@@ -20,14 +26,16 @@ let MainThreadStorage = class MainThreadStorage {
|
|
|
20
26
|
this._storageListener = ( new DisposableStore());
|
|
21
27
|
this._sharedStorageKeysToWatch = ( new Map());
|
|
22
28
|
this._proxy = ( extHostContext.getProxy(ExtHostContext.ExtHostStorage));
|
|
23
|
-
this._storageListener.add(
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
29
|
+
this._storageListener.add(
|
|
30
|
+
this._storageService.onDidChangeValue(StorageScope.PROFILE, undefined, this._storageListener)(e => {
|
|
31
|
+
if (( this._sharedStorageKeysToWatch.has(e.key))) {
|
|
32
|
+
const rawState = this._extensionStorageService.getExtensionStateRaw(e.key, true);
|
|
33
|
+
if (typeof rawState === "string") {
|
|
34
|
+
this._proxy.$acceptValue(true, e.key, rawState);
|
|
35
|
+
}
|
|
28
36
|
}
|
|
29
|
-
}
|
|
30
|
-
|
|
37
|
+
})
|
|
38
|
+
);
|
|
31
39
|
}
|
|
32
40
|
dispose() {
|
|
33
41
|
this._storageListener.dispose();
|
|
@@ -57,18 +65,11 @@ let MainThreadStorage = class MainThreadStorage {
|
|
|
57
65
|
}
|
|
58
66
|
await migrateExtensionStorage(sourceExtensionId, extensionId, shared, this._instantiationService);
|
|
59
67
|
}
|
|
60
|
-
}
|
|
61
|
-
catch (error) {
|
|
68
|
+
} catch (error) {
|
|
62
69
|
this._logService.error(error);
|
|
63
70
|
}
|
|
64
71
|
}
|
|
65
72
|
};
|
|
66
|
-
MainThreadStorage = __decorate([
|
|
67
|
-
extHostNamedCustomer(MainContext.MainThreadStorage),
|
|
68
|
-
( __param(1, IExtensionStorageService)),
|
|
69
|
-
( __param(2, IStorageService)),
|
|
70
|
-
( __param(3, IInstantiationService)),
|
|
71
|
-
( __param(4, ILogService))
|
|
72
|
-
], MainThreadStorage);
|
|
73
|
+
MainThreadStorage = __decorate([extHostNamedCustomer(MainContext.MainThreadStorage), ( __param(1, IExtensionStorageService)), ( __param(2, IStorageService)), ( __param(3, IInstantiationService)), ( __param(4, ILogService))], MainThreadStorage);
|
|
73
74
|
|
|
74
75
|
export { MainThreadStorage };
|