qword 1.1.14 → 1.1.16

package/ChangeLog

@@ -1,3 +1,13 @@
+2026.09.07, v1.1.16
+
+fix:
+- 89f550a double enter in vim mode
+
+2026.09.07, v1.1.15
+
+fix:
+- bbc0dd9 client: loadremote
+
 2026.09.07, v1.1.14
 
 fix:

package/client/create.js

@@ -19,7 +19,7 @@ import {
     keymapExtension,
     themeExtension,
     languageExtension,
-} from './options.js';
+} from './options/options.js';
 import {markField, lineField} from './decorations.js';
 
 export function createEditor(element, options = {}) {

package/client/editor.d.ts

@@ -3,7 +3,7 @@ import {
     type CreateEditorOptions,
 } from './create.js';
 import type {MarkHandle} from './decorations.js';
-import type {OptionKey, OptionValue} from './options.js';
+import type {OptionKey, OptionValue} from './options/options.js';
 import type {
     SourceCode,
     SourcePosition,

package/client/editor.js

@@ -12,7 +12,7 @@ import {
     addLineClass,
     removeLineClass,
 } from './decorations.js';
-import {setOption} from './options.js';
+import {setOption} from './options/options.js';
 import {clearHistory} from './history.js';
 import {observeResize} from './dom.js';
 

package/client/index.d.ts

@@ -47,7 +47,7 @@ export {
     setOption,
     type OptionKey,
     type OptionValue,
-} from './options.js';
+} from './options/options.js';
 export {clearHistory} from './history.js';
 export {highlightStyle} from './highlight.js';
 export type {

package/client/index.js

@@ -33,6 +33,6 @@ export {
     languageExtension,
     indentKeymap,
     setOption,
-} from './options.js';
+} from './options/options.js';
 export {clearHistory} from './history.js';
 export {highlightStyle} from './highlight.js';

package/client/loadremote.js

@@ -59,12 +59,7 @@ export default async (name, options = {}) => {
         local = [module.local];
     }
     
-    local = [];
-    
-    for (const url of local) {
-        local.push(prefix + url);
-    }
-    
+    local = local.map((url) => prefix + url);
     const remote = [];
     
     for (const tmpl of remoteTmpls) {
@@ -100,3 +95,4 @@ function binom(name, array) {
     
     return ret;
 }
+

package/client/{options.d.ts → options/options.d.ts}

@@ -1,10 +1,10 @@
 import {type Extension} from '@codemirror/state';
-import type {QwordEditorView} from './create.js';
+import type {QwordEditorView} from '../create.js';
 import type {
     KeyMap,
     EditorMode,
     EditorTheme,
-} from './types.js';
+} from '../types.js';
 
 export function keymapExtension(name: KeyMap): Extension;
 

package/client/{options.js → options/options.js}

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

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

@@ -0,0 +1,52 @@
+import {EditorState, Prec} from '@codemirror/state';
+
+export const keepIndentAfterEnterVim = EditorState.transactionFilter.of((tr) => {
+    if (!tr.docChanged)
+        return tr;
+    
+    const selection = tr.newSelection.main;
+    
+    if (!selection.empty)
+        return tr;
+    
+    const pos = selection.head;
+    const line = tr.newDoc.lineAt(pos);
+    
+    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] || '';
+    
+    if (!indent)
+        return tr;
+    
+    return [
+        tr, {
+            changes: {
+                from: pos,
+                to: pos,
+                insert: indent,
+            },
+            selection: {
+                anchor: pos + indent.length,
+            },
+        },
+    ];
+});
+