trash remove

Author: get1024

.gitignore

@@ -1,3 +1,3 @@
-
+.trash
 .vitepress/cache
 node_modules

.obsidian/appearance.json

@@ -1,5 +1,5 @@
 {
-  "accentColor": "#7e47ff",
+  "accentColor": "",
   "interfaceFontFamily": "霞鹜文楷 Medium",
   "textFontFamily": "霞鹜文楷 Medium",
   "monospaceFontFamily": "霞鹜文楷 Medium",
@@ -13,7 +13,8 @@
     "超长文件名换行",
     "标签样式",
     "页内搜索-替换框",
-    "outline"
+    "outline",
+    "inline-code"
   ],
   "theme": "obsidian",
   "baseFontSizeAction": true,

.obsidian/community-plugins.json

@@ -14,7 +14,6 @@
   "obsidian-day-and-night",
   "calendar",
   "dataview",
-  "obsidian-daily-stats",
   "editing-toolbar",
   "recent-files-obsidian",
   "floating-settings",

.obsidian/plugins/attachment-flow-plugin/main.js

@@ -1 +1 @@
-{"id":"attachment-flow-plugin","name":"AttachFlow","version":"0.4.3","minAppVersion":"1.0.9","description":"This nifty plugin enables seamless management of attachments and referenced links directly from your documents. Taking advantage of an intuitive right-click menu, you can efficiently handle resources in both LIVE and READ modes.","author":"yaozhuwa","authorUrl":"https://github.com/Yaozhuwa","isDesktopOnly":false,"fundingUrl":"https://www.buymeacoffee.com/yaozhuwa"}
+{"id":"attachment-flow-plugin","name":"AttachFlow","version":"0.4.5","minAppVersion":"1.0.9","description":"This nifty plugin enables seamless management of attachments and referenced links directly from your documents. Taking advantage of an intuitive right-click menu, you can efficiently handle resources in both LIVE and READ modes.","author":"yaozhuwa","authorUrl":"https://github.com/Yaozhuwa","isDesktopOnly":false,"fundingUrl":"https://www.buymeacoffee.com/yaozhuwa"}

.obsidian/plugins/attachment-flow-plugin/manifest.json

@@ -1455,6 +1455,10 @@ var locale = {
       name: "Enhance Mod+A selection in text",
       desc: "First select the current line, second select the current text block, third select the entire text."
     },
