qword 1.1.16 → 1.1.17

package/ChangeLog

@@ -1,3 +1,9 @@
+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/options/options.js

@@ -21,10 +21,7 @@ const enterKeepIndent = {
 
 export function keymapExtension(name) {
     if (name === 'vim')
-        return keymap.of([
-            vim(),
-            keepIndentAfterEnterVim,
-        ]);
+        return [vim(), keepIndentAfterEnterVim];
     
     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,
         },
     ];
 });
-