qword 1.1.16 → 1.1.18

package/ChangeLog

@@ -1,3 +1,14 @@
+2026.09.07, v1.1.18
+
+feature:
+- 587085d client: keep-indent-after-vim-paste
+
+2026.09.07, v1.1.17
+
+fix:
+- 1ab4367 client: options: vim: keep indent after second enter
+- 7bde795 client: options: vim returns array with keepIndentAfterEnterVim
+
 2026.09.07, v1.1.16
 
 fix:

package/client/create.js

@@ -20,6 +20,7 @@ import {
     themeExtension,
     languageExtension,
 } from './options/options.js';
+import {normalizeVimPaste} from './options/vim/keep-indent-after-vim-paste.js';
 import {markField, lineField} from './decorations.js';
 
 export function createEditor(element, options = {}) {
@@ -58,6 +59,7 @@ export function createEditor(element, options = {}) {
         langCompartment.of(languageExtension(mode)),
         syntaxHighlighting(highlightStyle),
         indentOnInput(),
+        normalizeVimPaste,
         indentUnit.of('    '),
         ...lineNumbers
             ? [

package/client/options/options.js

@@ -13,6 +13,7 @@ import {
 } from '@codemirror/commands';
 
 import {keepIndentAfterEnterVim} from './vim/keep-indent-after-enter-vim.js';
+import {normalizeVimPaste} from './vim/keep-indent-after-vim-paste.js';
 
 const enterKeepIndent = {
     key: 'Enter',
@@ -21,10 +22,7 @@ const enterKeepIndent = {
 
 export function keymapExtension(name) {
     if (name === 'vim')
-        return keymap.of([
-            vim(),
-            keepIndentAfterEnterVim,
-        ]);
+        return [vim(), keepIndentAfterEnterVim, normalizeVimPaste];
     
     if (name === 'emacs')
         return keymap.of([...emacsStyleKeymap, indentWithTab]);

package/client/options/vim/keep-indent-after-enter-vim.js

@@ -1,4 +1,4 @@
-import {EditorState, Prec} from '@codemirror/state';
+import {EditorState} from '@codemirror/state';
 
 export const keepIndentAfterEnterVim = EditorState.transactionFilter.of((tr) => {
     if (!tr.docChanged)
@@ -15,38 +15,41 @@ export const keepIndentAfterEnterVim = EditorState.transactionFilter.of((tr) =>
     if (pos !== line.from)
         return tr;
     
-    let insertedNewline = false;
-    
-    tr.changes.iterChanges((fromA, toA, fromB, toB, inserted) => {
-        if (inserted.toString().includes('\n'))
-            insertedNewline = true;
-    });
-    
-    if (!insertedNewline)
-        return tr;
-    
-    // Берём indentation предыдущей строки.
     if (line.number === 1)
         return tr;
     
     const previousLine = tr.newDoc.line(line.number - 1);
-    const match = previousLine.text.match(/^\s*/);
-    const indent = match?.[0] || '';
+    const indent = previousLine.text.match(/^\s*/)?.[0] || '';
     
     if (!indent)
         return tr;
     
+    let insertedNewline = false;
+    let alreadyIndented = false;
+    
+    tr.changes.iterChanges((_fromA, _toA, _fromB, _toB, inserted) => {
+        const text = inserted.toString();
+        
+        if (text.includes('\n'))
+            insertedNewline = true;
+        
+        if (text.endsWith(`\n${indent}`))
+            alreadyIndented = true;
+    });
+    
+    if (!insertedNewline || alreadyIndented)
+        return tr;
+    
     return [
         tr, {
             changes: {
                 from: pos,
-                to: pos,
                 insert: indent,
             },
             selection: {
                 anchor: pos + indent.length,
             },
+            sequential: true,
         },
     ];
 });
-

package/client/options/vim/keep-indent-after-vim-paste.js

@@ -0,0 +1,54 @@
+import {EditorState, Transaction} from '@codemirror/state';
+
+export const normalizeVimPaste = EditorState.transactionFilter.of((tr) => {
+    if (!tr.docChanged)
+        return tr;
+    
+    if (!tr.isUserEvent('input.type.compose'))
+        return tr;
+    
+    if (!tr.newSelection.empty)
+        return tr;
+    
+    const pos = tr.newSelection.main.head;
+    const line = tr.newDoc.lineAt(pos);
+    
+    if (pos !== line.from)
+        return tr;
+    
+    let hasNewlineInsert = false;
+    tr.changes.iterChanges((fromA, toA, fromB, toB, inserted) => {
+        if (inserted.toString().includes('\n'))
+            hasNewlineInsert = true;
+    });
+    
+    if (!hasNewlineInsert)
+        return tr;
+    
+    const destIndent = line.text.match(/^\s*/)?.[0] || '';
+    if (!destIndent)
+        return tr;
+    
+    let hasBuggyPrefix = false;
+    tr.changes.iterChanges((fromA, toA, fromB, toB, inserted) => {
+        const text = inserted.toString();
+        if (text.startsWith('\n') && text.slice(1).startsWith(destIndent))
+            hasBuggyPrefix = true;
+    });
+    
+    if (!hasBuggyPrefix)
+        return tr;
+    
+    const newAnnotations = tr.annotations
+        .filter((a) => a.type !== Transaction.userEvent)
+        .concat(Transaction.userEvent.of('input.paste'));
+    
+    return Transaction.create(
+        tr.startState,
+        tr.changes,
+        tr.selection,
+        tr.effects,
+        newAnnotations,
+        tr.scrollIntoView
+    );
+});