@theia/notebook 1.61.0-next.8 → 1.62.0-next.3
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/notebook-frontend-module.d.ts.map +1 -1
- package/lib/browser/notebook-frontend-module.js +2 -0
- package/lib/browser/notebook-frontend-module.js.map +1 -1
- package/lib/browser/service/notebook-cell-editor-service.d.ts +5 -1
- package/lib/browser/service/notebook-cell-editor-service.d.ts.map +1 -1
- package/lib/browser/service/notebook-cell-editor-service.js +12 -0
- package/lib/browser/service/notebook-cell-editor-service.js.map +1 -1
- package/package.json +8 -8
- package/src/browser/notebook-frontend-module.ts +2 -0
- package/src/browser/service/notebook-cell-editor-service.ts +13 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notebook-frontend-module.d.ts","sourceRoot":"","sources":["../../src/browser/notebook-frontend-module.ts"],"names":[],"mappings":"AAeA,OAAO,mCAAmC,CAAC;AAE3C,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;;
|
|
1
|
+
{"version":3,"file":"notebook-frontend-module.d.ts","sourceRoot":"","sources":["../../src/browser/notebook-frontend-module.ts"],"names":[],"mappings":"AAeA,OAAO,mCAAmC,CAAC;AAE3C,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;;AAwC/D,wBAwEG"}
|
|
@@ -52,6 +52,7 @@ const notebook_status_bar_contribution_1 = require("./contributions/notebook-sta
|
|
|
52
52
|
const notebook_cell_editor_service_1 = require("./service/notebook-cell-editor-service");
|
|
53
53
|
const notebook_cell_status_bar_service_1 = require("./service/notebook-cell-status-bar-service");
|
|
54
54
|
const monaco_text_model_service_1 = require("@theia/monaco/lib/browser/monaco-text-model-service");
|
|
55
|
+
const monaco_editor_service_1 = require("@theia/monaco/lib/browser/monaco-editor-service");
|
|
55
56
|
exports.default = new inversify_1.ContainerModule(bind => {
|
|
56
57
|
bind(notebook_color_contribution_1.NotebookColorContribution).toSelf().inSingletonScope();
|
|
57
58
|
bind(color_application_contribution_1.ColorContribution).toService(notebook_color_contribution_1.NotebookColorContribution);
|
|
@@ -70,6 +71,7 @@ exports.default = new inversify_1.ContainerModule(bind => {
|
|
|
70
71
|
bind(notebook_kernel_quick_pick_service_1.NotebookKernelQuickPickService).toSelf().inSingletonScope();
|
|
71
72
|
bind(notebook_clipboard_service_1.NotebookClipboardService).toSelf().inSingletonScope();
|
|
72
73
|
bind(notebook_cell_editor_service_1.NotebookCellEditorService).toSelf().inSingletonScope();
|
|
74
|
+
bind(monaco_editor_service_1.ActiveMonacoEditorContribution).toService(notebook_cell_editor_service_1.NotebookCellEditorService);
|
|
73
75
|
bind(notebook_cell_status_bar_service_1.NotebookCellStatusBarService).toSelf().inSingletonScope();
|
|
74
76
|
bind(notebook_cell_resource_resolver_1.NotebookCellResourceResolver).toSelf().inSingletonScope();
|
|
75
77
|
bind(core_1.ResourceResolver).toService(notebook_cell_resource_resolver_1.NotebookCellResourceResolver);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notebook-frontend-module.js","sourceRoot":"","sources":["../../src/browser/notebook-frontend-module.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,6CAA2C;AAE3C,4DAA+D;AAC/D,qDAEiC;AACjC,2GAA2F;AAC3F,mEAA8D;AAC9D,sCAAuF;AACvF,qEAAgE;AAChE,6EAAwE;AACxE,iEAA6D;AAC7D,qFAA+E;AAC/E,uFAAiH;AACjH,+FAAyF;AACzF,2GAAoG;AACpG,gEAAuK;AACvK,0EAAyJ;AACzJ,qEAAgK;AAChK,iGAA4F;AAC5F,qFAAgF;AAChF,iGAA2F;AAC3F,+EAA0E;AAC1E,qGAA8F;AAC9F,+FAAyF;AACzF,6FAAuF;AACvF,uGAAiG;AACjG,6FAAwF;AACxF,qGAA+H;AAC/H,iGAA4F;AAC5F,+GAAyG;AACzG,6GAAuG;AACvG,qFAAgF;AAChF,+EAA+E;AAC/E,iEAAoE;AACpE,2FAAqF;AACrF,uGAAiG;AACjG,yFAAmF;AACnF,iGAA0F;AAC1F,mGAA8F;
|
|
1
|
+
{"version":3,"file":"notebook-frontend-module.js","sourceRoot":"","sources":["../../src/browser/notebook-frontend-module.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,11 @@
|
|
|
1
1
|
import { Emitter, URI } from '@theia/core';
|
|
2
2
|
import { SimpleMonacoEditor } from '@theia/monaco/lib/browser/simple-monaco-editor';
|
|
3
3
|
import { NotebookEditorWidgetService } from './notebook-editor-widget-service';
|
|
4
|
-
|
|
4
|
+
import { ActiveMonacoEditorContribution, MonacoEditorService } from '@theia/monaco/lib/browser/monaco-editor-service';
|
|
5
|
+
import { ICodeEditor } from '@theia/monaco-editor-core/esm/vs/editor/browser/editorBrowser';
|
|
6
|
+
export declare class NotebookCellEditorService implements ActiveMonacoEditorContribution {
|
|
5
7
|
protected readonly notebookEditorWidgetService: NotebookEditorWidgetService;
|
|
8
|
+
protected readonly monacoEditorService: MonacoEditorService;
|
|
6
9
|
protected onDidChangeCellEditorsEmitter: Emitter<void>;
|
|
7
10
|
readonly onDidChangeCellEditors: import("@theia/core").Event<void>;
|
|
8
11
|
protected onDidChangeFocusedCellEditorEmitter: Emitter<SimpleMonacoEditor | undefined>;
|
|
@@ -15,5 +18,6 @@ export declare class NotebookCellEditorService {
|
|
|
15
18
|
editorDisposed(uri: URI): void;
|
|
16
19
|
editorFocusChanged(editor?: SimpleMonacoEditor): void;
|
|
17
20
|
getActiveCell(): SimpleMonacoEditor | undefined;
|
|
21
|
+
getActiveEditor(): ICodeEditor | undefined;
|
|
18
22
|
}
|
|
19
23
|
//# sourceMappingURL=notebook-cell-editor-service.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notebook-cell-editor-service.d.ts","sourceRoot":"","sources":["../../../src/browser/service/notebook-cell-editor-service.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAE3C,OAAO,EAAE,kBAAkB,EAAE,MAAM,gDAAgD,CAAC;AACpF,OAAO,EAAE,2BAA2B,EAAE,MAAM,kCAAkC,CAAC;
|
|
1
|
+
{"version":3,"file":"notebook-cell-editor-service.d.ts","sourceRoot":"","sources":["../../../src/browser/service/notebook-cell-editor-service.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAE3C,OAAO,EAAE,kBAAkB,EAAE,MAAM,gDAAgD,CAAC;AACpF,OAAO,EAAE,2BAA2B,EAAE,MAAM,kCAAkC,CAAC;AAE/E,OAAO,EAAE,8BAA8B,EAAE,mBAAmB,EAAE,MAAM,iDAAiD,CAAC;AACtH,OAAO,EAAE,WAAW,EAAE,MAAM,+DAA+D,CAAC;AAE5F,qBACa,yBAA0B,YAAW,8BAA8B;IAG5E,SAAS,CAAC,QAAQ,CAAC,2BAA2B,EAAE,2BAA2B,CAAC;IAG5E,SAAS,CAAC,QAAQ,CAAC,mBAAmB,EAAE,mBAAmB,CAAC;IAE5D,SAAS,CAAC,6BAA6B,gBAAuB;IAC9D,QAAQ,CAAC,sBAAsB,oCAA4C;IAE3E,SAAS,CAAC,mCAAmC,0CAAiD;IAC9F,QAAQ,CAAC,4BAA4B,8DAAkD;IAEvF,SAAS,CAAC,iBAAiB,CAAC,EAAE,kBAAkB,CAAC;IAEjD,SAAS,CAAC,kBAAkB,EAAE,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAa;IAG1E,SAAS,CAAC,IAAI,IAAI,IAAI;IAYtB,IAAI,cAAc,IAAI,kBAAkB,EAAE,CAEzC;IAED,aAAa,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,kBAAkB,GAAG,IAAI;IAKzD,cAAc,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI;IAK9B,kBAAkB,CAAC,MAAM,CAAC,EAAE,kBAAkB,GAAG,IAAI;IAQrD,aAAa,IAAI,kBAAkB,GAAG,SAAS;IAI/C,eAAe,IAAI,WAAW,GAAG,SAAS;CAG7C"}
|
|
@@ -21,6 +21,7 @@ const core_1 = require("@theia/core");
|
|
|
21
21
|
const inversify_1 = require("@theia/core/shared/inversify");
|
|
22
22
|
const notebook_editor_widget_service_1 = require("./notebook-editor-widget-service");
|
|
23
23
|
const common_1 = require("../../common");
|
|
24
|
+
const monaco_editor_service_1 = require("@theia/monaco/lib/browser/monaco-editor-service");
|
|
24
25
|
let NotebookCellEditorService = class NotebookCellEditorService {
|
|
25
26
|
constructor() {
|
|
26
27
|
this.onDidChangeCellEditorsEmitter = new core_1.Emitter();
|
|
@@ -35,6 +36,8 @@ let NotebookCellEditorService = class NotebookCellEditorService {
|
|
|
35
36
|
// if defocus notebook editor or another notebook editor is focused, clear the active cell
|
|
36
37
|
if (!editor || (this.currentActiveCell && ((_a = common_1.CellUri.parse(this.currentActiveCell.uri)) === null || _a === void 0 ? void 0 : _a.notebook.toString()) !== ((_b = editor === null || editor === void 0 ? void 0 : editor.model) === null || _b === void 0 ? void 0 : _b.uri.toString()))) {
|
|
37
38
|
this.currentActiveCell = undefined;
|
|
39
|
+
// eslint-disable-next-line no-null/no-null
|
|
40
|
+
this.monacoEditorService.setActiveCodeEditor(null);
|
|
38
41
|
this.onDidChangeFocusedCellEditorEmitter.fire(undefined);
|
|
39
42
|
}
|
|
40
43
|
});
|
|
@@ -53,18 +56,27 @@ let NotebookCellEditorService = class NotebookCellEditorService {
|
|
|
53
56
|
editorFocusChanged(editor) {
|
|
54
57
|
if (editor) {
|
|
55
58
|
this.currentActiveCell = editor;
|
|
59
|
+
this.monacoEditorService.setActiveCodeEditor(editor.getControl());
|
|
56
60
|
this.onDidChangeFocusedCellEditorEmitter.fire(editor);
|
|
57
61
|
}
|
|
58
62
|
}
|
|
59
63
|
getActiveCell() {
|
|
60
64
|
return this.currentActiveCell;
|
|
61
65
|
}
|
|
66
|
+
getActiveEditor() {
|
|
67
|
+
var _a;
|
|
68
|
+
return (_a = this.getActiveCell()) === null || _a === void 0 ? void 0 : _a.getControl();
|
|
69
|
+
}
|
|
62
70
|
};
|
|
63
71
|
exports.NotebookCellEditorService = NotebookCellEditorService;
|
|
64
72
|
tslib_1.__decorate([
|
|
65
73
|
(0, inversify_1.inject)(notebook_editor_widget_service_1.NotebookEditorWidgetService),
|
|
66
74
|
tslib_1.__metadata("design:type", notebook_editor_widget_service_1.NotebookEditorWidgetService)
|
|
67
75
|
], NotebookCellEditorService.prototype, "notebookEditorWidgetService", void 0);
|
|
76
|
+
tslib_1.__decorate([
|
|
77
|
+
(0, inversify_1.inject)(monaco_editor_service_1.MonacoEditorService),
|
|
78
|
+
tslib_1.__metadata("design:type", monaco_editor_service_1.MonacoEditorService)
|
|
79
|
+
], NotebookCellEditorService.prototype, "monacoEditorService", void 0);
|
|
68
80
|
tslib_1.__decorate([
|
|
69
81
|
(0, inversify_1.postConstruct)(),
|
|
70
82
|
tslib_1.__metadata("design:type", Function),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notebook-cell-editor-service.js","sourceRoot":"","sources":["../../../src/browser/service/notebook-cell-editor-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,sCAA2C;AAC3C,4DAAiF;AAEjF,qFAA+E;AAC/E,yCAAuC;
|
|
1
|
+
{"version":3,"file":"notebook-cell-editor-service.js","sourceRoot":"","sources":["../../../src/browser/service/notebook-cell-editor-service.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/notebook",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.62.0-next.3+907647f99",
|
|
4
4
|
"description": "Theia - Notebook Extension",
|
|
5
5
|
"dependencies": {
|
|
6
|
-
"@theia/core": "1.
|
|
7
|
-
"@theia/editor": "1.
|
|
8
|
-
"@theia/filesystem": "1.
|
|
9
|
-
"@theia/monaco": "1.
|
|
6
|
+
"@theia/core": "1.62.0-next.3+907647f99",
|
|
7
|
+
"@theia/editor": "1.62.0-next.3+907647f99",
|
|
8
|
+
"@theia/filesystem": "1.62.0-next.3+907647f99",
|
|
9
|
+
"@theia/monaco": "1.62.0-next.3+907647f99",
|
|
10
10
|
"@theia/monaco-editor-core": "1.96.302",
|
|
11
|
-
"@theia/outline-view": "1.
|
|
11
|
+
"@theia/outline-view": "1.62.0-next.3+907647f99",
|
|
12
12
|
"advanced-mark.js": "^2.6.0",
|
|
13
13
|
"react-perfect-scrollbar": "^1.5.8",
|
|
14
14
|
"tslib": "^2.6.2"
|
|
@@ -46,12 +46,12 @@
|
|
|
46
46
|
"watch": "theiaext watch"
|
|
47
47
|
},
|
|
48
48
|
"devDependencies": {
|
|
49
|
-
"@theia/ext-scripts": "1.
|
|
49
|
+
"@theia/ext-scripts": "1.61.0",
|
|
50
50
|
"@types/markdown-it": "^12.2.3",
|
|
51
51
|
"@types/vscode-notebook-renderer": "^1.72.0"
|
|
52
52
|
},
|
|
53
53
|
"nyc": {
|
|
54
54
|
"extends": "../../configs/nyc.json"
|
|
55
55
|
},
|
|
56
|
-
"gitHead": "
|
|
56
|
+
"gitHead": "907647f99bd78541b18e8e6133acc9246d85a8a2"
|
|
57
57
|
}
|
|
@@ -53,6 +53,7 @@ import { NotebookStatusBarContribution } from './contributions/notebook-status-b
|
|
|
53
53
|
import { NotebookCellEditorService } from './service/notebook-cell-editor-service';
|
|
54
54
|
import { NotebookCellStatusBarService } from './service/notebook-cell-status-bar-service';
|
|
55
55
|
import { MonacoEditorModelFilter } from '@theia/monaco/lib/browser/monaco-text-model-service';
|
|
56
|
+
import { ActiveMonacoEditorContribution } from '@theia/monaco/lib/browser/monaco-editor-service';
|
|
56
57
|
|
|
57
58
|
export default new ContainerModule(bind => {
|
|
58
59
|
bind(NotebookColorContribution).toSelf().inSingletonScope();
|
|
@@ -76,6 +77,7 @@ export default new ContainerModule(bind => {
|
|
|
76
77
|
bind(NotebookKernelQuickPickService).toSelf().inSingletonScope();
|
|
77
78
|
bind(NotebookClipboardService).toSelf().inSingletonScope();
|
|
78
79
|
bind(NotebookCellEditorService).toSelf().inSingletonScope();
|
|
80
|
+
bind(ActiveMonacoEditorContribution).toService(NotebookCellEditorService);
|
|
79
81
|
bind(NotebookCellStatusBarService).toSelf().inSingletonScope();
|
|
80
82
|
|
|
81
83
|
bind(NotebookCellResourceResolver).toSelf().inSingletonScope();
|
|
@@ -19,13 +19,18 @@ import { inject, injectable, postConstruct } from '@theia/core/shared/inversify'
|
|
|
19
19
|
import { SimpleMonacoEditor } from '@theia/monaco/lib/browser/simple-monaco-editor';
|
|
20
20
|
import { NotebookEditorWidgetService } from './notebook-editor-widget-service';
|
|
21
21
|
import { CellUri } from '../../common';
|
|
22
|
+
import { ActiveMonacoEditorContribution, MonacoEditorService } from '@theia/monaco/lib/browser/monaco-editor-service';
|
|
23
|
+
import { ICodeEditor } from '@theia/monaco-editor-core/esm/vs/editor/browser/editorBrowser';
|
|
22
24
|
|
|
23
25
|
@injectable()
|
|
24
|
-
export class NotebookCellEditorService {
|
|
26
|
+
export class NotebookCellEditorService implements ActiveMonacoEditorContribution {
|
|
25
27
|
|
|
26
28
|
@inject(NotebookEditorWidgetService)
|
|
27
29
|
protected readonly notebookEditorWidgetService: NotebookEditorWidgetService;
|
|
28
30
|
|
|
31
|
+
@inject(MonacoEditorService)
|
|
32
|
+
protected readonly monacoEditorService: MonacoEditorService;
|
|
33
|
+
|
|
29
34
|
protected onDidChangeCellEditorsEmitter = new Emitter<void>();
|
|
30
35
|
readonly onDidChangeCellEditors = this.onDidChangeCellEditorsEmitter.event;
|
|
31
36
|
|
|
@@ -42,6 +47,8 @@ export class NotebookCellEditorService {
|
|
|
42
47
|
// if defocus notebook editor or another notebook editor is focused, clear the active cell
|
|
43
48
|
if (!editor || (this.currentActiveCell && CellUri.parse(this.currentActiveCell.uri)?.notebook.toString() !== editor?.model?.uri.toString())) {
|
|
44
49
|
this.currentActiveCell = undefined;
|
|
50
|
+
// eslint-disable-next-line no-null/no-null
|
|
51
|
+
this.monacoEditorService.setActiveCodeEditor(null);
|
|
45
52
|
this.onDidChangeFocusedCellEditorEmitter.fire(undefined);
|
|
46
53
|
}
|
|
47
54
|
});
|
|
@@ -64,6 +71,7 @@ export class NotebookCellEditorService {
|
|
|
64
71
|
editorFocusChanged(editor?: SimpleMonacoEditor): void {
|
|
65
72
|
if (editor) {
|
|
66
73
|
this.currentActiveCell = editor;
|
|
74
|
+
this.monacoEditorService.setActiveCodeEditor(editor.getControl());
|
|
67
75
|
this.onDidChangeFocusedCellEditorEmitter.fire(editor);
|
|
68
76
|
}
|
|
69
77
|
}
|
|
@@ -71,4 +79,8 @@ export class NotebookCellEditorService {
|
|
|
71
79
|
getActiveCell(): SimpleMonacoEditor | undefined {
|
|
72
80
|
return this.currentActiveCell;
|
|
73
81
|
}
|
|
82
|
+
|
|
83
|
+
getActiveEditor(): ICodeEditor | undefined {
|
|
84
|
+
return this.getActiveCell()?.getControl();
|
|
85
|
+
}
|
|
74
86
|
}
|