timw4mail/scroll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve display of save as

Browse Source
This commit is contained in:
Timothy Warren 2023-11-30 11:15:37 -05:00
parent 02be6a133c
commit 1b748ed63e
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/document.ts
View File

@ -84,7 +84,7 @@ export class Document {
} }
const row = this.row(at.y)!; const row = this.row(at.y)!;
const mergeNextRow = at.x === row.size && at.y < len - 1; const mergeNextRow = at.x === row.size && at.y + 1 < len;
const mergeIntoPrevRow = at.x === 0 && at.y > 0; const mergeIntoPrevRow = at.x === 0 && at.y > 0;
// If we are at the end of a line, and press delete, // If we are at the end of a line, and press delete,

10
src/common/editor.ts
View File

@ -97,8 +97,9 @@ class Editor {
public async save(): Promise<void> { public async save(): Promise<void> {
if (this.#filename === '') { if (this.#filename === '') {
const filename = await this.prompt('Save as: '); const filename = await this.prompt('Save as: %s (ESC to cancel)');
if (filename === null) { if (filename === null) {
this.setStatusMessage('Save aborted');
return; return;
} }
@ -232,7 +233,12 @@ class Editor {
let res = ''; let res = '';
outer: while (true) { outer: while (true) {
this.setStatusMessage(`${p}${res}`); if (p.includes('%s')) {
this.setStatusMessage(p.replace('%s', res));
} else {
this.setStatusMessage(`${p}${res}`);
}
await this.refreshScreen(); await this.refreshScreen();
for await (const chunk of term.inputLoop()) { for await (const chunk of term.inputLoop()) {
const char = readKey(chunk); const char = readKey(chunk);