@theia/notebook 1.47.1 → 1.48.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/lib/browser/contributions/cell-operations.d.ts +8 -0
- package/lib/browser/contributions/cell-operations.d.ts.map +1 -0
- package/lib/browser/contributions/cell-operations.js +37 -0
- package/lib/browser/contributions/cell-operations.js.map +1 -0
- package/lib/browser/contributions/notebook-actions-contribution.d.ts +10 -2
- package/lib/browser/contributions/notebook-actions-contribution.d.ts.map +1 -1
- package/lib/browser/contributions/notebook-actions-contribution.js +61 -7
- package/lib/browser/contributions/notebook-actions-contribution.js.map +1 -1
- package/lib/browser/contributions/notebook-cell-actions-contribution.d.ts +16 -1
- package/lib/browser/contributions/notebook-cell-actions-contribution.d.ts.map +1 -1
- package/lib/browser/contributions/notebook-cell-actions-contribution.js +154 -17
- package/lib/browser/contributions/notebook-cell-actions-contribution.js.map +1 -1
- package/lib/browser/notebook-editor-widget.d.ts +8 -2
- package/lib/browser/notebook-editor-widget.d.ts.map +1 -1
- package/lib/browser/notebook-editor-widget.js +38 -13
- package/lib/browser/notebook-editor-widget.js.map +1 -1
- package/lib/browser/notebook-frontend-module.d.ts.map +1 -1
- package/lib/browser/notebook-frontend-module.js +6 -9
- package/lib/browser/notebook-frontend-module.js.map +1 -1
- package/lib/browser/notebook-types.d.ts +10 -2
- package/lib/browser/notebook-types.d.ts.map +1 -1
- package/lib/browser/notebook-types.js.map +1 -1
- package/lib/browser/service/notebook-context-manager.d.ts +24 -0
- package/lib/browser/service/notebook-context-manager.d.ts.map +1 -0
- package/lib/browser/service/notebook-context-manager.js +112 -0
- package/lib/browser/service/notebook-context-manager.js.map +1 -0
- package/lib/browser/service/notebook-editor-widget-service.d.ts +3 -0
- package/lib/browser/service/notebook-editor-widget-service.d.ts.map +1 -1
- package/lib/browser/service/notebook-editor-widget-service.js +21 -11
- package/lib/browser/service/notebook-editor-widget-service.js.map +1 -1
- package/lib/browser/service/notebook-kernel-service.d.ts +1 -0
- package/lib/browser/service/notebook-kernel-service.d.ts.map +1 -1
- package/lib/browser/service/notebook-kernel-service.js +6 -3
- package/lib/browser/service/notebook-kernel-service.js.map +1 -1
- package/lib/browser/service/notebook-monaco-text-model-service.d.ts +16 -0
- package/lib/browser/service/notebook-monaco-text-model-service.d.ts.map +1 -0
- package/lib/browser/service/notebook-monaco-text-model-service.js +49 -0
- package/lib/browser/service/notebook-monaco-text-model-service.js.map +1 -0
- package/lib/browser/service/notebook-service.d.ts +10 -2
- package/lib/browser/service/notebook-service.d.ts.map +1 -1
- package/lib/browser/service/notebook-service.js +19 -6
- package/lib/browser/service/notebook-service.js.map +1 -1
- package/lib/browser/view/notebook-cell-editor.d.ts +7 -0
- package/lib/browser/view/notebook-cell-editor.d.ts.map +1 -1
- package/lib/browser/view/notebook-cell-editor.js +43 -3
- package/lib/browser/view/notebook-cell-editor.js.map +1 -1
- package/lib/browser/view/notebook-cell-list-view.d.ts.map +1 -1
- package/lib/browser/view/notebook-cell-list-view.js +6 -3
- package/lib/browser/view/notebook-cell-list-view.js.map +1 -1
- package/lib/browser/view/notebook-cell-toolbar-factory.d.ts +2 -0
- package/lib/browser/view/notebook-cell-toolbar-factory.d.ts.map +1 -1
- package/lib/browser/view/notebook-cell-toolbar-factory.js +12 -6
- package/lib/browser/view/notebook-cell-toolbar-factory.js.map +1 -1
- package/lib/browser/view/notebook-cell-toolbar.js +1 -1
- package/lib/browser/view/notebook-cell-toolbar.js.map +1 -1
- package/lib/browser/view/notebook-code-cell-view.d.ts +11 -0
- package/lib/browser/view/notebook-code-cell-view.d.ts.map +1 -1
- package/lib/browser/view/notebook-code-cell-view.js +52 -4
- package/lib/browser/view/notebook-code-cell-view.js.map +1 -1
- package/lib/browser/view/notebook-main-toolbar.d.ts +6 -1
- package/lib/browser/view/notebook-main-toolbar.d.ts.map +1 -1
- package/lib/browser/view/notebook-main-toolbar.js +23 -5
- package/lib/browser/view/notebook-main-toolbar.js.map +1 -1
- package/lib/browser/view/notebook-markdown-cell-view.d.ts +2 -0
- package/lib/browser/view/notebook-markdown-cell-view.d.ts.map +1 -1
- package/lib/browser/view/notebook-markdown-cell-view.js +9 -4
- package/lib/browser/view/notebook-markdown-cell-view.js.map +1 -1
- package/lib/browser/view/notebook-viewport-service.d.ts +17 -0
- package/lib/browser/view/notebook-viewport-service.d.ts.map +1 -0
- package/lib/browser/view/notebook-viewport-service.js +60 -0
- package/lib/browser/view/notebook-viewport-service.js.map +1 -0
- package/lib/browser/view-model/notebook-cell-model.d.ts +9 -15
- package/lib/browser/view-model/notebook-cell-model.d.ts.map +1 -1
- package/lib/browser/view-model/notebook-cell-model.js +22 -23
- package/lib/browser/view-model/notebook-cell-model.js.map +1 -1
- package/lib/browser/view-model/notebook-model.d.ts +7 -4
- package/lib/browser/view-model/notebook-model.d.ts.map +1 -1
- package/lib/browser/view-model/notebook-model.js +50 -6
- package/lib/browser/view-model/notebook-model.js.map +1 -1
- package/lib/common/notebook-common.d.ts +7 -0
- package/lib/common/notebook-common.d.ts.map +1 -1
- package/lib/common/notebook-common.js +12 -1
- package/lib/common/notebook-common.js.map +1 -1
- package/package.json +8 -7
- package/src/browser/contributions/cell-operations.ts +38 -0
- package/src/browser/contributions/notebook-actions-contribution.ts +66 -6
- package/src/browser/contributions/notebook-cell-actions-contribution.ts +194 -22
- package/src/browser/notebook-editor-widget.tsx +43 -17
- package/src/browser/notebook-frontend-module.ts +8 -11
- package/src/browser/notebook-types.ts +13 -1
- package/src/browser/service/notebook-context-manager.ts +127 -0
- package/src/browser/service/notebook-editor-widget-service.ts +20 -10
- package/src/browser/service/notebook-kernel-service.ts +6 -2
- package/src/browser/service/notebook-monaco-text-model-service.ts +48 -0
- package/src/browser/service/notebook-service.ts +26 -5
- package/src/browser/style/index.css +25 -8
- package/src/browser/view/notebook-cell-editor.tsx +52 -10
- package/src/browser/view/notebook-cell-list-view.tsx +8 -4
- package/src/browser/view/notebook-cell-toolbar-factory.tsx +9 -4
- package/src/browser/view/notebook-cell-toolbar.tsx +1 -1
- package/src/browser/view/notebook-code-cell-view.tsx +64 -8
- package/src/browser/view/notebook-main-toolbar.tsx +26 -5
- package/src/browser/view/notebook-markdown-cell-view.tsx +9 -4
- package/src/browser/view/notebook-viewport-service.ts +61 -0
- package/src/browser/view-model/notebook-cell-model.ts +26 -33
- package/src/browser/view-model/notebook-model.ts +70 -7
- package/src/common/notebook-common.ts +13 -0
- package/lib/browser/service/notebook-cell-context-manager.d.ts +0 -16
- package/lib/browser/service/notebook-cell-context-manager.d.ts.map +0 -1
- package/lib/browser/service/notebook-cell-context-manager.js +0 -74
- package/lib/browser/service/notebook-cell-context-manager.js.map +0 -1
- package/src/browser/service/notebook-cell-context-manager.ts +0 -72
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notebook-kernel-service.d.ts","sourceRoot":"","sources":["../../../src/browser/service/notebook-kernel-service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"notebook-kernel-service.d.ts","sourceRoot":"","sources":["../../../src/browser/service/notebook-kernel-service.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAEvF,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,0BAA0B,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAErD,MAAM,WAAW,iCAAiC;IAC9C,QAAQ,EAAE,GAAG,CAAC;IACd,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;CACjC;AAED,MAAM,WAAW,yBAAyB;IACtC,QAAQ,CAAC,QAAQ,EAAE,cAAc,GAAG,SAAS,CAAC;IAC9C,QAAQ,CAAC,WAAW,EAAE,cAAc,EAAE,CAAC;IACvC,QAAQ,CAAC,GAAG,EAAE,cAAc,EAAE,CAAC;IAC/B,QAAQ,CAAC,MAAM,EAAE,cAAc,EAAE,CAAC;CACrC;AAED,MAAM,WAAW,yBAAyB;IACtC,KAAK,CAAC,EAAE,IAAI,CAAC;IACb,WAAW,CAAC,EAAE,IAAI,CAAC;IACnB,MAAM,CAAC,EAAE,IAAI,CAAC;IACd,kBAAkB,CAAC,EAAE,IAAI,CAAC;IAC1B,iBAAiB,CAAC,EAAE,IAAI,CAAC;IACzB,mBAAmB,CAAC,EAAE,IAAI,CAAC;CAC9B;AAED,MAAM,WAAW,cAAc;IAC3B,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,yBAAyB,CAAC,CAAC,CAAC;IAEjE,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAE7B,QAAQ,CAAC,iBAAiB,EAAE,GAAG,CAAC;IAChC,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE,CAAC;IAC5B,QAAQ,CAAC,eAAe,EAAE,MAAM,EAAE,CAAC;IAEnC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,kBAAkB,EAAE,MAAM,EAAE,CAAC;IAC7B,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,wBAAwB,CAAC,EAAE,OAAO,CAAC;IAEnC,2BAA2B,CAAC,GAAG,EAAE,GAAG,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5E,2BAA2B,CAAC,GAAG,EAAE,GAAG,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/E;AAED,0BAAkB,gBAAgB;IAC9B,YAAY,IAAI;IAChB,SAAS,IAAI;IACb,YAAY,IAAI;CACnB;AAED,MAAM,WAAW,+BAAgC,SAAQ,yBAAyB;IAC9E,eAAe,CAAC,EAAE,IAAI,CAAC;CAC1B;AAED,MAAM,WAAW,qBAAqB;IAAG,GAAG,EAAE,GAAG,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE;AAErE,cAAM,UAAU;IAEZ,OAAO,CAAC,MAAM,CAAC,eAAe,CAAK;IAEnC,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,MAAM,EAAE,cAAc,CAAC;IAChC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;gBAEZ,MAAM,EAAE,cAAc;CAKrC;AAED,MAAM,WAAW,+BAA+B;IAC5C,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,0BAA0B;IACvC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,wBAAwB,CAAC,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;IACvC,0BAA0B,IAAI,OAAO,CAAC,0BAA0B,EAAE,CAAC,CAAC;CACvE;AAED,qBAAa,aAAc,YAAW,UAAU;IAMxC,QAAQ,CAAC,OAAO,EAAE,OAAO;IACzB,QAAQ,CAAC,KAAK,EAAE,qBAAqB;IANzC,SAAS,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC;IACrC,SAAS,CAAC,QAAQ,CAAC,uBAAuB,gBAAuB;IACjE,QAAQ,CAAC,gBAAgB,cAAsC;gBAGlD,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,qBAAqB;IAGnC,GAAG,CAAC,cAAc,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;YAY1C,UAAU;IAWxB,OAAO,IAAI,IAAI;CAIlB;AAGD,qBACa,qBAAqB;IAG9B,SAAS,CAAC,eAAe,EAAE,eAAe,CAAC;IAG3C,SAAS,CAAC,cAAc,EAAE,cAAc,CAAC;IAEzC,SAAS,CAAC,QAAQ,CAAC,OAAO,0BAAiC;IAE3D,SAAS,CAAC,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAM;IAExD,SAAS,CAAC,QAAQ,CAAC,oBAAoB,wBAA+B;IACtE,SAAS,CAAC,QAAQ,CAAC,sCAAsC,kBAAyB;IAClF,QAAQ,CAAC,+BAA+B,gBAAqD;IAE7F,SAAS,CAAC,QAAQ,CAAC,+BAA+B,2CAAkD;IACpG,SAAS,CAAC,QAAQ,CAAC,2BAA2B,4CAAmD;IACjG,QAAQ,CAAC,wBAAwB,EAAE,KAAK,CAAC,+BAA+B,CAAC,CAA8C;IAEvH,SAAS,CAAC,QAAQ,CAAC,qBAAqB,0BAAiC;IACzE,QAAQ,CAAC,cAAc,EAAE,KAAK,CAAC,cAAc,CAAC,CAAoC;IAElF,SAAS,CAAC,QAAQ,CAAC,wBAAwB,0BAAiC;IAC5E,QAAQ,CAAC,iBAAiB,EAAE,KAAK,CAAC,cAAc,CAAC,CAAuC;IAExF,SAAS,CAAC,QAAQ,CAAC,+CAA+C,6CAAoD;IACtH,QAAQ,CAAC,yBAAyB,EAAE,KAAK,CAAC,iCAAiC,CAAC,CAA8D;IAE1I,SAAS,CAAC,QAAQ,CAAC,kCAAkC,gBAAuB;IAC5E,QAAQ,CAAC,2BAA2B,EAAE,KAAK,CAAC,IAAI,CAAC,CAAiD;IAGlG,IAAI,IAAI,IAAI;IASZ,cAAc,CAAC,MAAM,EAAE,cAAc,GAAG,UAAU;IAqBlD;;;;;;;;OAQG;IACH,iBAAiB,CAAC,QAAQ,EAAE,qBAAqB,GAAG,yBAAyB;IAyB7E,yBAAyB,CAAC,QAAQ,EAAE,qBAAqB,GAAG,cAAc,GAAG,SAAS;IAKtF,uBAAuB,CAAC,MAAM,EAAE,cAAc,GAAG,SAAS,EAAE,QAAQ,EAAE,qBAAqB,GAAG,IAAI;IAclG,4BAA4B,CAAC,QAAQ,EAAE,aAAa,GAAG,cAAc,GAAG,SAAS;IASjF,SAAS,CAAC,EAAE,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS;IAIjD,OAAO,CAAC,MAAM,CAAC,KAAK;IAUpB,OAAO,CAAC,mBAAmB;IAiB3B,mCAAmC,CAAC,YAAY,EAAE,MAAM,GAAG,UAAU;IAgBrE,uBAAuB,CAAC,QAAQ,EAAE,qBAAqB,GAAG,MAAM,EAAE;IAIlE,kCAAkC,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,0BAA0B,GAAG,UAAU;IAsBhG,mCAAmC,CAAC,QAAQ,EAAE,qBAAqB,GAAG,OAAO,CAAC,0BAA0B,EAAE,CAAC;CAOpH"}
|
|
@@ -121,7 +121,6 @@ let NotebookKernelService = NotebookKernelService_1 = class NotebookKernelServic
|
|
|
121
121
|
* hidden kernels (if any)
|
|
122
122
|
*/
|
|
123
123
|
getMatchingKernel(notebook) {
|
|
124
|
-
var _a;
|
|
125
124
|
const kernels = [];
|
|
126
125
|
for (const info of this.kernels.values()) {
|
|
127
126
|
const score = NotebookKernelService_1.score(info.kernel, notebook);
|
|
@@ -137,12 +136,16 @@ let NotebookKernelService = NotebookKernelService_1 = class NotebookKernelServic
|
|
|
137
136
|
.sort((a, b) => b.instanceAffinity - a.instanceAffinity || a.score - b.score || a.kernel.label.localeCompare(b.kernel.label));
|
|
138
137
|
const all = kernels.map(obj => obj.kernel);
|
|
139
138
|
// bound kernel
|
|
140
|
-
const
|
|
141
|
-
const selected = selectedId ? (_a = this.kernels.get(selectedId)) === null || _a === void 0 ? void 0 : _a.kernel : undefined;
|
|
139
|
+
const selected = this.getSelectedNotebookKernel(notebook);
|
|
142
140
|
const suggestions = kernels.filter(item => item.instanceAffinity > 1).map(item => item.kernel); // TODO implement notebookAffinity
|
|
143
141
|
const hidden = kernels.filter(item => item.instanceAffinity < 0).map(item => item.kernel);
|
|
144
142
|
return { all, selected, suggestions, hidden };
|
|
145
143
|
}
|
|
144
|
+
getSelectedNotebookKernel(notebook) {
|
|
145
|
+
var _a;
|
|
146
|
+
const selectedId = this.notebookBindings[`${notebook.viewType}/${notebook.uri}`];
|
|
147
|
+
return selectedId ? (_a = this.kernels.get(selectedId)) === null || _a === void 0 ? void 0 : _a.kernel : undefined;
|
|
148
|
+
}
|
|
146
149
|
selectKernelForNotebook(kernel, notebook) {
|
|
147
150
|
const key = `${notebook.viewType}/${notebook.uri}`;
|
|
148
151
|
const oldKernel = this.notebookBindings[key];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notebook-kernel-service.js","sourceRoot":"","sources":["../../../src/browser/service/notebook-kernel-service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"notebook-kernel-service.js","sourceRoot":"","sources":["../../../src/browser/service/notebook-kernel-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import { ReferenceCollection, URI, Reference, Event } from '@theia/core';
|
|
2
|
+
import { MonacoTextModelService } from '@theia/monaco/lib/browser/monaco-text-model-service';
|
|
3
|
+
import { MonacoEditorModel } from '@theia/monaco/lib/browser/monaco-editor-model';
|
|
4
|
+
import { NotebookModel } from '../view-model/notebook-model';
|
|
5
|
+
/**
|
|
6
|
+
* special service for creating monaco textmodels for notebook cells.
|
|
7
|
+
* Its for optimization purposes since there is alot of overhead otherwise with calling the backend to create a document for each cell and other smaller things.
|
|
8
|
+
*/
|
|
9
|
+
export declare class NotebookMonacoTextModelService {
|
|
10
|
+
protected readonly monacoTextModelService: MonacoTextModelService;
|
|
11
|
+
protected readonly cellmodels: ReferenceCollection<string, MonacoEditorModel>;
|
|
12
|
+
getOrCreateNotebookCellModelReference(uri: URI): Promise<Reference<MonacoEditorModel>>;
|
|
13
|
+
createTextModelsForNotebook(notebook: NotebookModel): Promise<void>;
|
|
14
|
+
get onDidCreateNotebookCellModel(): Event<MonacoEditorModel>;
|
|
15
|
+
}
|
|
16
|
+
//# sourceMappingURL=notebook-monaco-text-model-service.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"notebook-monaco-text-model-service.d.ts","sourceRoot":"","sources":["../../../src/browser/service/notebook-monaco-text-model-service.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,mBAAmB,EAAE,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEzE,OAAO,EAAE,sBAAsB,EAAE,MAAM,qDAAqD,CAAC;AAC7F,OAAO,EAAE,iBAAiB,EAAE,MAAM,+CAA+C,CAAC;AAClF,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAE7D;;;GAGG;AACH,qBACa,8BAA8B;IAGvC,SAAS,CAAC,QAAQ,CAAC,sBAAsB,EAAE,sBAAsB,CAAC;IAElE,SAAS,CAAC,QAAQ,CAAC,UAAU,iDAE3B;IAEF,qCAAqC,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC;IAIhF,2BAA2B,CAAC,QAAQ,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAIzE,IAAI,4BAA4B,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAE3D;CACJ"}
|
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
// *****************************************************************************
|
|
3
|
+
// Copyright (C) 2024 TypeFox and others.
|
|
4
|
+
//
|
|
5
|
+
// This program and the accompanying materials are made available under the
|
|
6
|
+
// terms of the Eclipse Public License v. 2.0 which is available at
|
|
7
|
+
// http://www.eclipse.org/legal/epl-2.0.
|
|
8
|
+
//
|
|
9
|
+
// This Source Code may also be made available under the following Secondary
|
|
10
|
+
// Licenses when the conditions for such availability set forth in the Eclipse
|
|
11
|
+
// Public License v. 2.0 are satisfied: GNU General Public License, version 2
|
|
12
|
+
// with the GNU Classpath Exception which is available at
|
|
13
|
+
// https://www.gnu.org/software/classpath/license.html.
|
|
14
|
+
//
|
|
15
|
+
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
|
+
// *****************************************************************************
|
|
17
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
|
+
exports.NotebookMonacoTextModelService = void 0;
|
|
19
|
+
const tslib_1 = require("tslib");
|
|
20
|
+
const core_1 = require("@theia/core");
|
|
21
|
+
const inversify_1 = require("@theia/core/shared/inversify");
|
|
22
|
+
const monaco_text_model_service_1 = require("@theia/monaco/lib/browser/monaco-text-model-service");
|
|
23
|
+
/**
|
|
24
|
+
* special service for creating monaco textmodels for notebook cells.
|
|
25
|
+
* Its for optimization purposes since there is alot of overhead otherwise with calling the backend to create a document for each cell and other smaller things.
|
|
26
|
+
*/
|
|
27
|
+
let NotebookMonacoTextModelService = class NotebookMonacoTextModelService {
|
|
28
|
+
constructor() {
|
|
29
|
+
this.cellmodels = new core_1.ReferenceCollection(uri => this.monacoTextModelService.createUnmangedModel(new core_1.URI(uri)));
|
|
30
|
+
}
|
|
31
|
+
getOrCreateNotebookCellModelReference(uri) {
|
|
32
|
+
return this.cellmodels.acquire(uri.toString());
|
|
33
|
+
}
|
|
34
|
+
async createTextModelsForNotebook(notebook) {
|
|
35
|
+
await Promise.all(notebook.cells.map(cell => this.getOrCreateNotebookCellModelReference(cell.uri)));
|
|
36
|
+
}
|
|
37
|
+
get onDidCreateNotebookCellModel() {
|
|
38
|
+
return this.cellmodels.onDidCreate;
|
|
39
|
+
}
|
|
40
|
+
};
|
|
41
|
+
(0, tslib_1.__decorate)([
|
|
42
|
+
(0, inversify_1.inject)(monaco_text_model_service_1.MonacoTextModelService),
|
|
43
|
+
(0, tslib_1.__metadata)("design:type", monaco_text_model_service_1.MonacoTextModelService)
|
|
44
|
+
], NotebookMonacoTextModelService.prototype, "monacoTextModelService", void 0);
|
|
45
|
+
NotebookMonacoTextModelService = (0, tslib_1.__decorate)([
|
|
46
|
+
(0, inversify_1.injectable)()
|
|
47
|
+
], NotebookMonacoTextModelService);
|
|
48
|
+
exports.NotebookMonacoTextModelService = NotebookMonacoTextModelService;
|
|
49
|
+
//# sourceMappingURL=notebook-monaco-text-model-service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"notebook-monaco-text-model-service.js","sourceRoot":"","sources":["../../../src/browser/service/notebook-monaco-text-model-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;;;;AAEhF,sCAAyE;AACzE,4DAAkE;AAClE,mGAA6F;AAI7F;;;GAGG;AAEH,IAAa,8BAA8B,GAA3C,MAAa,8BAA8B;IAA3C;QAKuB,eAAU,GAAG,IAAI,0BAAmB,CACnD,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,sBAAsB,CAAC,mBAAmB,CAAC,IAAI,UAAG,CAAC,GAAG,CAAC,CAAC,CACvE,CAAC;IAaN,CAAC;IAXG,qCAAqC,CAAC,GAAQ;QAC1C,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;IACnD,CAAC;IAED,KAAK,CAAC,2BAA2B,CAAC,QAAuB;QACrD,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,qCAAqC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IACxG,CAAC;IAED,IAAI,4BAA4B;QAC5B,OAAO,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC;IACvC,CAAC;CACJ,CAAA;AAjBG;IADC,IAAA,kBAAM,EAAC,kDAAsB,CAAC;2CACY,kDAAsB;8EAAC;AAHzD,8BAA8B;IAD1C,IAAA,sBAAU,GAAE;GACA,8BAA8B,CAoB1C;AApBY,wEAA8B"}
|
|
@@ -3,9 +3,10 @@ import { BinaryBuffer } from '@theia/core/lib/common/buffer';
|
|
|
3
3
|
import { NotebookData, TransientOptions } from '../../common';
|
|
4
4
|
import { NotebookModel, NotebookModelProps } from '../view-model/notebook-model';
|
|
5
5
|
import { FileService } from '@theia/filesystem/lib/browser/file-service';
|
|
6
|
-
import { MonacoTextModelService } from '@theia/monaco/lib/browser/monaco-text-model-service';
|
|
7
6
|
import { NotebookCellModel, NotebookCellModelProps } from '../view-model/notebook-cell-model';
|
|
8
7
|
import { Deferred } from '@theia/core/lib/common/promise-util';
|
|
8
|
+
import { NotebookMonacoTextModelService } from './notebook-monaco-text-model-service';
|
|
9
|
+
import { CellEditOperation } from '../notebook-types';
|
|
9
10
|
export declare const NotebookProvider: unique symbol;
|
|
10
11
|
export interface NotebookProviderInfo {
|
|
11
12
|
readonly notebookType: string;
|
|
@@ -16,11 +17,17 @@ export interface NotebookSerializer {
|
|
|
16
17
|
toNotebook(data: BinaryBuffer): Promise<NotebookData>;
|
|
17
18
|
fromNotebook(data: NotebookData): Promise<BinaryBuffer>;
|
|
18
19
|
}
|
|
20
|
+
export interface NotebookWorkspaceEdit {
|
|
21
|
+
edits: {
|
|
22
|
+
resource: URI;
|
|
23
|
+
edit: CellEditOperation;
|
|
24
|
+
}[];
|
|
25
|
+
}
|
|
19
26
|
export declare class NotebookService implements Disposable {
|
|
20
27
|
protected fileService: FileService;
|
|
21
|
-
protected modelService: MonacoTextModelService;
|
|
22
28
|
protected notebookModelFactory: (props: NotebookModelProps) => NotebookModel;
|
|
23
29
|
protected notebookCellModelFactory: (props: NotebookCellModelProps) => NotebookCellModel;
|
|
30
|
+
protected textModelService: NotebookMonacoTextModelService;
|
|
24
31
|
protected willUseNotebookSerializerEmitter: Emitter<string>;
|
|
25
32
|
readonly onWillUseNotebookSerializer: import("@theia/core").Event<string>;
|
|
26
33
|
protected readonly disposables: DisposableCollection;
|
|
@@ -55,5 +62,6 @@ export declare class NotebookService implements Disposable {
|
|
|
55
62
|
getNotebookModels(): Iterable<NotebookModel>;
|
|
56
63
|
willOpenNotebook(type: string): Promise<void>;
|
|
57
64
|
listNotebookDocuments(): NotebookModel[];
|
|
65
|
+
applyWorkspaceEdit(workspaceEdit: NotebookWorkspaceEdit): boolean;
|
|
58
66
|
}
|
|
59
67
|
//# sourceMappingURL=notebook-service.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notebook-service.d.ts","sourceRoot":"","sources":["../../../src/browser/service/notebook-service.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAEvF,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAwB,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AACvG,OAAO,EAAE,WAAW,EAAE,MAAM,4CAA4C,CAAC;AACzE,OAAO,EAAE,sBAAsB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"notebook-service.d.ts","sourceRoot":"","sources":["../../../src/browser/service/notebook-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,9 +21,9 @@ const core_1 = require("@theia/core");
|
|
|
21
21
|
const inversify_1 = require("@theia/core/shared/inversify");
|
|
22
22
|
const notebook_model_1 = require("../view-model/notebook-model");
|
|
23
23
|
const file_service_1 = require("@theia/filesystem/lib/browser/file-service");
|
|
24
|
-
const monaco_text_model_service_1 = require("@theia/monaco/lib/browser/monaco-text-model-service");
|
|
25
24
|
const notebook_cell_model_1 = require("../view-model/notebook-cell-model");
|
|
26
25
|
const promise_util_1 = require("@theia/core/lib/common/promise-util");
|
|
26
|
+
const notebook_monaco_text_model_service_1 = require("./notebook-monaco-text-model-service");
|
|
27
27
|
exports.NotebookProvider = Symbol('notebook provider');
|
|
28
28
|
let NotebookService = class NotebookService {
|
|
29
29
|
constructor() {
|
|
@@ -74,7 +74,7 @@ let NotebookService = class NotebookService {
|
|
|
74
74
|
this.notebookModels.set(resource.uri.toString(), model);
|
|
75
75
|
// Resolve cell text models right after creating the notebook model
|
|
76
76
|
// This ensures that all text models are available in the plugin host
|
|
77
|
-
|
|
77
|
+
this.textModelService.createTextModelsForNotebook(model);
|
|
78
78
|
this.didAddNotebookDocumentEmitter.fire(model);
|
|
79
79
|
return model;
|
|
80
80
|
}
|
|
@@ -130,15 +130,24 @@ let NotebookService = class NotebookService {
|
|
|
130
130
|
listNotebookDocuments() {
|
|
131
131
|
return [...this.notebookModels.values()];
|
|
132
132
|
}
|
|
133
|
+
applyWorkspaceEdit(workspaceEdit) {
|
|
134
|
+
try {
|
|
135
|
+
workspaceEdit.edits.forEach(edit => {
|
|
136
|
+
const notebook = this.getNotebookEditorModel(edit.resource);
|
|
137
|
+
notebook === null || notebook === void 0 ? void 0 : notebook.applyEdits([edit.edit], true);
|
|
138
|
+
});
|
|
139
|
+
return true;
|
|
140
|
+
}
|
|
141
|
+
catch (e) {
|
|
142
|
+
console.error(e);
|
|
143
|
+
return false;
|
|
144
|
+
}
|
|
145
|
+
}
|
|
133
146
|
};
|
|
134
147
|
(0, tslib_1.__decorate)([
|
|
135
148
|
(0, inversify_1.inject)(file_service_1.FileService),
|
|
136
149
|
(0, tslib_1.__metadata)("design:type", file_service_1.FileService)
|
|
137
150
|
], NotebookService.prototype, "fileService", void 0);
|
|
138
|
-
(0, tslib_1.__decorate)([
|
|
139
|
-
(0, inversify_1.inject)(monaco_text_model_service_1.MonacoTextModelService),
|
|
140
|
-
(0, tslib_1.__metadata)("design:type", monaco_text_model_service_1.MonacoTextModelService)
|
|
141
|
-
], NotebookService.prototype, "modelService", void 0);
|
|
142
151
|
(0, tslib_1.__decorate)([
|
|
143
152
|
(0, inversify_1.inject)(notebook_model_1.NotebookModelFactory),
|
|
144
153
|
(0, tslib_1.__metadata)("design:type", Function)
|
|
@@ -147,6 +156,10 @@ let NotebookService = class NotebookService {
|
|
|
147
156
|
(0, inversify_1.inject)(notebook_cell_model_1.NotebookCellModelFactory),
|
|
148
157
|
(0, tslib_1.__metadata)("design:type", Function)
|
|
149
158
|
], NotebookService.prototype, "notebookCellModelFactory", void 0);
|
|
159
|
+
(0, tslib_1.__decorate)([
|
|
160
|
+
(0, inversify_1.inject)(notebook_monaco_text_model_service_1.NotebookMonacoTextModelService),
|
|
161
|
+
(0, tslib_1.__metadata)("design:type", notebook_monaco_text_model_service_1.NotebookMonacoTextModelService)
|
|
162
|
+
], NotebookService.prototype, "textModelService", void 0);
|
|
150
163
|
NotebookService = (0, tslib_1.__decorate)([
|
|
151
164
|
(0, inversify_1.injectable)()
|
|
152
165
|
], NotebookService);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notebook-service.js","sourceRoot":"","sources":["../../../src/browser/service/notebook-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;;;;AAEhF,sCAAuF;AACvF,4DAAkE;AAGlE,iEAAuG;AACvG,6EAAyE;AACzE,
|
|
1
|
+
{"version":3,"file":"notebook-service.js","sourceRoot":"","sources":["../../../src/browser/service/notebook-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,11 +4,17 @@ import { NotebookModel } from '../view-model/notebook-model';
|
|
|
4
4
|
import { NotebookCellModel } from '../view-model/notebook-cell-model';
|
|
5
5
|
import { SimpleMonacoEditor } from '@theia/monaco/lib/browser/simple-monaco-editor';
|
|
6
6
|
import { MonacoEditorServices } from '@theia/monaco/lib/browser/monaco-editor';
|
|
7
|
+
import { NotebookContextManager } from '../service/notebook-context-manager';
|
|
7
8
|
import { DisposableCollection } from '@theia/core';
|
|
9
|
+
import { NotebookViewportService } from './notebook-viewport-service';
|
|
10
|
+
import { BareFontInfo } from '@theia/monaco-editor-core/esm/vs/editor/common/config/fontInfo';
|
|
8
11
|
interface CellEditorProps {
|
|
9
12
|
notebookModel: NotebookModel;
|
|
10
13
|
cell: NotebookCellModel;
|
|
11
14
|
monacoServices: MonacoEditorServices;
|
|
15
|
+
notebookContextManager: NotebookContextManager;
|
|
16
|
+
notebookViewportService?: NotebookViewportService;
|
|
17
|
+
fontInfo?: BareFontInfo;
|
|
12
18
|
}
|
|
13
19
|
export declare class CellEditor extends React.Component<CellEditorProps, {}> {
|
|
14
20
|
protected editor?: SimpleMonacoEditor;
|
|
@@ -20,6 +26,7 @@ export declare class CellEditor extends React.Component<CellEditorProps, {}> {
|
|
|
20
26
|
protected initEditor(): Promise<void>;
|
|
21
27
|
protected setContainer(component: HTMLDivElement | null): void;
|
|
22
28
|
protected handleResize: () => void;
|
|
29
|
+
protected estimateHeight(): string;
|
|
23
30
|
render(): React.ReactNode;
|
|
24
31
|
}
|
|
25
32
|
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notebook-cell-editor.d.ts","sourceRoot":"","sources":["../../../src/browser/view/notebook-cell-editor.tsx"],"names":[],"mappings":";AAgBA,OAAO,KAAK,KAAK,MAAM,0BAA0B,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AACtE,OAAO,EAAE,kBAAkB,EAAE,MAAM,gDAAgD,CAAC;AACpF,OAAO,
|
|
1
|
+
{"version":3,"file":"notebook-cell-editor.d.ts","sourceRoot":"","sources":["../../../src/browser/view/notebook-cell-editor.tsx"],"names":[],"mappings":";AAgBA,OAAO,KAAK,KAAK,MAAM,0BAA0B,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AACtE,OAAO,EAAE,kBAAkB,EAAE,MAAM,gDAAgD,CAAC;AACpF,OAAO,EAAgB,oBAAoB,EAAE,MAAM,yCAAyC,CAAC;AAG7F,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAC7E,OAAO,EAAE,oBAAoB,EAAM,MAAM,aAAa,CAAC;AACvD,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,gEAAgE,CAAC;AAE9F,UAAU,eAAe;IACrB,aAAa,EAAE,aAAa,CAAC;IAC7B,IAAI,EAAE,iBAAiB,CAAC;IACxB,cAAc,EAAE,oBAAoB,CAAC;IACrC,sBAAsB,EAAE,sBAAsB,CAAC;IAC/C,uBAAuB,CAAC,EAAE,uBAAuB,CAAC;IAClD,QAAQ,CAAC,EAAE,YAAY,CAAC;CAC3B;AAYD,qBAAa,UAAW,SAAQ,KAAK,CAAC,SAAS,CAAC,eAAe,EAAE,EAAE,CAAC;IAEhE,SAAS,CAAC,MAAM,CAAC,EAAE,kBAAkB,CAAC;IACtC,SAAS,CAAC,SAAS,uBAA8B;IACjD,SAAS,CAAC,SAAS,CAAC,EAAE,cAAc,CAAC;IAE5B,iBAAiB,IAAI,IAAI;IAyBzB,oBAAoB,IAAI,IAAI;IAIrC,SAAS,CAAC,aAAa,IAAI,IAAI;cAKf,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAkC3C,SAAS,CAAC,YAAY,CAAC,SAAS,EAAE,cAAc,GAAG,IAAI,GAAG,IAAI;IAI9D,SAAS,CAAC,YAAY,aAEpB;IAEF,SAAS,CAAC,cAAc,IAAI,MAAM;IAKzB,MAAM,IAAI,KAAK,CAAC,SAAS;CAMrC"}
|
|
@@ -19,6 +19,7 @@ exports.CellEditor = void 0;
|
|
|
19
19
|
const React = require("@theia/core/shared/react");
|
|
20
20
|
const simple_monaco_editor_1 = require("@theia/monaco/lib/browser/simple-monaco-editor");
|
|
21
21
|
const monaco_editor_provider_1 = require("@theia/monaco/lib/browser/monaco-editor-provider");
|
|
22
|
+
const contextkey_1 = require("@theia/monaco-editor-core/esm/vs/platform/contextkey/common/contextkey");
|
|
22
23
|
const core_1 = require("@theia/core");
|
|
23
24
|
const DEFAULT_EDITOR_OPTIONS = {
|
|
24
25
|
...monaco_editor_provider_1.MonacoEditorProvider.inlineOptions,
|
|
@@ -39,8 +40,32 @@ class CellEditor extends React.Component {
|
|
|
39
40
|
};
|
|
40
41
|
}
|
|
41
42
|
componentDidMount() {
|
|
43
|
+
var _a;
|
|
42
44
|
this.disposeEditor();
|
|
43
|
-
this.
|
|
45
|
+
this.toDispose.push(this.props.cell.onWillFocusCellEditor(() => {
|
|
46
|
+
var _a;
|
|
47
|
+
(_a = this.editor) === null || _a === void 0 ? void 0 : _a.getControl().focus();
|
|
48
|
+
}));
|
|
49
|
+
this.toDispose.push(this.props.notebookModel.onDidChangeSelectedCell(() => {
|
|
50
|
+
var _a;
|
|
51
|
+
if (this.props.notebookModel.selectedCell !== this.props.cell && ((_a = this.editor) === null || _a === void 0 ? void 0 : _a.getControl().hasTextFocus())) {
|
|
52
|
+
if (document.activeElement && 'blur' in document.activeElement) {
|
|
53
|
+
document.activeElement.blur();
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
}));
|
|
57
|
+
if (!this.props.notebookViewportService || (this.container && this.props.notebookViewportService.isElementInViewport(this.container))) {
|
|
58
|
+
this.initEditor();
|
|
59
|
+
}
|
|
60
|
+
else {
|
|
61
|
+
const disposable = (_a = this.props.notebookViewportService) === null || _a === void 0 ? void 0 : _a.onDidChangeViewport(() => {
|
|
62
|
+
if (!this.editor && this.container && this.props.notebookViewportService.isElementInViewport(this.container)) {
|
|
63
|
+
this.initEditor();
|
|
64
|
+
disposable.dispose();
|
|
65
|
+
}
|
|
66
|
+
});
|
|
67
|
+
this.toDispose.push(disposable);
|
|
68
|
+
}
|
|
44
69
|
}
|
|
45
70
|
componentWillUnmount() {
|
|
46
71
|
this.disposeEditor();
|
|
@@ -53,9 +78,10 @@ class CellEditor extends React.Component {
|
|
|
53
78
|
const { cell, notebookModel, monacoServices } = this.props;
|
|
54
79
|
if (this.container) {
|
|
55
80
|
const editorNode = this.container;
|
|
81
|
+
editorNode.style.height = '';
|
|
56
82
|
const editorModel = await cell.resolveTextModel();
|
|
57
83
|
const uri = cell.uri;
|
|
58
|
-
this.editor = new simple_monaco_editor_1.SimpleMonacoEditor(uri, editorModel, editorNode, monacoServices, DEFAULT_EDITOR_OPTIONS);
|
|
84
|
+
this.editor = new simple_monaco_editor_1.SimpleMonacoEditor(uri, editorModel, editorNode, monacoServices, DEFAULT_EDITOR_OPTIONS, [[contextkey_1.IContextKeyService, this.props.notebookContextManager.scopedStore]]);
|
|
59
85
|
this.toDispose.push(this.editor);
|
|
60
86
|
this.editor.setLanguage(cell.language);
|
|
61
87
|
this.toDispose.push(this.editor.getControl().onDidContentSizeChange(() => {
|
|
@@ -65,14 +91,28 @@ class CellEditor extends React.Component {
|
|
|
65
91
|
this.toDispose.push(this.editor.onDocumentContentChanged(e => {
|
|
66
92
|
notebookModel.cellDirtyChanged(cell, true);
|
|
67
93
|
}));
|
|
94
|
+
this.toDispose.push(this.editor.getControl().onDidFocusEditorText(() => {
|
|
95
|
+
this.props.notebookContextManager.onDidEditorTextFocus(true);
|
|
96
|
+
}));
|
|
97
|
+
this.toDispose.push(this.editor.getControl().onDidBlurEditorText(() => {
|
|
98
|
+
this.props.notebookContextManager.onDidEditorTextFocus(false);
|
|
99
|
+
}));
|
|
100
|
+
if (cell.editing && notebookModel.selectedCell === cell) {
|
|
101
|
+
this.editor.getControl().focus();
|
|
102
|
+
}
|
|
68
103
|
}
|
|
69
104
|
}
|
|
70
105
|
setContainer(component) {
|
|
71
106
|
this.container = component !== null && component !== void 0 ? component : undefined;
|
|
72
107
|
}
|
|
73
108
|
;
|
|
109
|
+
estimateHeight() {
|
|
110
|
+
var _a, _b;
|
|
111
|
+
const lineHeight = (_b = (_a = this.props.fontInfo) === null || _a === void 0 ? void 0 : _a.lineHeight) !== null && _b !== void 0 ? _b : 20;
|
|
112
|
+
return this.props.cell.text.split(core_1.OS.backend.EOL).length * lineHeight + 10 + 7 + 'px';
|
|
113
|
+
}
|
|
74
114
|
render() {
|
|
75
|
-
return React.createElement("div", { className: 'theia-notebook-cell-editor', onResize: this.handleResize, id: this.props.cell.uri.toString(), ref: container => this.setContainer(container) });
|
|
115
|
+
return React.createElement("div", { className: 'theia-notebook-cell-editor', onResize: this.handleResize, id: this.props.cell.uri.toString(), ref: container => this.setContainer(container), style: { height: this.editor ? undefined : this.estimateHeight() } });
|
|
76
116
|
}
|
|
77
117
|
}
|
|
78
118
|
exports.CellEditor = CellEditor;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notebook-cell-editor.js","sourceRoot":"","sources":["../../../src/browser/view/notebook-cell-editor.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,kDAAkD;AAGlD,yFAAoF;AAEpF,6FAAwF;AACxF,
|
|
1
|
+
{"version":3,"file":"notebook-cell-editor.js","sourceRoot":"","sources":["../../../src/browser/view/notebook-cell-editor.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notebook-cell-list-view.d.ts","sourceRoot":"","sources":["../../../src/browser/view/notebook-cell-list-view.tsx"],"names":[],"mappings":";AAeA,OAAO,KAAK,KAAK,MAAM,0BAA0B,CAAC;AAClD,OAAO,EAAgB,QAAQ,EAAE,MAAM,cAAc,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAE7E,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAO,MAAM,aAAa,CAAC;AAIzE,MAAM,WAAW,YAAY;IACzB,MAAM,CAAC,YAAY,EAAE,aAAa,EAAE,IAAI,EAAE,iBAAiB,EAAE,KAAK,EAAE,MAAM,GAAG,KAAK,CAAC,SAAS,CAAA;CAC/F;AAED,UAAU,aAAa;IACnB,SAAS,EAAE,GAAG,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;IACvC,aAAa,EAAE,aAAa,CAAC;IAC7B,eAAe,EAAE,0BAA0B,CAAC;IAC5C,eAAe,EAAE,eAAe,CAAA;CACnC;AAED,UAAU,qBAAqB;IAC3B,YAAY,CAAC,EAAE,iBAAiB,CAAC;IACjC,iBAAiB,EAAE;QAAE,IAAI,EAAE,iBAAiB,CAAC;QAAC,QAAQ,EAAE,KAAK,GAAG,QAAQ,CAAA;KAAE,GAAG,SAAS,CAAC;CAC1F;AAED,qBAAa,oBAAqB,SAAQ,KAAK,CAAC,SAAS,CAAC,aAAa,EAAE,qBAAqB,CAAC;IAE3F,SAAS,CAAC,SAAS,uBAA8B;gBAErC,KAAK,EAAE,aAAa;
|
|
1
|
+
{"version":3,"file":"notebook-cell-list-view.d.ts","sourceRoot":"","sources":["../../../src/browser/view/notebook-cell-list-view.tsx"],"names":[],"mappings":";AAeA,OAAO,KAAK,KAAK,MAAM,0BAA0B,CAAC;AAClD,OAAO,EAAgB,QAAQ,EAAE,MAAM,cAAc,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAE7E,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAO,MAAM,aAAa,CAAC;AAIzE,MAAM,WAAW,YAAY;IACzB,MAAM,CAAC,YAAY,EAAE,aAAa,EAAE,IAAI,EAAE,iBAAiB,EAAE,KAAK,EAAE,MAAM,GAAG,KAAK,CAAC,SAAS,CAAA;CAC/F;AAED,UAAU,aAAa;IACnB,SAAS,EAAE,GAAG,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;IACvC,aAAa,EAAE,aAAa,CAAC;IAC7B,eAAe,EAAE,0BAA0B,CAAC;IAC5C,eAAe,EAAE,eAAe,CAAA;CACnC;AAED,UAAU,qBAAqB;IAC3B,YAAY,CAAC,EAAE,iBAAiB,CAAC;IACjC,iBAAiB,EAAE;QAAE,IAAI,EAAE,iBAAiB,CAAC;QAAC,QAAQ,EAAE,KAAK,GAAG,QAAQ,CAAA;KAAE,GAAG,SAAS,CAAC;CAC1F;AAED,qBAAa,oBAAqB,SAAQ,KAAK,CAAC,SAAS,CAAC,aAAa,EAAE,qBAAqB,CAAC;IAE3F,SAAS,CAAC,SAAS,uBAA8B;gBAErC,KAAK,EAAE,aAAa;IAgBvB,oBAAoB,IAAI,IAAI;IAI5B,MAAM,IAAI,KAAK,CAAC,SAAS;IAwClC,iBAAiB,CAAC,IAAI,EAAE,iBAAiB,EAAE,KAAK,EAAE,MAAM,GAAG,KAAK,CAAC,SAAS;IAQ1E,SAAS,CAAC,WAAW,CAAC,KAAK,EAAE,KAAK,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IAUjF,SAAS,CAAC,UAAU,CAAC,KAAK,EAAE,KAAK,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,IAAI,EAAE,iBAAiB,EAAE,QAAQ,CAAC,EAAE,KAAK,GAAG,QAAQ,GAAG,IAAI;IAUvH,SAAS,CAAC,SAAS,IAAI,OAAO;IAI9B,SAAS,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,gBAAgB,EAAE,MAAM,GAAG,IAAI;IAoBvF,SAAS,CAAC,YAAY,CAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IAU3D,SAAS,CAAC,6BAA6B,CAAC,IAAI,EAAE,iBAAiB,EAAE,QAAQ,EAAE,KAAK,GAAG,QAAQ,GAAG,OAAO;CAOxG;AAED,MAAM,WAAW,wBAAwB;IACrC,SAAS,EAAE,MAAM,OAAO,CAAC;IACzB,YAAY,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK,IAAI,CAAC;IACvC,MAAM,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,SAAS,CAAC,aAAa,CAAC,KAAK,IAAI,CAAC;IACxD,UAAU,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,SAAS,CAAC,aAAa,CAAC,KAAK,IAAI,CAAC;CAC/D;AAED,wBAAgB,mBAAmB,CAAC,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,wBAAwB,GAAG,KAAK,CAAC,GAAG,CAAC,OAAO,CAehI"}
|
|
@@ -35,6 +35,9 @@ class NotebookCellListView extends React.Component {
|
|
|
35
35
|
this.setState({ ...this.state, selectedCell: this.props.notebookModel.cells.find(cell => cell === this.state.selectedCell) });
|
|
36
36
|
}
|
|
37
37
|
}));
|
|
38
|
+
this.toDispose.push(props.notebookModel.onDidChangeSelectedCell(cell => {
|
|
39
|
+
this.setState({ ...this.state, selectedCell: cell });
|
|
40
|
+
}));
|
|
38
41
|
}
|
|
39
42
|
componentWillUnmount() {
|
|
40
43
|
this.toDispose.dispose();
|
|
@@ -45,10 +48,10 @@ class NotebookCellListView extends React.Component {
|
|
|
45
48
|
.map((cell, index) => React.createElement(React.Fragment, { key: 'cell-' + cell.handle },
|
|
46
49
|
React.createElement(NotebookCellDivider, { isVisible: () => this.isEnabled(), onAddNewCell: (kind) => this.onAddNewCell(kind, index), onDrop: e => this.onDrop(e, index), onDragOver: e => this.onDragOver(e, cell, 'top') }),
|
|
47
50
|
this.shouldRenderDragOverIndicator(cell, 'top') && React.createElement(CellDropIndicator, null),
|
|
48
|
-
React.createElement("li", { className: 'theia-notebook-cell' + (this.state.selectedCell === cell ? ' focused' : '') + (this.isEnabled() ? ' draggable' : ''), onClick:
|
|
49
|
-
this.setState({ selectedCell: cell });
|
|
51
|
+
React.createElement("li", { className: 'theia-notebook-cell' + (this.state.selectedCell === cell ? ' focused' : '') + (this.isEnabled() ? ' draggable' : ''), onClick: e => {
|
|
52
|
+
this.setState({ ...this.state, selectedCell: cell });
|
|
50
53
|
this.props.notebookModel.setSelectedCell(cell);
|
|
51
|
-
}, onDragStart: e => this.onDragStart(e, index), onDragOver: e => this.onDragOver(e, cell), onDrop: e => this.onDrop(e, index), draggable: true, ref:
|
|
54
|
+
}, onDragStart: e => this.onDragStart(e, index), onDragOver: e => this.onDragOver(e, cell), onDrop: e => this.onDrop(e, index), draggable: true, ref: ref => cell === this.state.selectedCell && (ref === null || ref === void 0 ? void 0 : ref.scrollIntoView({ block: 'nearest' })) },
|
|
52
55
|
React.createElement("div", { className: 'theia-notebook-cell-marker' + (this.state.selectedCell === cell ? ' theia-notebook-cell-marker-selected' : '') }),
|
|
53
56
|
React.createElement("div", { className: 'theia-notebook-cell-content' }, this.renderCellContent(cell, index)),
|
|
54
57
|
this.state.selectedCell === cell &&
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notebook-cell-list-view.js","sourceRoot":"","sources":["../../../src/browser/view/notebook-cell-list-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;AAChF,kDAAkD;AAClD,yCAAsD;AAItD,qDAAkD;AAClD,sCAAyE;AACzE,kGAAkF;AAClF,4GAAqG;AAkBrG,MAAa,oBAAqB,SAAQ,KAAK,CAAC,SAA+C;IAI3F,YAAY,KAAoB;QAC5B,KAAK,CAAC,KAAK,CAAC,CAAC;QAHP,cAAS,GAAG,IAAI,2BAAoB,EAAE,CAAC;QAI7C,IAAI,CAAC,KAAK,GAAG,EAAE,YAAY,EAAE,SAAS,EAAE,iBAAiB,EAAE,SAAS,EAAE,CAAC;QACvE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,oBAAoB,CAAC,CAAC,CAAC,EAAE;YAC7D,IAAI,CAAC,CAAC,UAAU,IAAI,CAAC,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;gBACzC,IAAI,CAAC,QAAQ,CAAC,EAAE,GAAG,IAAI,CAAC,KAAK,EAAE,YAAY,EAAE,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC,UAAW,CAAC,CAAC,CAAC,UAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;aAC1J;iBAAM;gBACH,IAAI,CAAC,QAAQ,CAAC,EAAE,GAAG,IAAI,CAAC,KAAK,EAAE,YAAY,EAAE,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,KAAK,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,
|
|
1
|
+
{"version":3,"file":"notebook-cell-list-view.js","sourceRoot":"","sources":["../../../src/browser/view/notebook-cell-list-view.tsx"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ import { ContextMenuRenderer } from '@theia/core/lib/browser';
|
|
|
6
6
|
import { NotebookModel } from '../view-model/notebook-model';
|
|
7
7
|
import { NotebookCellModel } from '../view-model/notebook-cell-model';
|
|
8
8
|
import { NotebookCellOutputModel } from '../view-model/notebook-cell-output-model';
|
|
9
|
+
import { NotebookContextManager } from '../service/notebook-context-manager';
|
|
9
10
|
export interface NotebookCellToolbarItem {
|
|
10
11
|
id: string;
|
|
11
12
|
icon?: string;
|
|
@@ -19,6 +20,7 @@ export declare class NotebookCellToolbarFactory {
|
|
|
19
20
|
protected contextKeyService: ContextKeyService;
|
|
20
21
|
protected readonly contextMenuRenderer: ContextMenuRenderer;
|
|
21
22
|
protected readonly commandRegistry: CommandRegistry;
|
|
23
|
+
protected readonly notebookContextManager: NotebookContextManager;
|
|
22
24
|
renderCellToolbar(menuPath: string[], notebookModel: NotebookModel, cell: NotebookCellModel): React.ReactNode;
|
|
23
25
|
renderSidebar(menuPath: string[], notebookModel: NotebookModel, cell: NotebookCellModel, output?: NotebookCellOutputModel): React.ReactNode;
|
|
24
26
|
private getMenuItems;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notebook-cell-toolbar-factory.d.ts","sourceRoot":"","sources":["../../../src/browser/view/notebook-cell-toolbar-factory.tsx"],"names":[],"mappings":";AAgBA,OAAO,KAAK,KAAK,MAAM,0BAA0B,CAAC;AAClD,OAAO,EAAE,eAAe,EAAwB,iBAAiB,EAAY,MAAM,aAAa,CAAC;AAEjG,OAAO,EAAE,iBAAiB,EAAE,MAAM,6CAA6C,CAAC;AAEhF,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AACtE,OAAO,EAAE,uBAAuB,EAAE,MAAM,0CAA0C,CAAC;
|
|
1
|
+
{"version":3,"file":"notebook-cell-toolbar-factory.d.ts","sourceRoot":"","sources":["../../../src/browser/view/notebook-cell-toolbar-factory.tsx"],"names":[],"mappings":";AAgBA,OAAO,KAAK,KAAK,MAAM,0BAA0B,CAAC;AAClD,OAAO,EAAE,eAAe,EAAwB,iBAAiB,EAAY,MAAM,aAAa,CAAC;AAEjG,OAAO,EAAE,iBAAiB,EAAE,MAAM,6CAA6C,CAAC;AAEhF,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AACtE,OAAO,EAAE,uBAAuB,EAAE,MAAM,0CAA0C,CAAC;AACnF,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAE7E,MAAM,WAAW,uBAAuB;IACpC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,UAAU,KAAK,IAAI,CAAC;IACvC,SAAS,EAAE,MAAM,OAAO,CAAC;IACzB,WAAW,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;CAC5B;AAED,qBACa,0BAA0B;IAGnC,SAAS,CAAC,YAAY,EAAE,iBAAiB,CAAC;IAG1C,SAAS,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAG/C,SAAS,CAAC,QAAQ,CAAC,mBAAmB,EAAE,mBAAmB,CAAC;IAG5D,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAGpD,SAAS,CAAC,QAAQ,CAAC,sBAAsB,EAAE,sBAAsB,CAAC;IAElE,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,aAAa,EAAE,aAAa,EAAE,IAAI,EAAE,iBAAiB,GAAG,KAAK,CAAC,SAAS;IAK7G,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,aAAa,EAAE,aAAa,EAAE,IAAI,EAAE,iBAAiB,EAAE,MAAM,CAAC,EAAE,uBAAuB,GAAG,KAAK,CAAC,SAAS;IAK3I,OAAO,CAAC,YAAY;IAepB,OAAO,CAAC,iBAAiB;CAoB5B"}
|
|
@@ -23,20 +23,21 @@ const inversify_1 = require("@theia/core/shared/inversify");
|
|
|
23
23
|
const context_key_service_1 = require("@theia/core/lib/browser/context-key-service");
|
|
24
24
|
const notebook_cell_toolbar_1 = require("./notebook-cell-toolbar");
|
|
25
25
|
const browser_1 = require("@theia/core/lib/browser");
|
|
26
|
+
const notebook_context_manager_1 = require("../service/notebook-context-manager");
|
|
26
27
|
let NotebookCellToolbarFactory = class NotebookCellToolbarFactory {
|
|
27
28
|
renderCellToolbar(menuPath, notebookModel, cell) {
|
|
28
|
-
return React.createElement(notebook_cell_toolbar_1.NotebookCellToolbar, { getMenuItems: () => this.getMenuItems(menuPath, notebookModel, cell), onContextKeysChanged:
|
|
29
|
+
return React.createElement(notebook_cell_toolbar_1.NotebookCellToolbar, { getMenuItems: () => this.getMenuItems(menuPath, notebookModel, cell), onContextKeysChanged: this.notebookContextManager.onDidChangeContext });
|
|
29
30
|
}
|
|
30
31
|
renderSidebar(menuPath, notebookModel, cell, output) {
|
|
31
|
-
return React.createElement(notebook_cell_toolbar_1.NotebookCellSidebar, { getMenuItems: () => this.getMenuItems(menuPath, notebookModel, cell, output), onContextKeysChanged:
|
|
32
|
+
return React.createElement(notebook_cell_toolbar_1.NotebookCellSidebar, { getMenuItems: () => this.getMenuItems(menuPath, notebookModel, cell, output), onContextKeysChanged: this.notebookContextManager.onDidChangeContext });
|
|
32
33
|
}
|
|
33
34
|
getMenuItems(menuItemPath, notebookModel, cell, output) {
|
|
34
|
-
var _a, _b
|
|
35
|
+
var _a, _b;
|
|
35
36
|
const inlineItems = [];
|
|
36
37
|
for (const menuNode of this.menuRegistry.getMenu(menuItemPath).children) {
|
|
37
|
-
if (!menuNode.when || this.contextKeyService.match(menuNode.when,
|
|
38
|
+
if (!menuNode.when || this.contextKeyService.match(menuNode.when, this.notebookContextManager.context)) {
|
|
38
39
|
if (menuNode.role === 2 /* Flat */) {
|
|
39
|
-
inlineItems.push(...(
|
|
40
|
+
inlineItems.push(...(_b = (_a = menuNode.children) === null || _a === void 0 ? void 0 : _a.map(child => this.createToolbarItem(child, notebookModel, cell, output))) !== null && _b !== void 0 ? _b : []);
|
|
40
41
|
}
|
|
41
42
|
else {
|
|
42
43
|
inlineItems.push(this.createToolbarItem(menuNode, notebookModel, cell, output));
|
|
@@ -56,7 +57,8 @@ let NotebookCellToolbarFactory = class NotebookCellToolbarFactory {
|
|
|
56
57
|
anchor: e.nativeEvent,
|
|
57
58
|
menuPath,
|
|
58
59
|
includeAnchorArg: false,
|
|
59
|
-
args: [
|
|
60
|
+
args: [cell],
|
|
61
|
+
context: this.notebookContextManager.context
|
|
60
62
|
}) :
|
|
61
63
|
() => this.commandRegistry.executeCommand(menuNode.command, notebookModel, cell, output),
|
|
62
64
|
isVisible: () => menuPath ? true : Boolean(this.commandRegistry.getVisibleHandler(menuNode.command, notebookModel, cell, output)),
|
|
@@ -80,6 +82,10 @@ let NotebookCellToolbarFactory = class NotebookCellToolbarFactory {
|
|
|
80
82
|
(0, inversify_1.inject)(core_1.CommandRegistry),
|
|
81
83
|
(0, tslib_1.__metadata)("design:type", core_1.CommandRegistry)
|
|
82
84
|
], NotebookCellToolbarFactory.prototype, "commandRegistry", void 0);
|
|
85
|
+
(0, tslib_1.__decorate)([
|
|
86
|
+
(0, inversify_1.inject)(notebook_context_manager_1.NotebookContextManager),
|
|
87
|
+
(0, tslib_1.__metadata)("design:type", notebook_context_manager_1.NotebookContextManager)
|
|
88
|
+
], NotebookCellToolbarFactory.prototype, "notebookContextManager", void 0);
|
|
83
89
|
NotebookCellToolbarFactory = (0, tslib_1.__decorate)([
|
|
84
90
|
(0, inversify_1.injectable)()
|
|
85
91
|
], NotebookCellToolbarFactory);
|