@theia/notebook 1.45.1 → 1.46.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.
Files changed (15) hide show
  1. package/lib/browser/service/notebook-kernel-history-service.d.ts +7 -5
  2. package/lib/browser/service/notebook-kernel-history-service.d.ts.map +1 -1
  3. package/lib/browser/service/notebook-kernel-history-service.js +1 -1
  4. package/lib/browser/service/notebook-kernel-history-service.js.map +1 -1
  5. package/lib/browser/service/notebook-kernel-quick-pick-service.d.ts.map +1 -1
  6. package/lib/browser/service/notebook-kernel-quick-pick-service.js +2 -0
  7. package/lib/browser/service/notebook-kernel-quick-pick-service.js.map +1 -1
  8. package/lib/browser/view/notebook-code-cell-view.d.ts +4 -1
  9. package/lib/browser/view/notebook-code-cell-view.d.ts.map +1 -1
  10. package/lib/browser/view/notebook-code-cell-view.js +27 -12
  11. package/lib/browser/view/notebook-code-cell-view.js.map +1 -1
  12. package/package.json +7 -7
  13. package/src/browser/service/notebook-kernel-history-service.ts +5 -7
  14. package/src/browser/service/notebook-kernel-quick-pick-service.ts +2 -0
  15. package/src/browser/view/notebook-code-cell-view.tsx +29 -12
package/lib/browser/service/notebook-kernel-history-service.d.ts CHANGED
@@ -2,6 +2,9 @@ import { StorageService } from '@theia/core/lib/browser';
2
2
  import { NotebookKernel, NotebookTextModelLike, NotebookKernelService } from './notebook-kernel-service';
3
3
  import { CommandService, Disposable } from '@theia/core';
4
4
  import { NotebookModel } from '../view-model/notebook-model';
