@theia/plugin-ext 1.46.0-next.137 → 1.46.0-next.151

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.
Files changed (40) hide show
  1. package/lib/common/plugin-protocol.d.ts +2 -0
  2. package/lib/common/plugin-protocol.d.ts.map +1 -1
  3. package/lib/common/plugin-protocol.js.map +1 -1
  4. package/lib/hosted/node/scanners/scanner-theia.d.ts +1 -1
  5. package/lib/hosted/node/scanners/scanner-theia.d.ts.map +1 -1
  6. package/lib/hosted/node/scanners/scanner-theia.js +2 -2
  7. package/lib/hosted/node/scanners/scanner-theia.js.map +1 -1
  8. package/lib/main/browser/custom-editors/plugin-custom-editor-registry.d.ts +4 -8
  9. package/lib/main/browser/custom-editors/plugin-custom-editor-registry.d.ts.map +1 -1
  10. package/lib/main/browser/custom-editors/plugin-custom-editor-registry.js +18 -33
  11. package/lib/main/browser/custom-editors/plugin-custom-editor-registry.js.map +1 -1
  12. package/lib/main/browser/notebooks/notebook-dto.js +1 -1
  13. package/lib/main/browser/notebooks/notebook-dto.js.map +1 -1
  14. package/lib/main/browser/notebooks/notebook-kernels-main.d.ts.map +1 -1
  15. package/lib/main/browser/notebooks/notebook-kernels-main.js +7 -0
  16. package/lib/main/browser/notebooks/notebook-kernels-main.js.map +1 -1
  17. package/lib/main/browser/plugin-contribution-handler.js +4 -4
  18. package/lib/main/browser/plugin-contribution-handler.js.map +1 -1
  19. package/lib/main/browser/view/plugin-view-registry.d.ts +6 -0
  20. package/lib/main/browser/view/plugin-view-registry.d.ts.map +1 -1
  21. package/lib/main/browser/view/plugin-view-registry.js +44 -27
  22. package/lib/main/browser/view/plugin-view-registry.js.map +1 -1
  23. package/lib/plugin/notebook/notebook-document.d.ts +1 -3
  24. package/lib/plugin/notebook/notebook-document.d.ts.map +1 -1
  25. package/lib/plugin/notebook/notebook-document.js +2 -16
  26. package/lib/plugin/notebook/notebook-document.js.map +1 -1
  27. package/lib/plugin/notebook/notebooks.d.ts.map +1 -1
  28. package/lib/plugin/notebook/notebooks.js +12 -10
  29. package/lib/plugin/notebook/notebooks.js.map +1 -1
  30. package/package.json +28 -28
  31. package/src/common/plugin-protocol.ts +2 -0
  32. package/src/hosted/node/scanners/scanner-theia.ts +2 -2
  33. package/src/main/browser/custom-editors/plugin-custom-editor-registry.ts +14 -36
  34. package/src/main/browser/notebooks/notebook-dto.ts +1 -1
  35. package/src/main/browser/notebooks/notebook-kernels-main.ts +8 -1
  36. package/src/main/browser/plugin-contribution-handler.ts +4 -4
  37. package/src/main/browser/view/plugin-view-registry.ts +52 -27
  38. package/src/main/browser/webview/pre/host.js +1 -1
  39. package/src/plugin/notebook/notebook-document.ts +2 -17
  40. package/src/plugin/notebook/notebooks.ts +16 -12
package/lib/plugin/notebook/notebooks.js CHANGED
@@ -159,6 +159,8 @@ class NotebooksExtImpl {
159
159
  }
