@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
|
@@ -22,9 +22,11 @@ import { ResourceMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/
|
|
|
22
22
|
import { onUnexpectedError, ErrorNoTelemetry } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
|
|
23
23
|
|
|
24
24
|
class BoundModelReferenceCollection {
|
|
25
|
-
constructor(
|
|
26
|
-
|
|
27
|
-
|
|
25
|
+
constructor(
|
|
26
|
+
_extUri,
|
|
27
|
+
_maxAge = 1000 * 60 * 3,
|
|
28
|
+
_maxLength = 1024 * 1024 * 80,
|
|
29
|
+
_maxSize = 50
|
|
28
30
|
) {
|
|
29
31
|
this._extUri = _extUri;
|
|
30
32
|
this._maxAge = _maxAge;
|
|
@@ -54,7 +56,11 @@ class BoundModelReferenceCollection {
|
|
|
54
56
|
}
|
|
55
57
|
};
|
|
56
58
|
const handle = setTimeout(dispose, this._maxAge);
|
|
57
|
-
const entry = {
|
|
59
|
+
const entry = {
|
|
60
|
+
uri,
|
|
61
|
+
length,
|
|
62
|
+
dispose
|
|
63
|
+
};
|
|
58
64
|
this._data.push(entry);
|
|
59
65
|
this._length += length;
|
|
60
66
|
this._cleanup();
|
|
@@ -77,7 +83,7 @@ class ModelTracker extends Disposable {
|
|
|
77
83
|
this._proxy = _proxy;
|
|
78
84
|
this._textFileService = _textFileService;
|
|
79
85
|
this._knownVersionId = this._model.getVersionId();
|
|
80
|
-
this._store.add(this._model.onDidChangeContent(
|
|
86
|
+
this._store.add(this._model.onDidChangeContent(e => {
|
|
81
87
|
this._knownVersionId = e.versionId;
|
|
82
88
|
if (e.detailedReasonsChangeLengths.length !== 1) {
|
|
83
89
|
onUnexpectedError(( new Error(`Unexpected reasons: ${( e.detailedReasons.map(r => ( r.toString())))}`)));
|
|
@@ -90,7 +96,7 @@ class ModelTracker extends Disposable {
|
|
|
90
96
|
isFlush: e.isFlush,
|
|
91
97
|
eol: e.eol,
|
|
92
98
|
versionId: e.versionId,
|
|
93
|
-
detailedReason: e.detailedReasons[0].metadata
|
|
99
|
+
detailedReason: e.detailedReasons[0].metadata
|
|
94
100
|
};
|
|
95
101
|
this._proxy.$acceptModelChanged(this._model.uri, evt, this._textFileService.isDirty(this._model.uri));
|
|
96
102
|
if (this.isCaughtUpWithContentChanges()) {
|
|
@@ -103,7 +109,17 @@ class ModelTracker extends Disposable {
|
|
|
103
109
|
}
|
|
104
110
|
}
|
|
105
111
|
let MainThreadDocuments = class MainThreadDocuments extends Disposable {
|
|
106
|
-
constructor(
|
|
112
|
+
constructor(
|
|
113
|
+
extHostContext,
|
|
114
|
+
_modelService,
|
|
115
|
+
_textFileService,
|
|
116
|
+
_fileService,
|
|
117
|
+
_textModelResolverService,
|
|
118
|
+
_environmentService,
|
|
119
|
+
_uriIdentityService,
|
|
120
|
+
workingCopyFileService,
|
|
121
|
+
_pathService
|
|
122
|
+
) {
|
|
107
123
|
super();
|
|
108
124
|
this._modelService = _modelService;
|
|
109
125
|
this._textFileService = _textFileService;
|
|
@@ -128,7 +144,10 @@ let MainThreadDocuments = class MainThreadDocuments extends Disposable {
|
|
|
128
144
|
this._proxy.$acceptDirtyStateChanged(m.resource, m.isDirty());
|
|
129
145
|
}
|
|
130
146
|
}));
|
|
131
|
-
this._store.add(Event.any(
|
|
147
|
+
this._store.add(Event.any(
|
|
148
|
+
_textFileService.files.onDidChangeEncoding,
|
|
149
|
+
_textFileService.untitled.onDidChangeEncoding
|
|
150
|
+
)(m => {
|
|
132
151
|
if (this._shouldHandleFileEvent(m.resource)) {
|
|
133
152
|
const encoding = m.getEncoding();
|
|
134
153
|
if (encoding) {
|
|
@@ -176,7 +195,9 @@ let MainThreadDocuments = class MainThreadDocuments extends Disposable {
|
|
|
176
195
|
)));
|
|
177
196
|
}
|
|
178
197
|
_onModelModeChanged(event) {
|
|
179
|
-
const {
|
|
198
|
+
const {
|
|
199
|
+
model
|
|
200
|
+
} = event;
|
|
180
201
|
if (!( this._modelTrackers.has(model.uri))) {
|
|
181
202
|
return;
|
|
182
203
|
}
|
|
@@ -201,31 +222,27 @@ let MainThreadDocuments = class MainThreadDocuments extends Disposable {
|
|
|
201
222
|
const canonicalUri = this._uriIdentityService.asCanonicalUri(inputUri);
|
|
202
223
|
let promise;
|
|
203
224
|
switch (canonicalUri.scheme) {
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
225
|
+
case Schemas.untitled:
|
|
226
|
+
promise = this._handleUntitledScheme(canonicalUri, options);
|
|
227
|
+
break;
|
|
228
|
+
case Schemas.file:
|
|
229
|
+
default:
|
|
230
|
+
promise = this._handleAsResourceInput(canonicalUri, options);
|
|
231
|
+
break;
|
|
211
232
|
}
|
|
212
233
|
let documentUri;
|
|
213
234
|
try {
|
|
214
235
|
documentUri = await promise;
|
|
215
|
-
}
|
|
216
|
-
catch (err) {
|
|
236
|
+
} catch (err) {
|
|
217
237
|
throw ( new ErrorNoTelemetry(`cannot open ${( canonicalUri.toString())}. Detail: ${toErrorMessage(err)}`));
|
|
218
238
|
}
|
|
219
239
|
if (!documentUri) {
|
|
220
240
|
throw ( new ErrorNoTelemetry(`cannot open ${( canonicalUri.toString())}`));
|
|
221
|
-
}
|
|
222
|
-
else if (!extUri.isEqual(documentUri, canonicalUri)) {
|
|
241
|
+
} else if (!extUri.isEqual(documentUri, canonicalUri)) {
|
|
223
242
|
throw ( new ErrorNoTelemetry(`cannot open ${( canonicalUri.toString())}. Detail: Actual document opened as ${( documentUri.toString())}`));
|
|
224
|
-
}
|
|
225
|
-
else if (!( this._modelTrackers.has(canonicalUri))) {
|
|
243
|
+
} else if (!( this._modelTrackers.has(canonicalUri))) {
|
|
226
244
|
throw ( new ErrorNoTelemetry(`cannot open ${( canonicalUri.toString())}. Detail: Files above 50MB cannot be synchronized with extensions.`));
|
|
227
|
-
}
|
|
228
|
-
else {
|
|
245
|
+
} else {
|
|
229
246
|
return canonicalUri;
|
|
230
247
|
}
|
|
231
248
|
}
|
|
@@ -234,7 +251,10 @@ let MainThreadDocuments = class MainThreadDocuments extends Disposable {
|
|
|
234
251
|
}
|
|
235
252
|
async _handleAsResourceInput(uri, options) {
|
|
236
253
|
if (options?.encoding) {
|
|
237
|
-
const model = await this._textFileService.files.resolve(uri, {
|
|
254
|
+
const model = await this._textFileService.files.resolve(uri, {
|
|
255
|
+
encoding: options.encoding,
|
|
256
|
+
reason: TextFileResolveReason.REFERENCE
|
|
257
|
+
});
|
|
238
258
|
if (model.isDirty()) {
|
|
239
259
|
throw ( new ErrorNoTelemetry(
|
|
240
260
|
`Cannot re-open a dirty text document with different encoding. Save it first.`
|
|
@@ -247,10 +267,14 @@ let MainThreadDocuments = class MainThreadDocuments extends Disposable {
|
|
|
247
267
|
return ref.object.textEditorModel.uri;
|
|
248
268
|
}
|
|
249
269
|
async _handleUntitledScheme(uri, options) {
|
|
250
|
-
const asLocalUri = toLocalResource(
|
|
270
|
+
const asLocalUri = toLocalResource(
|
|
271
|
+
uri,
|
|
272
|
+
this._environmentService.remoteAuthority,
|
|
273
|
+
this._pathService.defaultUriScheme
|
|
274
|
+
);
|
|
251
275
|
const exists = await this._fileService.exists(asLocalUri);
|
|
252
276
|
if (exists) {
|
|
253
|
-
return Promise.reject(( new Error(
|
|
277
|
+
return Promise.reject(( new Error("file already exists")));
|
|
254
278
|
}
|
|
255
279
|
return await this._doCreateUntitled(Boolean(uri.path) ? uri : undefined, options);
|
|
256
280
|
}
|
|
@@ -276,15 +300,6 @@ let MainThreadDocuments = class MainThreadDocuments extends Disposable {
|
|
|
276
300
|
return resource;
|
|
277
301
|
}
|
|
278
302
|
};
|
|
279
|
-
MainThreadDocuments = ( __decorate([
|
|
280
|
-
( __param(1, IModelService)),
|
|
281
|
-
( __param(2, ITextFileService)),
|
|
282
|
-
( __param(3, IFileService)),
|
|
283
|
-
( __param(4, ITextModelService)),
|
|
284
|
-
( __param(5, IWorkbenchEnvironmentService)),
|
|
285
|
-
( __param(6, IUriIdentityService)),
|
|
286
|
-
( __param(7, IWorkingCopyFileService)),
|
|
287
|
-
( __param(8, IPathService))
|
|
288
|
-
], MainThreadDocuments));
|
|
303
|
+
MainThreadDocuments = ( __decorate([( __param(1, IModelService)), ( __param(2, ITextFileService)), ( __param(3, IFileService)), ( __param(4, ITextModelService)), ( __param(5, IWorkbenchEnvironmentService)), ( __param(6, IUriIdentityService)), ( __param(7, IWorkingCopyFileService)), ( __param(8, IPathService))], MainThreadDocuments));
|
|
289
304
|
|
|
290
305
|
export { BoundModelReferenceCollection, MainThreadDocuments };
|
|
@@ -35,25 +35,28 @@ class TextEditorSnapshot {
|
|
|
35
35
|
}
|
|
36
36
|
}
|
|
37
37
|
class DocumentAndEditorStateDelta {
|
|
38
|
-
constructor(
|
|
38
|
+
constructor(
|
|
39
|
+
removedDocuments,
|
|
40
|
+
addedDocuments,
|
|
41
|
+
removedEditors,
|
|
42
|
+
addedEditors,
|
|
43
|
+
oldActiveEditor,
|
|
44
|
+
newActiveEditor
|
|
45
|
+
) {
|
|
39
46
|
this.removedDocuments = removedDocuments;
|
|
40
47
|
this.addedDocuments = addedDocuments;
|
|
41
48
|
this.removedEditors = removedEditors;
|
|
42
49
|
this.addedEditors = addedEditors;
|
|
43
50
|
this.oldActiveEditor = oldActiveEditor;
|
|
44
51
|
this.newActiveEditor = newActiveEditor;
|
|
45
|
-
this.isEmpty = this.removedDocuments.length === 0
|
|
46
|
-
&& this.addedDocuments.length === 0
|
|
47
|
-
&& this.removedEditors.length === 0
|
|
48
|
-
&& this.addedEditors.length === 0
|
|
49
|
-
&& oldActiveEditor === newActiveEditor;
|
|
52
|
+
this.isEmpty = this.removedDocuments.length === 0 && this.addedDocuments.length === 0 && this.removedEditors.length === 0 && this.addedEditors.length === 0 && oldActiveEditor === newActiveEditor;
|
|
50
53
|
}
|
|
51
54
|
toString() {
|
|
52
|
-
let ret =
|
|
53
|
-
ret += `\tRemoved Documents: [${( this.removedDocuments.map(d => ( d.uri.toString(true)))).join(
|
|
54
|
-
ret += `\tAdded Documents: [${( this.addedDocuments.map(d => ( d.uri.toString(true)))).join(
|
|
55
|
-
ret += `\tRemoved Editors: [${( this.removedEditors.map(e => e.id)).join(
|
|
56
|
-
ret += `\tAdded Editors: [${( this.addedEditors.map(e => e.id)).join(
|
|
55
|
+
let ret = "DocumentAndEditorStateDelta\n";
|
|
56
|
+
ret += `\tRemoved Documents: [${( this.removedDocuments.map(d => ( d.uri.toString(true)))).join(", ")}]\n`;
|
|
57
|
+
ret += `\tAdded Documents: [${( this.addedDocuments.map(d => ( d.uri.toString(true)))).join(", ")}]\n`;
|
|
58
|
+
ret += `\tRemoved Editors: [${( this.removedEditors.map(e => e.id)).join(", ")}]\n`;
|
|
59
|
+
ret += `\tAdded Editors: [${( this.addedEditors.map(e => e.id)).join(", ")}]\n`;
|
|
57
60
|
ret += `\tNew Active Editor: ${this.newActiveEditor}\n`;
|
|
58
61
|
return ret;
|
|
59
62
|
}
|
|
@@ -83,12 +86,18 @@ class DocumentAndEditorState {
|
|
|
83
86
|
}
|
|
84
87
|
}
|
|
85
88
|
var ActiveEditorOrder;
|
|
86
|
-
(function
|
|
89
|
+
(function(ActiveEditorOrder) {
|
|
87
90
|
ActiveEditorOrder[ActiveEditorOrder["Editor"] = 0] = "Editor";
|
|
88
91
|
ActiveEditorOrder[ActiveEditorOrder["Panel"] = 1] = "Panel";
|
|
89
92
|
})(ActiveEditorOrder || (ActiveEditorOrder = {}));
|
|
90
93
|
let MainThreadDocumentAndEditorStateComputer = class MainThreadDocumentAndEditorStateComputer {
|
|
91
|
-
constructor(
|
|
94
|
+
constructor(
|
|
95
|
+
_onDidChangeState,
|
|
96
|
+
_modelService,
|
|
97
|
+
_codeEditorService,
|
|
98
|
+
_editorService,
|
|
99
|
+
_paneCompositeService
|
|
100
|
+
) {
|
|
92
101
|
this._onDidChangeState = _onDidChangeState;
|
|
93
102
|
this._modelService = _modelService;
|
|
94
103
|
this._codeEditorService = _codeEditorService;
|
|
@@ -103,9 +112,27 @@ let MainThreadDocumentAndEditorStateComputer = class MainThreadDocumentAndEditor
|
|
|
103
112
|
this._codeEditorService.onCodeEditorAdd(this._onDidAddEditor, this, this._toDispose);
|
|
104
113
|
this._codeEditorService.onCodeEditorRemove(this._onDidRemoveEditor, this, this._toDispose);
|
|
105
114
|
this._codeEditorService.listCodeEditors().forEach(this._onDidAddEditor, this);
|
|
106
|
-
Event.filter(
|
|
107
|
-
|
|
108
|
-
|
|
115
|
+
Event.filter(
|
|
116
|
+
this._paneCompositeService.onDidPaneCompositeOpen,
|
|
117
|
+
event => event.viewContainerLocation === ViewContainerLocation.Panel
|
|
118
|
+
)(
|
|
119
|
+
_ => this._activeEditorOrder = ActiveEditorOrder.Panel,
|
|
120
|
+
undefined,
|
|
121
|
+
this._toDispose
|
|
122
|
+
);
|
|
123
|
+
Event.filter(
|
|
124
|
+
this._paneCompositeService.onDidPaneCompositeClose,
|
|
125
|
+
event => event.viewContainerLocation === ViewContainerLocation.Panel
|
|
126
|
+
)(
|
|
127
|
+
_ => this._activeEditorOrder = ActiveEditorOrder.Editor,
|
|
128
|
+
undefined,
|
|
129
|
+
this._toDispose
|
|
130
|
+
);
|
|
131
|
+
this._editorService.onDidVisibleEditorsChange(
|
|
132
|
+
_ => this._activeEditorOrder = ActiveEditorOrder.Editor,
|
|
133
|
+
undefined,
|
|
134
|
+
this._toDispose
|
|
135
|
+
);
|
|
109
136
|
this._updateState();
|
|
110
137
|
}
|
|
111
138
|
dispose() {
|
|
@@ -113,7 +140,11 @@ let MainThreadDocumentAndEditorStateComputer = class MainThreadDocumentAndEditor
|
|
|
113
140
|
this._toDisposeOnEditorRemove.dispose();
|
|
114
141
|
}
|
|
115
142
|
_onDidAddEditor(e) {
|
|
116
|
-
this._toDisposeOnEditorRemove.set(e.getId(), combinedDisposable(
|
|
143
|
+
this._toDisposeOnEditorRemove.set(e.getId(), combinedDisposable(
|
|
144
|
+
e.onDidChangeModel(() => this._updateState()),
|
|
145
|
+
e.onDidFocusEditorText(() => this._updateState()),
|
|
146
|
+
e.onDidFocusEditorWidget(() => this._updateState(e))
|
|
147
|
+
));
|
|
117
148
|
this._updateState();
|
|
118
149
|
}
|
|
119
150
|
_onDidRemoveEditor(e) {
|
|
@@ -152,10 +183,8 @@ let MainThreadDocumentAndEditorStateComputer = class MainThreadDocumentAndEditor
|
|
|
152
183
|
continue;
|
|
153
184
|
}
|
|
154
185
|
const model = editor.getModel();
|
|
155
|
-
if (
|
|
156
|
-
|
|
157
|
-
&& Boolean(this._modelService.getModel(model.uri))
|
|
158
|
-
) {
|
|
186
|
+
if (
|
|
187
|
+
editor.hasModel() && model && shouldSynchronizeModel(model) && !model.isDisposed() && Boolean(this._modelService.getModel(model.uri))) {
|
|
159
188
|
const apiEditor = ( new TextEditorSnapshot(editor));
|
|
160
189
|
editors.set(apiEditor.id, apiEditor);
|
|
161
190
|
if (editor.hasTextFocus() || (widgetFocusCandidate === editor && editor.hasWidgetFocus())) {
|
|
@@ -167,8 +196,7 @@ let MainThreadDocumentAndEditorStateComputer = class MainThreadDocumentAndEditor
|
|
|
167
196
|
let candidate;
|
|
168
197
|
if (this._activeEditorOrder === ActiveEditorOrder.Editor) {
|
|
169
198
|
candidate = this._getActiveEditorFromEditorPart() || this._getActiveEditorFromPanel();
|
|
170
|
-
}
|
|
171
|
-
else {
|
|
199
|
+
} else {
|
|
172
200
|
candidate = this._getActiveEditorFromPanel() || this._getActiveEditorFromEditorPart();
|
|
173
201
|
}
|
|
174
202
|
if (candidate) {
|
|
@@ -204,14 +232,26 @@ let MainThreadDocumentAndEditorStateComputer = class MainThreadDocumentAndEditor
|
|
|
204
232
|
return activeTextEditorControl;
|
|
205
233
|
}
|
|
206
234
|
};
|
|
207
|
-
MainThreadDocumentAndEditorStateComputer = ( __decorate([
|
|
208
|
-
( __param(1, IModelService)),
|
|
209
|
-
( __param(2, ICodeEditorService)),
|
|
210
|
-
( __param(3, IEditorService)),
|
|
211
|
-
( __param(4, IPaneCompositePartService))
|
|
212
|
-
], MainThreadDocumentAndEditorStateComputer));
|
|
235
|
+
MainThreadDocumentAndEditorStateComputer = ( __decorate([( __param(1, IModelService)), ( __param(2, ICodeEditorService)), ( __param(3, IEditorService)), ( __param(4, IPaneCompositePartService))], MainThreadDocumentAndEditorStateComputer));
|
|
213
236
|
let MainThreadDocumentsAndEditors = class MainThreadDocumentsAndEditors {
|
|
214
|
-
constructor(
|
|
237
|
+
constructor(
|
|
238
|
+
extHostContext,
|
|
239
|
+
_modelService,
|
|
240
|
+
_textFileService,
|
|
241
|
+
_editorService,
|
|
242
|
+
codeEditorService,
|
|
243
|
+
fileService,
|
|
244
|
+
textModelResolverService,
|
|
245
|
+
_editorGroupService,
|
|
246
|
+
paneCompositeService,
|
|
247
|
+
environmentService,
|
|
248
|
+
workingCopyFileService,
|
|
249
|
+
uriIdentityService,
|
|
250
|
+
_clipboardService,
|
|
251
|
+
pathService,
|
|
252
|
+
configurationService,
|
|
253
|
+
quickDiffModelService
|
|
254
|
+
) {
|
|
215
255
|
this._modelService = _modelService;
|
|
216
256
|
this._textFileService = _textFileService;
|
|
217
257
|
this._editorService = _editorService;
|
|
@@ -259,19 +299,16 @@ let MainThreadDocumentsAndEditors = class MainThreadDocumentsAndEditors {
|
|
|
259
299
|
const addedEditors = [];
|
|
260
300
|
const removedDocuments = ( delta.removedDocuments.map(m => m.uri));
|
|
261
301
|
for (const apiEditor of delta.addedEditors) {
|
|
262
|
-
const mainThreadEditor = ( new MainThreadTextEditor(
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
{ onGainedFocus() { }, onLostFocus() { } },
|
|
267
|
-
this._mainThreadDocuments,
|
|
268
|
-
this._modelService,
|
|
269
|
-
this._clipboardService
|
|
270
|
-
));
|
|
302
|
+
const mainThreadEditor = ( new MainThreadTextEditor(apiEditor.id, apiEditor.editor.getModel(), apiEditor.editor, {
|
|
303
|
+
onGainedFocus() {},
|
|
304
|
+
onLostFocus() {}
|
|
305
|
+
}, this._mainThreadDocuments, this._modelService, this._clipboardService));
|
|
271
306
|
this._textEditors.set(apiEditor.id, mainThreadEditor);
|
|
272
307
|
addedEditors.push(mainThreadEditor);
|
|
273
308
|
}
|
|
274
|
-
for (const {
|
|
309
|
+
for (const {
|
|
310
|
+
id
|
|
311
|
+
} of delta.removedEditors) {
|
|
275
312
|
const mainThreadEditor = this._textEditors.get(id);
|
|
276
313
|
if (mainThreadEditor) {
|
|
277
314
|
mainThreadEditor.dispose();
|
|
@@ -359,23 +396,6 @@ let MainThreadDocumentsAndEditors = class MainThreadDocumentsAndEditors {
|
|
|
359
396
|
return this._textEditors.get(id);
|
|
360
397
|
}
|
|
361
398
|
};
|
|
362
|
-
MainThreadDocumentsAndEditors = __decorate([
|
|
363
|
-
extHostCustomer,
|
|
364
|
-
( __param(1, IModelService)),
|
|
365
|
-
( __param(2, ITextFileService)),
|
|
366
|
-
( __param(3, IEditorService)),
|
|
367
|
-
( __param(4, ICodeEditorService)),
|
|
368
|
-
( __param(5, IFileService)),
|
|
369
|
-
( __param(6, ITextModelService)),
|
|
370
|
-
( __param(7, IEditorGroupsService)),
|
|
371
|
-
( __param(8, IPaneCompositePartService)),
|
|
372
|
-
( __param(9, IWorkbenchEnvironmentService)),
|
|
373
|
-
( __param(10, IWorkingCopyFileService)),
|
|
374
|
-
( __param(11, IUriIdentityService)),
|
|
375
|
-
( __param(12, IClipboardService)),
|
|
376
|
-
( __param(13, IPathService)),
|
|
377
|
-
( __param(14, IConfigurationService)),
|
|
378
|
-
( __param(15, IQuickDiffModelService))
|
|
379
|
-
], MainThreadDocumentsAndEditors);
|
|
399
|
+
MainThreadDocumentsAndEditors = __decorate([extHostCustomer, ( __param(1, IModelService)), ( __param(2, ITextFileService)), ( __param(3, IEditorService)), ( __param(4, ICodeEditorService)), ( __param(5, IFileService)), ( __param(6, ITextModelService)), ( __param(7, IEditorGroupsService)), ( __param(8, IPaneCompositePartService)), ( __param(9, IWorkbenchEnvironmentService)), ( __param(10, IWorkingCopyFileService)), ( __param(11, IUriIdentityService)), ( __param(12, IClipboardService)), ( __param(13, IPathService)), ( __param(14, IConfigurationService)), ( __param(15, IQuickDiffModelService))], MainThreadDocumentsAndEditors);
|
|
380
400
|
|
|
381
401
|
export { MainThreadDocumentsAndEditors };
|
|
@@ -14,7 +14,7 @@ class ExtHostEditSessionIdentityCreateParticipant {
|
|
|
14
14
|
}
|
|
15
15
|
async participate(workspaceFolder, token) {
|
|
16
16
|
const p = ( new Promise((resolve, reject) => {
|
|
17
|
-
setTimeout(() => reject(( new Error(( localize(
|
|
17
|
+
setTimeout(() => reject(( new Error(( localize(2506, "Aborted onWillCreateEditSessionIdentity-event after 10000ms"))))), this.timeout);
|
|
18
18
|
this._proxy.$onWillCreateEditSessionIdentity(workspaceFolder.uri, token, this.timeout).then(resolve, reject);
|
|
19
19
|
}));
|
|
20
20
|
return raceCancellationError(p, token);
|
|
@@ -23,16 +23,14 @@ class ExtHostEditSessionIdentityCreateParticipant {
|
|
|
23
23
|
let EditSessionIdentityCreateParticipant = class EditSessionIdentityCreateParticipant {
|
|
24
24
|
constructor(extHostContext, instantiationService, _editSessionIdentityService) {
|
|
25
25
|
this._editSessionIdentityService = _editSessionIdentityService;
|
|
26
|
-
this._saveParticipantDisposable = this._editSessionIdentityService.addEditSessionIdentityCreateParticipant(
|
|
26
|
+
this._saveParticipantDisposable = this._editSessionIdentityService.addEditSessionIdentityCreateParticipant(
|
|
27
|
+
instantiationService.createInstance(ExtHostEditSessionIdentityCreateParticipant, extHostContext)
|
|
28
|
+
);
|
|
27
29
|
}
|
|
28
30
|
dispose() {
|
|
29
31
|
this._saveParticipantDisposable.dispose();
|
|
30
32
|
}
|
|
31
33
|
};
|
|
32
|
-
EditSessionIdentityCreateParticipant = __decorate([
|
|
33
|
-
extHostCustomer,
|
|
34
|
-
( __param(1, IInstantiationService)),
|
|
35
|
-
( __param(2, IEditSessionIdentityService))
|
|
36
|
-
], EditSessionIdentityCreateParticipant);
|
|
34
|
+
EditSessionIdentityCreateParticipant = __decorate([extHostCustomer, ( __param(1, IInstantiationService)), ( __param(2, IEditSessionIdentityService))], EditSessionIdentityCreateParticipant);
|
|
37
35
|
|
|
38
36
|
export { EditSessionIdentityCreateParticipant };
|