+    collapsePersistentEnter: {
+      name: "Collapse Persistent Enter",
+      desc: "Adds same-level header line without expanding when pressing Enter on a collapsed header."
+    },
     puncRectify: {
       name: "Punc rectify",
       desc: "Automatically convert English punctuation (, . ? !) between Chinese characters to full-width punctuation during typing (reversible)."
@@ -1655,6 +1659,10 @@ var locale2 = {
       name: "\u589E\u5F3A Ctrl/Cmd+A \u529F\u80FD",
       desc: "\u7B2C\u4E00\u6B21\u9009\u4E2D\u5F53\u524D\u884C\uFF0C\u7B2C\u4E8C\u6B21\u9009\u4E2D\u5F53\u524D\u6587\u672C\u5757\uFF0C\u7B2C\u4E09\u6B21\u9009\u4E2D\u5168\u6587\u3002"
     },
+    collapsePersistentEnter: {
+      name: "\u6807\u9898\u6298\u53E0\u4FDD\u5E8F",
+      desc: "\u5728\u6298\u53E0\u7684\u540C\u7EA7\u6807\u9898\u884C\u6309\u56DE\u8F66\u4E0D\u4F1A\u5C55\u5F00\uFF0C\u76F4\u63A5\u6DFB\u52A0\u540C\u7EA7\u6807\u9898\u884C"
+    },
     puncRectify: {
       name: "\u6807\u70B9\u77EB\u6B63",
       desc: "\u4EC5\u5728\u8F93\u5165\u8FC7\u7A0B\u4E2D\uFF0C\u4E2D\u6587\u95F4\u7684\u82F1\u6587\u6807\u70B9\uFF08,.?!\uFF09\u81EA\u52A8\u8F6C\u6362\u4E3A\u5168\u89D2\uFF08\u53EF\u64A4\u9500\uFF09"
@@ -1855,6 +1863,10 @@ var locale3 = {
       name: "\u0423\u043B\u0443\u0447\u0448\u0438\u0442\u044C \u0432\u044B\u0434\u0435\u043B\u0435\u043D\u0438\u0435 Mod+A \u0432 \u0442\u0435\u043A\u0441\u0442\u0435",
       desc: "\u0421\u043D\u0430\u0447\u0430\u043B\u0430 \u0432\u044B\u0434\u0435\u043B\u0438\u0442\u0435 \u0442\u0435\u043A\u0443\u0449\u0443\u044E \u0441\u0442\u0440\u043E\u043A\u0443, \u0437\u0430\u0442\u0435\u043C \u0432\u044B\u0434\u0435\u043B\u0438\u0442\u0435 \u0442\u0435\u043A\u0443\u0449\u0438\u0439 \u0442\u0435\u043A\u0441\u0442\u043E\u0432\u044B\u0439 \u0431\u043B\u043E\u043A, \u0437\u0430\u0442\u0435\u043C \u0432\u044B\u0434\u0435\u043B\u0438\u0442\u0435 \u0432\u0435\u0441\u044C \u0442\u0435\u043A\u0441\u0442."
     },
+    collapsePersistentEnter: {
+      name: "\u0421\u0432\u043E\u0440\u0430\u0447\u0438\u0432\u0430\u043D\u0438\u0435 \u043F\u043E\u0441\u0442\u043E\u044F\u043D\u043D\u043E\u0433\u043E \u0432\u0432\u043E\u0434\u0430",
+      desc: "\u0414\u043E\u0431\u0430\u0432\u043B\u044F\u0435\u0442 \u043E\u0434\u0438\u043D\u0430\u043A\u043E\u0432\u044B\u0435 \u0443\u0440\u043E\u0432\u043D\u0438 \u0437\u0430\u0433\u043E\u043B\u043E\u0432\u043A\u043E\u0432 \u0431\u0435\u0437 \u0440\u0430\u0441\u043A\u0440\u044B\u0442\u0438\u044F \u043F\u0440\u0438 \u043D\u0430\u0436\u0430\u0442\u0438\u0438 Enter \u043D\u0430 \u0441\u0432\u0435\u0440\u043D\u0443\u0442\u043E\u043C \u0437\u0430\u0433\u043E\u043B\u043E\u0432\u043A\u0435."
+    },
     puncRectify: {
       name: "\u041A\u043E\u0440\u0440\u0435\u043A\u0446\u0438\u044F \u043F\u0443\u043D\u043A\u0442\u0443\u0430\u0446\u0438\u0438",
       desc: "\u0410\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u0435\u0441\u043A\u0430\u044F \u043A\u043E\u043D\u0432\u0435\u0440\u0442\u0430\u0446\u0438\u044F \u0430\u043D\u0433\u043B\u0438\u0439\u0441\u043A\u043E\u0439 \u043F\u0443\u043D\u043A\u0442\u0443\u0430\u0446\u0438\u0438 (, . ? !) \u043C\u0435\u0436\u0434\u0443 \u043A\u0438\u0442\u0430\u0439\u0441\u043A\u0438\u043C\u0438 \u0441\u0438\u043C\u0432\u043E\u043B\u0430\u043C\u0438 \u0432 \u043F\u043E\u043B\u043D\u043E\u0448\u0438\u0440\u0438\u043D\u043D\u0443\u044E \u043F\u0443\u043D\u043A\u0442\u0443\u0430\u0446\u0438\u044E \u043F\u0440\u0438 \u043D\u0430\u0431\u043E\u0440\u0435 \u0442\u0435\u043A\u0441\u0442\u0430 (\u043E\u0431\u0440\u0430\u0442\u0438\u043C\u043E)."
@@ -2055,6 +2067,10 @@ var locale4 = {
       name: "\u589E\u5F37 Mod+A \u529F\u80FD",
       desc: "\u7B2C\u4E00\u6B21\u9078\u4E2D\u7576\u524D\u884C\uFF0C\u7B2C\u4E8C\u6B21\u9078\u4E2D\u7576\u524D\u6587\u672C\u584A\uFF0C\u7B2C\u4E09\u6B21\u9078\u4E2D\u5168\u6587\u3002"
     },
+    collapsePersistentEnter: {
+      name: "\u6A19\u984C\u6298\u53E0\u4FDD\u5E8F",
+      desc: "\u5728\u6298\u53E0\u7684\u540C\u7EA7\u6A19\u984C\u884C\u6309\u56DE\u8ECA\u4E0D\u6703\u5C55\u958B\uFF0C\u76F4\u63A5\u6DFB\u52A0\u540C\u7D1A\u6A19\u984C\u884C"
+    },
     puncRectify: {
       name: "\u6A19\u9EDE\u77EB\u6B63",
       desc: "\u50C5\u5728\u8F38\u5165\u904E\u7A0B\u4E2D\uFF0C\u4E2D\u6587\u9593\u7684\u82F1\u6587\u6A19\u9EDE\uFF08,.?!\uFF09\u81EA\u52D5\u8F49\u63DB\u70BA\u5168\u89D2\uFF08\u53EF\u53D6\u6D88\uFF09"
@@ -2193,7 +2209,8 @@ var DEFAULT_SETTINGS = {
   TryFixChineseIM: true,
   PuncRectify: false,
   FixMacOSContextMenu: false,
-  TryFixMSIME: false
+  TryFixMSIME: false,
+  CollapsePersistentEnter: false
 };
 var locale5 = en_US_default;
 var EasyTypingSettingTab = class extends import_obsidian2.PluginSettingTab {
@@ -2436,6 +2453,12 @@ var EasyTypingSettingTab = class extends import_obsidian2.PluginSettingTab {
         await this.plugin.saveSettings();
       });
     });
+    new import_obsidian2.Setting(containerEl).setName(locale5.settings.collapsePersistentEnter.name).setDesc(locale5.settings.collapsePersistentEnter.desc).addToggle((toggle) => {
+      toggle.setValue(this.plugin.settings.CollapsePersistentEnter).onChange(async (value) => {
+        this.plugin.settings.CollapsePersistentEnter = value;
+        await this.plugin.saveSettings();
+      });
+    });
     new import_obsidian2.Setting(containerEl).setName(locale5.settings.fixMicrosoftIME.name).setDesc(locale5.settings.fixMicrosoftIME.desc).addToggle((toggle) => {
       toggle.setValue(this.plugin.settings.TryFixMSIME).onChange(async (value) => {
         this.plugin.settings.TryFixMSIME = value;
@@ -2923,6 +2946,9 @@ function getTabstopGroupsFromView(view) {
   const currentTabstopGroups = view.state.field(tabstopsStateField);
   return currentTabstopGroups;
 }
+function hasTabstops(view) {
+  return getTabstopGroupsFromView(view).length > 0;
+}
 function addTabstops(view, tabstopGroups) {
   view.dispatch({
     effects: [addTabstopsEffect.of(tabstopGroups)]
@@ -3486,10 +3512,10 @@ var EasyTypingPlugin = class extends import_obsidian3.Plugin {
       if (this.onFormatArticle === true)
         return;
       let cursor_changed = update.transactions.find((tr2) => tr2.selection) != null;
-      if ((update.docChanged || cursor_changed) && !update.view.composing && !isInsideCurTabstop(update.view)) {
+      if (hasTabstops(update.view) && (update.docChanged || cursor_changed) && !update.view.composing && !isInsideCurTabstop(update.view)) {
         removeAllTabstops(update.view);
       }
-      if (update.transactions.find((tr2) => tr2.isUserEvent("undo"))) {
+      if (hasTabstops(update.view) && update.transactions.find((tr2) => tr2.isUserEvent("undo"))) {
         removeAllTabstops(update.view);
       }
       let notSelected = true;
@@ -3653,7 +3679,7 @@ var EasyTypingPlugin = class extends import_obsidian3.Plugin {
       return false;
     };
     this.handleEnter = (view) => {
-      var _a;
+      var _a, _b;
       let state = view.state;
       let doc = state.doc;
       const tree = (0, import_language3.syntaxTree)(state);
@@ -3663,8 +3689,43 @@ var EasyTypingPlugin = class extends import_obsidian3.Plugin {
       const pos = s.main.to;
       let line = doc.lineAt(pos);
       let codeBlockInfo = getCodeBlockInfoInPos(state, pos);
+      if (this.settings.CollapsePersistentEnter) {
+        const editor = this.app.workspace.getActiveViewOfType(import_obsidian3.MarkdownView).editor;
+        let fold_offsets = editor.getFoldOffsets();
+        let all_foldable_lines = editor.getAllFoldableLines();
+        let folded_lines = [];
+        for (let offset of fold_offsets) {
+          let folded = all_foldable_lines.find((l) => l.from == offset);
+          if (folded) {
+            folded_lines.push(folded);
+          }
+        }
+        let folded_line = folded_lines.find((l) => pos >= l.from && pos <= l.to);
+        if (folded_line) {
+          let folded_first_line = doc.lineAt(folded_line.from).text;
+          let reg_headings = /^#+ /;
+          if (reg_headings.test(folded_first_line)) {
+            let heading_level = (_a = folded_first_line.match(/^#+/)) == null ? void 0 : _a[0].length;
+            let new_heading_level = heading_level;
+            let new_heading_line = "\n" + "#".repeat(new_heading_level) + " ";
+            let folded_last_line = doc.lineAt(folded_line.to).text;
+            let folded_last_line_is_blank = /^\s*$/.test(folded_last_line);
+            let new_heading_line_pos = editor.offsetToPos(folded_line.to);
+            let new_cursor_pos = { line: new_heading_line_pos.line + 1, ch: new_heading_level + 1 };
+            if (this.settings.StrictModeEnter && !folded_last_line_is_blank && (this.app.vault.config.strictLineBreaks || false)) {
+              new_heading_line = "\n\n" + "#".repeat(new_heading_level) + " ";
+              new_cursor_pos = { line: new_heading_line_pos.line + 2, ch: new_heading_level + 1 };
+            }
+            editor.replaceRange(new_heading_line, new_heading_line_pos);
+            editor.setCursor(editor.offsetToPos(folded_line.from));
+            editor.exec("toggleFold");
+            editor.setCursor(new_cursor_pos);
+            return true;
+          }
+        }
+      }
       if (this.settings.BetterCodeEdit && codeBlockInfo && codeBlockInfo.code_start_pos !== doc.lineAt(codeBlockInfo.start_pos).to && pos >= codeBlockInfo.code_start_pos && pos <= codeBlockInfo.code_end_pos) {
-        let line_indent_str = ((_a = line.text.match(/^\s*/)) == null ? void 0 : _a[0]) || "";
+        let line_indent_str = ((_b = line.text.match(/^\s*/)) == null ? void 0 : _b[0]) || "";
         view.dispatch({
           changes: { from: pos, to: pos, insert: "\n" + line_indent_str },
           selection: { anchor: pos + line_indent_str.length + 1, head: pos + line_indent_str.length + 1 },
@@ -3682,7 +3743,7 @@ var EasyTypingPlugin = class extends import_obsidian3.Plugin {
       if (pos == line.from)
         return false;
       if (getPosLineType2(state, pos) == "quote" /* quote */) {
-        let reg_quote = /^(\s*)(>+)/;
+        let reg_quote = /^(\s*)(>+ ?)/;
         let quote_match = line.text.match(reg_quote);
         if (!quote_match)
           return false;
@@ -3695,9 +3756,9 @@ var EasyTypingPlugin = class extends import_obsidian3.Plugin {
           let space_str2 = "  ";
           if (quote_content.endsWith("  "))
             space_str2 = "";
-          let inserted_str = space_str2 + "\n" + quote_match[0] + " ";
+          let inserted_str = space_str2 + "\n" + quote_match[0];
           if (this.settings.StrictLineMode == "enter_twice" /* EnterTwice */) {
-            inserted_str = "\n" + quote_match[0] + " \n" + quote_match[0] + " ";
+            inserted_str = "\n" + quote_match[0] + "\n" + quote_match[0];
           }
           view.dispatch({
             changes: { from: pos, to: pos, insert: inserted_str },
@@ -3799,7 +3860,7 @@ var EasyTypingPlugin = class extends import_obsidian3.Plugin {
     };
     this.triggerCvtRule = (view, cursor_pos) => {
       let rules = [];
-      if (this.settings.BaseObEditEnhance)
+      if (this.settings.QuoteSpace)
         rules = rules.concat(this.ExtraBasicConvRules);
       if (this.settings.QuoteSpace)
         rules = rules.concat(this.QuoteSpaceRules);
@@ -4603,7 +4664,7 @@ var EasyTypingPlugin = class extends import_obsidian3.Plugin {
     const line = doc.lineAt(selection.head);
     const lineContent = line.text;
     const listMatch = lineContent.match(/^(\s*)([-*+] \[.\]|[-*+]|\d+\.)\s/);
-    const quoteMatch = lineContent.match(/^(\s*)(>+)(\s)?/);
+    const quoteMatch = lineContent.match(/^(\s*)(>+ ?)/);
     let changes;
     let newCursorPos;
     let prefix = "";
@@ -4617,7 +4678,7 @@ var EasyTypingPlugin = class extends import_obsidian3.Plugin {
         prefix = indent + (parseInt(listMarker) + 1) + ". ";
       }
     } else if (quoteMatch) {
-      prefix = quoteMatch[1] + quoteMatch[2] + " ";
+      prefix = quoteMatch[1] + quoteMatch[2];
     }
     changes = [{ from: line.to, insert: "\n" + prefix }];
     newCursorPos = line.to + 1 + prefix.length;

.obsidian/plugins/attachment-flow-plugin/styles.css

@@ -1,7 +1,7 @@
 {
 	"id": "easy-typing-obsidian",
 	"name": "Easy Typing",
-	"version": "5.5.11",
+	"version": "5.5.12",
 	"minAppVersion": "0.15.0",
 	"description": "This plugin aims to enhance and optimize the editing experience in Obsidian",
 	"author": "yaozhuwa",

.obsidian/plugins/easy-typing-obsidian/main.js

@@ -1,5 +1,5 @@
 {
-  "lastVersion": "3.1.5",
+  "lastVersion": "3.1.13",
   "aestheticStyle": "glass",
   "positionStyle": "top",
   "menuCommands": [