@theia/notebook 1.52.0 → 1.53.0-next.5
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 +1 -1
- package/lib/browser/contributions/cell-operations.d.ts.map +1 -1
- package/lib/browser/contributions/cell-operations.js +10 -2
- package/lib/browser/contributions/cell-operations.js.map +1 -1
- package/lib/browser/contributions/notebook-actions-contribution.d.ts +1 -0
- package/lib/browser/contributions/notebook-actions-contribution.d.ts.map +1 -1
- package/lib/browser/contributions/notebook-actions-contribution.js +19 -23
- package/lib/browser/contributions/notebook-actions-contribution.js.map +1 -1
- package/lib/browser/contributions/notebook-cell-actions-contribution.d.ts +2 -0
- package/lib/browser/contributions/notebook-cell-actions-contribution.d.ts.map +1 -1
- package/lib/browser/contributions/notebook-cell-actions-contribution.js +26 -15
- package/lib/browser/contributions/notebook-cell-actions-contribution.js.map +1 -1
- package/lib/browser/contributions/notebook-undo-redo-handler.d.ts +10 -0
- package/lib/browser/contributions/notebook-undo-redo-handler.d.ts.map +1 -0
- package/lib/browser/contributions/notebook-undo-redo-handler.js +49 -0
- package/lib/browser/contributions/notebook-undo-redo-handler.js.map +1 -0
- package/lib/browser/notebook-editor-widget.d.ts +6 -0
- package/lib/browser/notebook-editor-widget.d.ts.map +1 -1
- package/lib/browser/notebook-editor-widget.js +39 -1
- 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 +3 -0
- package/lib/browser/notebook-frontend-module.js.map +1 -1
- package/lib/browser/service/notebook-context-manager.d.ts +2 -1
- package/lib/browser/service/notebook-context-manager.d.ts.map +1 -1
- package/lib/browser/service/notebook-context-manager.js +6 -3
- package/lib/browser/service/notebook-context-manager.js.map +1 -1
- package/lib/browser/service/notebook-options.d.ts +1 -0
- package/lib/browser/service/notebook-options.d.ts.map +1 -1
- package/lib/browser/service/notebook-options.js +1 -0
- package/lib/browser/service/notebook-options.js.map +1 -1
- package/lib/browser/service/notebook-service.d.ts +1 -0
- package/lib/browser/service/notebook-service.d.ts.map +1 -1
- package/lib/browser/service/notebook-service.js +7 -0
- package/lib/browser/service/notebook-service.js.map +1 -1
- package/lib/browser/view/notebook-cell-editor.d.ts +7 -1
- package/lib/browser/view/notebook-cell-editor.d.ts.map +1 -1
- package/lib/browser/view/notebook-cell-editor.js +75 -5
- package/lib/browser/view/notebook-cell-editor.js.map +1 -1
- package/lib/browser/view/notebook-cell-list-view.d.ts +3 -0
- package/lib/browser/view/notebook-cell-list-view.d.ts.map +1 -1
- package/lib/browser/view/notebook-cell-list-view.js +26 -2
- package/lib/browser/view/notebook-cell-list-view.js.map +1 -1
- package/lib/browser/view/notebook-code-cell-view.d.ts +1 -1
- package/lib/browser/view/notebook-code-cell-view.d.ts.map +1 -1
- package/lib/browser/view/notebook-code-cell-view.js +19 -17
- package/lib/browser/view/notebook-code-cell-view.js.map +1 -1
- package/lib/browser/view/notebook-find-widget.d.ts +63 -0
- package/lib/browser/view/notebook-find-widget.d.ts.map +1 -0
- package/lib/browser/view/notebook-find-widget.js +225 -0
- package/lib/browser/view/notebook-find-widget.js.map +1 -0
- package/lib/browser/view/notebook-markdown-cell-view.d.ts +4 -0
- package/lib/browser/view/notebook-markdown-cell-view.d.ts.map +1 -1
- package/lib/browser/view/notebook-markdown-cell-view.js +105 -8
- package/lib/browser/view/notebook-markdown-cell-view.js.map +1 -1
- package/lib/browser/view-model/notebook-cell-model.d.ts +24 -1
- package/lib/browser/view-model/notebook-cell-model.d.ts.map +1 -1
- package/lib/browser/view-model/notebook-cell-model.js +71 -1
- package/lib/browser/view-model/notebook-cell-model.js.map +1 -1
- package/lib/browser/view-model/notebook-model.d.ts +8 -1
- package/lib/browser/view-model/notebook-model.d.ts.map +1 -1
- package/lib/browser/view-model/notebook-model.js +66 -14
- package/lib/browser/view-model/notebook-model.js.map +1 -1
- package/package.json +8 -7
- package/src/browser/contributions/cell-operations.ts +8 -2
- package/src/browser/contributions/notebook-actions-contribution.ts +21 -22
- package/src/browser/contributions/notebook-cell-actions-contribution.ts +26 -16
- package/src/browser/contributions/notebook-undo-redo-handler.ts +41 -0
- package/src/browser/notebook-editor-widget.tsx +49 -2
- package/src/browser/notebook-frontend-module.ts +5 -1
- package/src/browser/service/notebook-context-manager.ts +8 -4
- package/src/browser/service/notebook-options.ts +2 -1
- package/src/browser/service/notebook-service.ts +7 -1
- package/src/browser/style/index.css +165 -6
- package/src/browser/view/notebook-cell-editor.tsx +79 -6
- package/src/browser/view/notebook-cell-list-view.tsx +32 -3
- package/src/browser/view/notebook-code-cell-view.tsx +19 -17
- package/src/browser/view/notebook-find-widget.tsx +335 -0
- package/src/browser/view/notebook-markdown-cell-view.tsx +134 -17
- package/src/browser/view-model/notebook-cell-model.ts +94 -8
- package/src/browser/view-model/notebook-model.ts +77 -20
|
@@ -25,9 +25,12 @@ const inversify_1 = require("@theia/core/shared/inversify");
|
|
|
25
25
|
const monaco_editor_1 = require("@theia/monaco/lib/browser/monaco-editor");
|
|
26
26
|
const core_1 = require("@theia/core");
|
|
27
27
|
const notebook_context_manager_1 = require("../service/notebook-context-manager");
|
|
28
|
+
const notebook_options_1 = require("../service/notebook-options");
|
|
29
|
+
const notebook_code_cell_view_1 = require("./notebook-code-cell-view");
|
|
30
|
+
const mark = require("advanced-mark.js");
|
|
28
31
|
let NotebookMarkdownCellRenderer = class NotebookMarkdownCellRenderer {
|
|
29
32
|
render(notebookModel, cell) {
|
|
30
|
-
return React.createElement(MarkdownCell, { markdownRenderer: this.markdownRenderer, monacoServices: this.monacoServices, cell: cell, notebookModel: notebookModel, notebookContextManager: this.notebookContextManager });
|
|
33
|
+
return React.createElement(MarkdownCell, { markdownRenderer: this.markdownRenderer, commandRegistry: this.commandRegistry, monacoServices: this.monacoServices, notebookOptionsService: this.notebookOptionsService, cell: cell, notebookModel: notebookModel, notebookContextManager: this.notebookContextManager });
|
|
31
34
|
}
|
|
32
35
|
renderDragImage(cell) {
|
|
33
36
|
var _a;
|
|
@@ -52,28 +55,122 @@ tslib_1.__decorate([
|
|
|
52
55
|
(0, inversify_1.inject)(notebook_context_manager_1.NotebookContextManager),
|
|
53
56
|
tslib_1.__metadata("design:type", notebook_context_manager_1.NotebookContextManager)
|
|
54
57
|
], NotebookMarkdownCellRenderer.prototype, "notebookContextManager", void 0);
|
|
58
|
+
tslib_1.__decorate([
|
|
59
|
+
(0, inversify_1.inject)(core_1.CommandRegistry),
|
|
60
|
+
tslib_1.__metadata("design:type", core_1.CommandRegistry)
|
|
61
|
+
], NotebookMarkdownCellRenderer.prototype, "commandRegistry", void 0);
|
|
62
|
+
tslib_1.__decorate([
|
|
63
|
+
(0, inversify_1.inject)(notebook_options_1.NotebookOptionsService),
|
|
64
|
+
tslib_1.__metadata("design:type", notebook_options_1.NotebookOptionsService)
|
|
65
|
+
], NotebookMarkdownCellRenderer.prototype, "notebookOptionsService", void 0);
|
|
55
66
|
exports.NotebookMarkdownCellRenderer = NotebookMarkdownCellRenderer = tslib_1.__decorate([
|
|
56
67
|
(0, inversify_1.injectable)()
|
|
57
68
|
], NotebookMarkdownCellRenderer);
|
|
58
|
-
function MarkdownCell({ markdownRenderer, monacoServices, cell, notebookModel, notebookContextManager }) {
|
|
69
|
+
function MarkdownCell({ markdownRenderer, monacoServices, cell, notebookModel, notebookContextManager, notebookOptionsService, commandRegistry }) {
|
|
59
70
|
const [editMode, setEditMode] = React.useState(cell.editing);
|
|
71
|
+
let empty = false;
|
|
60
72
|
React.useEffect(() => {
|
|
61
73
|
const listener = cell.onDidRequestCellEditChange(cellEdit => setEditMode(cellEdit));
|
|
62
74
|
return () => listener.dispose();
|
|
63
75
|
}, [editMode]);
|
|
76
|
+
React.useEffect(() => {
|
|
77
|
+
if (!editMode) {
|
|
78
|
+
const instance = new mark(markdownContent);
|
|
79
|
+
cell.onMarkdownFind = options => {
|
|
80
|
+
instance.unmark();
|
|
81
|
+
if (empty) {
|
|
82
|
+
return [];
|
|
83
|
+
}
|
|
84
|
+
return searchInMarkdown(instance, options);
|
|
85
|
+
};
|
|
86
|
+
return () => {
|
|
87
|
+
cell.onMarkdownFind = undefined;
|
|
88
|
+
instance.unmark();
|
|
89
|
+
};
|
|
90
|
+
}
|
|
91
|
+
}, [editMode, cell.source]);
|
|
64
92
|
let markdownContent = React.useMemo(() => {
|
|
65
93
|
const markdownString = new markdown_string_1.MarkdownStringImpl(cell.source, { supportHtml: true, isTrusted: true });
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
94
|
+
const rendered = markdownRenderer.render(markdownString).element;
|
|
95
|
+
const children = [];
|
|
96
|
+
rendered.childNodes.forEach(child => {
|
|
97
|
+
if (child instanceof HTMLElement) {
|
|
98
|
+
children.push(child);
|
|
99
|
+
}
|
|
100
|
+
});
|
|
101
|
+
return children;
|
|
102
|
+
}, [cell.source]);
|
|
103
|
+
if (markdownContent.length === 0) {
|
|
69
104
|
const italic = document.createElement('i');
|
|
70
105
|
italic.className = 'theia-notebook-empty-markdown';
|
|
71
106
|
italic.innerText = core_1.nls.localizeByDefault('Empty markdown cell, double-click or press enter to edit.');
|
|
72
107
|
italic.style.pointerEvents = 'none';
|
|
73
|
-
markdownContent = italic;
|
|
108
|
+
markdownContent = [italic];
|
|
109
|
+
empty = true;
|
|
74
110
|
}
|
|
75
111
|
return editMode ?
|
|
76
|
-
React.createElement(
|
|
77
|
-
|
|
112
|
+
(React.createElement("div", { className: 'theia-notebook-markdown-editor-container', key: "code" },
|
|
113
|
+
React.createElement(notebook_cell_editor_1.CellEditor, { notebookModel: notebookModel, cell: cell, monacoServices: monacoServices, notebookContextManager: notebookContextManager, fontInfo: notebookOptionsService.editorFontInfo }),
|
|
114
|
+
React.createElement(notebook_code_cell_view_1.NotebookCodeCellStatus, { cell: cell, notebook: notebookModel, commandRegistry: commandRegistry, onClick: () => cell.requestFocusEditor() }))) :
|
|
115
|
+
(React.createElement("div", { className: 'theia-notebook-markdown-content', key: "markdown", onDoubleClick: () => cell.requestEdit(), ref: node => node === null || node === void 0 ? void 0 : node.replaceChildren(...markdownContent) }));
|
|
116
|
+
}
|
|
117
|
+
function searchInMarkdown(instance, options) {
|
|
118
|
+
const matches = [];
|
|
119
|
+
const markOptions = {
|
|
120
|
+
className: 'theia-find-match',
|
|
121
|
+
diacritics: false,
|
|
122
|
+
caseSensitive: options.matchCase,
|
|
123
|
+
acrossElements: true,
|
|
124
|
+
separateWordSearch: false,
|
|
125
|
+
each: node => {
|
|
126
|
+
matches.push(new MarkdownEditorFindMatch(node));
|
|
127
|
+
}
|
|
128
|
+
};
|
|
129
|
+
if (options.regex || options.wholeWord) {
|
|
130
|
+
let search = options.search;
|
|
131
|
+
if (options.wholeWord) {
|
|
132
|
+
if (!options.regex) {
|
|
133
|
+
search = escapeRegExp(search);
|
|
134
|
+
}
|
|
135
|
+
search = '\\b' + search + '\\b';
|
|
136
|
+
}
|
|
137
|
+
instance.markRegExp(new RegExp(search, options.matchCase ? '' : 'i'), markOptions);
|
|
138
|
+
}
|
|
139
|
+
else {
|
|
140
|
+
instance.mark(options.search, markOptions);
|
|
141
|
+
}
|
|
142
|
+
return matches;
|
|
143
|
+
}
|
|
144
|
+
function escapeRegExp(value) {
|
|
145
|
+
return value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
|
|
146
|
+
}
|
|
147
|
+
class MarkdownEditorFindMatch {
|
|
148
|
+
constructor(node) {
|
|
149
|
+
this.node = node;
|
|
150
|
+
this._selected = false;
|
|
151
|
+
}
|
|
152
|
+
get selected() {
|
|
153
|
+
return this._selected;
|
|
154
|
+
}
|
|
155
|
+
set selected(selected) {
|
|
156
|
+
this._selected = selected;
|
|
157
|
+
const className = 'theia-find-match-selected';
|
|
158
|
+
if (this.node instanceof HTMLElement) {
|
|
159
|
+
if (selected) {
|
|
160
|
+
this.node.classList.add(className);
|
|
161
|
+
}
|
|
162
|
+
else {
|
|
163
|
+
this.node.classList.remove(className);
|
|
164
|
+
}
|
|
165
|
+
}
|
|
166
|
+
}
|
|
167
|
+
show() {
|
|
168
|
+
if (this.node instanceof HTMLElement) {
|
|
169
|
+
this.node.scrollIntoView({
|
|
170
|
+
behavior: 'instant',
|
|
171
|
+
block: 'center'
|
|
172
|
+
});
|
|
173
|
+
}
|
|
174
|
+
}
|
|
78
175
|
}
|
|
79
176
|
//# sourceMappingURL=notebook-markdown-cell-view.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notebook-markdown-cell-view.js","sourceRoot":"","sources":["../../../src/browser/view/notebook-markdown-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,kDAAkD;AAClD,oGAAgG;AAChG,+FAA+F;AAI/F,iEAAoD;AACpD,4DAAkE;AAClE,2EAA+E;AAC/E,
|
|
1
|
+
{"version":3,"file":"notebook-markdown-cell-view.js","sourceRoot":"","sources":["../../../src/browser/view/notebook-markdown-cell-view.tsx"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,8 @@ import { NotebookMonacoTextModelService } from '../service/notebook-monaco-text-
|
|
|
8
8
|
import { NotebookCellOutputModel } from './notebook-cell-output-model';
|
|
9
9
|
import { PreferenceService } from '@theia/core/lib/browser';
|
|
10
10
|
import { LanguageService } from '@theia/core/lib/browser/language-service';
|
|
11
|
+
import { NotebookEditorFindMatch, NotebookEditorFindMatchOptions } from '../view/notebook-find-widget';
|
|
12
|
+
import { Range } from '@theia/core/shared/vscode-languageserver-protocol';
|
|
11
13
|
export declare const NotebookCellModelFactory: unique symbol;
|
|
12
14
|
export type NotebookCellModelFactory = (props: NotebookCellModelProps) => NotebookCellModel;
|
|
13
15
|
export type CellEditorFocusRequest = number | 'lastLine' | undefined;
|
|
@@ -47,7 +49,7 @@ export declare class NotebookCellModel implements NotebookCell, Disposable {
|
|
|
47
49
|
protected readonly onDidChangeOutputItemsEmitter: Emitter<CellOutput>;
|
|
48
50
|
readonly onDidChangeOutputItems: Event<CellOutput>;
|
|
49
51
|
protected readonly onDidChangeContentEmitter: Emitter<"content" | "language" | "mime">;
|
|
50
|
-
readonly onDidChangeContent: Event<
|
|
52
|
+
readonly onDidChangeContent: Event<"content" | "language" | "mime">;
|
|
51
53
|
protected readonly onDidChangeMetadataEmitter: Emitter<void>;
|
|
52
54
|
readonly onDidChangeMetadata: Event<void>;
|
|
53
55
|
protected readonly onDidChangeInternalMetadataEmitter: Emitter<CellInternalMetadataChangedEvent>;
|
|
@@ -64,6 +66,10 @@ export declare class NotebookCellModel implements NotebookCell, Disposable {
|
|
|
64
66
|
readonly onDidChangeEditorOptions: Event<MonacoEditor.IOptions>;
|
|
65
67
|
protected readonly outputVisibilityChangeEmitter: Emitter<boolean>;
|
|
66
68
|
readonly onDidChangeOutputVisibility: Event<boolean>;
|
|
69
|
+
protected readonly onDidFindMatchesEmitter: Emitter<NotebookCodeEditorFindMatch[]>;
|
|
70
|
+
readonly onDidFindMatches: Event<NotebookCodeEditorFindMatch[]>;
|
|
71
|
+
protected readonly onDidSelectFindMatchEmitter: Emitter<NotebookCodeEditorFindMatch>;
|
|
72
|
+
readonly onDidSelectFindMatch: Event<NotebookCodeEditorFindMatch>;
|
|
67
73
|
protected readonly props: NotebookCellModelProps;
|
|
68
74
|
protected readonly textModelService: NotebookMonacoTextModelService;
|
|
69
75
|
protected readonly languageService: LanguageService;
|
|
@@ -107,5 +113,22 @@ export declare class NotebookCellModel implements NotebookCell, Disposable {
|
|
|
107
113
|
getData(): CellData;
|
|
108
114
|
resolveTextModel(): Promise<MonacoEditorModel>;
|
|
109
115
|
restartOutputRenderer(outputId: string): void;
|
|
116
|
+
onMarkdownFind: ((options: NotebookEditorFindMatchOptions) => NotebookEditorFindMatch[]) | undefined;
|
|
117
|
+
showMatch(selected: NotebookCodeEditorFindMatch): void;
|
|
118
|
+
findMatches(options: NotebookEditorFindMatchOptions): NotebookEditorFindMatch[];
|
|
119
|
+
replaceAll(matches: NotebookCodeEditorFindMatch[], value: string): void;
|
|
120
|
+
}
|
|
121
|
+
export interface NotebookCellFindMatches {
|
|
122
|
+
matches: NotebookEditorFindMatch[];
|
|
123
|
+
selected: NotebookEditorFindMatch;
|
|
124
|
+
}
|
|
125
|
+
export declare class NotebookCodeEditorFindMatch implements NotebookEditorFindMatch {
|
|
126
|
+
readonly cell: NotebookCellModel;
|
|
127
|
+
readonly range: Range;
|
|
128
|
+
readonly textModel: MonacoEditorModel;
|
|
129
|
+
selected: boolean;
|
|
130
|
+
constructor(cell: NotebookCellModel, range: Range, textModel: MonacoEditorModel);
|
|
131
|
+
show(): void;
|
|
132
|
+
replace(value: string): void;
|
|
110
133
|
}
|
|
111
134
|
//# sourceMappingURL=notebook-cell-model.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notebook-cell-model.d.ts","sourceRoot":"","sources":["../../../src/browser/view-model/notebook-cell-model.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AACpF,OAAO,EAAsB,UAAU,EAAiB,MAAM,8BAA8B,CAAC;AAC7F,OAAO,EAAE,iBAAiB,EAAE,MAAM,+CAA+C,CAAC;AAClF,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,yCAAyC,CAAC;AAC5E,OAAO,EACH,QAAQ,EAAE,yBAAyB,EAAE,4BAA4B,EACjE,oBAAoB,EAAE,UAAU,EAAE,QAAQ,EAAE,cAAc,EAC7D,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,yBAAyB,EAAE,MAAM,mBAAmB,CAAC;AAC9D,OAAO,EAAE,8BAA8B,EAAE,MAAM,+CAA+C,CAAC;AAC/F,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAE5D,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;
|
|
1
|
+
{"version":3,"file":"notebook-cell-model.d.ts","sourceRoot":"","sources":["../../../src/browser/view-model/notebook-cell-model.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,10 +19,11 @@
|
|
|
19
19
|
* Licensed under the MIT License. See License.txt in the project root for license information.
|
|
20
20
|
*--------------------------------------------------------------------------------------------*/
|
|
21
21
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
22
|
-
exports.NotebookCellModel = exports.createNotebookCellModelContainer = exports.NotebookCellModelFactory = void 0;
|
|
22
|
+
exports.NotebookCodeEditorFindMatch = exports.NotebookCellModel = exports.createNotebookCellModelContainer = exports.NotebookCellModelFactory = void 0;
|
|
23
23
|
const tslib_1 = require("tslib");
|
|
24
24
|
const core_1 = require("@theia/core");
|
|
25
25
|
const inversify_1 = require("@theia/core/shared/inversify");
|
|
26
|
+
const common_1 = require("../../common");
|
|
26
27
|
const notebook_monaco_text_model_service_1 = require("../service/notebook-monaco-text-model-service");
|
|
27
28
|
const notebook_cell_output_model_1 = require("./notebook-cell-output-model");
|
|
28
29
|
const browser_1 = require("@theia/core/lib/browser");
|
|
@@ -61,6 +62,10 @@ let NotebookCellModel = class NotebookCellModel {
|
|
|
61
62
|
this.onDidChangeEditorOptions = this.onDidChangeEditorOptionsEmitter.event;
|
|
62
63
|
this.outputVisibilityChangeEmitter = new core_1.Emitter();
|
|
63
64
|
this.onDidChangeOutputVisibility = this.outputVisibilityChangeEmitter.event;
|
|
65
|
+
this.onDidFindMatchesEmitter = new core_1.Emitter();
|
|
66
|
+
this.onDidFindMatches = this.onDidFindMatchesEmitter.event;
|
|
67
|
+
this.onDidSelectFindMatchEmitter = new core_1.Emitter();
|
|
68
|
+
this.onDidSelectFindMatch = this.onDidSelectFindMatchEmitter.event;
|
|
64
69
|
this.toDispose = new core_1.DisposableCollection();
|
|
65
70
|
this._editing = false;
|
|
66
71
|
this._editorOptions = {};
|
|
@@ -258,6 +263,44 @@ let NotebookCellModel = class NotebookCellModel {
|
|
|
258
263
|
this.onDidChangeOutputItemsEmitter.fire(output);
|
|
259
264
|
}
|
|
260
265
|
}
|
|
266
|
+
showMatch(selected) {
|
|
267
|
+
this.onDidSelectFindMatchEmitter.fire(selected);
|
|
268
|
+
}
|
|
269
|
+
findMatches(options) {
|
|
270
|
+
var _a, _b;
|
|
271
|
+
if (this.cellKind === common_1.CellKind.Markup && !this.editing) {
|
|
272
|
+
return (_b = (_a = this.onMarkdownFind) === null || _a === void 0 ? void 0 : _a.call(this, options)) !== null && _b !== void 0 ? _b : [];
|
|
273
|
+
}
|
|
274
|
+
if (!this.textModel) {
|
|
275
|
+
return [];
|
|
276
|
+
}
|
|
277
|
+
const matches = options.search ? this.textModel.findMatches({
|
|
278
|
+
searchString: options.search,
|
|
279
|
+
isRegex: options.regex,
|
|
280
|
+
matchCase: options.matchCase,
|
|
281
|
+
matchWholeWord: options.wholeWord
|
|
282
|
+
}) : [];
|
|
283
|
+
const editorFindMatches = matches.map(match => new NotebookCodeEditorFindMatch(this, match.range, this.textModel));
|
|
284
|
+
this.onDidFindMatchesEmitter.fire(editorFindMatches);
|
|
285
|
+
return editorFindMatches;
|
|
286
|
+
}
|
|
287
|
+
replaceAll(matches, value) {
|
|
288
|
+
var _a;
|
|
289
|
+
const editOperations = matches.map(match => ({
|
|
290
|
+
range: {
|
|
291
|
+
startColumn: match.range.start.character,
|
|
292
|
+
startLineNumber: match.range.start.line,
|
|
293
|
+
endColumn: match.range.end.character,
|
|
294
|
+
endLineNumber: match.range.end.line
|
|
295
|
+
},
|
|
296
|
+
text: value
|
|
297
|
+
}));
|
|
298
|
+
(_a = this.textModel) === null || _a === void 0 ? void 0 : _a.textEditorModel.pushEditOperations(
|
|
299
|
+
// eslint-disable-next-line no-null/no-null
|
|
300
|
+
null, editOperations,
|
|
301
|
+
// eslint-disable-next-line no-null/no-null
|
|
302
|
+
() => null);
|
|
303
|
+
}
|
|
261
304
|
};
|
|
262
305
|
exports.NotebookCellModel = NotebookCellModel;
|
|
263
306
|
tslib_1.__decorate([
|
|
@@ -285,6 +328,33 @@ tslib_1.__decorate([
|
|
|
285
328
|
exports.NotebookCellModel = NotebookCellModel = tslib_1.__decorate([
|
|
286
329
|
(0, inversify_1.injectable)()
|
|
287
330
|
], NotebookCellModel);
|
|
331
|
+
class NotebookCodeEditorFindMatch {
|
|
332
|
+
constructor(cell, range, textModel) {
|
|
333
|
+
this.cell = cell;
|
|
334
|
+
this.range = range;
|
|
335
|
+
this.textModel = textModel;
|
|
336
|
+
this.selected = false;
|
|
337
|
+
}
|
|
338
|
+
show() {
|
|
339
|
+
this.cell.showMatch(this);
|
|
340
|
+
}
|
|
341
|
+
replace(value) {
|
|
342
|
+
this.textModel.textEditorModel.pushEditOperations(
|
|
343
|
+
// eslint-disable-next-line no-null/no-null
|
|
344
|
+
null, [{
|
|
345
|
+
range: {
|
|
346
|
+
startColumn: this.range.start.character,
|
|
347
|
+
startLineNumber: this.range.start.line,
|
|
348
|
+
endColumn: this.range.end.character,
|
|
349
|
+
endLineNumber: this.range.end.line
|
|
350
|
+
},
|
|
351
|
+
text: value
|
|
352
|
+
}],
|
|
353
|
+
// eslint-disable-next-line no-null/no-null
|
|
354
|
+
() => null);
|
|
355
|
+
}
|
|
356
|
+
}
|
|
357
|
+
exports.NotebookCodeEditorFindMatch = NotebookCodeEditorFindMatch;
|
|
288
358
|
function computeRunStartTimeAdjustment(oldMetadata, newMetadata) {
|
|
289
359
|
if (oldMetadata.runStartTime !== newMetadata.runStartTime && typeof newMetadata.runStartTime === 'number') {
|
|
290
360
|
const offset = Date.now() - newMetadata.runStartTime;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notebook-cell-model.js","sourceRoot":"","sources":["../../../src/browser/view-model/notebook-cell-model.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"notebook-cell-model.js","sourceRoot":"","sources":["../../../src/browser/view-model/notebook-cell-model.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,7 @@ import { UndoRedoService } from '@theia/editor/lib/browser/undo-redo-service';
|
|
|
10
10
|
import { MarkdownString } from '@theia/core/lib/common/markdown-rendering';
|
|
11
11
|
import type { NotebookModelResolverService } from '../service/notebook-model-resolver-service';
|
|
12
12
|
import { BinaryBuffer } from '@theia/core/lib/common/buffer';
|
|
13
|
+
import { NotebookEditorFindMatch, NotebookEditorFindMatchOptions } from '../view/notebook-find-widget';
|
|
13
14
|
export declare const NotebookModelFactory: unique symbol;
|
|
14
15
|
export declare function createNotebookModelContainer(parent: interfaces.Container, props: NotebookModelProps): interfaces.Container;
|
|
15
16
|
export declare const NotebookModelResolverServiceProxy: unique symbol;
|
|
@@ -49,6 +50,9 @@ export declare class NotebookModel implements Saveable, Disposable {
|
|
|
49
50
|
set dirty(dirty: boolean);
|
|
50
51
|
get dirty(): boolean;
|
|
51
52
|
get readOnly(): boolean | MarkdownString;
|
|
53
|
+
protected _selectedText: string;
|
|
54
|
+
set selectedText(value: string);
|
|
55
|
+
get selectedText(): string;
|
|
52
56
|
selectedCell?: NotebookCellModel;
|
|
53
57
|
protected dirtyCells: NotebookCellModel[];
|
|
54
58
|
cells: NotebookCellModel[];
|
|
@@ -71,7 +75,8 @@ export declare class NotebookModel implements Saveable, Disposable {
|
|
|
71
75
|
setSelectedCell(cell: NotebookCellModel, scrollIntoView?: boolean): void;
|
|
72
76
|
private addCellOutputListeners;
|
|
73
77
|
applyEdits(rawEdits: CellEditOperation[], computeUndoRedo: boolean): void;
|
|
74
|
-
protected
|
|
78
|
+
protected fireContentChange(): void;
|
|
79
|
+
protected replaceCells(start: number, deleteCount: number, newCells: CellData[], computeUndoRedo: boolean, requestEdit: boolean): void;
|
|
75
80
|
protected changeCellInternalMetadataPartial(cell: NotebookCellModel, internalMetadata: NullablePartialNotebookCellInternalMetadata): void;
|
|
76
81
|
protected updateNotebookMetadata(metadata: NotebookDocumentMetadata, computeUndoRedo: boolean): void;
|
|
77
82
|
protected changeCellMetadataPartial(cell: NotebookCellModel, metadata: NullablePartialNotebookCellMetadata, computeUndoRedo: boolean): void;
|
|
@@ -80,5 +85,7 @@ export declare class NotebookModel implements Saveable, Disposable {
|
|
|
80
85
|
protected moveCellToIndex(fromIndex: number, length: number, toIndex: number, computeUndoRedo: boolean): boolean;
|
|
81
86
|
protected getCellIndexByHandle(handle: number): number;
|
|
82
87
|
protected isCellMetadataChanged(a: NotebookCellMetadata, b: NotebookCellMetadata): boolean;
|
|
88
|
+
findMatches(options: NotebookEditorFindMatchOptions): NotebookEditorFindMatch[];
|
|
89
|
+
replaceAll(matches: NotebookEditorFindMatch[], text: string): void;
|
|
83
90
|
}
|
|
84
91
|
//# sourceMappingURL=notebook-model.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notebook-model.d.ts","sourceRoot":"","sources":["../../../src/browser/view-model/notebook-model.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,KAAK,EAAE,gBAAgB,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAC1F,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EACH,QAAQ,EACR,oBAAoB,EACkC,YAAY,EAClE,wBAAwB,EAC3B,MAAM,cAAc,CAAC;AACtB,OAAO,EACH,2BAA2B,EAAE,+BAA+B,EAC5D,iBAAiB,EAAE,2CAA2C,EAC9D,mCAAmC,EACtC,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,WAAW,EAAE,MAAM,4CAA4C,CAAC;AACzE,OAAO,EAAE,iBAAiB,EAAE,wBAAwB,
|
|
1
|
+
{"version":3,"file":"notebook-model.d.ts","sourceRoot":"","sources":["../../../src/browser/view-model/notebook-model.ts"],"names":[],"mappings":"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"}
|
|
@@ -52,6 +52,7 @@ let NotebookModel = class NotebookModel {
|
|
|
52
52
|
this.onDidDispose = this.onDidDisposeEmitter.event;
|
|
53
53
|
this.nextHandle = 0;
|
|
54
54
|
this._dirty = false;
|
|
55
|
+
this._selectedText = '';
|
|
55
56
|
this.dirtyCells = [];
|
|
56
57
|
this.metadata = {};
|
|
57
58
|
}
|
|
@@ -73,6 +74,12 @@ let NotebookModel = class NotebookModel {
|
|
|
73
74
|
var _a;
|
|
74
75
|
return (_a = this.props.resource.readOnly) !== null && _a !== void 0 ? _a : false;
|
|
75
76
|
}
|
|
77
|
+
set selectedText(value) {
|
|
78
|
+
this._selectedText = value;
|
|
79
|
+
}
|
|
80
|
+
get selectedText() {
|
|
81
|
+
return this._selectedText;
|
|
82
|
+
}
|
|
76
83
|
get uri() {
|
|
77
84
|
return this.props.resource.uri;
|
|
78
85
|
}
|
|
@@ -152,11 +159,14 @@ let NotebookModel = class NotebookModel {
|
|
|
152
159
|
this.dirtyCells.splice(this.dirtyCells.indexOf(cell), 1);
|
|
153
160
|
}
|
|
154
161
|
this.dirty = this.dirtyCells.length > 0;
|
|
162
|
+
// Only fire `onContentChangedEmitter` here, because `onDidChangeContentEmitter` is used for model level changes only
|
|
163
|
+
// However, this event indicates that the content of a cell has changed
|
|
164
|
+
this.onContentChangedEmitter.fire();
|
|
155
165
|
}
|
|
156
166
|
setData(data, markDirty = true) {
|
|
157
167
|
// Replace all cells in the model
|
|
158
168
|
this.dirtyCells = [];
|
|
159
|
-
this.replaceCells(0, this.cells.length, data.cells, false);
|
|
169
|
+
this.replaceCells(0, this.cells.length, data.cells, false, false);
|
|
160
170
|
this.metadata = data.metadata;
|
|
161
171
|
this.dirty = markDirty;
|
|
162
172
|
this.onDidChangeContentEmitter.fire();
|
|
@@ -168,12 +178,14 @@ let NotebookModel = class NotebookModel {
|
|
|
168
178
|
};
|
|
169
179
|
}
|
|
170
180
|
undo() {
|
|
171
|
-
|
|
172
|
-
|
|
181
|
+
if (!this.readOnly) {
|
|
182
|
+
this.undoRedoService.undo(this.uri);
|
|
183
|
+
}
|
|
173
184
|
}
|
|
174
185
|
redo() {
|
|
175
|
-
|
|
176
|
-
|
|
186
|
+
if (!this.readOnly) {
|
|
187
|
+
this.undoRedoService.redo(this.uri);
|
|
188
|
+
}
|
|
177
189
|
}
|
|
178
190
|
setSelectedCell(cell, scrollIntoView) {
|
|
179
191
|
if (this.selectedCell !== cell) {
|
|
@@ -186,6 +198,9 @@ let NotebookModel = class NotebookModel {
|
|
|
186
198
|
cell.onDidChangeOutputs(() => {
|
|
187
199
|
this.dirty = true;
|
|
188
200
|
});
|
|
201
|
+
cell.onDidRequestCellEditChange(() => {
|
|
202
|
+
this.onContentChangedEmitter.fire();
|
|
203
|
+
});
|
|
189
204
|
}
|
|
190
205
|
}
|
|
191
206
|
applyEdits(rawEdits, computeUndoRedo) {
|
|
@@ -216,7 +231,7 @@ let NotebookModel = class NotebookModel {
|
|
|
216
231
|
let scrollIntoView = true;
|
|
217
232
|
switch (edit.editType) {
|
|
218
233
|
case 1 /* CellEditType.Replace */:
|
|
219
|
-
this.replaceCells(edit.index, edit.count, edit.cells, computeUndoRedo);
|
|
234
|
+
this.replaceCells(edit.index, edit.count, edit.cells, computeUndoRedo, true);
|
|
220
235
|
scrollIntoView = edit.cells.length > 0;
|
|
221
236
|
break;
|
|
222
237
|
case 2 /* CellEditType.Output */: {
|
|
@@ -239,10 +254,10 @@ let NotebookModel = class NotebookModel {
|
|
|
239
254
|
});
|
|
240
255
|
break;
|
|
241
256
|
case 3 /* CellEditType.Metadata */:
|
|
242
|
-
this.changeCellMetadata(this.cells[cellIndex], edit.metadata,
|
|
257
|
+
this.changeCellMetadata(this.cells[cellIndex], edit.metadata, false);
|
|
243
258
|
break;
|
|
244
259
|
case 8 /* CellEditType.PartialMetadata */:
|
|
245
|
-
this.changeCellMetadataPartial(this.cells[cellIndex], edit.metadata,
|
|
260
|
+
this.changeCellMetadataPartial(this.cells[cellIndex], edit.metadata, false);
|
|
246
261
|
break;
|
|
247
262
|
case 9 /* CellEditType.PartialInternalMetadata */:
|
|
248
263
|
this.changeCellInternalMetadataPartial(this.cells[cellIndex], edit.internalMetadata);
|
|
@@ -251,7 +266,7 @@ let NotebookModel = class NotebookModel {
|
|
|
251
266
|
this.changeCellLanguage(this.cells[cellIndex], edit.language, computeUndoRedo);
|
|
252
267
|
break;
|
|
253
268
|
case 5 /* CellEditType.DocumentMetadata */:
|
|
254
|
-
this.updateNotebookMetadata(edit.metadata,
|
|
269
|
+
this.updateNotebookMetadata(edit.metadata, false);
|
|
255
270
|
break;
|
|
256
271
|
case 6 /* CellEditType.Move */:
|
|
257
272
|
this.moveCellToIndex(cellIndex, edit.length, edit.newIdx, computeUndoRedo);
|
|
@@ -262,10 +277,13 @@ let NotebookModel = class NotebookModel {
|
|
|
262
277
|
this.setSelectedCell(this.cells[Math.min(cellIndex, this.cells.length - 1)], scrollIntoView);
|
|
263
278
|
}
|
|
264
279
|
}
|
|
280
|
+
this.fireContentChange();
|
|
281
|
+
}
|
|
282
|
+
fireContentChange() {
|
|
265
283
|
this.onDidChangeContentEmitter.fire();
|
|
266
284
|
this.onContentChangedEmitter.fire();
|
|
267
285
|
}
|
|
268
|
-
replaceCells(start, deleteCount, newCells, computeUndoRedo) {
|
|
286
|
+
replaceCells(start, deleteCount, newCells, computeUndoRedo, requestEdit) {
|
|
269
287
|
const cells = newCells.map(cell => {
|
|
270
288
|
const handle = this.nextHandle++;
|
|
271
289
|
return this.cellModelFactory({
|
|
@@ -287,11 +305,17 @@ let NotebookModel = class NotebookModel {
|
|
|
287
305
|
cell.dispose();
|
|
288
306
|
}
|
|
289
307
|
if (computeUndoRedo) {
|
|
290
|
-
this.undoRedoService.pushElement(this.uri, async () =>
|
|
308
|
+
this.undoRedoService.pushElement(this.uri, async () => {
|
|
309
|
+
this.replaceCells(start, newCells.length, deletedCells.map(cell => cell.getData()), false, false);
|
|
310
|
+
this.fireContentChange();
|
|
311
|
+
}, async () => {
|
|
312
|
+
this.replaceCells(start, deleteCount, newCells, false, false);
|
|
313
|
+
this.fireContentChange();
|
|
314
|
+
});
|
|
291
315
|
}
|
|
292
316
|
this.onDidAddOrRemoveCellEmitter.fire({ rawEvent: { kind: common_1.NotebookCellsChangeType.ModelChange, changes }, newCellIds: cells.map(cell => cell.handle) });
|
|
293
317
|
this.onDidChangeContentEmitter.queue({ kind: common_1.NotebookCellsChangeType.ModelChange, changes });
|
|
294
|
-
if (cells.length > 0) {
|
|
318
|
+
if (cells.length > 0 && requestEdit) {
|
|
295
319
|
this.setSelectedCell(cells[cells.length - 1]);
|
|
296
320
|
cells[cells.length - 1].requestEdit();
|
|
297
321
|
}
|
|
@@ -351,7 +375,13 @@ let NotebookModel = class NotebookModel {
|
|
|
351
375
|
}
|
|
352
376
|
moveCellToIndex(fromIndex, length, toIndex, computeUndoRedo) {
|
|
353
377
|
if (computeUndoRedo) {
|
|
354
|
-
this.undoRedoService.pushElement(this.uri, async () => {
|
|
378
|
+
this.undoRedoService.pushElement(this.uri, async () => {
|
|
379
|
+
this.moveCellToIndex(toIndex, length, fromIndex, false);
|
|
380
|
+
this.fireContentChange();
|
|
381
|
+
}, async () => {
|
|
382
|
+
this.moveCellToIndex(fromIndex, length, toIndex, false);
|
|
383
|
+
this.fireContentChange();
|
|
384
|
+
});
|
|
355
385
|
}
|
|
356
386
|
const cells = this.cells.splice(fromIndex, length);
|
|
357
387
|
this.cells.splice(toIndex, 0, ...cells);
|
|
@@ -364,12 +394,34 @@ let NotebookModel = class NotebookModel {
|
|
|
364
394
|
isCellMetadataChanged(a, b) {
|
|
365
395
|
const keys = new Set([...Object.keys(a || {}), ...Object.keys(b || {})]);
|
|
366
396
|
for (const key of keys) {
|
|
367
|
-
if (
|
|
397
|
+
if (a[key] !== b[key]) {
|
|
368
398
|
return true;
|
|
369
399
|
}
|
|
370
400
|
}
|
|
371
401
|
return false;
|
|
372
402
|
}
|
|
403
|
+
findMatches(options) {
|
|
404
|
+
const matches = [];
|
|
405
|
+
for (const cell of this.cells) {
|
|
406
|
+
matches.push(...cell.findMatches(options));
|
|
407
|
+
}
|
|
408
|
+
return matches;
|
|
409
|
+
}
|
|
410
|
+
replaceAll(matches, text) {
|
|
411
|
+
var _a;
|
|
412
|
+
const matchMap = new Map();
|
|
413
|
+
for (const match of matches) {
|
|
414
|
+
if (match instanceof notebook_cell_model_1.NotebookCodeEditorFindMatch) {
|
|
415
|
+
if (!matchMap.has(match.cell)) {
|
|
416
|
+
matchMap.set(match.cell, []);
|
|
417
|
+
}
|
|
418
|
+
(_a = matchMap.get(match.cell)) === null || _a === void 0 ? void 0 : _a.push(match);
|
|
419
|
+
}
|
|
420
|
+
}
|
|
421
|
+
for (const [cell, cellMatches] of matchMap) {
|
|
422
|
+
cell.replaceAll(cellMatches, text);
|
|
423
|
+
}
|
|
424
|
+
}
|
|
373
425
|
};
|
|
374
426
|
exports.NotebookModel = NotebookModel;
|
|
375
427
|
tslib_1.__decorate([
|