@codingame/monaco-vscode-extensions-service-override 4.5.0 → 4.5.2
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.d.ts +2 -2
- package/package.json +3 -3
- package/vscode/src/vs/base/common/console.js +1 -1
- package/vscode/src/vs/platform/extensionManagement/common/extensionManagementCLI.js +67 -134
- package/vscode/src/vs/platform/extensionResourceLoader/browser/extensionResourceLoaderService.js +1 -1
- package/vscode/src/vs/workbench/api/browser/mainThreadAuthentication.js +32 -37
- package/vscode/src/vs/workbench/api/browser/mainThreadBulkEdits.js +1 -1
- package/vscode/src/vs/workbench/api/browser/mainThreadCLICommands.js +12 -11
- package/vscode/src/vs/workbench/api/browser/mainThreadChat.js +2 -2
- package/vscode/src/vs/workbench/api/browser/mainThreadChatAgents2.js +5 -3
- package/vscode/src/vs/workbench/api/browser/mainThreadCodeInsets.js +1 -1
- package/vscode/src/vs/workbench/api/browser/mainThreadCommands.js +1 -1
- package/vscode/src/vs/workbench/api/browser/mainThreadComments.js +44 -38
- package/vscode/src/vs/workbench/api/browser/mainThreadCustomEditors.js +60 -66
- package/vscode/src/vs/workbench/api/browser/mainThreadDebugService.js +2 -2
- package/vscode/src/vs/workbench/api/browser/mainThreadDocuments.js +6 -6
- package/vscode/src/vs/workbench/api/browser/mainThreadEditSessionIdentityParticipant.js +10 -9
- package/vscode/src/vs/workbench/api/browser/mainThreadEditor.js +1 -1
- package/vscode/src/vs/workbench/api/browser/mainThreadEditorTabs.js +1 -1
- package/vscode/src/vs/workbench/api/browser/mainThreadEditors.js +1 -1
- package/vscode/src/vs/workbench/api/browser/mainThreadExtensionService.js +41 -50
- package/vscode/src/vs/workbench/api/browser/mainThreadFileSystem.js +1 -1
- package/vscode/src/vs/workbench/api/browser/mainThreadFileSystemEventService.js +53 -100
- package/vscode/src/vs/workbench/api/browser/mainThreadLanguageFeatures.js +4 -4
- package/vscode/src/vs/workbench/api/browser/mainThreadLanguageModels.js +21 -29
- package/vscode/src/vs/workbench/api/browser/mainThreadLogService.js +2 -2
- package/vscode/src/vs/workbench/api/browser/mainThreadMessageService.js +47 -56
- package/vscode/src/vs/workbench/api/browser/mainThreadNotebookEditors.js +3 -1
- package/vscode/src/vs/workbench/api/browser/mainThreadNotebookKernels.js +5 -5
- package/vscode/src/vs/workbench/api/browser/mainThreadNotebookSaveParticipant.js +7 -10
- package/vscode/src/vs/workbench/api/browser/mainThreadProgress.js +11 -12
- package/vscode/src/vs/workbench/api/browser/mainThreadSaveParticipant.js +8 -11
- package/vscode/src/vs/workbench/api/browser/mainThreadSearch.js +3 -3
- package/vscode/src/vs/workbench/api/browser/mainThreadTask.js +179 -162
- package/vscode/src/vs/workbench/api/browser/mainThreadTreeViews.js +1 -1
- package/vscode/src/vs/workbench/api/browser/mainThreadTunnelService.js +28 -30
- package/vscode/src/vs/workbench/api/browser/mainThreadUriOpeners.js +23 -23
- package/vscode/src/vs/workbench/api/browser/mainThreadWebviewPanels.js +3 -3
- package/vscode/src/vs/workbench/api/browser/mainThreadWebviewViews.js +3 -3
- package/vscode/src/vs/workbench/api/browser/mainThreadWebviews.js +19 -18
- package/vscode/src/vs/workbench/api/browser/mainThreadWorkspace.js +36 -33
- package/vscode/src/vs/workbench/api/common/shared/dataTransferCache.js +2 -2
- package/vscode/src/vs/workbench/services/extensionManagement/browser/extensionBisect.js +56 -121
- package/vscode/src/vs/workbench/services/extensions/browser/extensionService.js +1 -1
- package/vscode/src/vs/workbench/services/extensions/browser/webWorkerFileSystemProvider.js +5 -5
- package/vscode/src/vs/workbench/services/extensions/common/abstractExtensionService.js +130 -142
- package/vscode/src/vs/workbench/services/extensions/common/extensionHostManager.js +33 -32
- package/vscode/src/vs/workbench/services/extensions/common/extensionsUtil.js +9 -8
- package/vscode/src/vs/workbench/services/extensions/common/lazyCreateExtensionHostManager.js +1 -1
- package/extensions.d.ts +0 -44
- package/localExtensionHost.d.ts +0 -41
- package/vscode/src/vs/platform/remote/common/remoteExtensionsScanner.service.d.ts +0 -13
- package/vscode/src/vs/workbench/services/extensionManagement/common/extensionManagement.d.ts +0 -53
- package/vscode/src/vs/workbench/services/extensionManagement/common/extensionManagement.service.d.ts +0 -106
- package/vscode/src/vs/workbench/services/extensions/browser/extensionService.d.ts +0 -45
- package/vscode/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.d.ts +0 -10
- package/vscode/src/vs/workbench/services/extensions/common/abstractExtensionService.d.ts +0 -162
- package/vscode/src/vs/workbench/services/extensions/common/extensionDescriptionRegistry.d.ts +0 -18
- package/vscode/src/vs/workbench/services/extensions/common/extensionHostManagers.d.ts +0 -39
- package/vscode/src/vs/workbench/services/extensions/common/extensionHostProxy.d.ts +0 -17
- package/vscode/src/vs/workbench/services/extensions/common/extensionManifestPropertiesService.service.d.ts +0 -20
- package/vscode/src/vs/workbench/services/extensions/common/extensionRunningLocationTracker.d.ts +0 -45
- package/vscode/src/vs/workbench/services/extensions/common/extensionsProposedApi.d.ts +0 -17
- package/vscode/src/vs/workbench/services/extensions/common/rpcProtocol.d.ts +0 -6
- package/vscode/src/vs/workbench/services/remote/common/remoteExplorerService.d.ts +0 -49
- package/vscode/src/vs/workbench/services/remote/common/remoteExplorerService.service.d.ts +0 -40
- package/vscode/src/vs/workbench/services/remote/common/tunnelModel.d.ts +0 -185
- package/vscode/src/vs/workbench/services/userData/browser/userDataInit.d.ts +0 -11
- package/vscode/src/vs/workbench/services/userData/browser/userDataInit.service.d.ts +0 -9
|
@@ -16,6 +16,7 @@ import { IExtensionFeaturesManagementService } from 'vscode/vscode/vs/workbench/
|
|
|
16
16
|
import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
|
|
17
17
|
import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
|
|
18
18
|
|
|
19
|
+
const _moduleId = "vs/workbench/api/browser/mainThreadLanguageModels";
|
|
19
20
|
let MainThreadLanguageModels = class MainThreadLanguageModels {
|
|
20
21
|
constructor(extHostContext, _chatProviderService, _extensionFeaturesManagementService, _logService, _authenticationService, _authenticationAccessService, _extensionService) {
|
|
21
22
|
this._chatProviderService = _chatProviderService;
|
|
@@ -24,11 +25,11 @@ let MainThreadLanguageModels = class MainThreadLanguageModels {
|
|
|
24
25
|
this._authenticationService = _authenticationService;
|
|
25
26
|
this._authenticationAccessService = _authenticationAccessService;
|
|
26
27
|
this._extensionService = _extensionService;
|
|
27
|
-
this._store = ( new DisposableStore());
|
|
28
|
-
this._providerRegistrations = ( new DisposableMap());
|
|
29
|
-
this._pendingProgress = ( new Map());
|
|
30
|
-
this._proxy = ( extHostContext.getProxy(ExtHostContext.ExtHostChatProvider));
|
|
31
|
-
this._proxy.$updateLanguageModels({ added: coalesce(( _chatProviderService.getLanguageModelIds().map(id => _chatProviderService.lookupLanguageModel(id)))) });
|
|
28
|
+
this._store = ( (new DisposableStore()));
|
|
29
|
+
this._providerRegistrations = ( (new DisposableMap()));
|
|
30
|
+
this._pendingProgress = ( (new Map()));
|
|
31
|
+
this._proxy = ( (extHostContext.getProxy(ExtHostContext.ExtHostChatProvider)));
|
|
32
|
+
this._proxy.$updateLanguageModels({ added: coalesce(( (_chatProviderService.getLanguageModelIds().map(id => _chatProviderService.lookupLanguageModel(id))))) });
|
|
32
33
|
this._store.add(_chatProviderService.onDidChangeLanguageModels(this._proxy.$updateLanguageModels, this._proxy));
|
|
33
34
|
}
|
|
34
35
|
dispose() {
|
|
@@ -36,7 +37,7 @@ let MainThreadLanguageModels = class MainThreadLanguageModels {
|
|
|
36
37
|
this._store.dispose();
|
|
37
38
|
}
|
|
38
39
|
$registerLanguageModelProvider(handle, identifier, metadata) {
|
|
39
|
-
const dipsosables = ( new DisposableStore());
|
|
40
|
+
const dipsosables = ( (new DisposableStore()));
|
|
40
41
|
dipsosables.add(this._chatProviderService.registerLanguageModelChat(identifier, {
|
|
41
42
|
metadata,
|
|
42
43
|
provideChatResponse: async (messages, from, options, progress, token) => {
|
|
@@ -53,14 +54,9 @@ let MainThreadLanguageModels = class MainThreadLanguageModels {
|
|
|
53
54
|
if (metadata.auth) {
|
|
54
55
|
dipsosables.add(this._registerAuthenticationProvider(metadata.extension, metadata.auth));
|
|
55
56
|
}
|
|
56
|
-
dipsosables.add(( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
|
|
57
|
+
dipsosables.add(( (Registry.as(Extensions.ExtensionFeaturesRegistry))).registerExtensionFeature({
|
|
57
58
|
id: `lm-${identifier}`,
|
|
58
|
-
label: ( localizeWithPath(
|
|
59
|
-
'vs/workbench/api/browser/mainThreadLanguageModels',
|
|
60
|
-
'languageModels',
|
|
61
|
-
"Language Model ({0})",
|
|
62
|
-
`${identifier}`
|
|
63
|
-
)),
|
|
59
|
+
label: ( localizeWithPath(_moduleId, 0, "Language Model ({0})", `${identifier}`)),
|
|
64
60
|
access: {
|
|
65
61
|
canToggle: false,
|
|
66
62
|
},
|
|
@@ -88,9 +84,9 @@ let MainThreadLanguageModels = class MainThreadLanguageModels {
|
|
|
88
84
|
async $fetchResponse(extension, providerId, requestId, messages, options, token) {
|
|
89
85
|
await this._extensionFeaturesManagementService.getAccess(extension, `lm-${providerId}`);
|
|
90
86
|
this._logService.debug('[CHAT] extension request STARTED', extension.value, requestId);
|
|
91
|
-
const task = this._chatProviderService.makeLanguageModelChatRequest(providerId, extension, messages, options, ( new Progress(value => {
|
|
87
|
+
const task = this._chatProviderService.makeLanguageModelChatRequest(providerId, extension, messages, options, ( (new Progress(value => {
|
|
92
88
|
this._proxy.$handleResponseFragment(requestId, value);
|
|
93
|
-
})), token);
|
|
89
|
+
}))), token);
|
|
94
90
|
task.catch(err => {
|
|
95
91
|
this._logService.error('[CHAT] extension request ERRORED', err, extension.value, requestId);
|
|
96
92
|
throw err;
|
|
@@ -104,13 +100,9 @@ let MainThreadLanguageModels = class MainThreadLanguageModels {
|
|
|
104
100
|
if (this._authenticationService.getProviderIds().includes(authProviderId)) {
|
|
105
101
|
return Disposable.None;
|
|
106
102
|
}
|
|
107
|
-
const accountLabel = auth.accountLabel ?? ( localizeWithPath(
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
'Language Models'
|
|
111
|
-
));
|
|
112
|
-
const disposables = ( new DisposableStore());
|
|
113
|
-
this._authenticationService.registerAuthenticationProvider(authProviderId, ( new LanguageModelAccessAuthProvider(authProviderId, auth.providerLabel, accountLabel)));
|
|
103
|
+
const accountLabel = auth.accountLabel ?? ( localizeWithPath(_moduleId, 1, 'Language Models'));
|
|
104
|
+
const disposables = ( (new DisposableStore()));
|
|
105
|
+
this._authenticationService.registerAuthenticationProvider(authProviderId, ( (new LanguageModelAccessAuthProvider(authProviderId, auth.providerLabel, accountLabel))));
|
|
114
106
|
disposables.add(toDisposable(() => {
|
|
115
107
|
this._authenticationService.unregisterAuthenticationProvider(authProviderId);
|
|
116
108
|
}));
|
|
@@ -134,12 +126,12 @@ let MainThreadLanguageModels = class MainThreadLanguageModels {
|
|
|
134
126
|
};
|
|
135
127
|
MainThreadLanguageModels = __decorate([
|
|
136
128
|
extHostNamedCustomer(MainContext.MainThreadLanguageModels),
|
|
137
|
-
( __param(1, ILanguageModelsService)),
|
|
138
|
-
( __param(2, IExtensionFeaturesManagementService)),
|
|
139
|
-
( __param(3, ILogService)),
|
|
140
|
-
( __param(4, IAuthenticationService)),
|
|
141
|
-
( __param(5, IAuthenticationAccessService)),
|
|
142
|
-
( __param(6, IExtensionService))
|
|
129
|
+
( (__param(1, ILanguageModelsService))),
|
|
130
|
+
( (__param(2, IExtensionFeaturesManagementService))),
|
|
131
|
+
( (__param(3, ILogService))),
|
|
132
|
+
( (__param(4, IAuthenticationService))),
|
|
133
|
+
( (__param(5, IAuthenticationAccessService))),
|
|
134
|
+
( (__param(6, IExtensionService)))
|
|
143
135
|
], MainThreadLanguageModels);
|
|
144
136
|
class LanguageModelAccessAuthProvider {
|
|
145
137
|
constructor(id, label, _accountLabel) {
|
|
@@ -147,7 +139,7 @@ class LanguageModelAccessAuthProvider {
|
|
|
147
139
|
this.label = label;
|
|
148
140
|
this._accountLabel = _accountLabel;
|
|
149
141
|
this.supportsMultipleAccounts = false;
|
|
150
|
-
this._onDidChangeSessions = ( new Emitter());
|
|
142
|
+
this._onDidChangeSessions = ( (new Emitter()));
|
|
151
143
|
this.onDidChangeSessions = this._onDidChangeSessions.event;
|
|
152
144
|
}
|
|
153
145
|
async getSessions(scopes) {
|
|
@@ -25,7 +25,7 @@ let MainThreadLoggerService = class MainThreadLoggerService {
|
|
|
25
25
|
$log(file, messages) {
|
|
26
26
|
const logger = this.loggerService.getLogger(URI.revive(file));
|
|
27
27
|
if (!logger) {
|
|
28
|
-
throw new Error('Create the logger before logging');
|
|
28
|
+
throw ( new Error('Create the logger before logging'));
|
|
29
29
|
}
|
|
30
30
|
for (const [level, message] of messages) {
|
|
31
31
|
log(logger, level, message);
|
|
@@ -49,7 +49,7 @@ let MainThreadLoggerService = class MainThreadLoggerService {
|
|
|
49
49
|
$flush(file) {
|
|
50
50
|
const logger = this.loggerService.getLogger(URI.revive(file));
|
|
51
51
|
if (!logger) {
|
|
52
|
-
throw new Error('Create the logger before flushing');
|
|
52
|
+
throw ( new Error('Create the logger before flushing'));
|
|
53
53
|
}
|
|
54
54
|
logger.flush();
|
|
55
55
|
}
|
|
@@ -9,6 +9,7 @@ import { Event } from 'vscode/vscode/vs/base/common/event';
|
|
|
9
9
|
import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
|
|
10
10
|
import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
|
|
11
11
|
|
|
12
|
+
const _moduleId = "vs/workbench/api/browser/mainThreadMessageService";
|
|
12
13
|
let MainThreadMessageService = class MainThreadMessageService {
|
|
13
14
|
constructor(extHostContext, _notificationService, _commandService, _dialogService, extensionService) {
|
|
14
15
|
this._notificationService = _notificationService;
|
|
@@ -32,54 +33,48 @@ let MainThreadMessageService = class MainThreadMessageService {
|
|
|
32
33
|
}
|
|
33
34
|
}
|
|
34
35
|
_showMessage(severity, message, commands, options) {
|
|
35
|
-
return (
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
resolve(command.handle);
|
|
42
|
-
return Promise.resolve();
|
|
43
|
-
}
|
|
44
|
-
})));
|
|
45
|
-
let source;
|
|
46
|
-
if (options.source) {
|
|
47
|
-
source = {
|
|
48
|
-
label: options.source.label,
|
|
49
|
-
id: options.source.identifier.value
|
|
50
|
-
};
|
|
51
|
-
}
|
|
52
|
-
if (!source) {
|
|
53
|
-
source = ( localizeWithPath(
|
|
54
|
-
'vs/workbench/api/browser/mainThreadMessageService',
|
|
55
|
-
'defaultSource',
|
|
56
|
-
"Extension"
|
|
57
|
-
));
|
|
58
|
-
}
|
|
59
|
-
const secondaryActions = [];
|
|
60
|
-
if (options.source) {
|
|
61
|
-
secondaryActions.push(toAction({
|
|
62
|
-
id: options.source.identifier.value,
|
|
63
|
-
label: ( localizeWithPath(
|
|
64
|
-
'vs/workbench/api/browser/mainThreadMessageService',
|
|
65
|
-
'manageExtension',
|
|
66
|
-
"Manage Extension"
|
|
67
|
-
)),
|
|
36
|
+
return (
|
|
37
|
+
(new Promise(resolve => {
|
|
38
|
+
const primaryActions = ( (commands.map(command => toAction({
|
|
39
|
+
id: `_extension_message_handle_${command.handle}`,
|
|
40
|
+
label: command.title,
|
|
41
|
+
enabled: true,
|
|
68
42
|
run: () => {
|
|
69
|
-
|
|
43
|
+
resolve(command.handle);
|
|
44
|
+
return Promise.resolve();
|
|
70
45
|
}
|
|
71
|
-
}));
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
46
|
+
}))));
|
|
47
|
+
let source;
|
|
48
|
+
if (options.source) {
|
|
49
|
+
source = {
|
|
50
|
+
label: options.source.label,
|
|
51
|
+
id: options.source.identifier.value
|
|
52
|
+
};
|
|
53
|
+
}
|
|
54
|
+
if (!source) {
|
|
55
|
+
source = ( localizeWithPath(_moduleId, 0, "Extension"));
|
|
56
|
+
}
|
|
57
|
+
const secondaryActions = [];
|
|
58
|
+
if (options.source) {
|
|
59
|
+
secondaryActions.push(toAction({
|
|
60
|
+
id: options.source.identifier.value,
|
|
61
|
+
label: ( localizeWithPath(_moduleId, 1, "Manage Extension")),
|
|
62
|
+
run: () => {
|
|
63
|
+
return this._commandService.executeCommand('_extensions.manage', options.source.identifier.value);
|
|
64
|
+
}
|
|
65
|
+
}));
|
|
66
|
+
}
|
|
67
|
+
const messageHandle = this._notificationService.notify({
|
|
68
|
+
severity,
|
|
69
|
+
message,
|
|
70
|
+
actions: { primary: primaryActions, secondary: secondaryActions },
|
|
71
|
+
source
|
|
72
|
+
});
|
|
73
|
+
Event.once(messageHandle.onDidClose)(() => {
|
|
74
|
+
resolve(undefined);
|
|
75
|
+
});
|
|
76
|
+
}))
|
|
77
|
+
);
|
|
83
78
|
}
|
|
84
79
|
async _showModalMessage(severity, message, detail, commands, useCustom) {
|
|
85
80
|
const buttons = [];
|
|
@@ -99,17 +94,13 @@ let MainThreadMessageService = class MainThreadMessageService {
|
|
|
99
94
|
if (!cancelButton) {
|
|
100
95
|
if (buttons.length > 0) {
|
|
101
96
|
cancelButton = {
|
|
102
|
-
label: ( localizeWithPath(
|
|
97
|
+
label: ( localizeWithPath(_moduleId, 2, "Cancel")),
|
|
103
98
|
run: () => undefined
|
|
104
99
|
};
|
|
105
100
|
}
|
|
106
101
|
else {
|
|
107
102
|
cancelButton = {
|
|
108
|
-
label: ( localizeWithPath(
|
|
109
|
-
'vs/workbench/api/browser/mainThreadMessageService',
|
|
110
|
-
{ key: 'ok', comment: ['&& denotes a mnemonic'] },
|
|
111
|
-
"&&OK"
|
|
112
|
-
)),
|
|
103
|
+
label: ( localizeWithPath(_moduleId, 3, "&&OK")),
|
|
113
104
|
run: () => undefined
|
|
114
105
|
};
|
|
115
106
|
}
|
|
@@ -127,10 +118,10 @@ let MainThreadMessageService = class MainThreadMessageService {
|
|
|
127
118
|
};
|
|
128
119
|
MainThreadMessageService = __decorate([
|
|
129
120
|
extHostNamedCustomer(MainContext.MainThreadMessageService),
|
|
130
|
-
( __param(1, INotificationService)),
|
|
131
|
-
( __param(2, ICommandService)),
|
|
132
|
-
( __param(3, IDialogService)),
|
|
133
|
-
( __param(4, IExtensionService))
|
|
121
|
+
( (__param(1, INotificationService))),
|
|
122
|
+
( (__param(2, ICommandService))),
|
|
123
|
+
( (__param(3, IDialogService))),
|
|
124
|
+
( (__param(4, IExtensionService)))
|
|
134
125
|
], MainThreadMessageService);
|
|
135
126
|
|
|
136
127
|
export { MainThreadMessageService };
|
|
@@ -83,7 +83,9 @@ let MainThreadNotebookEditors = class MainThreadNotebookEditors {
|
|
|
83
83
|
return notebookEditor.getId();
|
|
84
84
|
}
|
|
85
85
|
else {
|
|
86
|
-
throw new Error(
|
|
86
|
+
throw ( new Error(
|
|
87
|
+
`Notebook Editor creation failure for document ${JSON.stringify(resource)}`
|
|
88
|
+
));
|
|
87
89
|
}
|
|
88
90
|
}
|
|
89
91
|
async $tryRevealRange(id, range, revealType) {
|
|
@@ -147,7 +147,7 @@ let MainThreadNotebookKernels = class MainThreadNotebookKernels {
|
|
|
147
147
|
async $postMessage(handle, editorId, message) {
|
|
148
148
|
const tuple = this._kernels.get(handle);
|
|
149
149
|
if (!tuple) {
|
|
150
|
-
throw new Error('kernel already disposed');
|
|
150
|
+
throw ( new Error('kernel already disposed'));
|
|
151
151
|
}
|
|
152
152
|
const [kernel] = tuple;
|
|
153
153
|
let didSend = false;
|
|
@@ -236,11 +236,11 @@ let MainThreadNotebookKernels = class MainThreadNotebookKernels {
|
|
|
236
236
|
const uri = URI.revive(rawUri);
|
|
237
237
|
const notebook = this._notebookService.getNotebookTextModel(uri);
|
|
238
238
|
if (!notebook) {
|
|
239
|
-
throw new Error(`Notebook not found: ${uri.toString()}`);
|
|
239
|
+
throw ( new Error(`Notebook not found: ${( uri.toString())}`));
|
|
240
240
|
}
|
|
241
241
|
const kernel = this._notebookKernelService.getMatchingKernel(notebook);
|
|
242
242
|
if (!kernel.selected || kernel.selected.id !== controllerId) {
|
|
243
|
-
throw new Error(`Kernel is not selected: ${kernel.selected?.id} !== ${controllerId}`);
|
|
243
|
+
throw ( new Error(`Kernel is not selected: ${kernel.selected?.id} !== ${controllerId}`));
|
|
244
244
|
}
|
|
245
245
|
const execution = this._notebookExecutionStateService.createCellExecution(uri, cellHandle);
|
|
246
246
|
execution.confirm();
|
|
@@ -272,11 +272,11 @@ let MainThreadNotebookKernels = class MainThreadNotebookKernels {
|
|
|
272
272
|
const uri = URI.revive(rawUri);
|
|
273
273
|
const notebook = this._notebookService.getNotebookTextModel(uri);
|
|
274
274
|
if (!notebook) {
|
|
275
|
-
throw new Error(`Notebook not found: ${uri.toString()}`);
|
|
275
|
+
throw ( new Error(`Notebook not found: ${( uri.toString())}`));
|
|
276
276
|
}
|
|
277
277
|
const kernel = this._notebookKernelService.getMatchingKernel(notebook);
|
|
278
278
|
if (!kernel.selected || kernel.selected.id !== controllerId) {
|
|
279
|
-
throw new Error(`Kernel is not selected: ${kernel.selected?.id} !== ${controllerId}`);
|
|
279
|
+
throw ( new Error(`Kernel is not selected: ${kernel.selected?.id} !== ${controllerId}`));
|
|
280
280
|
}
|
|
281
281
|
const execution = this._notebookExecutionStateService.createExecution(uri);
|
|
282
282
|
execution.confirm();
|
|
@@ -7,26 +7,23 @@ import { raceCancellationError } from 'vscode/vscode/vs/base/common/async';
|
|
|
7
7
|
import { IWorkingCopyFileService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyFileService.service';
|
|
8
8
|
import { NotebookFileWorkingCopyModel } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookEditorModel';
|
|
9
9
|
|
|
10
|
+
const _moduleId = "vs/workbench/api/browser/mainThreadNotebookSaveParticipant";
|
|
10
11
|
class ExtHostNotebookDocumentSaveParticipant {
|
|
11
12
|
constructor(extHostContext) {
|
|
12
|
-
this._proxy = ( extHostContext.getProxy(ExtHostContext.ExtHostNotebookDocumentSaveParticipant));
|
|
13
|
+
this._proxy = ( (extHostContext.getProxy(ExtHostContext.ExtHostNotebookDocumentSaveParticipant)));
|
|
13
14
|
}
|
|
14
15
|
async participate(workingCopy, context, _progress, token) {
|
|
15
16
|
if (!workingCopy.model || !(workingCopy.model instanceof NotebookFileWorkingCopyModel)) {
|
|
16
17
|
return undefined;
|
|
17
18
|
}
|
|
18
19
|
let _warningTimeout;
|
|
19
|
-
const p = ( new Promise((resolve, reject) => {
|
|
20
|
-
_warningTimeout = setTimeout(() => reject(( new Error(( localizeWithPath(
|
|
21
|
-
'vs/workbench/api/browser/mainThreadNotebookSaveParticipant',
|
|
22
|
-
'timeout.onWillSave',
|
|
23
|
-
"Aborted onWillSaveNotebookDocument-event after 1750ms"
|
|
24
|
-
))))), 1750);
|
|
20
|
+
const p = ( (new Promise((resolve, reject) => {
|
|
21
|
+
_warningTimeout = setTimeout(() => reject(( (new Error(( localizeWithPath(_moduleId, 0, "Aborted onWillSaveNotebookDocument-event after 1750ms")))))), 1750);
|
|
25
22
|
this._proxy.$participateInSave(workingCopy.resource, context.reason, token).then(_ => {
|
|
26
23
|
clearTimeout(_warningTimeout);
|
|
27
24
|
return undefined;
|
|
28
25
|
}).then(resolve, reject);
|
|
29
|
-
}));
|
|
26
|
+
})));
|
|
30
27
|
return raceCancellationError(p, token);
|
|
31
28
|
}
|
|
32
29
|
}
|
|
@@ -41,8 +38,8 @@ let SaveParticipant = class SaveParticipant {
|
|
|
41
38
|
};
|
|
42
39
|
SaveParticipant = __decorate([
|
|
43
40
|
extHostCustomer,
|
|
44
|
-
( __param(1, IInstantiationService)),
|
|
45
|
-
( __param(2, IWorkingCopyFileService))
|
|
41
|
+
( (__param(1, IInstantiationService))),
|
|
42
|
+
( (__param(2, IWorkingCopyFileService)))
|
|
46
43
|
], SaveParticipant);
|
|
47
44
|
|
|
48
45
|
export { SaveParticipant };
|
|
@@ -6,6 +6,7 @@ import { Action } from 'vscode/vscode/vs/base/common/actions';
|
|
|
6
6
|
import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
|
|
7
7
|
import { localizeWithPath } from 'vscode/vscode/vs/nls';
|
|
8
8
|
|
|
9
|
+
const _moduleId = "vs/workbench/api/browser/mainThreadProgress";
|
|
9
10
|
class ManageExtensionAction extends Action {
|
|
10
11
|
constructor(extensionId, label, commandService) {
|
|
11
12
|
super(extensionId, label, undefined, true, () => {
|
|
@@ -16,8 +17,8 @@ class ManageExtensionAction extends Action {
|
|
|
16
17
|
let MainThreadProgress = class MainThreadProgress {
|
|
17
18
|
constructor(extHostContext, progressService, _commandService) {
|
|
18
19
|
this._commandService = _commandService;
|
|
19
|
-
this._progress = ( new Map());
|
|
20
|
-
this._proxy = ( extHostContext.getProxy(ExtHostContext.ExtHostProgress));
|
|
20
|
+
this._progress = ( (new Map()));
|
|
21
|
+
this._proxy = ( (extHostContext.getProxy(ExtHostContext.ExtHostProgress)));
|
|
21
22
|
this._progressService = progressService;
|
|
22
23
|
}
|
|
23
24
|
dispose() {
|
|
@@ -30,11 +31,7 @@ let MainThreadProgress = class MainThreadProgress {
|
|
|
30
31
|
const notificationOptions = {
|
|
31
32
|
...options,
|
|
32
33
|
location: 15 ,
|
|
33
|
-
secondaryActions: [( new ManageExtensionAction(extensionId, ( localizeWithPath(
|
|
34
|
-
'vs/workbench/api/browser/mainThreadProgress',
|
|
35
|
-
'manageExtension',
|
|
36
|
-
"Manage Extension"
|
|
37
|
-
)), this._commandService))]
|
|
34
|
+
secondaryActions: [( (new ManageExtensionAction(extensionId, ( localizeWithPath(_moduleId, 0, "Manage Extension")), this._commandService)))]
|
|
38
35
|
};
|
|
39
36
|
options = notificationOptions;
|
|
40
37
|
}
|
|
@@ -53,16 +50,18 @@ let MainThreadProgress = class MainThreadProgress {
|
|
|
53
50
|
}
|
|
54
51
|
_createTask(handle) {
|
|
55
52
|
return (progress) => {
|
|
56
|
-
return (
|
|
57
|
-
|
|
58
|
-
|
|
53
|
+
return (
|
|
54
|
+
(new Promise(resolve => {
|
|
55
|
+
this._progress.set(handle, { resolve, progress });
|
|
56
|
+
}))
|
|
57
|
+
);
|
|
59
58
|
};
|
|
60
59
|
}
|
|
61
60
|
};
|
|
62
61
|
MainThreadProgress = __decorate([
|
|
63
62
|
extHostNamedCustomer(MainContext.MainThreadProgress),
|
|
64
|
-
( __param(1, IProgressService)),
|
|
65
|
-
( __param(2, ICommandService))
|
|
63
|
+
( (__param(1, IProgressService))),
|
|
64
|
+
( (__param(2, ICommandService)))
|
|
66
65
|
], MainThreadProgress);
|
|
67
66
|
|
|
68
67
|
export { MainThreadProgress };
|
|
@@ -7,27 +7,24 @@ import { ITextFileService } from 'vscode/vscode/vs/workbench/services/textfile/c
|
|
|
7
7
|
import { ExtHostContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
|
|
8
8
|
import { raceCancellationError } from 'vscode/vscode/vs/base/common/async';
|
|
9
9
|
|
|
10
|
+
const _moduleId = "vs/workbench/api/browser/mainThreadSaveParticipant";
|
|
10
11
|
class ExtHostSaveParticipant {
|
|
11
12
|
constructor(extHostContext) {
|
|
12
|
-
this._proxy = ( extHostContext.getProxy(ExtHostContext.ExtHostDocumentSaveParticipant));
|
|
13
|
+
this._proxy = ( (extHostContext.getProxy(ExtHostContext.ExtHostDocumentSaveParticipant)));
|
|
13
14
|
}
|
|
14
15
|
async participate(editorModel, context, _progress, token) {
|
|
15
16
|
if (!editorModel.textEditorModel || !shouldSynchronizeModel(editorModel.textEditorModel)) {
|
|
16
17
|
return undefined;
|
|
17
18
|
}
|
|
18
|
-
const p = ( new Promise((resolve, reject) => {
|
|
19
|
-
setTimeout(() => reject(( new Error(( localizeWithPath(
|
|
20
|
-
'vs/workbench/api/browser/mainThreadSaveParticipant',
|
|
21
|
-
'timeout.onWillSave',
|
|
22
|
-
"Aborted onWillSaveTextDocument-event after 1750ms"
|
|
23
|
-
))))), 1750);
|
|
19
|
+
const p = ( (new Promise((resolve, reject) => {
|
|
20
|
+
setTimeout(() => reject(( (new Error(( localizeWithPath(_moduleId, 0, "Aborted onWillSaveTextDocument-event after 1750ms")))))), 1750);
|
|
24
21
|
this._proxy.$participateInSave(editorModel.resource, context.reason).then(values => {
|
|
25
22
|
if (!values.every(success => success)) {
|
|
26
|
-
return Promise.reject(( new Error('listener failed')));
|
|
23
|
+
return Promise.reject(( (new Error('listener failed'))));
|
|
27
24
|
}
|
|
28
25
|
return undefined;
|
|
29
26
|
}).then(resolve, reject);
|
|
30
|
-
}));
|
|
27
|
+
})));
|
|
31
28
|
return raceCancellationError(p, token);
|
|
32
29
|
}
|
|
33
30
|
}
|
|
@@ -42,8 +39,8 @@ let SaveParticipant = class SaveParticipant {
|
|
|
42
39
|
};
|
|
43
40
|
SaveParticipant = __decorate([
|
|
44
41
|
extHostCustomer,
|
|
45
|
-
( __param(1, IInstantiationService)),
|
|
46
|
-
( __param(2, ITextFileService))
|
|
42
|
+
( (__param(1, IInstantiationService))),
|
|
43
|
+
( (__param(2, ITextFileService)))
|
|
47
44
|
], SaveParticipant);
|
|
48
45
|
|
|
49
46
|
export { SaveParticipant };
|
|
@@ -59,14 +59,14 @@ let MainThreadSearch = class MainThreadSearch {
|
|
|
59
59
|
$handleFileMatch(handle, session, data) {
|
|
60
60
|
const provider = this._searchProvider.get(handle);
|
|
61
61
|
if (!provider) {
|
|
62
|
-
throw new Error('Got result for unknown provider');
|
|
62
|
+
throw ( new Error('Got result for unknown provider'));
|
|
63
63
|
}
|
|
64
64
|
provider.handleFindMatch(session, data);
|
|
65
65
|
}
|
|
66
66
|
$handleTextMatch(handle, session, data) {
|
|
67
67
|
const provider = this._searchProvider.get(handle);
|
|
68
68
|
if (!provider) {
|
|
69
|
-
throw new Error('Got result for unknown provider');
|
|
69
|
+
throw ( new Error('Got result for unknown provider'));
|
|
70
70
|
}
|
|
71
71
|
provider.handleFindMatch(session, data);
|
|
72
72
|
}
|
|
@@ -121,7 +121,7 @@ class RemoteSearchProvider {
|
|
|
121
121
|
}
|
|
122
122
|
doSearch(query, onProgress, token = CancellationToken.None) {
|
|
123
123
|
if (!query.folderQueries.length) {
|
|
124
|
-
throw new Error('Empty folderQueries');
|
|
124
|
+
throw ( new Error('Empty folderQueries'));
|
|
125
125
|
}
|
|
126
126
|
const search = ( new SearchOperation(onProgress));
|
|
127
127
|
this._searches.set(search.id, search);
|