160
160
  async $acceptDocumentsAndEditorsDelta(delta) {
161
161
  var _a, _b, _c;
162
+ const removedCellDocuments = [];
163
+ const addedCellDocuments = [];
162
164
  if (delta.removedDocuments) {
163
165
  for (const uri of delta.removedDocuments) {
164
166
  const revivedUri = core_1.URI.fromComponents(uri);
@@ -167,6 +169,7 @@ class NotebooksExtImpl {
167
169
  document.dispose();
168
170
  this.documents.delete(revivedUri.toString());
169
171
  this.onDidCloseNotebookDocumentEmitter.fire(document.apiNotebook);
172
+ removedCellDocuments.push(...document.apiNotebook.getCells().map(cell => cell.document.uri));
170
173
  }
171
174
  for (const editor of this.editors.values()) {
172
175
  if (editor.notebookData.uri.toString() === revivedUri.toString()) {
@@ -175,6 +178,10 @@ class NotebooksExtImpl {
175
178
  }
176
179
  }
177
180
  }
181
+ // publish all removed cell documents first
182
+ await this.textDocumentsAndEditors.$acceptEditorsAndDocumentsDelta({
183
+ removedDocuments: removedCellDocuments
184
+ });
178
185
  if (delta.addedDocuments) {
179
186
  for (const modelData of delta.addedDocuments) {
180
187
  const uri = types_impl_1.URI.from(modelData.uri);
@@ -184,19 +191,14 @@ class NotebooksExtImpl {
184
191
  const document = new notebook_document_1.NotebookDocument(this.notebookDocumentsProxy, this.textDocumentsAndEditors, this.textDocuments, uri, modelData);
185
192
  (_a = this.documents.get(uri.toString())) === null || _a === void 0 ? void 0 : _a.dispose();
186
193
  this.documents.set(uri.toString(), document);
187
- this.textDocumentsAndEditors.$acceptEditorsAndDocumentsDelta({
188
- addedDocuments: modelData.cells.map(cell => ({
189
- uri: cell.uri,
190
- versionId: 1,
191
- lines: cell.source,
192
- EOL: cell.eol,
193
- modeId: '',
194
- isDirty: false
195
- }))
196
- });
194
+ addedCellDocuments.push(...modelData.cells.map(cell => notebook_document_1.Cell.asModelAddData(cell)));
197
195
  this.onDidOpenNotebookDocumentEmitter.fire(document.apiNotebook);
198
196
  }
199
197
  }
198
+ // publish all added cell documents in a separate call
199
+ await this.textDocumentsAndEditors.$acceptEditorsAndDocumentsDelta({
200
+ addedDocuments: addedCellDocuments
201
+ });
200
202
  if (delta.addedEditors) {
201
203
  for (const editorModelData of delta.addedEditors) {
202
204
  if (this.editors.has(editorModelData.id)) {
package/lib/plugin/notebook/notebooks.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"notebooks.js","sourceRoot":"","sources":["../../../src/plugin/notebook/notebooks.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"notebooks.js","sourceRoot":"","sources":["../../../src/plugin/notebook/notebooks.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;AAChF;;;gGAGgG;;;AAEhG,sCAAuG;AACvG,8CAAgD;AAEhD,yCAIsB;AACtB,8CAA2C;AAI3C,qDAAqD;AACrD,0DAA6D;AAC7D,2DAA6D;AAC7D,uDAAmD;AAGnD,uDAAuG;AAEvG,MAAa,gBAAgB;IAkCzB,YACI,GAAgB,EAChB,QAA4B,EACpB,uBAAmD,EACnD,aAA+B;QAD/B,4BAAuB,GAAvB,uBAAuB,CAA4B;QACnD,kBAAa,GAAb,aAAa,CAAkB;QApC1B,mCAA8B,GAAG,IAAI,GAAG,EAAmD,CAAC;QAG5F,2CAAsC,GAAG,IAAI,cAAO,EAAoC,CAAC;QACjG,oCAA+B,GAAG,IAAI,CAAC,sCAAsC,CAAC,KAAK,CAAC;QAE5E,qCAAgC,GAAG,IAAI,cAAO,EAA0B,CAAC;QAC1F,8BAAyB,GAAkC,IAAI,CAAC,gCAAgC,CAAC,KAAK,CAAC;QACtF,sCAAiC,GAAG,IAAI,cAAO,EAA0B,CAAC;QAC3F,+BAA0B,GAAkC,IAAI,CAAC,iCAAiC,CAAC,KAAK,CAAC;QAExF,6CAAwC,GAAG,IAAI,cAAO,EAA0B,CAAC;QAClG,sCAAiC,GAAG,IAAI,CAAC,wCAAwC,CAAC,KAAK,CAAC;QAOhF,2BAAsB,GAAqB,EAAE,CAAC;QAKrC,cAAS,GAAG,IAAI,GAAG,EAA4B,CAAC;QAChD,YAAO,GAAG,IAAI,GAAG,EAA0B,CAAC;QACrD,sBAAiB,GAAG,IAAI,aAAK,CAAa,4BAA4B,CAAC,CAAC;QAiEhF,4BAA4B;QAEpB,4BAAuB,GAAG,CAAC,CAAC;QACnB,uBAAkB,GAAG,IAAI,GAAG,EAAoC,CAAC;QAxD9E,IAAI,CAAC,aAAa,GAAG,GAAG,CAAC,QAAQ,CAAC,2BAAkB,CAAC,cAAc,CAAC,CAAC;QACrE,IAAI,CAAC,sBAAsB,GAAG,GAAG,CAAC,QAAQ,CAAC,2BAAkB,CAAC,uBAAuB,CAAC,CAAC;QACvF,IAAI,CAAC,eAAe,GAAG,GAAG,CAAC,QAAQ,CAAC,2BAAkB,CAAC,qBAAqB,CAAC,CAAC;QAE9E,QAAQ,CAAC,yBAAyB,CAAC;YAC/B,eAAe,EAAE,GAAG,CAAC,EAAE;;gBACnB,IAAI,8BAAqB,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE;oBAC/B,OAAO,MAAA,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,gBAAgB,CAAC,QAAQ,EAAE,CAAC,0CAAE,WAAW,CAAC;iBAC3E;qBAAM,IAAI,kCAAyB,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE;oBAC1C,MAAM,OAAO,GAAG,gBAAO,CAAC,KAAK,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;oBACxD,IAAI,OAAO,EAAE;wBACT,OAAO,MAAA,MAAA,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,QAAQ,CAAC,QAAQ,EAAE,CAAC,0CAAE,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,0CAAE,OAAO,CAAC;qBAC7F;oBACD,OAAO,SAAS,CAAC;iBACpB;qBAAM;oBACH,OAAO,GAAG,CAAC;iBACd;YACL,CAAC;SACJ,CAAC,CAAC;IACP,CAAC;IA1CD,IAAI,uBAAuB;;QACvB,OAAO,MAAA,IAAI,CAAC,oBAAoB,0CAAE,SAAS,CAAC;IAChD,CAAC;IAGD,IAAI,yBAAyB;QACzB,OAAO,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IACvE,CAAC;IAqCD,KAAK,CAAC,kCAAkC,CAAC,MAAc,EAAE,GAAkB,EAAE,KAAa,EAAE,KAAwB;QAChH,MAAM,QAAQ,GAAG,IAAI,CAAC,8BAA8B,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACjE,MAAM,UAAU,GAAG,UAAG,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;QAC3C,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC3D,IAAI,CAAC,QAAQ,IAAI,CAAC,QAAQ,EAAE;YACxB,OAAO;SACV;QAED,MAAM,IAAI,GAAG,QAAQ,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;QAC9C,IAAI,CAAC,IAAI,EAAE;YACP,OAAO;SACV;QAED,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,yBAAyB,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAC7E,IAAI,CAAC,MAAM,EAAE;YACT,OAAO,SAAS,CAAC;SACpB;QAED,MAAM,WAAW,GAAG,IAAI,2BAAoB,EAAE,CAAC;QAC/C,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC;QAC1D,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;QAC5D,MAAM,KAAK,GAAG,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,cAAc,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,iBAAiB,EAAE,WAAW,CAAC,CAAC,CAAC;QAC1H,OAAO;YACH,OAAO;YACP,KAAK;SACR,CAAC;IACN,CAAC;IAED,kCAAkC,CAAC,OAAe;QAC9C,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAC3C,CAAC;IAOD,0BAA0B,CAAC,MAAc,EAAE,QAAgB,EAAE,UAAoC,EAC7F,OAA8C;QAC9C,IAAI,CAAC,QAAQ,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE;YAC/B,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;SAClE;QACD,MAAM,MAAM,GAAG,IAAI,CAAC,uBAAuB,EAAE,CAAC;QAC9C,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;QAChD,IAAI,CAAC,aAAa,CAAC,2BAA2B,CAC1C,MAAM,EACN,QAAQ,EACR,cAAc,CAAC,8BAA8B,CAAC,IAAI,CAAC,OAAO,CAAC,CAC9D,CAAC;QACF,OAAO,iBAAU,CAAC,MAAM,CAAC,GAAG,EAAE;YAC1B,IAAI,CAAC,aAAa,CAAC,6BAA6B,CAAC,MAAM,CAAC,CAAC;QAC7D,CAAC,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,MAAc,EAAE,KAAmB,EAAE,KAAwB;QAC/E,MAAM,UAAU,GAAG,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACvD,IAAI,CAAC,UAAU,EAAE;YACb,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;SAC1C;QACD,MAAM,IAAI,GAAG,MAAM,UAAU,CAAC,mBAAmB,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACvE,OAAO,cAAc,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAClD,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,MAAc,EAAE,IAAqB,EAAE,KAAwB;QACjF,MAAM,UAAU,GAAG,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACvD,IAAI,CAAC,UAAU,EAAE;YACb,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;SAC1C;QACD,MAAM,KAAK,GAAG,MAAM,UAAU,CAAC,iBAAiB,CAAC,cAAc,CAAC,YAAY,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,CAAC;QAC9F,OAAO,qBAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACpC,CAAC;IAED,yCAAyC,CAAC,YAAoB,EAAE,QAAiD;QAE7G,MAAM,MAAM,GAAG,IAAI,CAAC,uBAAuB,EAAE,CAAC;QAC9C,MAAM,WAAW,GAAG,OAAO,QAAQ,CAAC,6BAA6B,KAAK,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,uBAAuB,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;QAE9H,IAAI,CAAC,8BAA8B,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QAC1D,IAAI,CAAC,aAAa,CAAC,0CAA0C,CAAC,MAAM,EAAE,WAAW,EAAE,YAAY,CAAC,CAAC;QAEjG,IAAI,YAA0C,CAAC;QAC/C,IAAI,WAAW,KAAK,SAAS,EAAE;YAC3B,YAAY,GAAG,QAAQ,CAAC,6BAA8B,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,uBAAuB,CAAC,WAAW,CAAC,CAAC,CAAC;SACxH;QAED,OAAO,iBAAU,CAAC,MAAM,CAAC,GAAG,EAAE;YAC1B,IAAI,CAAC,8BAA8B,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YACnD,IAAI,CAAC,aAAa,CAAC,4CAA4C,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;YACrF,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,OAAO,EAAE,CAAC;QAC5B,CAAC,CAAC,CAAC;IACP,CAAC;IAED,aAAa,CAAC,QAAgB;QAC1B,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC1C,IAAI,CAAC,MAAM,EAAE;YACT,MAAM,IAAI,KAAK,CAAC,wBAAwB,QAAQ,oBAAoB,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC;SACpG;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,kBAAkB;QACd,OAAO,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IACpE,CAAC;IAED,KAAK,CAAC,+BAA+B,CAAC,KAAuC;;QACzE,MAAM,oBAAoB,GAAoB,EAAE,CAAC;QACjD,MAAM,kBAAkB,GAAqB,EAAE,CAAC;QAChD,IAAI,KAAK,CAAC,gBAAgB,EAAE;YACxB,KAAK,MAAM,GAAG,IAAI,KAAK,CAAC,gBAAgB,EAAE;gBACtC,MAAM,UAAU,GAAG,UAAG,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;gBAC3C,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC;gBAE3D,IAAI,QAAQ,EAAE;oBACV,QAAQ,CAAC,OAAO,EAAE,CAAC;oBACnB,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC;oBAC7C,IAAI,CAAC,iCAAiC,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;oBAClE,oBAAoB,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;iBAChG;gBAED,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE;oBACxC,IAAI,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,UAAU,CAAC,QAAQ,EAAE,EAAE;wBAC9D,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;qBAClC;iBACJ;aACJ;SACJ;QAED,2CAA2C;QAC3C,MAAM,IAAI,CAAC,uBAAuB,CAAC,+BAA+B,CAAC;YAC/D,gBAAgB,EAAE,oBAAoB;SACzC,CAAC,CAAC;QAEH,IAAI,KAAK,CAAC,cAAc,EAAE;YACtB,KAAK,MAAM,SAAS,IAAI,KAAK,CAAC,cAAc,EAAE;gBAC1C,MAAM,GAAG,GAAG,gBAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;gBAEzC,IAAI,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,EAAE;oBACpC,MAAM,IAAI,KAAK,CAAC,4BAA4B,GAAG,GAAG,CAAC,CAAC;iBACvD;gBAED,MAAM,QAAQ,GAAG,IAAI,oCAAgB,CACjC,IAAI,CAAC,sBAAsB,EAC3B,IAAI,CAAC,uBAAuB,EAC5B,IAAI,CAAC,aAAa,EAClB,GAAG,EACH,SAAS,CACZ,CAAC;gBAEF,MAAA,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,0CAAE,OAAO,EAAE,CAAC;gBAC9C,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,QAAQ,CAAC,CAAC;gBAE7C,kBAAkB,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,wBAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBAEnF,IAAI,CAAC,gCAAgC,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;aACpE;SACJ;QAED,sDAAsD;QACtD,MAAM,IAAI,CAAC,uBAAuB,CAAC,+BAA+B,CAAC;YAC/D,cAAc,EAAE,kBAAkB;SACrC,CAAC,CAAC;QAEH,IAAI,KAAK,CAAC,YAAY,EAAE;YACpB,KAAK,MAAM,eAAe,IAAI,KAAK,CAAC,YAAY,EAAE;gBAC9C,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,EAAE,CAAC,EAAE;oBACtC,OAAO;iBACV;gBAED,MAAM,UAAU,GAAG,UAAG,CAAC,cAAc,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;gBACnE,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC;gBAE3D,IAAI,QAAQ,EAAE;oBACV,IAAI,CAAC,mBAAmB,CAAC,QAAQ,EAAE,eAAe,CAAC,EAAE,EAAE,eAAe,CAAC,CAAC;iBAC3E;aACJ;SACJ;QAED,MAAM,cAAc,GAAqB,EAAE,CAAC;QAE5C,IAAI,KAAK,CAAC,cAAc,EAAE;YACtB,KAAK,MAAM,QAAQ,IAAI,KAAK,CAAC,cAAc,EAAE;gBACzC,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;gBAE1C,IAAI,MAAM,EAAE;oBACR,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;oBAE9B,IAAI,CAAA,MAAA,IAAI,CAAC,oBAAoB,0CAAE,EAAE,MAAK,MAAM,CAAC,EAAE,EAAE;wBAC7C,IAAI,CAAC,oBAAoB,GAAG,SAAS,CAAC;qBACzC;oBAED,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;iBAC/B;aACJ;SACJ;QAED,IAAI,KAAK,CAAC,cAAc,EAAE;YACtB,IAAI,CAAC,sBAAsB,GAAG,KAAK,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAE,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAqB,CAAC;YACnI,MAAM,iBAAiB,GAAG,IAAI,GAAG,EAAU,CAAC;YAC5C,IAAI,CAAC,sBAAsB,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,iBAAiB,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;YAEhF,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE;gBACxC,MAAM,QAAQ,GAAG,iBAAiB,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBAClD,MAAM,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;aACrC;YAED,IAAI,CAAC,sBAAsB,GAAG,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;YAC5F,IAAI,CAAC,wCAAwC,CAAC,IAAI,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;SACtF;QAED,IAAI,KAAK,CAAC,eAAe,KAAK,IAAI,EAAE;YAChC,wEAAwE;YACxE,IAAI,CAAC,oBAAoB,GAAG,SAAS,CAAC;SACzC;aAAM,IAAI,KAAK,CAAC,eAAe,EAAE;YAC9B,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;YAC7D,IAAI,CAAC,YAAY,EAAE;gBACf,OAAO,CAAC,KAAK,CAAC,yCAAyC,KAAK,CAAC,eAAe,EAAE,CAAC,CAAC;aACnF;YACD,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;SACvE;QACD,IAAI,KAAK,CAAC,eAAe,KAAK,SAAS,EAAE;YACrC,IAAI,CAAC,sCAAsC,CAAC,IAAI,CAAC,MAAA,IAAI,CAAC,oBAAoB,0CAAE,SAAS,CAAC,CAAC;SAC1F;IACL,CAAC;IAID,mBAAmB,CAAC,GAAa,EAAE,OAAc;QAC7C,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;QAClD,IAAI,CAAC,MAAM,IAAI,CAAC,OAAO,EAAE;YACrB,MAAM,IAAI,KAAK,CAAC,6BAA6B,GAAG,GAAG,CAAC,CAAC;SACxD;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,uBAAuB,CAAC,GAAa,EAAE,QAAQ,GAAG,IAAI;QAClD,MAAM,QAAQ,GAAG,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QACrD,IAAI,QAAQ,EAAE;YACV,OAAO,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;SACpC;QACD,OAAO,IAAI,OAAO,CAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrD,MAAM,QAAQ,GAAG,IAAI,CAAC,yBAAyB,CAAC,KAAK,CAAC,EAAE;gBACpD,IAAI,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,GAAG,CAAC,QAAQ,EAAE,EAAE;oBACzC,YAAY,CAAC,OAAO,CAAC,CAAC;oBACtB,QAAQ,CAAC,OAAO,EAAE,CAAC;oBACnB,OAAO,CAAC,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC;iBAC1C;YACL,CAAC,CAAC,CAAC;YACH,MAAM,OAAO,GAAG,UAAU,CAAC,GAAG,EAAE;gBAC5B,QAAQ,CAAC,OAAO,EAAE,CAAC;gBACnB,MAAM,CAAC,IAAI,KAAK,CAAC,qCAAqC,QAAQ,OAAO,GAAG,EAAE,CAAC,CAAC,CAAC;YACjF,CAAC,EAAE,QAAQ,CAAC,CAAC;QACjB,CAAC,CAAC,CAAC;IACP,CAAC;IAEO,mBAAmB,CAAC,QAA0B,EAAE,QAAgB,EAAE,IAA2B;QAEjG,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;YAC5B,MAAM,IAAI,KAAK,CAAC,kCAAkC,QAAQ,EAAE,CAAC,CAAC;SACjE;QAED,MAAM,MAAM,GAAG,IAAI,gCAAc,CAC7B,QAAQ,EACR,QAAQ,EACR,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,cAAc,CAAC,aAAa,CAAC,EAAE,CAAC,EACvD,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,cAAc,CAAC,aAAa,CAAC,EAAE,CAAC,EACpD,OAAO,IAAI,CAAC,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,cAAc,CAAC,UAAU,CAAC,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,CAClG,CAAC;QAEF,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IACvC,CAAC;IAED,KAAK,CAAC,sBAAsB,CAAC,OAA2D;QACpF,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,kBAAkB,CAAC;YACtE,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,OAAO,EAAE,OAAO,CAAC,OAAO,IAAI,cAAc,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;SAChF,CAAC,CAAC;QACH,OAAO,gBAAQ,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACvC,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,GAAa;QACpC,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;QAClD,IAAI,MAAM,EAAE;YACR,OAAO,MAAM,CAAC,WAAW,CAAC;SAC7B;QACD,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;QAC7E,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,UAAG,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;QACjF,OAAO,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,WAAY,CAAC;IAClC,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,aAAgD,EAAE,OAA2C;;QACpH,IAAI,gBAAQ,CAAC,KAAK,CAAC,aAAa,CAAC,EAAE;YAC/B,aAAa,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,aAAyB,CAAC,CAAC;SAC9E;QAED,MAAM,QAAQ,GAAG,aAAuC,CAAC;QAEzD,IAAI,eAA4C,CAAC;QACjD,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;YAC7B,eAAe,GAAG;gBACd,QAAQ,EAAE,cAAc,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC;gBAC5D,aAAa,EAAE,OAAO,CAAC,aAAa;gBACpC,UAAU,EAAE,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,cAAc,CAAC,aAAa,CAAC,IAAI,CAAC;gBAC3F,MAAM,EAAE,OAAO,OAAO,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS;aAC9E,CAAC;SACL;aAAM;YACH,eAAe,GAAG;gBACd,aAAa,EAAE,KAAK;aACvB,CAAC;SACL;QAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,wBAAwB,CAAC,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,YAAY,EAAE,eAAe,CAAC,CAAC;QAC3H,MAAM,MAAM,GAAG,QAAQ,KAAI,MAAA,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,0CAAE,SAAS,CAAA,CAAC;QAEjE,IAAI,MAAM,EAAE;YACR,OAAO,MAAM,CAAC;SACjB;QAED,IAAI,QAAQ,EAAE;YACV,MAAM,IAAI,KAAK,CAAC,8BAA8B,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,kDAAkD,CAAC,CAAC;SAC5H;aAAM;YACH,MAAM,IAAI,KAAK,CAAC,8BAA8B,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;SAC9E;IACL,CAAC;CAEJ;AAjYD,4CAiYC"}
package/package.json CHANGED
@@ -1,37 +1,37 @@
1
1
  {
2
2
  "name": "@theia/plugin-ext",
3
- "version": "1.46.0-next.137+bce99c299",
3
+ "version": "1.46.0-next.151+106da538c",
4
4
  "description": "Theia - Plugin Extension",
5
5
  "main": "lib/common/index.js",
6
6
  "typings": "lib/common/index.d.ts",
7
7
  "dependencies": {
8
- "@theia/bulk-edit": "1.46.0-next.137+bce99c299",
9
- "@theia/callhierarchy": "1.46.0-next.137+bce99c299",
10
- "@theia/console": "1.46.0-next.137+bce99c299",
11
- "@theia/core": "1.46.0-next.137+bce99c299",
12
- "@theia/debug": "1.46.0-next.137+bce99c299",
13
- "@theia/editor": "1.46.0-next.137+bce99c299",
14
- "@theia/editor-preview": "1.46.0-next.137+bce99c299",
15
- "@theia/file-search": "1.46.0-next.137+bce99c299",
16
- "@theia/filesystem": "1.46.0-next.137+bce99c299",
17
- "@theia/markers": "1.46.0-next.137+bce99c299",
18
- "@theia/messages": "1.46.0-next.137+bce99c299",
19
- "@theia/monaco": "1.46.0-next.137+bce99c299",
8
+ "@theia/bulk-edit": "1.46.0-next.151+106da538c",
9
+ "@theia/callhierarchy": "1.46.0-next.151+106da538c",
10
+ "@theia/console": "1.46.0-next.151+106da538c",
11
+ "@theia/core": "1.46.0-next.151+106da538c",
12
+ "@theia/debug": "1.46.0-next.151+106da538c",
13
+ "@theia/editor": "1.46.0-next.151+106da538c",
14
+ "@theia/editor-preview": "1.46.0-next.151+106da538c",
15
+ "@theia/file-search": "1.46.0-next.151+106da538c",
16
+ "@theia/filesystem": "1.46.0-next.151+106da538c",
17
+ "@theia/markers": "1.46.0-next.151+106da538c",
18
+ "@theia/messages": "1.46.0-next.151+106da538c",
19
+ "@theia/monaco": "1.46.0-next.151+106da538c",
20
20
  "@theia/monaco-editor-core": "1.83.101",
21
- "@theia/navigator": "1.46.0-next.137+bce99c299",
22
- "@theia/notebook": "1.46.0-next.137+bce99c299",
23
- "@theia/output": "1.46.0-next.137+bce99c299",
24
- "@theia/plugin": "1.46.0-next.137+bce99c299",
25
- "@theia/preferences": "1.46.0-next.137+bce99c299",
26
- "@theia/scm": "1.46.0-next.137+bce99c299",
27
- "@theia/search-in-workspace": "1.46.0-next.137+bce99c299",
28
- "@theia/task": "1.46.0-next.137+bce99c299",
29
- "@theia/terminal": "1.46.0-next.137+bce99c299",
30
- "@theia/test": "1.46.0-next.137+bce99c299",
31
- "@theia/timeline": "1.46.0-next.137+bce99c299",
32
- "@theia/typehierarchy": "1.46.0-next.137+bce99c299",
33
- "@theia/variable-resolver": "1.46.0-next.137+bce99c299",
34
- "@theia/workspace": "1.46.0-next.137+bce99c299",
21
+ "@theia/navigator": "1.46.0-next.151+106da538c",
22
+ "@theia/notebook": "1.46.0-next.151+106da538c",
23
+ "@theia/output": "1.46.0-next.151+106da538c",
24
+ "@theia/plugin": "1.46.0-next.151+106da538c",
25
+ "@theia/preferences": "1.46.0-next.151+106da538c",
26
+ "@theia/scm": "1.46.0-next.151+106da538c",
27
+ "@theia/search-in-workspace": "1.46.0-next.151+106da538c",
28
+ "@theia/task": "1.46.0-next.151+106da538c",
29
+ "@theia/terminal": "1.46.0-next.151+106da538c",
30
+ "@theia/test": "1.46.0-next.151+106da538c",
31
+ "@theia/timeline": "1.46.0-next.151+106da538c",
32
+ "@theia/typehierarchy": "1.46.0-next.151+106da538c",
33
+ "@theia/variable-resolver": "1.46.0-next.151+106da538c",
34
+ "@theia/workspace": "1.46.0-next.151+106da538c",
35
35
  "@types/mime": "^2.0.1",
36
36
  "@vscode/debugprotocol": "^1.51.0",
37
37
  "@vscode/proxy-agent": "^0.13.2",
@@ -97,5 +97,5 @@
97
97
  "nyc": {
98
98
  "extends": "../../configs/nyc.json"
99
99
  },
100
- "gitHead": "bce99c299d7a01573330482ce26563eb6b00a6e9"
100
+ "gitHead": "106da538c88e2d8d20111abc08a1414d69c3b689"
101
101
  }
package/src/common/plugin-protocol.ts CHANGED
@@ -198,6 +198,7 @@ export interface PluginPackageViewWelcome {
198
198
  export interface PluginPackageCommand {
199
199
  command: string;
200
200
  title: string;
201
+ shortTitle?: string;
201
202
  original?: string;
202
203
  category?: string;
203
204
  icon?: string | { light: string; dark: string; };
@@ -858,6 +859,7 @@ export interface ViewWelcome {
858
859
  export interface PluginCommand {
859
860
  command: string;
860
861
  title: string;
862
+ shortTitle?: string;
861
863
  originalTitle?: string;
862
864
  category?: string;
863
865
  iconUrl?: IconUrl;
package/src/hosted/node/scanners/scanner-theia.ts CHANGED
@@ -455,9 +455,9 @@ export class TheiaPluginScanner extends AbstractPluginScanner {
455
455
  return translation;
456
456
  }
457
457
 
458
- protected readCommand({ command, title, original, category, icon, enablement }: PluginPackageCommand, pck: PluginPackage): PluginCommand {
458
+ protected readCommand({ command, title, shortTitle, original, category, icon, enablement }: PluginPackageCommand, pck: PluginPackage): PluginCommand {
459
459
  const { themeIcon, iconUrl } = this.transformIconUrl(pck, icon) ?? {};
460
- return { command, title, originalTitle: original, category, iconUrl, themeIcon, enablement };
460
+ return { command, title, shortTitle, originalTitle: original, category, iconUrl, themeIcon, enablement };
461
461
  }
462
462
 
463
463
  protected transformIconUrl(plugin: PluginPackage, original?: IconUrl): { iconUrl?: IconUrl; themeIcon?: string } | undefined {
package/src/main/browser/custom-editors/plugin-custom-editor-registry.ts CHANGED
@@ -15,15 +15,11 @@
15
15
  // *****************************************************************************
16
16
 
17
17
  import { injectable, inject, postConstruct } from '@theia/core/shared/inversify';
18
- import { CustomEditor } from '../../../common';
18
+ import { CustomEditor, DeployedPlugin } from '../../../common';
19
19
  import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposable';
20
20
  import { CustomEditorOpener } from './custom-editor-opener';
21
- import { WorkspaceCommands } from '@theia/workspace/lib/browser';
22
- import { CommandRegistry, Emitter, MenuModelRegistry } from '@theia/core';
23
- import { SelectionService } from '@theia/core/lib/common';
24
- import { UriAwareCommandHandler } from '@theia/core/lib/common/uri-command-handler';
25
- import { NavigatorContextMenu } from '@theia/navigator/lib//browser/navigator-contribution';
26
- import { ApplicationShell, DefaultOpenerService, WidgetManager, WidgetOpenerOptions } from '@theia/core/lib/browser';
21
+ import { Emitter } from '@theia/core';
22
+ import { ApplicationShell, DefaultOpenerService, OpenWithService, WidgetManager, WidgetOpenerOptions } from '@theia/core/lib/browser';
27
23
  import { CustomEditorWidget } from './custom-editor-widget';
28
24
 
29
25
  @injectable()
@@ -38,21 +34,15 @@ export class PluginCustomEditorRegistry {
38
34
  @inject(DefaultOpenerService)
39
35
  protected readonly defaultOpenerService: DefaultOpenerService;
40
36
 
41
- @inject(MenuModelRegistry)
42
- protected readonly menuModelRegistry: MenuModelRegistry;
43
-
44
- @inject(CommandRegistry)
45
- protected readonly commandRegistry: CommandRegistry;
46
-
47
- @inject(SelectionService)
48
- protected readonly selectionService: SelectionService;
49
-
50
37
  @inject(WidgetManager)
51
38
  protected readonly widgetManager: WidgetManager;
52
39
 
53
40
  @inject(ApplicationShell)
54
41
  protected readonly shell: ApplicationShell;
55
42
 
43
+ @inject(OpenWithService)
44
+ protected readonly openWithService: OpenWithService;
45
+
56
46
  @postConstruct()
57
47
  protected init(): void {
58
48
  this.widgetManager.onDidCreateWidget(({ factoryId, widget }) => {
@@ -71,7 +61,7 @@ export class PluginCustomEditorRegistry {
71
61
  });
72
62
  }
73
63
 
74
- registerCustomEditor(editor: CustomEditor): Disposable {
64
+ registerCustomEditor(editor: CustomEditor, plugin: DeployedPlugin): Disposable {
75
65
  if (this.editors.has(editor.viewType)) {
76
66
  console.warn('editor with such id already registered: ', JSON.stringify(editor));
77
67
  return Disposable.NULL;
@@ -87,26 +77,14 @@ export class PluginCustomEditorRegistry {
87
77
  this.widgetManager
88
78
  );
89
79
  toDispose.push(this.defaultOpenerService.addHandler(editorOpenHandler));
90
-
91
- const openWithCommand = WorkspaceCommands.FILE_OPEN_WITH(editorOpenHandler);
92
- toDispose.push(
93
- this.menuModelRegistry.registerMenuAction(
94
- NavigatorContextMenu.OPEN_WITH,
95
- {
96
- commandId: openWithCommand.id,
97
- label: editorOpenHandler.label
98
- }
99
- )
100
- );
101
80
  toDispose.push(
102
- this.commandRegistry.registerCommand(
103
- openWithCommand,
104
- UriAwareCommandHandler.MonoSelect(this.selectionService, {
105
- execute: uri => editorOpenHandler.open(uri),
106
- isEnabled: uri => editorOpenHandler.canHandle(uri) > 0,
107
- isVisible: uri => editorOpenHandler.canHandle(uri) > 0
108
- })
109
- )
81
+ this.openWithService.registerHandler({
82
+ id: editor.viewType,
83
+ label: editorOpenHandler.label,
84
+ providerName: plugin.metadata.model.displayName,
85
+ canHandle: uri => editorOpenHandler.canHandle(uri),
86
+ open: uri => editorOpenHandler.open(uri)
87
+ })
110
88
  );
111
89
  toDispose.push(
112
90
  editorOpenHandler.onDidOpenCustomEditor(event => this.resolveWidget(event[0], event[1]))
package/src/main/browser/notebooks/notebook-dto.ts CHANGED
@@ -94,7 +94,7 @@ export namespace NotebookDto {
94
94
  return {
95
95
  handle: cell.handle,
96
96
  uri: cell.uri.toComponents(),
97
- source: cell.text.split(eol),
97
+ source: cell.text.split(/\r?\n/g),
98
98
  eol,
99
99
  language: cell.language,
100
100
  cellKind: cell.cellKind,
package/src/main/browser/notebooks/notebook-kernels-main.ts CHANGED
@@ -209,9 +209,16 @@ export class NotebookKernelsMainImpl implements NotebookKernelsMain {
209
209
  }
210
210
  }(handle, data, this.languageService);
211
211
 
212
+ // this is for when a kernel is bound to a notebook while being registered
213
+ const autobindListener = this.notebookKernelService.onDidChangeSelectedKernel(e => {
214
+ if (e.newKernel === kernel.id) {
215
+ this.proxy.$acceptNotebookAssociation(handle, e.notebook.toComponents(), true);
216
+ }
217
+ });
218
+
212
219
  const registration = this.notebookKernelService.registerKernel(kernel);
213
220
  this.kernels.set(handle, [kernel, registration]);
214
-
221
+ autobindListener.dispose();
215
222
  }
216
223
 
217
224
  $updateKernel(handle: number, data: Partial<NotebookKernelDto>): void {
package/src/main/browser/plugin-contribution-handler.ts CHANGED
@@ -288,7 +288,7 @@ export class PluginContributionHandler {
288
288
  if (contributions.customEditors) {
289
289
  for (const customEditor of contributions.customEditors) {
290
290
  pushContribution(`customEditors.${customEditor.viewType}`,
291
- () => this.customEditorRegistry.registerCustomEditor(customEditor)
291
+ () => this.customEditorRegistry.registerCustomEditor(customEditor, plugin)
292
292
  );
293
293
  }
294
294
  }
@@ -434,7 +434,7 @@ export class PluginContributionHandler {
434
434
  if (contributions.notebooks) {
435
435
  for (const notebook of contributions.notebooks) {
436
436
  pushContribution(`notebook.${notebook.type}`,
437
- () => this.notebookTypeRegistry.registerNotebookType(notebook)
437
+ () => this.notebookTypeRegistry.registerNotebookType(notebook, plugin.metadata.model.displayName)
438
438
  );
439
439
  }
440
440
  }
@@ -463,7 +463,7 @@ export class PluginContributionHandler {
463
463
  return Disposable.NULL;
464
464
  }
465
465
  const toDispose = new DisposableCollection();
466
- for (const { iconUrl, themeIcon, command, category, title, originalTitle, enablement } of contribution.commands) {
466
+ for (const { iconUrl, themeIcon, command, category, shortTitle, title, originalTitle, enablement } of contribution.commands) {
467
467
  const reference = iconUrl && this.style.toIconClass(iconUrl);
468
468
  const icon = themeIcon && ThemeIcon.fromString(themeIcon);
469
469
  let iconClass;
@@ -473,7 +473,7 @@ export class PluginContributionHandler {
473
473
  } else if (icon) {
474
474
  iconClass = ThemeIcon.asClassName(icon);
475
475
  }
476
- toDispose.push(this.registerCommand({ id: command, category, label: title, originalLabel: originalTitle, iconClass }, enablement));
476
+ toDispose.push(this.registerCommand({ id: command, category, shortTitle, label: title, originalLabel: originalTitle, iconClass }, enablement));
477
477
  }
478
478
  return toDispose;
479
479
  }
package/src/main/browser/view/plugin-view-registry.ts CHANGED
@@ -55,6 +55,13 @@ export const PLUGIN_VIEW_DATA_FACTORY_ID = 'plugin-view-data';
55
55
 
56
56
  export type ViewDataProvider = (params: { state?: object, viewInfo: View }) => Promise<TreeViewWidget>;
57
57
 
58
+ export interface ViewContainerInfo {
59
+ id: string
60
+ location: string
61
+ options: ViewContainerTitleOptions
62
+ onViewAdded: () => void
63
+ }
64
+
58
65
  @injectable()
59
66
  export class PluginViewRegistry implements FrontendApplicationContribution {
60
67
 
@@ -96,7 +103,7 @@ export class PluginViewRegistry implements FrontendApplicationContribution {
96
103
 
97
104
  private readonly views = new Map<string, [string, View]>();
98
105
  private readonly viewsWelcome = new Map<string, ViewWelcome[]>();
99
- private readonly viewContainers = new Map<string, [string, ViewContainerTitleOptions]>();
106
+ private readonly viewContainers = new Map<string, ViewContainerInfo>();
100
107
  private readonly containerViews = new Map<string, string[]>();
101
108
  private readonly viewClauseContexts = new Map<string, Set<string> | undefined>();
102
109
 
@@ -324,34 +331,47 @@ export class PluginViewRegistry implements FrontendApplicationContribution {
324
331
 
325
332
  protected doRegisterViewContainer(id: string, location: string, options: ViewContainerTitleOptions): Disposable {
326
333
  const toDispose = new DisposableCollection();
327
- this.viewContainers.set(id, [location, options]);
328
334
  toDispose.push(Disposable.create(() => this.viewContainers.delete(id)));
329
335
  const toggleCommandId = `plugin.view-container.${id}.toggle`;
330
- toDispose.push(this.commands.registerCommand({
331
- id: toggleCommandId,
332
- label: 'Toggle ' + options.label + ' View'
333
- }, {
334
- execute: () => this.toggleViewContainer(id)
335
- }));
336
- toDispose.push(this.menus.registerMenuAction(CommonMenus.VIEW_VIEWS, {
337
- commandId: toggleCommandId,
338
- label: options.label
339
- }));
340
- toDispose.push(this.quickView?.registerItem({
341
- label: options.label,
342
- open: async () => {
343
- const widget = await this.openViewContainer(id);
336
+ // Some plugins may register empty view containers.
337
+ // We should not register commands for them immediately, as that leads to bad UX.
338
+ // Instead, we register commands the first time we add a view to them.
339
+ let activate = () => {
340
+ toDispose.push(this.commands.registerCommand({
341
+ id: toggleCommandId,
342
+ category: nls.localizeByDefault('View'),
343
+ label: nls.localizeByDefault('Toggle {0}', options.label)
344
+ }, {
345
+ execute: () => this.toggleViewContainer(id)
346
+ }));
347
+ toDispose.push(this.menus.registerMenuAction(CommonMenus.VIEW_VIEWS, {
348
+ commandId: toggleCommandId,
349
+ label: options.label
350
+ }));
351
+ toDispose.push(this.quickView?.registerItem({
352
+ label: options.label,
353
+ open: async () => {
354
+ const widget = await this.openViewContainer(id);
355
+ if (widget) {
356
+ this.shell.activateWidget(widget.id);
357
+ }
358
+ }
359
+ }));
360
+ toDispose.push(Disposable.create(async () => {
361
+ const widget = await this.getPluginViewContainer(id);
344
362
  if (widget) {
345
- this.shell.activateWidget(widget.id);
363
+ widget.dispose();
346
364
  }
347
- }
348
- }));
349
- toDispose.push(Disposable.create(async () => {
350
- const widget = await this.getPluginViewContainer(id);
351
- if (widget) {
352
- widget.dispose();
353
- }
354
- }));
365
+ }));
366
+ // Ignore every subsequent activation call
367
+ activate = () => { };
368
+ };
369
+ this.viewContainers.set(id, {
370
+ id,
371
+ location,
372
+ options,
373
+ onViewAdded: () => activate()
374
+ });
355
375
  return toDispose;
356
376
  }
357
377
 
@@ -374,6 +394,11 @@ export class PluginViewRegistry implements FrontendApplicationContribution {
374
394
  this.views.set(view.id, [viewContainerId, view]);
375
395
  toDispose.push(Disposable.create(() => this.views.delete(view.id)));
376
396
 
397
+ const containerInfo = this.viewContainers.get(viewContainerId);
398
+ if (containerInfo) {
399
+ containerInfo.onViewAdded();
400
+ }
401
+
377
402
  const containerViews = this.getContainerViews(viewContainerId);
378
403
  containerViews.push(view.id);
379
404
  this.containerViews.set(viewContainerId, containerViews);
@@ -634,7 +659,7 @@ export class PluginViewRegistry implements FrontendApplicationContribution {
634
659
  if (!data) {
635
660
  return undefined;
636
661
  }
637
- const [location] = data;
662
+ const { location } = data;
638
663
  const containerWidget = await this.getOrCreateViewContainerWidget(containerId);
639
664
  if (!containerWidget.isAttached) {
640
665
  await this.shell.addWidget(containerWidget, {
@@ -648,7 +673,7 @@ export class PluginViewRegistry implements FrontendApplicationContribution {
648
673
  protected async prepareViewContainer(viewContainerId: string, containerWidget: ViewContainerWidget): Promise<void> {
649
674
  const data = this.viewContainers.get(viewContainerId);
650
675
  if (data) {
651
- const [, options] = data;
676
+ const { options } = data;
652
677
  containerWidget.setTitleOptions(options);
653
678
  }
654
679
  for (const viewId of this.getContainerViews(viewContainerId)) {
package/src/main/browser/webview/pre/host.js CHANGED
@@ -31,7 +31,7 @@
31
31
  let sourceIsChildFrame = false;
32
32
  for (let i = 0; i < window.frames.length; i++) {
33
33
  const frame = window.frames[i];
34
- if (e.source === frame) {
34
+ if (e.origin === frame.origin) {
35
35
  sourceIsChildFrame = true;
36
36
  break;
37
37
  }
package/src/plugin/notebook/notebook-document.ts CHANGED
@@ -26,7 +26,6 @@ import { Disposable, URI } from '@theia/core';
26
26
  import * as typeConverters from '../type-converters';
27
27
  import { ModelAddedData, NotebookCellDto, NotebookCellsChangedEventDto, NotebookModelAddedData, NotebookOutputDto } from '../../common';
28
28
  import { NotebookRange } from '../types-impl';
29
- import { UriComponents } from '../../common/uri-components';
30
29
  import { DocumentsExtImpl } from '../documents';
31
30
 
32
31
  class RawContentChangeEvent {
@@ -49,7 +48,7 @@ class RawContentChangeEvent {
49
48
 
50
49
  export class Cell {
51
50
 
52
- static asModelAddData(notebook: theia.NotebookDocument, cell: NotebookCellDto): ModelAddedData & { notebook: theia.NotebookDocument } {
51
+ static asModelAddData(cell: NotebookCellDto): ModelAddedData {
53
52
  return {
54
53
  EOL: cell.eol,
55
54
  lines: cell.source,
@@ -57,7 +56,6 @@ export class Cell {
57
56
  uri: cell.uri,
58
57
  isDirty: false,
59
58
  versionId: 1,
60
- notebook,
61
59
  modeId: ''
62
60
  };
63
61
  }
@@ -348,8 +346,6 @@ export class NotebookDocument implements Disposable {
348
346
  }
349
347
 
350
348
  const contentChangeEvents: RawContentChangeEvent[] = [];
351
- const addedCellDocuments: ModelAddedData[] = [];
352
- const removedCellDocuments: UriComponents[] = [];
353
349
 
354
350
  splices.reverse().forEach(splice => {
355
351
  const cellDtos = splice.newItems;
@@ -357,18 +353,8 @@ export class NotebookDocument implements Disposable {
357
353
 
358
354
  const extCell = new Cell(this, this.editorsAndDocuments, cell);
359
355
  if (!initialization) {
360
- addedCellDocuments.push(Cell.asModelAddData(this.apiNotebook, cell));
361
356
  this.editorsAndDocuments.$acceptEditorsAndDocumentsDelta({
362
- addedDocuments: [
363
- {
364
- uri: cell.uri,
365
- versionId: 1,
366
- lines: cell.source,
367
- EOL: cell.eol,
368
- modeId: '',
369
- isDirty: false
370
- }
371
- ]
357
+ addedDocuments: [Cell.asModelAddData(cell)]
372
358
  });
373
359
  }
374
360
  return extCell;
@@ -377,7 +363,6 @@ export class NotebookDocument implements Disposable {
377
363
  const changeEvent = new RawContentChangeEvent(splice.start, splice.deleteCount, [], newCells);
378
364
  const deletedItems = this.cells.splice(splice.start, splice.deleteCount, ...newCells);
379
365
  for (const cell of deletedItems) {
380
- removedCellDocuments.push(cell.uri.toComponents());
381
366
  changeEvent.deletedItems.push(cell.apiCell);
382
367
  }
383
368
  contentChangeEvents.push(changeEvent);
package/src/plugin/notebook/notebooks.ts CHANGED
@@ -22,7 +22,7 @@ import { CancellationToken, Disposable, DisposableCollection, Emitter, Event, UR
22
22
  import { URI as TheiaURI } from '../types-impl';
23
23
  import * as theia from '@theia/plugin';
24
24
  import {
25
- CommandRegistryExt, NotebookCellStatusBarListDto, NotebookDataDto,
25
+ CommandRegistryExt, ModelAddedData, NotebookCellStatusBarListDto, NotebookDataDto,
26
26
  NotebookDocumentsAndEditorsDelta, NotebookDocumentShowOptions, NotebookDocumentsMain, NotebookEditorAddData, NotebookEditorsMain, NotebooksExt, NotebooksMain, Plugin,
27
27
  PLUGIN_RPC_CONTEXT
28
28
  } from '../../common';
@@ -32,7 +32,7 @@ import { UriComponents } from '../../common/uri-components';
32
32
  import { CommandsConverter } from '../command-registry';
33
33
  import * as typeConverters from '../type-converters';
34
34
  import { BinaryBuffer } from '@theia/core/lib/common/buffer';
35
- import { NotebookDocument } from './notebook-document';
35
+ import { Cell, NotebookDocument } from './notebook-document';
36
36
  import { NotebookEditor } from './notebook-editor';
37
37
  import { EditorsAndDocumentsExtImpl } from '../editors-and-documents';
38
38
  import { DocumentsExtImpl } from '../documents';
@@ -204,6 +204,8 @@ export class NotebooksExtImpl implements NotebooksExt {
204
204
  }
205
205
 
206
206
  async $acceptDocumentsAndEditorsDelta(delta: NotebookDocumentsAndEditorsDelta): Promise<void> {
207
+ const removedCellDocuments: UriComponents[] = [];
208
+ const addedCellDocuments: ModelAddedData[] = [];
207
209
  if (delta.removedDocuments) {
208
210
  for (const uri of delta.removedDocuments) {
209
211
  const revivedUri = URI.fromComponents(uri);
@@ -213,6 +215,7 @@ export class NotebooksExtImpl implements NotebooksExt {
213
215
  document.dispose();
214
216
  this.documents.delete(revivedUri.toString());
215
217
  this.onDidCloseNotebookDocumentEmitter.fire(document.apiNotebook);
218
+ removedCellDocuments.push(...document.apiNotebook.getCells().map(cell => cell.document.uri));
216
219
  }
217
220
 
218
221
  for (const editor of this.editors.values()) {
@@ -223,6 +226,11 @@ export class NotebooksExtImpl implements NotebooksExt {
223
226
  }
224
227
  }
225
228
 
229
+ // publish all removed cell documents first
230
+ await this.textDocumentsAndEditors.$acceptEditorsAndDocumentsDelta({
231
+ removedDocuments: removedCellDocuments
232
+ });
233
+
226
234
  if (delta.addedDocuments) {
227
235
  for (const modelData of delta.addedDocuments) {
228
236
  const uri = TheiaURI.from(modelData.uri);
@@ -242,21 +250,17 @@ export class NotebooksExtImpl implements NotebooksExt {
242
250
  this.documents.get(uri.toString())?.dispose();
243
251
  this.documents.set(uri.toString(), document);
244
252
 
245
- this.textDocumentsAndEditors.$acceptEditorsAndDocumentsDelta({
246
- addedDocuments: modelData.cells.map(cell => ({
247
- uri: cell.uri,
248
- versionId: 1,
249
- lines: cell.source,
250
- EOL: cell.eol,
251
- modeId: '',
252
- isDirty: false
253
- }))
254
- });
253
+ addedCellDocuments.push(...modelData.cells.map(cell => Cell.asModelAddData(cell)));
255
254
 
256
255
  this.onDidOpenNotebookDocumentEmitter.fire(document.apiNotebook);
257
256
  }
258
257
  }
259
258
 
259
+ // publish all added cell documents in a separate call
260
+ await this.textDocumentsAndEditors.$acceptEditorsAndDocumentsDelta({
261
+ addedDocuments: addedCellDocuments
262
+ });
263
+
260
264
  if (delta.addedEditors) {
261
265
  for (const editorModelData of delta.addedEditors) {
262
266
  if (this.editors.has(editorModelData.id)) {