@codingame/monaco-vscode-extensions-service-override 25.1.2 → 26.0.0
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
|
@@ -18,10 +18,23 @@ let MainThreadFileSystem = MainThreadFileSystem_1 = class MainThreadFileSystem {
|
|
|
18
18
|
this._proxy = ( extHostContext.getProxy(ExtHostContext.ExtHostFileSystem));
|
|
19
19
|
const infoProxy = ( extHostContext.getProxy(ExtHostContext.ExtHostFileSystemInfo));
|
|
20
20
|
for (const entry of _fileService.listCapabilities()) {
|
|
21
|
-
infoProxy.$acceptProviderInfos(( URI.from({
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
21
|
+
infoProxy.$acceptProviderInfos(( URI.from({
|
|
22
|
+
scheme: entry.scheme,
|
|
23
|
+
path: "/dummy"
|
|
24
|
+
})), entry.capabilities);
|
|
25
|
+
}
|
|
26
|
+
this._disposables.add(
|
|
27
|
+
_fileService.onDidChangeFileSystemProviderRegistrations(e => infoProxy.$acceptProviderInfos(( URI.from({
|
|
28
|
+
scheme: e.scheme,
|
|
29
|
+
path: "/dummy"
|
|
30
|
+
})), e.provider?.capabilities ?? null))
|
|
31
|
+
);
|
|
32
|
+
this._disposables.add(
|
|
33
|
+
_fileService.onDidChangeFileSystemProviderCapabilities(e => infoProxy.$acceptProviderInfos(( URI.from({
|
|
34
|
+
scheme: e.scheme,
|
|
35
|
+
path: "/dummy"
|
|
36
|
+
})), e.provider.capabilities))
|
|
37
|
+
);
|
|
25
38
|
}
|
|
26
39
|
dispose() {
|
|
27
40
|
this._disposables.dispose();
|
|
@@ -43,7 +56,7 @@ let MainThreadFileSystem = MainThreadFileSystem_1 = class MainThreadFileSystem {
|
|
|
43
56
|
$onFileSystemChange(handle, changes) {
|
|
44
57
|
const fileProvider = this._fileProvider.get(handle);
|
|
45
58
|
if (!fileProvider) {
|
|
46
|
-
throw ( new Error(
|
|
59
|
+
throw ( new Error("Unknown file provider"));
|
|
47
60
|
}
|
|
48
61
|
fileProvider.$onFileSystemChange(changes);
|
|
49
62
|
}
|
|
@@ -57,22 +70,22 @@ let MainThreadFileSystem = MainThreadFileSystem_1 = class MainThreadFileSystem {
|
|
|
57
70
|
permissions: stat.readonly ? FilePermission.Readonly : undefined,
|
|
58
71
|
type: MainThreadFileSystem_1._asFileType(stat)
|
|
59
72
|
};
|
|
60
|
-
}
|
|
61
|
-
catch (err) {
|
|
73
|
+
} catch (err) {
|
|
62
74
|
return MainThreadFileSystem_1._handleError(err);
|
|
63
75
|
}
|
|
64
76
|
}
|
|
65
77
|
async $readdir(uri) {
|
|
66
78
|
try {
|
|
67
|
-
const stat = await this._fileService.resolve(URI.revive(uri), {
|
|
79
|
+
const stat = await this._fileService.resolve(URI.revive(uri), {
|
|
80
|
+
resolveMetadata: false
|
|
81
|
+
});
|
|
68
82
|
if (!stat.isDirectory) {
|
|
69
83
|
const err = ( new Error(stat.name));
|
|
70
84
|
err.name = FileSystemProviderErrorCode.FileNotADirectory;
|
|
71
85
|
throw err;
|
|
72
86
|
}
|
|
73
87
|
return !stat.children ? [] : ( stat.children.map(child => [child.name, MainThreadFileSystem_1._asFileType(child)]));
|
|
74
|
-
}
|
|
75
|
-
catch (err) {
|
|
88
|
+
} catch (err) {
|
|
76
89
|
return MainThreadFileSystem_1._handleError(err);
|
|
77
90
|
}
|
|
78
91
|
}
|
|
@@ -80,8 +93,7 @@ let MainThreadFileSystem = MainThreadFileSystem_1 = class MainThreadFileSystem {
|
|
|
80
93
|
let res = 0;
|
|
81
94
|
if (stat.isFile) {
|
|
82
95
|
res += FileType.File;
|
|
83
|
-
}
|
|
84
|
-
else if (stat.isDirectory) {
|
|
96
|
+
} else if (stat.isDirectory) {
|
|
85
97
|
res += FileType.Directory;
|
|
86
98
|
}
|
|
87
99
|
if (stat.isSymbolicLink) {
|
|
@@ -93,69 +105,62 @@ let MainThreadFileSystem = MainThreadFileSystem_1 = class MainThreadFileSystem {
|
|
|
93
105
|
try {
|
|
94
106
|
const file = await this._fileService.readFile(URI.revive(uri));
|
|
95
107
|
return file.value;
|
|
96
|
-
}
|
|
97
|
-
catch (err) {
|
|
108
|
+
} catch (err) {
|
|
98
109
|
return MainThreadFileSystem_1._handleError(err);
|
|
99
110
|
}
|
|
100
111
|
}
|
|
101
112
|
async $writeFile(uri, content) {
|
|
102
113
|
try {
|
|
103
114
|
await this._fileService.writeFile(URI.revive(uri), content);
|
|
104
|
-
}
|
|
105
|
-
catch (err) {
|
|
115
|
+
} catch (err) {
|
|
106
116
|
return MainThreadFileSystem_1._handleError(err);
|
|
107
117
|
}
|
|
108
118
|
}
|
|
109
119
|
async $rename(source, target, opts) {
|
|
110
120
|
try {
|
|
111
121
|
await this._fileService.move(URI.revive(source), URI.revive(target), opts.overwrite);
|
|
112
|
-
}
|
|
113
|
-
catch (err) {
|
|
122
|
+
} catch (err) {
|
|
114
123
|
return MainThreadFileSystem_1._handleError(err);
|
|
115
124
|
}
|
|
116
125
|
}
|
|
117
126
|
async $copy(source, target, opts) {
|
|
118
127
|
try {
|
|
119
128
|
await this._fileService.copy(URI.revive(source), URI.revive(target), opts.overwrite);
|
|
120
|
-
}
|
|
121
|
-
catch (err) {
|
|
129
|
+
} catch (err) {
|
|
122
130
|
return MainThreadFileSystem_1._handleError(err);
|
|
123
131
|
}
|
|
124
132
|
}
|
|
125
133
|
async $mkdir(uri) {
|
|
126
134
|
try {
|
|
127
135
|
await this._fileService.createFolder(URI.revive(uri));
|
|
128
|
-
}
|
|
129
|
-
catch (err) {
|
|
136
|
+
} catch (err) {
|
|
130
137
|
return MainThreadFileSystem_1._handleError(err);
|
|
131
138
|
}
|
|
132
139
|
}
|
|
133
140
|
async $delete(uri, opts) {
|
|
134
141
|
try {
|
|
135
142
|
return await this._fileService.del(URI.revive(uri), opts);
|
|
136
|
-
}
|
|
137
|
-
catch (err) {
|
|
143
|
+
} catch (err) {
|
|
138
144
|
return MainThreadFileSystem_1._handleError(err);
|
|
139
145
|
}
|
|
140
146
|
}
|
|
141
147
|
static _handleError(err) {
|
|
142
148
|
if (err instanceof FileOperationError) {
|
|
143
149
|
switch (err.fileOperationResult) {
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
150
|
+
case FileOperationResult.FILE_NOT_FOUND:
|
|
151
|
+
err.name = FileSystemProviderErrorCode.FileNotFound;
|
|
152
|
+
break;
|
|
153
|
+
case FileOperationResult.FILE_IS_DIRECTORY:
|
|
154
|
+
err.name = FileSystemProviderErrorCode.FileIsADirectory;
|
|
155
|
+
break;
|
|
156
|
+
case FileOperationResult.FILE_PERMISSION_DENIED:
|
|
157
|
+
err.name = FileSystemProviderErrorCode.NoPermissions;
|
|
158
|
+
break;
|
|
159
|
+
case FileOperationResult.FILE_MOVE_CONFLICT:
|
|
160
|
+
err.name = FileSystemProviderErrorCode.FileExists;
|
|
161
|
+
break;
|
|
156
162
|
}
|
|
157
|
-
}
|
|
158
|
-
else if (err instanceof Error) {
|
|
163
|
+
} else if (err instanceof Error) {
|
|
159
164
|
const code = toFileSystemProviderErrorCode(err);
|
|
160
165
|
if (code !== FileSystemProviderErrorCode.Unknown) {
|
|
161
166
|
err.name = code;
|
|
@@ -167,10 +172,7 @@ let MainThreadFileSystem = MainThreadFileSystem_1 = class MainThreadFileSystem {
|
|
|
167
172
|
return this._fileService.activateProvider(scheme);
|
|
168
173
|
}
|
|
169
174
|
};
|
|
170
|
-
MainThreadFileSystem = MainThreadFileSystem_1 = __decorate([
|
|
171
|
-
extHostNamedCustomer(MainContext.MainThreadFileSystem),
|
|
172
|
-
( __param(1, IFileService))
|
|
173
|
-
], MainThreadFileSystem);
|
|
175
|
+
MainThreadFileSystem = MainThreadFileSystem_1 = __decorate([extHostNamedCustomer(MainContext.MainThreadFileSystem), ( __param(1, IFileService))], MainThreadFileSystem);
|
|
174
176
|
class RemoteFileSystemProvider {
|
|
175
177
|
constructor(fileService, scheme, capabilities, readOnlyMessage, _handle, _proxy) {
|
|
176
178
|
this.readOnlyMessage = readOnlyMessage;
|
|
@@ -197,13 +199,15 @@ class RemoteFileSystemProvider {
|
|
|
197
199
|
this._onDidChange.fire(( changes.map(RemoteFileSystemProvider._createFileChange)));
|
|
198
200
|
}
|
|
199
201
|
static _createFileChange(dto) {
|
|
200
|
-
return {
|
|
202
|
+
return {
|
|
203
|
+
resource: URI.revive(dto.resource),
|
|
204
|
+
type: dto.type
|
|
205
|
+
};
|
|
201
206
|
}
|
|
202
207
|
async stat(resource) {
|
|
203
208
|
try {
|
|
204
209
|
return await this._proxy.$stat(this._handle, resource);
|
|
205
|
-
}
|
|
206
|
-
catch (err) {
|
|
210
|
+
} catch (err) {
|
|
207
211
|
throw err;
|
|
208
212
|
}
|
|
209
213
|
}
|
|
@@ -25,9 +25,25 @@ import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
|
|
|
25
25
|
|
|
26
26
|
var MainThreadFileSystemEventService_1;
|
|
27
27
|
let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
|
|
28
|
-
static {
|
|
29
|
-
|
|
30
|
-
|
|
28
|
+
static {
|
|
29
|
+
MainThreadFileSystemEventService_1 = this;
|
|
30
|
+
}
|
|
31
|
+
static {
|
|
32
|
+
this.MementoKeyAdditionalEdits = `file.particpants.additionalEdits`;
|
|
33
|
+
}
|
|
34
|
+
constructor(
|
|
35
|
+
extHostContext,
|
|
36
|
+
_fileService,
|
|
37
|
+
workingCopyFileService,
|
|
38
|
+
bulkEditService,
|
|
39
|
+
progressService,
|
|
40
|
+
dialogService,
|
|
41
|
+
storageService,
|
|
42
|
+
logService,
|
|
43
|
+
envService,
|
|
44
|
+
uriIdentService,
|
|
45
|
+
_logService
|
|
46
|
+
) {
|
|
31
47
|
this._fileService = _fileService;
|
|
32
48
|
this._logService = _logService;
|
|
33
49
|
this._listener = ( new DisposableStore());
|
|
@@ -66,7 +82,10 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
|
|
|
66
82
|
return;
|
|
67
83
|
}
|
|
68
84
|
const needsConfirmation = ( data.edit.edits.some(edit => edit.metadata?.needsConfirmation));
|
|
69
|
-
let showPreview = storageService.getBoolean(
|
|
85
|
+
let showPreview = storageService.getBoolean(
|
|
86
|
+
MainThreadFileSystemEventService_1.MementoKeyAdditionalEdits,
|
|
87
|
+
StorageScope.PROFILE
|
|
88
|
+
);
|
|
70
89
|
if (envService.extensionTestsLocationURI) {
|
|
71
90
|
showPreview = false;
|
|
72
91
|
}
|
|
@@ -75,136 +94,149 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
|
|
|
75
94
|
if (data.extensionNames.length === 1) {
|
|
76
95
|
if (operation === FileOperation.CREATE) {
|
|
77
96
|
message = ( localize(
|
|
78
|
-
|
|
97
|
+
2518,
|
|
79
98
|
"Extension '{0}' wants to make refactoring changes with this file creation",
|
|
80
99
|
data.extensionNames[0]
|
|
81
100
|
));
|
|
82
|
-
}
|
|
83
|
-
else if (operation === FileOperation.COPY) {
|
|
101
|
+
} else if (operation === FileOperation.COPY) {
|
|
84
102
|
message = ( localize(
|
|
85
|
-
|
|
103
|
+
2519,
|
|
86
104
|
"Extension '{0}' wants to make refactoring changes with this file copy",
|
|
87
105
|
data.extensionNames[0]
|
|
88
106
|
));
|
|
89
|
-
}
|
|
90
|
-
else if (operation === FileOperation.MOVE) {
|
|
107
|
+
} else if (operation === FileOperation.MOVE) {
|
|
91
108
|
message = ( localize(
|
|
92
|
-
|
|
109
|
+
2520,
|
|
93
110
|
"Extension '{0}' wants to make refactoring changes with this file move",
|
|
94
111
|
data.extensionNames[0]
|
|
95
112
|
));
|
|
96
|
-
}
|
|
97
|
-
else {
|
|
113
|
+
} else {
|
|
98
114
|
message = ( localize(
|
|
99
|
-
|
|
115
|
+
2521,
|
|
100
116
|
"Extension '{0}' wants to make refactoring changes with this file deletion",
|
|
101
117
|
data.extensionNames[0]
|
|
102
118
|
));
|
|
103
119
|
}
|
|
104
|
-
}
|
|
105
|
-
else {
|
|
120
|
+
} else {
|
|
106
121
|
if (operation === FileOperation.CREATE) {
|
|
107
122
|
message = ( localize(
|
|
108
|
-
|
|
123
|
+
2522,
|
|
109
124
|
"{0} extensions want to make refactoring changes with this file creation",
|
|
110
125
|
data.extensionNames.length
|
|
111
126
|
));
|
|
112
|
-
}
|
|
113
|
-
else if (operation === FileOperation.COPY) {
|
|
127
|
+
} else if (operation === FileOperation.COPY) {
|
|
114
128
|
message = ( localize(
|
|
115
|
-
|
|
129
|
+
2523,
|
|
116
130
|
"{0} extensions want to make refactoring changes with this file copy",
|
|
117
131
|
data.extensionNames.length
|
|
118
132
|
));
|
|
119
|
-
}
|
|
120
|
-
else if (operation === FileOperation.MOVE) {
|
|
133
|
+
} else if (operation === FileOperation.MOVE) {
|
|
121
134
|
message = ( localize(
|
|
122
|
-
|
|
135
|
+
2524,
|
|
123
136
|
"{0} extensions want to make refactoring changes with this file move",
|
|
124
137
|
data.extensionNames.length
|
|
125
138
|
));
|
|
126
|
-
}
|
|
127
|
-
else {
|
|
139
|
+
} else {
|
|
128
140
|
message = ( localize(
|
|
129
|
-
|
|
141
|
+
2525,
|
|
130
142
|
"{0} extensions want to make refactoring changes with this file deletion",
|
|
131
143
|
data.extensionNames.length
|
|
132
144
|
));
|
|
133
145
|
}
|
|
134
146
|
}
|
|
135
147
|
if (needsConfirmation) {
|
|
136
|
-
const {
|
|
148
|
+
const {
|
|
149
|
+
confirmed
|
|
150
|
+
} = await dialogService.confirm({
|
|
137
151
|
type: Severity.Info,
|
|
138
152
|
message,
|
|
139
|
-
primaryButton: ( localize(
|
|
140
|
-
cancelButton: ( localize(
|
|
153
|
+
primaryButton: ( localize(2526, "Show &&Preview")),
|
|
154
|
+
cancelButton: ( localize(2527, "Skip Changes"))
|
|
141
155
|
});
|
|
142
156
|
showPreview = true;
|
|
143
157
|
if (!confirmed) {
|
|
144
158
|
return;
|
|
145
159
|
}
|
|
146
|
-
}
|
|
147
|
-
else {
|
|
160
|
+
} else {
|
|
148
161
|
let Choice;
|
|
149
|
-
(function
|
|
162
|
+
(function(Choice) {
|
|
150
163
|
Choice[Choice["OK"] = 0] = "OK";
|
|
151
164
|
Choice[Choice["Preview"] = 1] = "Preview";
|
|
152
165
|
Choice[Choice["Cancel"] = 2] = "Cancel";
|
|
153
166
|
})(Choice || (Choice = {}));
|
|
154
|
-
const {
|
|
167
|
+
const {
|
|
168
|
+
result,
|
|
169
|
+
checkboxChecked
|
|
170
|
+
} = await dialogService.prompt({
|
|
155
171
|
type: Severity.Info,
|
|
156
172
|
message,
|
|
157
|
-
buttons: [
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
run: () => Choice.Preview
|
|
165
|
-
}
|
|
166
|
-
],
|
|
173
|
+
buttons: [{
|
|
174
|
+
label: ( localize(2528, "&&OK")),
|
|
175
|
+
run: () => Choice.OK
|
|
176
|
+
}, {
|
|
177
|
+
label: ( localize(2526, "Show &&Preview")),
|
|
178
|
+
run: () => Choice.Preview
|
|
179
|
+
}],
|
|
167
180
|
cancelButton: {
|
|
168
|
-
label: ( localize(
|
|
181
|
+
label: ( localize(2527, "Skip Changes")),
|
|
169
182
|
run: () => Choice.Cancel
|
|
170
183
|
},
|
|
171
|
-
checkbox: {
|
|
184
|
+
checkbox: {
|
|
185
|
+
label: ( localize(2529, "Do not ask me again"))
|
|
186
|
+
}
|
|
172
187
|
});
|
|
173
188
|
if (result === Choice.Cancel) {
|
|
174
189
|
return;
|
|
175
190
|
}
|
|
176
191
|
showPreview = result === Choice.Preview;
|
|
177
192
|
if (checkboxChecked) {
|
|
178
|
-
storageService.store(
|
|
193
|
+
storageService.store(
|
|
194
|
+
MainThreadFileSystemEventService_1.MementoKeyAdditionalEdits,
|
|
195
|
+
showPreview,
|
|
196
|
+
StorageScope.PROFILE,
|
|
197
|
+
StorageTarget.USER
|
|
198
|
+
);
|
|
179
199
|
}
|
|
180
200
|
}
|
|
181
201
|
}
|
|
182
|
-
logService.info(
|
|
183
|
-
|
|
202
|
+
logService.info(
|
|
203
|
+
"[onWill-handler] applying additional workspace edit from extensions",
|
|
204
|
+
data.extensionNames
|
|
205
|
+
);
|
|
206
|
+
await bulkEditService.apply(reviveWorkspaceEditDto(data.edit, uriIdentService), {
|
|
207
|
+
undoRedoGroupId: undoInfo?.undoRedoGroupId,
|
|
208
|
+
showPreview
|
|
209
|
+
});
|
|
184
210
|
}
|
|
185
211
|
_progressLabel(operation) {
|
|
186
212
|
switch (operation) {
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
213
|
+
case FileOperation.CREATE:
|
|
214
|
+
return localize(2530, "Running 'File Create' participants...");
|
|
215
|
+
case FileOperation.MOVE:
|
|
216
|
+
return localize(2531, "Running 'File Rename' participants...");
|
|
217
|
+
case FileOperation.COPY:
|
|
218
|
+
return localize(2532, "Running 'File Copy' participants...");
|
|
219
|
+
case FileOperation.DELETE:
|
|
220
|
+
return localize(2533, "Running 'File Delete' participants...");
|
|
221
|
+
case FileOperation.WRITE:
|
|
222
|
+
return localize(2534, "Running 'File Write' participants...");
|
|
197
223
|
}
|
|
198
224
|
}
|
|
199
|
-
});
|
|
200
|
-
this._listener.add(
|
|
201
|
-
|
|
225
|
+
})();
|
|
226
|
+
this._listener.add(
|
|
227
|
+
workingCopyFileService.addFileOperationParticipant(fileOperationParticipant)
|
|
228
|
+
);
|
|
229
|
+
this._listener.add(
|
|
230
|
+
workingCopyFileService.onDidRunWorkingCopyFileOperation(e => this._proxy.$onDidRunFileOperation(e.operation, e.files))
|
|
231
|
+
);
|
|
202
232
|
}
|
|
203
233
|
async $watch(extensionId, session, resource, unvalidatedOpts, correlate) {
|
|
204
234
|
const uri = URI.revive(resource);
|
|
205
235
|
const canHandleWatcher = await this._fileService.canHandleResource(uri);
|
|
206
236
|
if (!canHandleWatcher) {
|
|
207
|
-
this._logService.warn(
|
|
237
|
+
this._logService.warn(
|
|
238
|
+
`MainThreadFileSystemEventService#$watch(): cannot watch resource as its scheme is not handled by the file service (extension: ${extensionId}, path: ${( uri.toString(true))})`
|
|
239
|
+
);
|
|
208
240
|
}
|
|
209
241
|
const opts = {
|
|
210
242
|
...unvalidatedOpts
|
|
@@ -215,14 +247,17 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
|
|
|
215
247
|
if (!stat.isDirectory) {
|
|
216
248
|
opts.recursive = false;
|
|
217
249
|
}
|
|
218
|
-
}
|
|
219
|
-
catch (error) {
|
|
220
|
-
}
|
|
250
|
+
} catch (error) {}
|
|
221
251
|
}
|
|
222
252
|
if (correlate && !opts.recursive) {
|
|
223
|
-
this._logService.trace(
|
|
253
|
+
this._logService.trace(
|
|
254
|
+
`MainThreadFileSystemEventService#$watch(): request to start watching correlated (extension: ${extensionId}, path: ${( uri.toString(true))}, recursive: ${opts.recursive}, session: ${session}, excludes: ${JSON.stringify(opts.excludes)}, includes: ${JSON.stringify(opts.includes)})`
|
|
255
|
+
);
|
|
224
256
|
const watcherDisposables = ( new DisposableStore());
|
|
225
|
-
const subscription = watcherDisposables.add(this._fileService.createWatcher(uri, {
|
|
257
|
+
const subscription = watcherDisposables.add(this._fileService.createWatcher(uri, {
|
|
258
|
+
...opts,
|
|
259
|
+
recursive: false
|
|
260
|
+
}));
|
|
226
261
|
watcherDisposables.add(subscription.onDidChange(event => {
|
|
227
262
|
this._proxy.$onFileEvent({
|
|
228
263
|
session,
|
|
@@ -234,14 +269,18 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
|
|
|
234
269
|
this._watches.set(session, watcherDisposables);
|
|
235
270
|
}
|
|
236
271
|
else {
|
|
237
|
-
this._logService.trace(
|
|
272
|
+
this._logService.trace(
|
|
273
|
+
`MainThreadFileSystemEventService#$watch(): request to start watching uncorrelated (extension: ${extensionId}, path: ${( uri.toString(true))}, recursive: ${opts.recursive}, session: ${session}, excludes: ${JSON.stringify(opts.excludes)}, includes: ${JSON.stringify(opts.includes)})`
|
|
274
|
+
);
|
|
238
275
|
const subscription = this._fileService.watch(uri, opts);
|
|
239
276
|
this._watches.set(session, subscription);
|
|
240
277
|
}
|
|
241
278
|
}
|
|
242
279
|
$unwatch(session) {
|
|
243
280
|
if (( this._watches.has(session))) {
|
|
244
|
-
this._logService.trace(
|
|
281
|
+
this._logService.trace(
|
|
282
|
+
`MainThreadFileSystemEventService#$unwatch(): request to stop watching (session: ${session})`
|
|
283
|
+
);
|
|
245
284
|
this._watches.deleteAndDispose(session);
|
|
246
285
|
}
|
|
247
286
|
}
|
|
@@ -266,16 +305,19 @@ MainThreadFileSystemEventService = MainThreadFileSystemEventService_1 = __decora
|
|
|
266
305
|
registerAction2(class ResetMemento extends Action2 {
|
|
267
306
|
constructor() {
|
|
268
307
|
super({
|
|
269
|
-
id:
|
|
308
|
+
id: "files.participants.resetChoice",
|
|
270
309
|
title: {
|
|
271
|
-
value: ( localize(
|
|
310
|
+
value: ( localize(2535, "Reset choice for 'File operation needs preview'")),
|
|
272
311
|
original: `Reset choice for 'File operation needs preview'`
|
|
273
312
|
},
|
|
274
313
|
f1: true
|
|
275
314
|
});
|
|
276
315
|
}
|
|
277
316
|
run(accessor) {
|
|
278
|
-
accessor.get(IStorageService).remove(
|
|
317
|
+
accessor.get(IStorageService).remove(
|
|
318
|
+
MainThreadFileSystemEventService.MementoKeyAdditionalEdits,
|
|
319
|
+
StorageScope.PROFILE
|
|
320
|
+
);
|
|
279
321
|
}
|
|
280
322
|
});
|
|
281
323
|
|
|
@@ -10,10 +10,10 @@ let MainThreadInteractive = class MainThreadInteractive {
|
|
|
10
10
|
constructor(extHostContext, interactiveDocumentService) {
|
|
11
11
|
this._disposables = ( new DisposableStore());
|
|
12
12
|
this._proxy = ( extHostContext.getProxy(ExtHostContext.ExtHostInteractive));
|
|
13
|
-
this._disposables.add(interactiveDocumentService.onWillAddInteractiveDocument(
|
|
14
|
-
this._proxy.$willAddInteractiveDocument(e.inputUri,
|
|
13
|
+
this._disposables.add(interactiveDocumentService.onWillAddInteractiveDocument(e => {
|
|
14
|
+
this._proxy.$willAddInteractiveDocument(e.inputUri, "\n", PLAINTEXT_LANGUAGE_ID, e.notebookUri);
|
|
15
15
|
}));
|
|
16
|
-
this._disposables.add(interactiveDocumentService.onWillRemoveInteractiveDocument(
|
|
16
|
+
this._disposables.add(interactiveDocumentService.onWillRemoveInteractiveDocument(e => {
|
|
17
17
|
this._proxy.$willRemoveInteractiveDocument(e.inputUri, e.notebookUri);
|
|
18
18
|
}));
|
|
19
19
|
}
|
|
@@ -21,9 +21,6 @@ let MainThreadInteractive = class MainThreadInteractive {
|
|
|
21
21
|
this._disposables.dispose();
|
|
22
22
|
}
|
|
23
23
|
};
|
|
24
|
-
MainThreadInteractive = __decorate([
|
|
25
|
-
extHostNamedCustomer(MainContext.MainThreadInteractive),
|
|
26
|
-
( __param(1, IInteractiveDocumentService))
|
|
27
|
-
], MainThreadInteractive);
|
|
24
|
+
MainThreadInteractive = __decorate([extHostNamedCustomer(MainContext.MainThreadInteractive), ( __param(1, IInteractiveDocumentService))], MainThreadInteractive);
|
|
28
25
|
|
|
29
26
|
export { MainThreadInteractive };
|
|
@@ -20,9 +20,6 @@ let MainThreadLabelService = class MainThreadLabelService extends Disposable {
|
|
|
20
20
|
this._resourceLabelFormatters.deleteAndDispose(handle);
|
|
21
21
|
}
|
|
22
22
|
};
|
|
23
|
-
MainThreadLabelService = __decorate([
|
|
24
|
-
extHostNamedCustomer(MainContext.MainThreadLabelService),
|
|
25
|
-
( __param(1, ILabelService))
|
|
26
|
-
], MainThreadLabelService);
|
|
23
|
+
MainThreadLabelService = __decorate([extHostNamedCustomer(MainContext.MainThreadLabelService), ( __param(1, ILabelService))], MainThreadLabelService);
|
|
27
24
|
|
|
28
25
|
export { MainThreadLabelService };
|
|
@@ -11,7 +11,7 @@ import { ILanguageFeaturesService } from "@codingame/monaco-vscode-api/vscode/vs
|
|
|
11
11
|
import { ExtensionIdentifier } from "@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions";
|
|
12
12
|
import { IUriIdentityService } from "@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service";
|
|
13
13
|
import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
|
|
14
|
-
import { ExtHostLanguageFeaturesShape, ICodeActionProviderMetadataDto, IDocumentDropEditProviderMetadata, IDocumentFilterDto, IInlineCompletionModelInfoDto, ILanguageConfigurationDto, IPasteEditProviderMetadataDto, ISignatureHelpProviderMetadataDto, MainThreadLanguageFeaturesShape } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
|
|
14
|
+
import { ExtHostLanguageFeaturesShape, ICodeActionProviderMetadataDto, IDocumentDropEditProviderMetadata, IDocumentFilterDto, IInlineCompletionChangeHintDto, IInlineCompletionModelInfoDto, ILanguageConfigurationDto, IPasteEditProviderMetadataDto, ISignatureHelpProviderMetadataDto, MainThreadLanguageFeaturesShape } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
|
|
15
15
|
import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
|
|
16
16
|
import { IInlineCompletionsUnificationService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/inlineCompletions/common/inlineCompletionsUnification.service";
|
|
17
17
|
export declare class MainThreadLanguageFeatures extends Disposable implements MainThreadLanguageFeaturesShape {
|
|
@@ -64,7 +64,7 @@ export declare class MainThreadLanguageFeatures extends Disposable implements Ma
|
|
|
64
64
|
private static _inflateSuggestDto;
|
|
65
65
|
$registerCompletionsProvider(handle: number, selector: IDocumentFilterDto[], triggerCharacters: string[], supportsResolveDetails: boolean, extensionId: ExtensionIdentifier): void;
|
|
66
66
|
$registerInlineCompletionsSupport(handle: number, selector: IDocumentFilterDto[], supportsHandleEvents: boolean, extensionId: string, extensionVersion: string, groupId: string | undefined, yieldsToExtensionIds: string[], displayName: string | undefined, debounceDelayMs: number | undefined, excludesExtensionIds: string[], supportsOnDidChange: boolean, supportsSetModelId: boolean, initialModelInfo: IInlineCompletionModelInfoDto | undefined, supportsOnDidChangeModelInfo: boolean): void;
|
|
67
|
-
$emitInlineCompletionsChange(handle: number): void;
|
|
67
|
+
$emitInlineCompletionsChange(handle: number, changeHint: IInlineCompletionChangeHintDto | undefined): void;
|
|
68
68
|
$emitInlineCompletionModelInfoChange(handle: number, data: IInlineCompletionModelInfoDto | undefined): void;
|
|
69
69
|
$registerSignatureHelpProvider(handle: number, selector: IDocumentFilterDto[], metadata: ISignatureHelpProviderMetadataDto): void;
|
|
70
70
|
$registerInlayHintsProvider(handle: number, selector: IDocumentFilterDto[], supportsResolve: boolean, eventHandle: number | undefined, displayName: string | undefined): void;
|