5
+ interface KernelsList {
6
+ [viewType: string]: string[];
7
+ }
5
8
  interface MostRecentKernelsResult {
6
9
  selected?: NotebookKernel;
7
10
  all: NotebookKernel[];
@@ -10,15 +13,14 @@ export declare class NotebookKernelHistoryService implements Disposable {
10
13
  protected storageService: StorageService;
11
14
  protected notebookKernelService: NotebookKernelService;
12
15
  protected commandService: CommandService;
13
- serviceBrand: undefined;
14
- private static STORAGE_KEY;
15
- private mostRecentKernelsMap;
16
+ protected static STORAGE_KEY: string;
17
+ protected mostRecentKernelsMap: KernelsList;
16
18
  protected init(): void;
17
19
  getKernels(notebook: NotebookTextModelLike): MostRecentKernelsResult;
18
20
  resolveSelectedKernel(notebook: NotebookModel): Promise<NotebookKernel | undefined>;
19
21
  addMostRecentKernel(kernel: NotebookKernel): void;
20
- private saveState;
21
- private loadState;
22
+ protected saveState(): void;
23
+ protected loadState(): Promise<void>;
22
24
  clear(): void;
23
25
  dispose(): void;
24
26
  }
package/lib/browser/service/notebook-kernel-history-service.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"notebook-kernel-history-service.d.ts","sourceRoot":"","sources":["../../../src/browser/service/notebook-kernel-history-service.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,qBAAqB,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AACzG,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAO7D,UAAU,uBAAuB;IAC7B,QAAQ,CAAC,EAAE,cAAc,CAAC;IAC1B,GAAG,EAAE,cAAc,EAAE,CAAA;CACxB;AAID,qBACa,4BAA6B,YAAW,UAAU;IAG3D,SAAS,CAAC,cAAc,EAAE,cAAc,CAAC;IAGzC,SAAS,CAAC,qBAAqB,EAAE,qBAAqB,CAAC;IAGvD,SAAS,CAAC,cAAc,EAAE,cAAc,CAAC;IAEjC,YAAY,EAAE,SAAS,CAAC;IAEhC,OAAO,CAAC,MAAM,CAAC,WAAW,CAA4B;IACtD,OAAO,CAAC,oBAAoB,CAAmB;IAG/C,SAAS,CAAC,IAAI,IAAI,IAAI;IAItB,UAAU,CAAC,QAAQ,EAAE,qBAAqB,GAAG,uBAAuB;IAe9D,qBAAqB,CAAC,QAAQ,EAAE,aAAa,GAAG,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC;IAYzF,mBAAmB,CAAC,MAAM,EAAE,cAAc,GAAG,IAAI;IAYjD,OAAO,CAAC,SAAS;YASH,SAAS;IASvB,KAAK,IAAI,IAAI;IAKb,OAAO,IAAI,IAAI;CAGlB"}
1
+ {"version":3,"file":"notebook-kernel-history-service.d.ts","sourceRoot":"","sources":["../../../src/browser/service/notebook-kernel-history-service.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,qBAAqB,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AACzG,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAG7D,UAAU,WAAW;IACjB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;CAChC;AAED,UAAU,uBAAuB;IAC7B,QAAQ,CAAC,EAAE,cAAc,CAAC;IAC1B,GAAG,EAAE,cAAc,EAAE,CAAA;CACxB;AAID,qBACa,4BAA6B,YAAW,UAAU;IAG3D,SAAS,CAAC,cAAc,EAAE,cAAc,CAAC;IAGzC,SAAS,CAAC,qBAAqB,EAAE,qBAAqB,CAAC;IAGvD,SAAS,CAAC,cAAc,EAAE,cAAc,CAAC;IAEzC,SAAS,CAAC,MAAM,CAAC,WAAW,SAA4B;IACxD,SAAS,CAAC,oBAAoB,EAAE,WAAW,CAAM;IAGjD,SAAS,CAAC,IAAI,IAAI,IAAI;IAItB,UAAU,CAAC,QAAQ,EAAE,qBAAqB,GAAG,uBAAuB;IAe9D,qBAAqB,CAAC,QAAQ,EAAE,aAAa,GAAG,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC;IAYzF,mBAAmB,CAAC,MAAM,EAAE,cAAc,GAAG,IAAI;IAYjD,SAAS,CAAC,SAAS,IAAI,IAAI;cASX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAS1C,KAAK,IAAI,IAAI;IAKb,OAAO,IAAI,IAAI;CAGlB"}
package/lib/browser/service/notebook-kernel-history-service.js CHANGED
@@ -77,7 +77,7 @@ let NotebookKernelHistoryService = NotebookKernelHistoryService_1 = class Notebo
77
77
  }
78
78
  saveState() {
79
79
  let notEmpty = false;
80
- for (const [_, kernels] of Object.entries(this.mostRecentKernelsMap)) {
80
+ for (const kernels of Object.values(this.mostRecentKernelsMap)) {
81
81
  notEmpty = notEmpty || Object.entries(kernels).length > 0;
82
82
  }
83
83
  this.storageService.setData(NotebookKernelHistoryService_1.STORAGE_KEY, notEmpty ? this.mostRecentKernelsMap : undefined);
package/lib/browser/service/notebook-kernel-history-service.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"notebook-kernel-history-service.js","sourceRoot":"","sources":["../../../src/browser/service/notebook-kernel-history-service.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,4DAAiF;AACjF,qDAAyD;AACzD,uEAAyG;AACzG,sCAAyD;AAEzD,kGAAkF;AAWlF,MAAM,sBAAsB,GAAG,CAAC,CAAC;AAGjC,IAAa,4BAA4B,oCAAzC,MAAa,4BAA4B;IAAzC;QAcY,yBAAoB,GAAgB,EAAE,CAAC;IAwEnD,CAAC;IArEa,IAAI;QACV,IAAI,CAAC,SAAS,EAAE,CAAC;IACrB,CAAC;IAED,UAAU,CAAC,QAA+B;QACtC,MAAM,mBAAmB,GAAG,IAAI,CAAC,qBAAqB,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;QACnF,MAAM,UAAU,GAAG,mBAAmB,CAAC,GAAG,CAAC;QAC3C,MAAM,cAAc,GAAG,mBAAmB,CAAC,QAAQ,CAAC;QACpD,kCAAkC;QAClC,MAAM,SAAS,GAAG,mBAAmB,CAAC,GAAG,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAChG,MAAM,mBAAmB,GAAG,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACtJ,MAAM,GAAG,GAAG,mBAAmB,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAqB,CAAC;QAElJ,OAAO;YACH,QAAQ,EAAE,cAAc,aAAd,cAAc,cAAd,cAAc,GAAI,SAAS;YACrC,GAAG;SACN,CAAC;IACN,CAAC;IAED,KAAK,CAAC,qBAAqB,CAAC,QAAuB;QAC/C,MAAM,eAAe,GAAG,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QAElD,IAAI,eAAe,CAAC,QAAQ,EAAE;YAC1B,OAAO,eAAe,CAAC,QAAQ,CAAC;SACnC;QAED,MAAM,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,gDAAgB,CAAC,qBAAqB,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;QAC9F,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QAC/C,OAAO,QAAQ,CAAC;IACpB,CAAC;IAED,mBAAmB,CAAC,MAAsB;;QACtC,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;QACjC,MAAM,aAAa,GAAG,MAAA,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC,mCAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAEzE,IAAI,aAAa,CAAC,MAAM,GAAG,sBAAsB,EAAE;YAC/C,aAAa,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAC;SAChD;QAED,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC,GAAG,aAAa,CAAC;QACpD,IAAI,CAAC,SAAS,EAAE,CAAC;IACrB,CAAC;IAEO,SAAS;QACb,IAAI,QAAQ,GAAG,KAAK,CAAC;QACrB,KAAK,MAAM,CAAC,CAAC,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,oBAAoB,CAAC,EAAE;YAClE,QAAQ,GAAG,QAAQ,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;SAC7D;QAED,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,8BAA4B,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IAC5H,CAAC;IAEO,KAAK,CAAC,SAAS;QACnB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,8BAA4B,CAAC,WAAW,CAAC,CAAC;QAC9F,IAAI,SAAS,EAAE;YACX,IAAI,CAAC,oBAAoB,GAAG,SAAwB,CAAC;SACxD;aAAM;YACH,IAAI,CAAC,oBAAoB,GAAG,EAAE,CAAC;SAClC;IACL,CAAC;IAED,KAAK;QACD,IAAI,CAAC,oBAAoB,GAAG,EAAE,CAAC;QAC/B,IAAI,CAAC,SAAS,EAAE,CAAC;IACrB,CAAC;IAED,OAAO;IAEP,CAAC;CACJ,CAAA;AAzEkB,wCAAW,GAAG,wBAAyB,CAAA;AAVtD;IADC,IAAA,kBAAM,EAAC,wBAAc,CAAC;;oEACkB;AAGzC;IADC,IAAA,kBAAM,EAAC,+CAAqB,CAAC;8BACG,+CAAqB;2EAAC;AAGvD;IADC,IAAA,kBAAM,EAAC,qBAAc,CAAC;;oEACkB;AAQzC;IADC,IAAA,yBAAa,GAAE;;;;wDAGf;AAnBQ,4BAA4B;IADxC,IAAA,sBAAU,GAAE;GACA,4BAA4B,CAsFxC;AAtFY,oEAA4B"}
1
+ {"version":3,"file":"notebook-kernel-history-service.js","sourceRoot":"","sources":["../../../src/browser/service/notebook-kernel-history-service.ts"],"names":[],"mappings":"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"}
package/lib/browser/service/notebook-kernel-quick-pick-service.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"notebook-kernel-quick-pick-service.d.ts","sourceRoot":"","sources":["../../../src/browser/service/notebook-kernel-quick-pick-service.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAc,cAAc,EAAsD,iBAAiB,EAAE,cAAc,EAAE,aAAa,EAAQ,MAAM,aAAa,CAAC;AAErK,OAAO,EAAE,qBAAqB,EAAE,cAAc,EAAE,yBAAyB,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC5H,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAW,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,EAAE,4BAA4B,EAAE,MAAM,mCAAmC,CAAC;AACjF,OAAO,EAAE,eAAe,EAAyB,MAAM,cAAc,CAAC;AAGtE,eAAO,MAAM,oBAAoB,uBAAuB,CAAC;AAEzD,aAAK,UAAU,GAAG,aAAa,GAAG;IAAE,MAAM,EAAE,cAAc,CAAA;CAAE,CAAC;AAI7D,aAAK,kBAAkB,GAAG,aAAa,GAAG;IAAE,OAAO,EAAE,cAAc,EAAE,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAIxF,aAAK,UAAU,GAAG,aAAa,GAAG;IAAE,MAAM,EAAE,aAAa,CAAA;CAAE,CAAC;AAI5D,aAAK,oBAAoB,GAAG,aAAa,GAAG;IAAE,YAAY,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC;AAEvE,aAAK,yBAAyB,GAAG,aAAa,GAAG;IAAE,OAAO,EAAE,eAAe,CAAC;IAAC,aAAa,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAStG,aAAK,mBAAmB,GAAG,CAAC,aAAa,GAAG;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC,GAAG,oBAAoB,GAAG,UAAU,GAAG,kBAAkB,GAAG,UAAU,GAAG,yBAAyB,CAAC;AAIrK,oBAAY,sBAAsB,GAC9B;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,GACjC;IAAE,gBAAgB,EAAE,MAAM,CAAA;CAAE,GAC5B;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,gBAAgB,EAAE,MAAM,CAAA;CAAE,GAC3D;IAAE,EAAE,CAAC,EAAE,OAAO,CAAC;IAAC,cAAc,CAAC,EAAE,oBAAoB,CAAA;CAAE,CAAC;AAmB5D,qBACa,8BAA8B;IAGvC,SAAS,CAAC,QAAQ,CAAC,qBAAqB,EAAE,qBAAqB,CAAC;IAEhE,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAExD,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IAGlD,SAAS,CAAC,aAAa,EAAE,aAAa,CAAC;IAGvC,SAAS,CAAC,4BAA4B,EAAE,4BAA4B,CAAC;IAE/D,aAAa,CAAC,MAAM,EAAE,aAAa,EAAE,QAAQ,CAAC,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IA6GtG,SAAS,CAAC,6BAA6B,CAAC,WAAW,EAAE,yBAAyB,GAAG,cAAc,CAAC,mBAAmB,CAAC,EAAE;IAgCtH,SAAS,CAAC,YAAY,CAAC,QAAQ,EAAE,aAAa,EAAE,MAAM,EAAE,cAAc,GAAG,IAAI;IAU7E,SAAS,CAAC,iBAAiB,CAAC,QAAQ,EAAE,aAAa,GAAG,yBAAyB;cAW/D,eAAe,CAAC,MAAM,EAAE,aAAa,EAAE,IAAI,EAAE,mBAAmB,EAAE,KAAK,EAAE,mBAAmB,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;YAmBnH,6BAA6B;IAwH3C,OAAO,CAAC,KAAK;YAIC,sBAAsB;YA6CtB,eAAe;YAwBf,cAAc;CAI/B"}
1
+ {"version":3,"file":"notebook-kernel-quick-pick-service.d.ts","sourceRoot":"","sources":["../../../src/browser/service/notebook-kernel-quick-pick-service.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAc,cAAc,EAAsD,iBAAiB,EAAE,cAAc,EAAE,aAAa,EAAQ,MAAM,aAAa,CAAC;AAErK,OAAO,EAAE,qBAAqB,EAAE,cAAc,EAAE,yBAAyB,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC5H,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAW,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,EAAE,4BAA4B,EAAE,MAAM,mCAAmC,CAAC;AACjF,OAAO,EAAE,eAAe,EAAyB,MAAM,cAAc,CAAC;AAGtE,eAAO,MAAM,oBAAoB,uBAAuB,CAAC;AAEzD,aAAK,UAAU,GAAG,aAAa,GAAG;IAAE,MAAM,EAAE,cAAc,CAAA;CAAE,CAAC;AAI7D,aAAK,kBAAkB,GAAG,aAAa,GAAG;IAAE,OAAO,EAAE,cAAc,EAAE,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAIxF,aAAK,UAAU,GAAG,aAAa,GAAG;IAAE,MAAM,EAAE,aAAa,CAAA;CAAE,CAAC;AAI5D,aAAK,oBAAoB,GAAG,aAAa,GAAG;IAAE,YAAY,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC;AAEvE,aAAK,yBAAyB,GAAG,aAAa,GAAG;IAAE,OAAO,EAAE,eAAe,CAAC;IAAC,aAAa,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAStG,aAAK,mBAAmB,GAAG,CAAC,aAAa,GAAG;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC,GAAG,oBAAoB,GAAG,UAAU,GAAG,kBAAkB,GAAG,UAAU,GAAG,yBAAyB,CAAC;AAIrK,oBAAY,sBAAsB,GAC9B;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,GACjC;IAAE,gBAAgB,EAAE,MAAM,CAAA;CAAE,GAC5B;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,gBAAgB,EAAE,MAAM,CAAA;CAAE,GAC3D;IAAE,EAAE,CAAC,EAAE,OAAO,CAAC;IAAC,cAAc,CAAC,EAAE,oBAAoB,CAAA;CAAE,CAAC;AAmB5D,qBACa,8BAA8B;IAGvC,SAAS,CAAC,QAAQ,CAAC,qBAAqB,EAAE,qBAAqB,CAAC;IAEhE,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAExD,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IAGlD,SAAS,CAAC,aAAa,EAAE,aAAa,CAAC;IAGvC,SAAS,CAAC,4BAA4B,EAAE,4BAA4B,CAAC;IAE/D,aAAa,CAAC,MAAM,EAAE,aAAa,EAAE,QAAQ,CAAC,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IA6GtG,SAAS,CAAC,6BAA6B,CAAC,WAAW,EAAE,yBAAyB,GAAG,cAAc,CAAC,mBAAmB,CAAC,EAAE;IAgCtH,SAAS,CAAC,YAAY,CAAC,QAAQ,EAAE,aAAa,EAAE,MAAM,EAAE,cAAc,GAAG,IAAI;IAU7E,SAAS,CAAC,iBAAiB,CAAC,QAAQ,EAAE,aAAa,GAAG,yBAAyB;cAW/D,eAAe,CAAC,MAAM,EAAE,aAAa,EAAE,IAAI,EAAE,mBAAmB,EAAE,KAAK,EAAE,mBAAmB,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;YAmBnH,6BAA6B;IA0H3C,OAAO,CAAC,KAAK;YAIC,sBAAsB;YA6CtB,eAAe;YAwBf,cAAc;CAI/B"}
package/lib/browser/service/notebook-kernel-quick-pick-service.js CHANGED
@@ -283,6 +283,7 @@ let NotebookKernelQuickPickService = class NotebookKernelQuickPickService {
283
283
  }
284
284
  }
285
285
  catch (ex) {
286
+ console.error('Failed to select notebook kernel', ex);
286
287
  return false;
287
288
  }
288
289
  }
@@ -301,6 +302,7 @@ let NotebookKernelQuickPickService = class NotebookKernelQuickPickService {
301
302
  return true;
302
303
  }
303
304
  catch (ex) {
305
+ console.error('Failed to select notebook kernel', ex);
304
306
  return false;
305
307
  }
306
308
  }
package/lib/browser/service/notebook-kernel-quick-pick-service.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"notebook-kernel-quick-pick-service.js","sourceRoot":"","sources":["../../../src/browser/service/notebook-kernel-quick-pick-service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"notebook-kernel-quick-pick-service.js","sourceRoot":"","sources":["../../../src/browser/service/notebook-kernel-quick-pick-service.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,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;AAChG,sCAAqK;AACrK,4DAAkE;AAClE,uEAA4H;AAG5H,qDAAiE;AACjE,uFAAiF;AACjF,yCAAsE;AACtE,+DAAgE;AAEnD,QAAA,oBAAoB,GAAG,oBAAoB,CAAC;AAGzD,SAAS,YAAY,CAAC,IAAmC;IACrD,OAAO,QAAQ,IAAI,IAAI,CAAC;AAC5B,CAAC;AAED,SAAS,oBAAoB,CAAC,IAAmC;IAC7D,OAAO,SAAS,IAAI,IAAI,CAAC;AAC7B,CAAC;AAED,SAAS,YAAY,CAAC,IAAmC;IACrD,OAAO,QAAQ,IAAI,IAAI,CAAC;AAC5B,CAAC;AAID,SAAS,2BAA2B,CAAC,IAAmB;IACpD,OAAO,SAAS,IAAI,IAAI,CAAC;AAC7B,CAAC;AAED,SAAS,cAAc,CAAC,IAAyC;IAC7D,OAAO,SAAS,IAAI,IAAI,IAAI,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC;AAC/C,CAAC;AAID,MAAM,6BAA6B,GAAG,GAAG,CAAC;AAQ1C,SAAS,iBAAiB,CAAC,MAAsB,EAAE,QAAoC;IACnF,MAAM,GAAG,GAAe;QACpB,MAAM;QACN,KAAK,EAAE,MAAM,CAAC,KAAK;QACnB,WAAW,EAAE,MAAM,CAAC,WAAW;QAC/B,MAAM,EAAE,MAAM,CAAC,MAAM;KACxB,CAAC;IACF,IAAI,MAAM,CAAC,EAAE,MAAK,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,EAAE,CAAA,EAAE;QAC5B,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE;YAClB,GAAG,CAAC,WAAW,GAAG,UAAG,CAAC,iBAAiB,CAAC,oBAAoB,CAAC,CAAC;SACjE;aAAM;YACH,GAAG,CAAC,WAAW,GAAG,UAAG,CAAC,iBAAiB,CAAC,0BAA0B,EAAE,GAAG,CAAC,WAAW,CAAC,CAAC;SACxF;KACJ;IACD,OAAO,GAAG,CAAC;AACf,CAAC;AAGD,IAAa,8BAA8B,GAA3C,MAAa,8BAA8B;IAevC,KAAK,CAAC,aAAa,CAAC,MAAqB,EAAE,QAAiB,EAAE,WAAqB;QAC/E,MAAM,QAAQ,GAAG,MAAM,CAAC;QACxB,MAAM,WAAW,GAAG,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;QACrD,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,WAAW,CAAC;QAEtC,IAAI,SAAqC,CAAC;QAC1C,IAAI,QAAQ,EAAE;YACV,KAAK,MAAM,SAAS,IAAI,GAAG,EAAE;gBACzB,IAAI,SAAS,CAAC,EAAE,KAAK,QAAQ,EAAE;oBAC3B,SAAS,GAAG,SAAS,CAAC;oBACtB,MAAM;iBACT;aACJ;YACD,IAAI,CAAC,SAAS,EAAE;gBACZ,OAAO,CAAC,IAAI,CAAC,yCAAyC,QAAQ,UAAU,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;gBAC9F,OAAO,KAAK,CAAC;aAChB;SACJ;QAED,IAAI,SAAS,EAAE;YACX,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;YACvC,OAAO,IAAI,CAAC;SACf;QAED,MAAM,SAAS,GAAG,IAAI,CAAC,iBAAiB,CAAC,eAAe,EAAuB,CAAC;QAChF,MAAM,cAAc,GAAG,IAAI,CAAC,6BAA6B,CAAC,WAAW,CAAC,CAAC;QAEvE,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,IAAI,cAAc,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE;YAClF,OAAO,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC,EAAE,cAAuC,CAAC,CAAC;SACnG;QAED,SAAS,CAAC,KAAK,GAAG,cAAc,CAAC;QACjC,SAAS,CAAC,aAAa,GAAG,KAAK,CAAC;QAChC,SAAS,CAAC,WAAW,GAAG,QAAQ;YAC5B,CAAC,CAAC,UAAG,CAAC,iBAAiB,CAAC,yBAAyB,EAAE,SAAS,CAAC,CAAC,4DAA4D;YAC1H,CAAC,CAAC,UAAG,CAAC,iBAAiB,CAAC,yBAAyB,EAAE,SAAS,CAAC,CAAC;QAElE,SAAS,CAAC,IAAI,GAAG,IAAI,CAAC,qBAAqB,CAAC,uBAAuB,CAAC,QAAQ,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;QAEzF,MAAM,2BAA2B,GAAG,IAAI,CAAC,qBAAqB,CAAC,+BAA+B,CAAC,GAAG,EAAE;YAChG,SAAS,CAAC,IAAI,GAAG,IAAI,CAAC,qBAAqB,CAAC,uBAAuB,CAAC,QAAQ,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;QAC7F,CAAC,CAAC,CAAC;QAEH,MAAM,yBAAyB,GAAG,QAAQ,CACtC,YAAK,CAAC,GAAG,CACL,IAAI,CAAC,qBAAqB,CAAC,wBAAwB,EACnD,IAAI,CAAC,qBAAqB,CAAC,cAAc,EACzC,IAAI,CAAC,qBAAqB,CAAC,iBAAiB,EAC5C,IAAI,CAAC,qBAAqB,CAAC,2BAA2B,CACzD,EACD,6BAA6B,CAChC,CAAC,KAAK,IAAI,EAAE;YACT,4BAA4B;YAC5B,SAAS,CAAC,IAAI,GAAG,KAAK,CAAC;YAEvB,MAAM,kBAAkB,GAAG,SAAS,CAAC,WAAW,CAAC;YACjD,MAAM,cAAc,GAAG,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;YACxD,MAAM,iBAAiB,GAAG,IAAI,CAAC,6BAA6B,CAAC,cAAc,CAAC,CAAC;YAC7E,SAAS,CAAC,kBAAkB,GAAG,IAAI,CAAC;YAEpC,2BAA2B;YAC3B,MAAM,WAAW,GAA0B,EAAE,CAAC;YAC9C,KAAK,MAAM,IAAI,IAAI,kBAAkB,EAAE;gBACnC,IAAI,YAAY,CAAC,IAAI,CAAC,EAAE;oBACpB,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;oBAChC,MAAM,QAAQ,GAAG,iBAAiB,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC,EAAE,KAAK,QAAQ,CAA2B,CAAC;oBACvH,IAAI,QAAQ,EAAE;wBACV,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;qBAC9B;iBACJ;qBAAM,IAAI,YAAY,CAAC,IAAI,CAAC,EAAE;oBAC3B,MAAM,QAAQ,GAAG,iBAAiB,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,KAAK,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAA2B,CAAC;oBAC7I,IAAI,QAAQ,EAAE;wBACV,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;qBAC9B;iBACJ;aACJ;YAED,SAAS,CAAC,KAAK,GAAG,iBAAiB,CAAC;YACpC,SAAS,CAAC,WAAW,GAAG,WAAW,CAAC;QACxC,CAAC,EAAE,IAAI,CAAC,CAAC;QAET,MAAM,IAAI,GAAG,MAAM,IAAI,OAAO,CAA8E,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC5H,SAAS,CAAC,WAAW,CAAC,GAAG,EAAE;gBACvB,MAAM,IAAI,GAAG,SAAS,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;gBACxC,IAAI,IAAI,EAAE;oBACN,OAAO,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,CAAC,KAA8B,EAAE,CAAC,CAAC;iBAChF;qBAAM;oBACH,OAAO,CAAC,EAAE,QAAQ,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,CAAC,KAA8B,EAAE,CAAC,CAAC;iBACrF;gBAED,SAAS,CAAC,IAAI,EAAE,CAAC;YACrB,CAAC,CAAC,CAAC;YAEH,SAAS,CAAC,SAAS,CAAC,GAAG,EAAE;gBACrB,2BAA2B,CAAC,OAAO,EAAE,CAAC;gBACtC,yBAAyB,aAAzB,yBAAyB,uBAAzB,yBAAyB,CAAE,OAAO,EAAE,CAAC;gBACrC,SAAS,CAAC,OAAO,EAAE,CAAC;gBACpB,OAAO,CAAC,EAAE,QAAQ,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,CAAC,KAA8B,EAAE,CAAC,CAAC;YACtF,CAAC,CAAC,CAAC;YACH,SAAS,CAAC,IAAI,EAAE,CAAC;QACrB,CAAC,CAAC,CAAC;QAEH,IAAI,IAAI,CAAC,QAAQ,EAAE;YACf,OAAO,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;SAClE;QAED,OAAO,KAAK,CAAC;IACjB,CAAC;IAES,6BAA6B,CAAC,WAAsC;QAC1E,MAAM,cAAc,GAA0C,EAAE,CAAC;QAEjE,IAAI,WAAW,CAAC,QAAQ,EAAE;YACtB,MAAM,UAAU,GAAG,iBAAiB,CAAC,WAAW,CAAC,QAAQ,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC;YACjF,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;SACnC;QAED,+FAA+F;QAC/F,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,WAAC,OAAA,MAAM,CAAC,EAAE,MAAK,MAAA,WAAW,CAAC,QAAQ,0CAAE,EAAE,CAAA,CAAA,EAAA,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,iBAAiB,CAAC,MAAM,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC;aAClI,OAAO,CAAC,MAAM,CAAC,EAAE;YACd,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAChC,CAAC,CAAC,CAAC;QAEP,MAAM,aAAa,GAAG,cAAc,CAAC,MAAM,KAAK,CAAC,CAAC;QAElD,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE;YAC3B,cAAc,CAAC,IAAI,CAAC;gBAChB,IAAI,EAAE,WAAW;aACpB,CAAC,CAAC;SACN;QAED,mCAAmC;QACnC,cAAc,CAAC,IAAI,CAAC;YAChB,EAAE,EAAE,eAAe;YACnB,KAAK,EAAE,UAAG,CAAC,iBAAiB,CAAC,0BAA0B,CAAC;YACxD,OAAO,EAAE,aAAa;SACzB,CAAC,CAAC;QAEH,OAAO,cAAc,CAAC;IAC1B,CAAC;IAES,YAAY,CAAC,QAAuB,EAAE,MAAsB;QAClE,MAAM,WAAW,GAAG,IAAI,CAAC,qBAAqB,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;QAC3E,IAAI,WAAW,CAAC,QAAQ,EAAE;YACtB,qCAAqC;YACrC,IAAI,CAAC,4BAA4B,CAAC,mBAAmB,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;SAC/E;QACD,IAAI,CAAC,qBAAqB,CAAC,uBAAuB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QACrE,IAAI,CAAC,4BAA4B,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC;IAClE,CAAC;IAES,iBAAiB,CAAC,QAAuB;QAC/C,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,4BAA4B,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QACjF,MAAM,cAAc,GAAG,IAAI,CAAC,qBAAqB,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;QAC9E,OAAO;YACH,QAAQ,EAAE,QAAQ;YAClB,GAAG,EAAE,cAAc,CAAC,GAAG;YACvB,WAAW,EAAE,GAAG;YAChB,MAAM,EAAE,EAAE;SACb,CAAC;IACN,CAAC;IAES,KAAK,CAAC,eAAe,CAAC,MAAqB,EAAE,IAAyB,EAAE,KAA4B;QAC1G,IAAI,IAAI,CAAC,EAAE,KAAK,eAAe,EAAE;YAC7B,OAAO,IAAI,CAAC,6BAA6B,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC;SAC9F;QAED,IAAI,YAAY,CAAC,IAAI,CAAC,EAAE;YACpB,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC;YAC9B,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;YACrC,OAAO,IAAI,CAAC;SACf;QAED,IAAI,YAAY,CAAC,IAAI,CAAC,EAAE;YACpB,wDAAwD;YACxD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;SACxC;QAED,OAAO,IAAI,CAAC;IAChB,CAAC;IAEO,KAAK,CAAC,6BAA6B,CAAC,MAAqB,EAAE,eAAwB;QACvF,MAAM,QAAQ,GAAkB,MAAM,CAAC;QACvC,MAAM,WAAW,GAAG,IAAI,2BAAoB,EAAE,CAAC;QAC/C,MAAM,SAAS,GAAG,IAAI,CAAC,iBAAiB,CAAC,eAAe,EAAuB,CAAC;QAChF,MAAM,aAAa,GAAG,MAAM,IAAI,OAAO,CAAqD,OAAO,CAAC,EAAE;YAClG,6BAA6B;YAC7B,SAAS,CAAC,KAAK,GAAG,eAAe,CAAC,CAAC,CAAC,UAAG,CAAC,iBAAiB,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,UAAG,CAAC,iBAAiB,CAAC,uBAAuB,CAAC,CAAC;YAC5H,SAAS,CAAC,WAAW,GAAG,UAAG,CAAC,iBAAiB,CAAC,gCAAgC,CAAC,CAAC;YAChF,SAAS,CAAC,IAAI,GAAG,IAAI,CAAC;YACtB,2DAA2D;YAC3D,SAAS,CAAC,IAAI,EAAE,CAAC;YAEjB,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,kBAAkB,CAAC,MAAM,CAAC,EAAE;gBACnD,IAAI,MAAM,KAAK,IAAI,CAAC,iBAAiB,CAAC,UAAU,EAAE;oBAC9C,OAAO,CAAC,MAAM,CAAC,CAAC;iBACnB;YACL,CAAC,CAAC,CAAC,CAAC;YACJ,SAAS,CAAC,sBAAsB,CAAC,KAAK,EAAC,CAAC,EAAC,EAAE;gBAEvC,IAAI,2BAA2B,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,aAAa,KAAK,SAAS,EAAE;oBAC3E,MAAM,GAAG,GAAoB,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,IAAI,UAAG,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;oBAC/J,IAAI,GAAG,EAAE;wBACL,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC;qBACvG;iBACJ;YACL,CAAC,CAAC,CAAC;YACH,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,KAAK,IAAI,EAAE;gBAC9C,OAAO,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;YACxC,CAAC,CAAC,CAAC,CAAC;YACJ,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,GAAG,EAAE;gBACtC,OAAO,CAAC,SAAS,CAAC,CAAC;YACvB,CAAC,CAAC,CAAC,CAAC;YAEJ,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE;gBACtD,SAAS,CAAC,KAAK,GAAG,cAAc,CAAC;gBACjC,IAAI,SAAS,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;oBAC5B,SAAS,CAAC,IAAI,GAAG,KAAK,CAAC;iBAC1B;YACL,CAAC,CAAC,CAAC;YAEH,QAAQ,CACJ,YAAK,CAAC,GAAG,CACL,IAAI,CAAC,qBAAqB,CAAC,wBAAwB,EACnD,IAAI,CAAC,qBAAqB,CAAC,cAAc,EACzC,IAAI,CAAC,qBAAqB,CAAC,iBAAiB,CAC/C,EACD,6BAA6B,CAChC,CAAC,KAAK,IAAI,EAAE;gBACT,SAAS,CAAC,IAAI,GAAG,IAAI,CAAC;gBACtB,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC;gBACjE,SAAS,CAAC,KAAK,GAAG,cAAc,CAAC;gBACjC,SAAS,CAAC,IAAI,GAAG,KAAK,CAAC;YAC3B,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,SAAS,CAAC,IAAI,EAAE,CAAC;QACjB,WAAW,CAAC,OAAO,EAAE,CAAC;QAEtB,IAAI,aAAa,KAAK,IAAI,CAAC,iBAAiB,CAAC,UAAU,EAAE;YACrD,OAAO,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;SACtD;QAED,IAAI,aAAa,EAAE;YACf,MAAM,sBAAsB,GAAG,aAAoC,CAAC;YACpE,IAAI,2BAA2B,CAAC,sBAAsB,CAAC,EAAE;gBACrD,IAAI;oBACA,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,cAAc,CAAS,QAAQ,EAAE,sBAAsB,CAAC,OAAO,CAAC,CAAC;oBACrG,IAAI,gBAAgB,EAAE;wBAClB,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;wBACjD,MAAM,cAAc,GAAG,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,KAAK,sBAAsB,gBAAgB,EAAE,CAAC,CAAC;wBAClG,IAAI,cAAc,EAAE;4BAChB,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;4BAC5C,OAAO,IAAI,CAAC;yBACf;wBACD,OAAO,IAAI,CAAC;qBACf;yBAAM;wBACH,OAAO,IAAI,CAAC,6BAA6B,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;qBAC5D;iBACJ;gBAAC,OAAO,EAAE,EAAE;oBACT,OAAO,CAAC,KAAK,CAAC,kCAAkC,EAAE,EAAE,CAAC,CAAC;oBACtD,OAAO,KAAK,CAAC;iBAChB;aACJ;iBAAM,IAAI,YAAY,CAAC,sBAAsB,CAAC,EAAE;gBAC7C,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,sBAAsB,CAAC,MAAM,CAAC,CAAC;gBAC3D,OAAO,IAAI,CAAC;aACf;iBAAM,IAAI,oBAAoB,CAAC,sBAAsB,CAAC,EAAE;gBACrD,MAAM,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,sBAAsB,CAAC,MAAM,EAAE,sBAAsB,CAAC,OAAO,CAAC,CAAC;gBACpG,OAAO,IAAI,CAAC;aACf;iBAAM,IAAI,YAAY,CAAC,sBAAsB,CAAC,EAAE;gBAC7C,wDAAwD;gBACxD,IAAI;oBACA,MAAM,sBAAsB,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;oBAC7D,OAAO,IAAI,CAAC;iBACf;gBAAC,OAAO,EAAE,EAAE;oBACT,OAAO,CAAC,KAAK,CAAC,kCAAkC,EAAE,EAAE,CAAC,CAAC;oBACtD,OAAO,KAAK,CAAC;iBAChB;aACJ;YACD,gEAAgE;YAChE,sCAAsC;YACtC,yCAAyC;YACzC,0CAA0C;YAC1C,iCAAiC;YACjC,qCAAqC;YACrC,aAAa;YACb,SAAS;YACT,mBAAmB;YACnB,+DAA+D;YAC/D,sCAAsC;YACtC,yCAAyC;YACzC,0CAA0C;YAC1C,iCAAiC;YACjC,qCAAqC;YACrC,+CAA+C;YAC/C,SAAS;YACT,mBAAmB;YACnB,IAAI;SACP;QAED,OAAO,KAAK,CAAC;IACjB,CAAC;IAEO,KAAK,CAAC,KAAa;QACvB,OAAO,2BAA2B,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACnD,CAAC;IAEO,KAAK,CAAC,sBAAsB,CAAC,MAAqB;QACtD,MAAM,QAAQ,GAAkB,MAAM,CAAC;QAEvC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,mCAAmC,CAAC,QAAQ,CAAC,CAAC;QAC/F,MAAM,WAAW,GAAG,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;QAErD,MAAM,MAAM,GAAG,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,WAAW,KAAK,4BAAoB,CAAC,CAAC;QACzF,MAAM,cAAc,GAA0C,EAAE,CAAC;QAEjE,iCAAiC;QACjC,KAAK,MAAM,KAAK,IAAI,iBAAU,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,KAAK,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE;YAC/F,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC;YACpC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;gBAClB,cAAc,CAAC,IAAI,CAAC;oBAChB,KAAK,EAAE,MAAM;oBACb,OAAO,EAAE,KAAK;iBACjB,CAAC,CAAC;aACN;iBAAM;gBACH,cAAc,CAAC,IAAI,CAAC;oBAChB,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK;oBACrB,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC;iBACnB,CAAC,CAAC;aACN;SACJ;QAED,MAAM,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAE9D,cAAc,CAAC,IAAI,CAAC,GAAG,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;YAC7C,MAAM,OAAO,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;oBACpC,SAAS,EAAE,IAAA,iBAAO,EAAC,MAAM,CAAC;oBAC1B,OAAO,EAAE,UAAG,CAAC,iBAAiB,CAAC,YAAY,CAAC;iBAC/C,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YACR,OAAO;gBACH,EAAE,EAAE,OAAO,MAAM,CAAC,OAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,OAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,OAAQ,CAAC,EAAE;gBAC9E,KAAK,EAAE,MAAM,CAAC,KAAK;gBACnB,WAAW,EAAE,MAAM,CAAC,WAAW;gBAC/B,OAAO,EAAE,MAAM,CAAC,OAAO;gBACvB,aAAa,EAAE,MAAM,CAAC,aAAa;gBACnC,OAAO;aACV,CAAC;QACN,CAAC,CAAC,CAAC,CAAC;QAEJ,OAAO,cAAc,CAAC;IAC1B,CAAC;IAEO,KAAK,CAAC,eAAe,CAAC,QAAuB,EAAE,MAAc,EAAE,OAAyB;QAC5F,MAAM,cAAc,GAAiC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,iBAAiB,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC;QACjH,MAAM,SAAS,GAAG,IAAI,CAAC,iBAAiB,CAAC,eAAe,EAAuB,CAAC;QAChF,SAAS,CAAC,KAAK,GAAG,cAAc,CAAC;QACjC,SAAS,CAAC,aAAa,GAAG,KAAK,CAAC;QAEhC,SAAS,CAAC,KAAK,GAAG,UAAG,CAAC,iBAAiB,CAAC,wBAAwB,EAAE,MAAM,CAAC,CAAC;QAE1E,SAAS,CAAC,WAAW,CAAC,KAAK,IAAI,EAAE;YAC7B,IAAI,SAAS,CAAC,aAAa,IAAI,SAAS,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,IAAI,YAAY,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,EAAE;gBAC3G,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,SAAS,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;aAClE;YAED,SAAS,CAAC,IAAI,EAAE,CAAC;YACjB,SAAS,CAAC,OAAO,EAAE,CAAC;QACxB,CAAC,CAAC,CAAC;QAEH,SAAS,CAAC,SAAS,CAAC,GAAG,EAAE;YACrB,SAAS,CAAC,OAAO,EAAE,CAAC;QACxB,CAAC,CAAC,CAAC;QAEH,SAAS,CAAC,IAAI,EAAE,CAAC;IACrB,CAAC;IAEO,KAAK,CAAC,cAAc,CAAI,QAAuB,EAAE,OAAwB;QAC7E,MAAM,IAAI,GAAG,CAAC,OAAO,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,8BAAqB,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QAC5F,OAAO,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,EAAE,GAAG,IAAI,CAAC,CAAC;IACnE,CAAC;CACJ,CAAA;AAxYG;IADC,IAAA,kBAAM,EAAC,+CAAqB,CAAC;8BACY,+CAAqB;6EAAC;AAEhE;IADC,IAAA,kBAAM,EAAC,wBAAiB,CAAC;;yEAC8B;AAExD;IADC,IAAA,kBAAM,EAAC,qBAAc,CAAC;;sEAC2B;AAGlD;IADC,IAAA,kBAAM,EAAC,uBAAa,CAAC;;qEACiB;AAGvC;IADC,IAAA,kBAAM,EAAC,8DAA4B,CAAC;8BACG,8DAA4B;oFAAC;AAb5D,8BAA8B;IAD1C,IAAA,sBAAU,GAAE;GACA,8BAA8B,CA2Y1C;AA3YY,wEAA8B"}
package/lib/browser/view/notebook-code-cell-view.d.ts CHANGED
@@ -38,9 +38,12 @@ interface NotebookCellOutputProps {
38
38
  }
39
39
  export declare class NotebookCodeCellOutputs extends React.Component<NotebookCellOutputProps> {
40
40
  protected outputsWebview: CellOutputWebview | undefined;
41
+ protected outputsWebviewPromise: Promise<CellOutputWebview> | undefined;
42
+ protected toDispose: DisposableCollection;
41
43
  constructor(props: NotebookCellOutputProps);
42
44
  componentDidMount(): Promise<void>;
43
- componentDidUpdate(): void;
45
+ componentDidUpdate(): Promise<void>;
46
+ componentWillUnmount(): Promise<void>;
44
47
  render(): React.ReactNode;
45
48
  }
46
49
  export {};
package/lib/browser/view/notebook-code-cell-view.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"notebook-code-cell-view.d.ts","sourceRoot":"","sources":["../../../src/browser/view/notebook-code-cell-view.tsx"],"names":[],"mappings":";AAiBA,OAAO,KAAK,KAAK,MAAM,0BAA0B,CAAC;AAClD,OAAO,EAAE,oBAAoB,EAAE,MAAM,yCAAyC,CAAC;AAC/E,OAAO,EAAE,wBAAwB,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AAC/F,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AACzE,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAE7D,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAE7E,OAAO,EAAE,aAAa,EAAE,6BAA6B,EAAE,MAAM,6CAA6C,CAAC;AAG3G,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAEnD,qBACa,wBAAyB,YAAW,YAAY;IAEzD,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,oBAAoB,CAAC;IAGxD,SAAS,CAAC,QAAQ,CAAC,wBAAwB,EAAE,wBAAwB,CAAC;IAGtE,SAAS,CAAC,QAAQ,CAAC,wBAAwB,EAAE,wBAAwB,CAAC;IAGtE,SAAS,CAAC,QAAQ,CAAC,0BAA0B,EAAE,0BAA0B,CAAC;IAG1E,SAAS,CAAC,QAAQ,CAAC,qBAAqB,EAAE,6BAA6B,CAAC;IAExE,MAAM,CAAC,aAAa,EAAE,aAAa,EAAE,IAAI,EAAE,iBAAiB,EAAE,MAAM,EAAE,MAAM,GAAG,KAAK,CAAC,SAAS;CAoBjG;AAED,MAAM,WAAW,2BAA2B;IACxC,IAAI,EAAE,iBAAiB,CAAC;IACxB,qBAAqB,EAAE,6BAA6B,CAAA;CACvD;AAED,qBAAa,sBAAuB,SAAQ,KAAK,CAAC,SAAS,CAAC,2BAA2B,EAAE;IAAE,gBAAgB,CAAC,EAAE,aAAa,CAAA;CAAE,CAAC;IAE1H,SAAS,CAAC,SAAS,uBAA8B;gBAErC,KAAK,EAAE,2BAA2B;IAYrC,oBAAoB,IAAI,IAAI;IAI5B,MAAM,IAAI,KAAK,CAAC,SAAS;IAWlC,OAAO,CAAC,oBAAoB;IA0B5B,OAAO,CAAC,gBAAgB;CAO3B;AAED,UAAU,uBAAuB;IAC7B,IAAI,EAAE,iBAAiB,CAAC;IACxB,oBAAoB,EAAE,wBAAwB,CAAC;IAC/C,aAAa,EAAE,MAAM,KAAK,CAAC,SAAS,CAAC;CACxC;AAED,qBAAa,uBAAwB,SAAQ,KAAK,CAAC,SAAS,CAAC,uBAAuB,CAAC;IAEjF,SAAS,CAAC,cAAc,EAAE,iBAAiB,GAAG,SAAS,CAAC;gBAE5C,KAAK,EAAE,uBAAuB;IAI3B,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC;IAiBxC,kBAAkB,IAAI,IAAI;IAM1B,MAAM,IAAI,KAAK,CAAC,SAAS;CAUrC"}
1
+ {"version":3,"file":"notebook-code-cell-view.d.ts","sourceRoot":"","sources":["../../../src/browser/view/notebook-code-cell-view.tsx"],"names":[],"mappings":";AAiBA,OAAO,KAAK,KAAK,MAAM,0BAA0B,CAAC;AAClD,OAAO,EAAE,oBAAoB,EAAE,MAAM,yCAAyC,CAAC;AAC/E,OAAO,EAAE,wBAAwB,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AAC/F,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AACzE,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAE7D,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAE7E,OAAO,EAAE,aAAa,EAAE,6BAA6B,EAAE,MAAM,6CAA6C,CAAC;AAG3G,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAEnD,qBACa,wBAAyB,YAAW,YAAY;IAEzD,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,oBAAoB,CAAC;IAGxD,SAAS,CAAC,QAAQ,CAAC,wBAAwB,EAAE,wBAAwB,CAAC;IAGtE,SAAS,CAAC,QAAQ,CAAC,wBAAwB,EAAE,wBAAwB,CAAC;IAGtE,SAAS,CAAC,QAAQ,CAAC,0BAA0B,EAAE,0BAA0B,CAAC;IAG1E,SAAS,CAAC,QAAQ,CAAC,qBAAqB,EAAE,6BAA6B,CAAC;IAExE,MAAM,CAAC,aAAa,EAAE,aAAa,EAAE,IAAI,EAAE,iBAAiB,EAAE,MAAM,EAAE,MAAM,GAAG,KAAK,CAAC,SAAS;CAoBjG;AAED,MAAM,WAAW,2BAA2B;IACxC,IAAI,EAAE,iBAAiB,CAAC;IACxB,qBAAqB,EAAE,6BAA6B,CAAA;CACvD;AAED,qBAAa,sBAAuB,SAAQ,KAAK,CAAC,SAAS,CAAC,2BAA2B,EAAE;IAAE,gBAAgB,CAAC,EAAE,aAAa,CAAA;CAAE,CAAC;IAE1H,SAAS,CAAC,SAAS,uBAA8B;gBAErC,KAAK,EAAE,2BAA2B;IAYrC,oBAAoB,IAAI,IAAI;IAI5B,MAAM,IAAI,KAAK,CAAC,SAAS;IAWlC,OAAO,CAAC,oBAAoB;IA0B5B,OAAO,CAAC,gBAAgB;CAO3B;AAED,UAAU,uBAAuB;IAC7B,IAAI,EAAE,iBAAiB,CAAC;IACxB,oBAAoB,EAAE,wBAAwB,CAAC;IAC/C,aAAa,EAAE,MAAM,KAAK,CAAC,SAAS,CAAC;CACxC;AAED,qBAAa,uBAAwB,SAAQ,KAAK,CAAC,SAAS,CAAC,uBAAuB,CAAC;IAEjF,SAAS,CAAC,cAAc,EAAE,iBAAiB,GAAG,SAAS,CAAC;IACxD,SAAS,CAAC,qBAAqB,EAAE,OAAO,CAAC,iBAAiB,CAAC,GAAG,SAAS,CAAC;IAExE,SAAS,CAAC,SAAS,uBAA8B;gBAErC,KAAK,EAAE,uBAAuB;IAI3B,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC;IA0BlC,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;IAMnC,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;IAK3C,MAAM,IAAI,KAAK,CAAC,SAAS;CAUrC"}
package/lib/browser/view/notebook-code-cell-view.js CHANGED
@@ -130,30 +130,45 @@ exports.NotebookCodeCellStatus = NotebookCodeCellStatus;
130
130
  class NotebookCodeCellOutputs extends React.Component {
131
131
  constructor(props) {
132
132
  super(props);
133
+ this.toDispose = new core_1.DisposableCollection();
133
134
  }
134
135
  async componentDidMount() {
135
136
  const { cell, outputWebviewFactory } = this.props;
136
- cell.onDidChangeOutputs(async () => {
137
- if (!this.outputsWebview && cell.outputs.length > 0) {
138
- this.outputsWebview = await outputWebviewFactory(cell);
137
+ this.toDispose.push(cell.onDidChangeOutputs(async () => {
138
+ if (!this.outputsWebviewPromise && cell.outputs.length > 0) {
139
+ this.outputsWebviewPromise = outputWebviewFactory(cell).then(webview => {
140
+ this.outputsWebview = webview;
141
+ this.forceUpdate();
142
+ return webview;
143
+ });
144
+ this.forceUpdate();
139
145
  }
140
- else if (this.outputsWebview && cell.outputs.length === 0) {
141
- this.outputsWebview.dispose();
146
+ else if (this.outputsWebviewPromise && cell.outputs.length === 0 && cell.internalMetadata.runEndTime) {
147
+ (await this.outputsWebviewPromise).dispose();
142
148
  this.outputsWebview = undefined;
149
+ this.outputsWebviewPromise = undefined;
150
+ this.forceUpdate();
143
151
  }
144
- this.forceUpdate();
145
- });
152
+ }));
146
153
  if (cell.outputs.length > 0) {
147
- this.outputsWebview = await outputWebviewFactory(cell);
148
- this.forceUpdate();
154
+ this.outputsWebviewPromise = outputWebviewFactory(cell).then(webview => {
155
+ this.outputsWebview = webview;
156
+ this.forceUpdate();
157
+ return webview;
158
+ });
149
159
  }
150
160
  }
151
- componentDidUpdate() {
161
+ async componentDidUpdate() {
152
162
  var _a, _b;
153
- if (!((_a = this.outputsWebview) === null || _a === void 0 ? void 0 : _a.isAttached())) {
154
- (_b = this.outputsWebview) === null || _b === void 0 ? void 0 : _b.attachWebview();
163
+ if (!((_a = (await this.outputsWebviewPromise)) === null || _a === void 0 ? void 0 : _a.isAttached())) {
164
+ (_b = (await this.outputsWebviewPromise)) === null || _b === void 0 ? void 0 : _b.attachWebview();
155
165
  }
156
166
  }
167
+ async componentWillUnmount() {
168
+ var _a;
169
+ this.toDispose.dispose();
170
+ (_a = (await this.outputsWebviewPromise)) === null || _a === void 0 ? void 0 : _a.dispose();
171
+ }
157
172
  render() {
158
173
  return this.outputsWebview ?
159
174
  React.createElement(React.Fragment, null,
package/lib/browser/view/notebook-code-cell-view.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"notebook-code-cell-view.js","sourceRoot":"","sources":["../../../src/browser/view/notebook-code-cell-view.tsx"],"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;;;;;;;;;;;;AAEhF,4DAAkE;AAClE,kDAAkD;AAClD,2EAA+E;AAC/E,0EAA+F;AAC/F,8EAAyE;AAGzE,iEAAoD;AAEpD,mFAA6E;AAC7E,4GAAqG;AACrG,kGAA2G;AAC3G,qDAAkD;AAClD,yCAA0D;AAC1D,sCAAmD;AAGnD,IAAa,wBAAwB,GAArC,MAAa,wBAAwB;IAgBjC,MAAM,CAAC,aAA4B,EAAE,IAAuB,EAAE,MAAc;QACxE,OAAO;YACH,6BAAK,SAAS,EAAC,kCAAkC;gBAC7C,iCACK,IAAI,CAAC,0BAA0B,CAAC,aAAa,CAAC,mEAA8B,CAAC,sBAAsB,EAAE,aAAa,EAAE,IAAI,CAAC,CAGxH;gBACN,6BAAK,SAAS,EAAC,sCAAsC;oBACjD,oBAAC,iCAAU,IAAC,aAAa,EAAE,aAAa,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,CAAC,cAAc,GAAI;oBAC7F,oBAAC,sBAAsB,IAAC,IAAI,EAAE,IAAI,EAAE,qBAAqB,EAAE,IAAI,CAAC,qBAAqB,GAA2B,CAC9G,CACJ;YACN,6BAAK,SAAS,EAAC,kCAAkC;gBAC7C,oBAAC,uBAAuB,IAAC,IAAI,EAAE,IAAI,EAAE,oBAAoB,EAAE,IAAI,CAAC,wBAAwB,EACpF,aAAa,EAAE,GAAG,EAAE,CAChB,IAAI,CAAC,0BAA0B,CAAC,aAAa,CAAC,mEAA8B,CAAC,mBAAmB,EAAE,aAAa,EAAE,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,GAAI,CACjJ,CACH,CAAC;IACZ,CAAC;CACJ,CAAA;AAlCG;IADC,IAAA,kBAAM,EAAC,oCAAoB,CAAC;8BACM,oCAAoB;gEAAC;AAGxD;IADC,IAAA,kBAAM,EAAC,qDAAwB,CAAC;8BACY,qDAAwB;0EAAC;AAGtE;IADC,IAAA,kBAAM,EAAC,8CAAwB,CAAC;;0EACqC;AAGtE;IADC,IAAA,kBAAM,EAAC,0DAA0B,CAAC;8BACY,0DAA0B;4EAAC;AAG1E;IADC,IAAA,kBAAM,EAAC,gEAA6B,CAAC;8BACI,gEAA6B;uEAAC;AAd/D,wBAAwB;IADpC,IAAA,sBAAU,GAAE;GACA,wBAAwB,CAoCpC;AApCY,4DAAwB;AA2CrC,MAAa,sBAAuB,SAAQ,KAAK,CAAC,SAA4E;IAI1H,YAAY,KAAkC;QAC1C,KAAK,CAAC,KAAK,CAAC,CAAC;QAHP,cAAS,GAAG,IAAI,2BAAoB,EAAE,CAAC;QAK7C,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;QAEhB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,qBAAqB,CAAC,oBAAoB,CAAC,KAAK,CAAC,EAAE;YACzE,IAAI,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;gBACxC,IAAI,CAAC,QAAQ,CAAC,EAAE,gBAAgB,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;aACtD;QACL,CAAC,CAAC,CAAC,CAAC;IACR,CAAC;IAEQ,oBAAoB;QACzB,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;IAEQ,MAAM;QACX,OAAO,6BAAK,SAAS,EAAC,sBAAsB;YACxC,6BAAK,SAAS,EAAC,2BAA2B,IACrC,IAAI,CAAC,oBAAoB,EAAE,CAC1B;YACN,6BAAK,SAAS,EAAC,4BAA4B;gBACvC,kCAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAQ,CACrC,CACJ,CAAC;IACX,CAAC;IAEO,oBAAoB;;QACxB,MAAM,KAAK,GAAG,MAAA,IAAI,CAAC,KAAK,CAAC,gBAAgB,0CAAE,KAAK,CAAC;QACjD,MAAM,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC;QAE5D,IAAI,WAAW,GAAuB,SAAS,CAAC;QAChD,IAAI,KAAK,GAAuB,SAAS,CAAC;QAC1C,IAAI,CAAC,KAAK,IAAI,cAAc,EAAE;YAC1B,WAAW,GAAG,IAAA,iBAAO,EAAC,OAAO,CAAC,CAAC;YAC/B,KAAK,GAAG,OAAO,CAAC;SACnB;aAAM,IAAI,CAAC,KAAK,IAAI,cAAc,KAAK,KAAK,EAAE;YAC3C,WAAW,GAAG,IAAA,iBAAO,EAAC,OAAO,CAAC,CAAC;YAC/B,KAAK,GAAG,KAAK,CAAC;SACjB;aAAM,IAAI,KAAK,KAAK,mCAA0B,CAAC,OAAO,IAAI,KAAK,KAAK,mCAA0B,CAAC,WAAW,EAAE;YACzG,WAAW,GAAG,IAAA,iBAAO,EAAC,OAAO,CAAC,CAAC;SAClC;aAAM,IAAI,KAAK,KAAK,mCAA0B,CAAC,SAAS,EAAE;YACvD,WAAW,GAAG,GAAG,IAAA,iBAAO,EAAC,MAAM,CAAC,uBAAuB,CAAC;SAC3D;QACD,OAAO,0CACF,WAAW;YACR;gBACI,8BAAM,SAAS,EAAE,GAAG,WAAW,4BAA4B,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,GAAS;gBACtF,6BAAK,SAAS,EAAC,2BAA2B,IAAE,IAAI,CAAC,gBAAgB,EAAE,CAAO,CAC3E,CACR,CAAC;IACR,CAAC;IAEO,gBAAgB;QACpB,MAAM,EAAE,YAAY,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC;QACtE,IAAI,YAAY,IAAI,UAAU,EAAE;YAC5B,OAAO,GAAG,CAAC,CAAC,UAAU,GAAG,YAAY,CAAC,GAAG,IAAI,CAAC,CAAC,cAAc,CAAC,SAAS,EAAE,EAAE,qBAAqB,EAAE,CAAC,EAAE,qBAAqB,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC;SACvI;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ;AAhED,wDAgEC;AAQD,MAAa,uBAAwB,SAAQ,KAAK,CAAC,SAAkC;IAIjF,YAAY,KAA8B;QACtC,KAAK,CAAC,KAAK,CAAC,CAAC;IACjB,CAAC;IAEQ,KAAK,CAAC,iBAAiB;QAC5B,MAAM,EAAE,IAAI,EAAE,oBAAoB,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QAClD,IAAI,CAAC,kBAAkB,CAAC,KAAK,IAAI,EAAE;YAC/B,IAAI,CAAC,IAAI,CAAC,cAAc,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;gBACjD,IAAI,CAAC,cAAc,GAAG,MAAM,oBAAoB,CAAC,IAAI,CAAC,CAAC;aAC1D;iBAAM,IAAI,IAAI,CAAC,cAAc,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;gBACzD,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC;gBAC9B,IAAI,CAAC,cAAc,GAAG,SAAS,CAAC;aACnC;YACD,IAAI,CAAC,WAAW,EAAE,CAAC;QACvB,CAAC,CAAC,CAAC;QACH,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;YACzB,IAAI,CAAC,cAAc,GAAG,MAAM,oBAAoB,CAAC,IAAI,CAAC,CAAC;YACvD,IAAI,CAAC,WAAW,EAAE,CAAC;SACtB;IACL,CAAC;IAEQ,kBAAkB;;QACvB,IAAI,CAAC,CAAA,MAAA,IAAI,CAAC,cAAc,0CAAE,UAAU,EAAE,CAAA,EAAE;YACpC,MAAA,IAAI,CAAC,cAAc,0CAAE,aAAa,EAAE,CAAC;SACxC;IACL,CAAC;IAEQ,MAAM;QACX,OAAO,IAAI,CAAC,cAAc,CAAC,CAAC;YACxB;gBACK,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE;gBAC1B,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,CAC9B,CAAC,CAAC;YACL,yCAAK,CAAC;IAEd,CAAC;CAEJ;AAzCD,0DAyCC"}
1
+ {"version":3,"file":"notebook-code-cell-view.js","sourceRoot":"","sources":["../../../src/browser/view/notebook-code-cell-view.tsx"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "name": "@theia/notebook",
3
- "version": "1.45.1",
3
+ "version": "1.46.0",
4
4
  "description": "Theia - Notebook Extension",
5
5
  "dependencies": {
6
- "@theia/core": "1.45.1",
7
- "@theia/editor": "1.45.1",
8
- "@theia/filesystem": "1.45.1",
9
- "@theia/monaco": "1.45.1",
6
+ "@theia/core": "1.46.0",
7
+ "@theia/editor": "1.46.0",
8
+ "@theia/filesystem": "1.46.0",
9
+ "@theia/monaco": "1.46.0",
10
10
  "uuid": "^8.3.2"
11
11
  },
12
12
  "publishConfig": {
@@ -42,11 +42,11 @@
42
42
  "watch": "theiaext watch"
43
43
  },
44
44
  "devDependencies": {
45
- "@theia/ext-scripts": "1.45.1",
45
+ "@theia/ext-scripts": "1.46.0",
46
46
  "@types/vscode-notebook-renderer": "^1.72.0"
47
47
  },
48
48
  "nyc": {
49
49
  "extends": "../../configs/nyc.json"
50
50
  },
51
- "gitHead": "3837c50544190b80d0ad8e87aa9fa9f286c70fcc"
51
+ "gitHead": "90ba9de68f5912773ae9e26fcffeb671c0ab43d2"
52
52
  }
package/src/browser/service/notebook-kernel-history-service.ts CHANGED
@@ -48,10 +48,8 @@ export class NotebookKernelHistoryService implements Disposable {
48
48
  @inject(CommandService)
49
49
  protected commandService: CommandService;
50
50
 
51
- declare serviceBrand: undefined;
52
-
53
- private static STORAGE_KEY = 'notebook.kernelHistory';
54
- private mostRecentKernelsMap: KernelsList = {};
51
+ protected static STORAGE_KEY = 'notebook.kernelHistory';
52
+ protected mostRecentKernelsMap: KernelsList = {};
55
53
 
56
54
  @postConstruct()
57
55
  protected init(): void {
@@ -97,16 +95,16 @@ export class NotebookKernelHistoryService implements Disposable {
97
95
  this.saveState();
98
96
  }
99
97
 
100
- private saveState(): void {
98
+ protected saveState(): void {
101
99
  let notEmpty = false;
102
- for (const [_, kernels] of Object.entries(this.mostRecentKernelsMap)) {
100
+ for (const kernels of Object.values(this.mostRecentKernelsMap)) {
103
101
  notEmpty = notEmpty || Object.entries(kernels).length > 0;
104
102
  }
105
103
 
106
104
  this.storageService.setData(NotebookKernelHistoryService.STORAGE_KEY, notEmpty ? this.mostRecentKernelsMap : undefined);
107
105
  }
108
106
 
109
- private async loadState(): Promise<void> {
107
+ protected async loadState(): Promise<void> {
110
108
  const kernelMap = await this.storageService.getData(NotebookKernelHistoryService.STORAGE_KEY);
111
109
  if (kernelMap) {
112
110
  this.mostRecentKernelsMap = kernelMap as KernelsList;
package/src/browser/service/notebook-kernel-quick-pick-service.ts CHANGED
@@ -356,6 +356,7 @@ export class NotebookKernelQuickPickService {
356
356
  return this.displaySelectAnotherQuickPick(editor, false);
357
357
  }
358
358
  } catch (ex) {
359
+ console.error('Failed to select notebook kernel', ex);
359
360
  return false;
360
361
  }
361
362
  } else if (isKernelPick(selectedKernelPickItem)) {
@@ -370,6 +371,7 @@ export class NotebookKernelQuickPickService {
370
371
  await selectedKernelPickItem.action.run(this.commandService);
371
372
  return true;
372
373
  } catch (ex) {
374
+ console.error('Failed to select notebook kernel', ex);
373
375
  return false;
374
376
  }
375
377
  }
package/src/browser/view/notebook-code-cell-view.tsx CHANGED
@@ -149,6 +149,9 @@ interface NotebookCellOutputProps {
149
149
  export class NotebookCodeCellOutputs extends React.Component<NotebookCellOutputProps> {
150
150
 
151
151
  protected outputsWebview: CellOutputWebview | undefined;
152
+ protected outputsWebviewPromise: Promise<CellOutputWebview> | undefined;
153
+
154
+ protected toDispose = new DisposableCollection();
152
155
 
153
156
  constructor(props: NotebookCellOutputProps) {
154
157
  super(props);
@@ -156,27 +159,41 @@ export class NotebookCodeCellOutputs extends React.Component<NotebookCellOutputP
156
159
 
157
160
  override async componentDidMount(): Promise<void> {
158
161
  const { cell, outputWebviewFactory } = this.props;
159
- cell.onDidChangeOutputs(async () => {
160
- if (!this.outputsWebview && cell.outputs.length > 0) {
161
- this.outputsWebview = await outputWebviewFactory(cell);
162
- } else if (this.outputsWebview && cell.outputs.length === 0) {
163
- this.outputsWebview.dispose();
162
+ this.toDispose.push(cell.onDidChangeOutputs(async () => {
163
+ if (!this.outputsWebviewPromise && cell.outputs.length > 0) {
164
+ this.outputsWebviewPromise = outputWebviewFactory(cell).then(webview => {
165
+ this.outputsWebview = webview;
166
+ this.forceUpdate();
167
+ return webview;
168
+ });
169
+ this.forceUpdate();
170
+ } else if (this.outputsWebviewPromise && cell.outputs.length === 0 && cell.internalMetadata.runEndTime) {
171
+ (await this.outputsWebviewPromise).dispose();
164
172
  this.outputsWebview = undefined;
173
+ this.outputsWebviewPromise = undefined;
174
+ this.forceUpdate();
165
175
  }
166
- this.forceUpdate();
167
- });
176
+ }));
168
177
  if (cell.outputs.length > 0) {
169
- this.outputsWebview = await outputWebviewFactory(cell);
170
- this.forceUpdate();
178
+ this.outputsWebviewPromise = outputWebviewFactory(cell).then(webview => {
179
+ this.outputsWebview = webview;
180
+ this.forceUpdate();
181
+ return webview;
182
+ });
171
183
  }
172
184
  }
173
185
 
174
- override componentDidUpdate(): void {
175
- if (!this.outputsWebview?.isAttached()) {
176
- this.outputsWebview?.attachWebview();
186
+ override async componentDidUpdate(): Promise<void> {
187
+ if (!(await this.outputsWebviewPromise)?.isAttached()) {
188
+ (await this.outputsWebviewPromise)?.attachWebview();
177
189
  }
178
190
  }
179
191
 
192
+ override async componentWillUnmount(): Promise<void> {
193
+ this.toDispose.dispose();
194
+ (await this.outputsWebviewPromise)?.dispose();
195
+ }
196
+
180
197
  override render(): React.ReactNode {
181
198
  return this.outputsWebview ?
182
199
  <>