mingzailao
/
silverbullet
mirror of https://github.com/silverbulletmd/silverbullet.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Slightly different way of addressing #1085 

saving files after local update with setTexrt
pull/1098/head
Zef Hemel 2024-09-24 17:34:46 +02:00
parent 362b590ba3
commit 28f3e454b6
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plug-api/syscalls/editor.ts
View File

@ -28,8 +28,11 @@ export function getText(): Promise<string> {
* This updates the editor text, but in a minimal-diff way: * This updates the editor text, but in a minimal-diff way:
* it compares the current editor text with the new text, and only sends the changes to the editor, thereby preserving cursor location * it compares the current editor text with the new text, and only sends the changes to the editor, thereby preserving cursor location
*/ */
export function setText(newText: string): Promise<void> { export function setText(
return syscall("editor.setText", newText); newText: string,
isolateHistory = false,
): Promise<void> {
return syscall("editor.setText", newText, isolateHistory);
} }
/** /**

4
web/client.ts
View File

@ -659,7 +659,7 @@ export class Client implements ConfigContainer {
if (this.currentPage) { if (this.currentPage) {
if ( if (
!this.ui.viewState.unsavedChanges || !this.ui.viewState.unsavedChanges ||
this.ui.viewState.uiOptions.forcedROMode this.ui.viewState.uiOptions.forcedROMode || this.readOnlyMode
) { ) {
// No unsaved changes, or read-only mode, not gonna save // No unsaved changes, or read-only mode, not gonna save
return resolve(); return resolve();
@ -1143,7 +1143,7 @@ export class Client implements ConfigContainer {
this.space.watchPage(pageName); this.space.watchPage(pageName);
} else { } else {
// Just apply minimal patches so that the cursor is preserved // Just apply minimal patches so that the cursor is preserved
await editor.setText(doc.text); await editor.setText(doc.text, true);
} }
// Note: these events are dispatched asynchronously deliberately (not waiting for results) // Note: these events are dispatched asynchronously deliberately (not waiting for results)

6
web/syscalls/editor.ts
View File

@ -25,12 +25,14 @@ export function editorSyscalls(client: Client): SysCallMapping {
"editor.getText": () => { "editor.getText": () => {
return client.editorView.state.sliceDoc(); return client.editorView.state.sliceDoc();
}, },
"editor.setText": (_ctx, newText: string) => { "editor.setText": (_ctx, newText: string, shouldIsolateHistory = false) => {
const currentText = client.editorView.state.sliceDoc(); const currentText = client.editorView.state.sliceDoc();
const allChanges = diffAndPrepareChanges(currentText, newText); const allChanges = diffAndPrepareChanges(currentText, newText);
client.editorView.dispatch({ client.editorView.dispatch({
changes: allChanges, changes: allChanges,
annotations: isolateHistory.of("full"), annotations: shouldIsolateHistory
? isolateHistory.of("full")
: undefined,
}); });
}, },
"editor.getCursor": (): number => { "editor.getCursor": (): number => {