Merge branch 'dev' into rss1102/milkdown-engine-editor

Author: RSS1102

.changeset/bright-headings-smile.md

@@ -0,0 +1,5 @@
+---
+'cherry-markdown': patch
+---
+
+fix: apply heading levels consistently across multiline selections

.changeset/quiet-lists-exit.md

@@ -0,0 +1,5 @@
+---
+'cherry-markdown': patch
+---
+
+fix: Markdown loose 列表回车续写不额外插入空行；协调同一有序列表多光标续写、退出和退级的编号，并合并为一次最终事务。空列表项直接退出或退级，不自动补段落空行。修复 Vim 普通模式按键优先级。

packages/cherry-markdown/src/Editor.js

@@ -28,7 +28,15 @@ import {
   rectangularSelection,
   dropCursor,
 } from '@codemirror/view';
-import { EditorState, StateEffect, StateField, EditorSelection, Transaction, Compartment } from '@codemirror/state';
+import {
+  EditorState,
+  StateEffect,
+  StateField,
+  EditorSelection,
+  Transaction,
+  Compartment,
+  Prec,
+} from '@codemirror/state';
 import { markdown } from '@codemirror/lang-markdown';
 import { search, searchKeymap, SearchQuery } from '@codemirror/search';
 import {
@@ -52,6 +60,7 @@ import { createElement } from './utils/dom';
 import { base64Reg, imgDrawioXmlReg, createUrlReg, getCodeBlockRule } from './utils/regexp';
 import { addEvent, removeEvent } from './utils/event';
 import { handleNewlineIndentList } from './utils/autoindent';
+import { createMarkdownKeymap } from './utils/markdownKeymap';
 import diff from 'fast-diff';
 
 /**
@@ -651,7 +660,8 @@ class CM6Adapter {
       try {
         const vimMod = await loadVimModule();
         this.view.dispatch({
-          effects: this.vimCompartment.reconfigure(vimMod.vim()),
+          // Vim handles normal-mode keys before Markdown; unhandled insert-mode keys fall through.
+          effects: this.vimCompartment.reconfigure(Prec.highest(vimMod.vim())),
         });
         this.currentKeyMap = 'vim';
       } catch (e) {
@@ -1909,14 +1919,6 @@ export default class Editor {
       { key: 'ArrowUp', run: () => self.arrowKeyInterceptor?.('ArrowUp') || false },
       { key: 'ArrowDown', run: () => self.arrowKeyInterceptor?.('ArrowDown') || false },
       { key: 'Escape', run: () => self.arrowKeyInterceptor?.('Escape') || false },
-      {
-        key: 'Enter',
-        run: (view) => {
-          if (self.arrowKeyInterceptor?.('Enter')) return true;
-          const adapter = self.editor || new CM6Adapter(view, self.vimCompartment, self.readOnlyCompartment);
-          return handleNewlineIndentList(adapter);
-        },
-      },
       // Sublime Text style keybindings
       // Ctrl-Shift-L / Cmd-Shift-L: 将选区拆分为多个光标，在每行末尾各放一个光标（Sublime split into lines）
       {
@@ -1961,7 +1963,18 @@ export default class Editor {
 
     const extensions = [
       cachedCherryHighlighting,
-      markdown(),
+      markdown({ addKeymap: false }),
+      Prec.high(
+        keymap.of(
+          createMarkdownKeymap({
+            interceptEnter: () => self.arrowKeyInterceptor?.('Enter') || false,
+            continueCustomList: (view) => {
+              const adapter = self.editor || new CM6Adapter(view, self.vimCompartment, self.readOnlyCompartment);
+              return handleNewlineIndentList(adapter);
+            },
+          }),
+        ),
+      ),
       this.historyCompartment.of(history()),
       search(),
       closeBrackets(),

packages/cherry-markdown/src/toolbars/hooks/Header.js

@@ -71,7 +71,7 @@ export default class Header extends MenuBase {
   }
 
   $testIsHead(selection) {
-    return /^\s*(#+)\s*.+/.test(selection);
+    return /^[ \t]*#+[ \t]*.+/m.test(selection);
   }
 
   /**
@@ -99,9 +99,9 @@ export default class Header extends MenuBase {
       // 如果选中的内容里有标题语法，并且标记级别与目标一致，则去掉标题语法
       // 反之，修改标题级别与目标一致
       let needClean = true;
-      const tmp = $selection.replace(/(^\s*)(#+)(\s*)(.+$)/gm, (w, m1, m2, m3, m4) => {
-        needClean = needClean ? m2.length === header.length : false;
-        return `${m1}${header}${m3}${m4}`;
+      const tmp = $selection.replace(/^([ \t]*)(#+)?([ \t]*)(.+)$/gm, (w, m1, m2, m3, m4) => {
+        needClean = needClean && !!m2 && m2.length === header.length;
+        return `${m1}${header}${m2 ? m3 : ' '}${m4}`;
       });
       if (needClean) {
         return $selection.replace(/(^\s*)(#+)(\s*)(.+$)/gm, '$1$4');