Skip to content

Open-source LLM knowledge platform: turn raw documents into a queryable RAG, an autonomous reasoning agent, and a self-maintaining Wiki.

fix(frontend): respect Markdown indentation selection boundaries (#4195)

Jarvisfd4cc4584884
diff --git a/frontend/src/utils/markdownEditing.test.ts b/frontend/src/utils/markdownEditing.test.ts
index 2197bb478..d6e8ca237 100644
--- a/frontend/src/utils/markdownEditing.test.ts
+++ b/frontend/src/utils/markdownEditing.test.ts
@@ -84,6 +84,45 @@ test('Tab indents every line of a multi-line selection but skips blank ones', ()
assert.deepEqual([patch?.start, patch?.end], [0, 8])
})
+for (const outdent of [false, true]) {
+ for (const followingLine of ['- second', '']) {
+ test(`${outdent ? 'Shift+Tab' : 'Tab'} excludes a line whose start is the selection end (${followingLine ? 'next item' : 'empty final line'})`, () => {
+ const first = outdent ? ' - first' : '- first'
+ const next = outdent && followingLine ? ' ' + followingLine : followingLine
+ const changed = outdent ? '- first' : ' - first'
+ const value = `${first}\n${next}`
+ const patch = indentOnTab({ value, start: 0, end: first.length + 1 }, outdent)
+ assert.deepEqual(patch, {
+ value: `${changed}\n${next}`,
+ start: 0,
+ end: changed.length + 1,
+ })
+ // Keep the trailing newline selected so repeated Tab works on the same block.
+ assert.ok(patch)
+ const repeated = indentOnTab(patch, outdent)
+ assert.ok(repeated)
+ assert.equal(repeated.value.slice(repeated.end), next)
+ })
+ }
+}
+
+test('a selection ending within the following line still indents that line', () => {
+ assert.deepEqual(indentOnTab({ value: '- first\n- second', start: 0, end: 9 }, false), {
+ value: ' - first\n - second', start: 0, end: 20,
+ })
+})
+
+test('Tab preserves a newline-ended selection of plain text for repeated indentation', () => {
+ const patch = indentOnTab({ value: 'first\nsecond\nthird', start: 2, end: 13 }, false)
+ assert.deepEqual(patch, {
+ value: ' first\n second\nthird', start: 0, end: 17,
+ })
+ assert.ok(patch)
+ assert.deepEqual(indentOnTab(patch, false), {
+ value: ' first\n second\nthird', start: 0, end: 21,
+ })
+})
+
test('Tab stays a focus move when it would not indent anything', () => {
assert.equal(indentOnTab(caret('plain text', 4), false), null)
})
diff --git a/frontend/src/utils/markdownEditing.ts b/frontend/src/utils/markdownEditing.ts
index ca78824a4..e959f12e4 100644
--- a/frontend/src/utils/markdownEditing.ts
+++ b/frontend/src/utils/markdownEditing.ts
@@ -70,12 +70,16 @@ function mapSelectedLines(
transform: (line: string) => string,
): EditorState {
const blockStart = lineStartAt(value, start)
- const blockEnd = lineEndAt(value, end)
+ // Textarea selections exclude `end`: a selection ending just after a
+ // newline does not include the following line. Keep that newline selected
+ // after rewriting so another Tab still operates on the same block.
+ const endsAtLineStart = end > start && value[end - 1] === '\n'
+ const blockEnd = lineEndAt(value, endsAtLineStart ? end - 1 : end)
const rewritten = value.slice(blockStart, blockEnd).split('\n').map(transform).join('\n')
return {
value: value.slice(0, blockStart) + rewritten + value.slice(blockEnd),
start: blockStart,
- end: blockStart + rewritten.length,
+ end: blockStart + rewritten.length + (endsAtLineStart ? 1 : 0),
}
}