diff --git a/CHANGELOG.md b/CHANGELOG.md index 298be5e..104dd3c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,24 @@ --- +## [2.0.3] - 2025-11-09 + +### 修复 + +#### Obsidian 插件 +- **修复 Normal 模式下按 ESC 触发输入法切换的问题**： + - 问题：在 Normal 模式下按 ESC 会意外触发输入法切换（从中文切到英文，再按又从英文切到英文） + - 原因：`handleKeyDown` 函数处理 ESC 键时没有检查当前 Vim 模式 + - 解决：增加模式检查，只在 Insert 或 Replace 模式下按 ESC 时才保存输入法状态并切换到英文 + - 效果：与原生 Vim 插件行为保持一致，Normal 模式下按 ESC 不会改变输入法 + +### 改进 + +- 提高了模式检测的准确性 +- 优化了 ESC 键的处理逻辑 + +--- + ## [2.0.0] - 2025-11-04 ### 新增功能 diff --git a/CHANGELOG_en.md b/CHANGELOG_en.md index b3d3730..5187012 100644 --- a/CHANGELOG_en.md +++ b/CHANGELOG_en.md @@ -11,6 +11,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 --- +## [2.0.3] - 2025-11-09 + +### Fixed + +#### Obsidian Plugin +- **Fixed input method switching triggered by ESC in Normal mode**: + - Issue: Pressing ESC in Normal mode would unexpectedly trigger input method switching (from Chinese to English, then English to English on second press) + - Cause: `handleKeyDown` function didn't check current Vim mode when handling ESC key + - Solution: Added mode check to only save IM state and switch to English when ESC is pressed in Insert or Replace mode + - Result: Behavior now consistent with native Vim plugin - ESC in Normal mode doesn't change input method + +### Improved + +- Enhanced accuracy of mode detection +- Optimized ESC key handling logic + +--- + ## [2.0.0] - 2025-11-04 ### Added diff --git a/README.md b/README.md index 4121bd2..226151c 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,26 @@ # Vim 输入法自动切换插件 +[![Version](https://img.shields.io/badge/version-2.0.3-blue.svg)](./CHANGELOG.md) +[![Platform](https://img.shields.io/badge/platform-macOS%20%7C%20Linux%20%7C%20Windows-lightgrey.svg)](#安装要求) +[![License](https://img.shields.io/badge/license-MIT-green.svg)](./LICENSE.txt) + [English](./README_en.md) | 中文 -这是为 原生Vim 和 Obsidian 编辑器的 Vim 模式设计的输入法自动切换插件，包含： -- **Obsidian 插件**：适用于 Obsidian 编辑器的 Vim 模式 -- **Vim 插件**：适用于原生 Vim/NeoVim 编辑器 +> 🚀 **智能输入法管理工具** - 为 Vim 用户打造的无感知输入法切换体验 -## 功能简介 +这是为 **原生 Vim** 和 **Obsidian 编辑器** 的 Vim 模式设计的智能输入法自动切换插件，包含： -- 自动切换输入法：在 Vim 的 Normal 模式和 Insert 模式之间切换时，自动切换输入法 -- 智能记忆：记住上次 Insert 模式退出时的输入法状态，下次进入时自动恢复 -- 无缝体验：在 Insert 模式下正常输入文本时不会触发输入法切换 +- 🎯 **Obsidian 插件**：适用于 Obsidian 编辑器的 Vim 模式 +- ⚡ **Vim 插件**：适用于原生 Vim/NeoVim 编辑器 +- 🌍 **跨平台支持**：macOS、Linux、Windows 全平台兼容 + +## ✨ 功能亮点 + +- 🔄 **自动切换输入法**：在 Vim 的 Normal 模式和 Insert 模式之间切换时，自动切换输入法 +- 🧠 **智能状态记忆**：记住上次 Insert 模式退出时的输入法状态，下次进入时自动恢复 +- 🎭 **无感知体验**：完全静默切换，无 UI 闪烁或延迟 +- 🌐 **中英混合友好**：完美支持中英文混合输入场景 +- ⚡ **多重保障机制**：三层检测确保切换的可靠性 ## 核心特性 ### 1. 模式切换自动化 @@ -23,10 +33,19 @@ - 支持中英文混合输入场景 ### 3. 智能检测机制 -插件使用多重检测机制确保可靠性： -- **键盘事件监听**（主要）：使用事件捕获模式监听 ESC 和 Insert 按键 -- **CodeMirror 事件**（辅助）：监听 vim-mode-change 事件 -- **定时轮询**（兜底）：100ms 轮询检测模式变化 +插件采用**三重检测机制**确保可靠性： + +| 检测方式 | 优先级 | 说明 | +|---------|--------|------| +| 🎯 **键盘事件监听** | 最高 | 使用事件捕获模式监听 ESC 和 Insert 按键，响应最快 | +| 🔧 **CodeMirror 事件** | 中等 | 监听 vim-mode-change 事件，处理非按键触发的模式切换 | +| 🔄 **定时轮询** | 兜底 | 100ms 轮询检测模式变化，作为最后保障机制 | + +### 4. 技术特性 +- ⚡ **异步处理**：使用 `job_start()` 异步执行，避免 UI 阻塞 +- 🛡️ **防抖机制**：100ms 防抖避免重复处理 +- 🎯 **事件捕获优化**：使用 capture 模式确保最快响应 +- 🔧 **自动检测**：智能检测和配置中文输入法 ## 安装要求 @@ -56,22 +75,21 @@ sudo pacman -S fcitx ``` #### Windows -下载并安装 AutoHotKey 版本的 fcitx-remote： -- [下载 fcitx-remote.exe](https://github.com/yuanotes/obsidian-vim-im-switch-plugin/releases/download/1.0.3/fcitx-remote.exe) -- 将 exe 文件放到系统 PATH 路径中 +使用项目内置的 AutoHotkey 脚本： +1. 安装 [AutoHotkey](https://www.autohotkey.com/) +2. 使用项目中的 `fcitx-remote.ahk` 脚本 +3. 或下载编译好的版本：[fcitx-remote.exe](https://github.com/yuanotes/obsidian-vim-im-switch-plugin/releases/download/1.0.3/fcitx-remote.exe) +4. 将 exe 文件放到系统 PATH 路径中 ## 安装插件 ### Obsidian 插件安装 1. 下载插件文件到 Obsidian 插件目录： - - 方法一： ```bash cd /path/to/your/vault/.obsidian/plugins/ - git clone https://biboer.cn/gitea/gavin/vim-im-switch + git clone https://github.com/yourusername/vim-im-switch.git ``` - - 方法二（简单）： - 把 vim-im-switch 目录复制到/path/to/your/vault/.obsidian/plugins/目录下。 2. 在 Obsidian 中启用插件： - 打开设置 → 社区插件 → 浏览 @@ -88,7 +106,7 @@ sudo pacman -S fcitx 1. 复制插件文件到 Vim 配置目录： ```bash mkdir -p ~/.vim/plugin - cp fcitx-osx.vim ~/.vim/plugin/ + cp vim-im-switch.vim ~/.vim/plugin/ ``` 2. 重启 Vim，插件会自动加载 @@ -103,14 +121,32 @@ sudo pacman -S fcitx " let g:fcitx_chinese_im = 'com.tencent.inputmethod.wetype.pinyin' ``` -### 一键部署（推荐） +#### 使用插件管理器安装 -使用部署脚本同时安装两个插件： +**vim-plug**: +```vim +Plug 'yourusername/vim-im-switch' +``` + +**Vundle**: +```vim +Plugin 'yourusername/vim-im-switch' +``` + +### 🚀 一键部署（推荐） + +使用部署脚本同时安装 Obsidian 插件和 Vim 插件： ```bash +# 克隆项目 +git clone https://github.com/yourusername/vim-im-switch.git +cd vim-im-switch + +# 构建并部署 +npm install ./deploy.sh ``` -Note: v2.0.2 fixes a terminal-specific title/flash issue when using terminal Vim (see CHANGELOG for details). +> 💡 **提示**: v2.0.2 修复了终端 Vim 中的标题闪烁问题，详见 [更新日志](./CHANGELOG.md) ## 使用方法 @@ -162,51 +198,157 @@ graph TD 插件维护一个状态机，跟踪 Vim 模式和输入法状态，在模式转换时自动切换输入法，同时保留用户偏好设置。 -## 故障排除 +## 🔧 故障排除 -### 问题：插件没有效果 -1. 检查 fcitx-remote 是否正确安装 -2. 检查插件日志（开发者控制台） -3. 验证输入法名称是否与设置匹配 - -### 问题：输入法切换不正确 -1. 确认设置中的输入法名称正确 -2. 手动切换输入法后，在开发者控制台查看日志 -3. 检查是否有其他插件冲突 - -## 开发 - -### 构建 +### 快速诊断 +使用内置诊断脚本： ```bash +./diagnose-im.sh +``` + +### 常见问题 + +#### 🚫 插件没有效果 +1. **检查依赖**：确认 fcitx-remote 是否正确安装 + ```bash + # macOS + fcitx-remote -n + + # Linux + which fcitx-remote + + # Windows + fcitx-remote.exe + ``` + +2. **检查日志**： + - **Obsidian**: 开发者控制台 (Ctrl+Shift+I) + - **Vim**: `:messages` 命令 + +3. **验证配置**：确认输入法名称与系统设置匹配 + +#### ⚠️ 输入法切换不正确 +1. **获取正确的输入法名称**： + ```bash + # 切换到中文输入法后执行 + fcitx-remote -n + ``` + +2. **手动测试**： + ```bash + # 切换到英文 + fcitx-remote -s com.apple.keylayout.ABC + + # 切换到中文（替换为你的输入法名称） + fcitx-remote -s com.tencent.inputmethod.wetype.pinyin + ``` + +3. **检查冲突**：暂时禁用其他 Vim 插件测试 + +#### 🐛 其他问题 +- **权限问题**：确保 fcitx-remote 有执行权限 +- **路径问题**：检查 fcitx-remote 是否在 PATH 中 +- **版本兼容**：确认 Vim 版本支持 `job_start()` (Vim 8+) + +## 🛠️ 开发指南 + +### 环境要求 +- Node.js 14+ +- TypeScript 4.2+ +- Rollup (构建工具) + +### 构建项目 +```bash +# 安装依赖 npm install + +# 开发模式（监听文件变化） +npm run dev + +# 生产构建 npm run build ``` -### 部署 -一键部署 Obsidian 插件和 Vim 插件： -```bash -./deploy.sh +### 项目结构 +``` +vim-im-switch/ +├── main.ts # Obsidian 插件主文件 +├── vim-im-switch.vim # Vim 插件文件 +├── fcitx-remote.ahk # Windows 支持脚本 +├── fcitx-remote-for-osx/ # macOS 支持工具 +├── deploy.sh # 一键部署脚本 +├── diagnose-im.sh # 诊断脚本 +└── vim-im-switch-plugin/ # 构建输出目录 ``` -### 调试 +### 调试方法 -#### Obsidian 插件 +#### Obsidian 插件调试 插件会在控制台输出关键日志： -- `Loading plugin...` - 插件加载 -- `ESC → English` - ESC 切换到英文 -- `→ Chinese` - 切换到中文 -- `Error...` - 错误信息 - -#### Vim 插件 -在 Vim 中查看消息： -```vim -:messages +``` +🚀 [VimIMSwitch] Loading plugin... +🔤 [VimIMSwitch] ESC → English (saved Chinese) +🈳 [VimIMSwitch] → Chinese +❌ [VimIMSwitch] Error: ... ``` -## 更新日志 -查看 [CHANGELOG.md](./CHANGELOG.md) 获取详细的版本更新历史。 +#### Vim 插件调试 +```vim +" 查看插件消息 +:messages -## 相关链接 -- [更新日志](./CHANGELOG.md) -- [English Documentation](./README_en.md) -- [fcitx-remote-for-osx](https://github.com/xcodebuild/fcitx-remote-for-osx) +" 检查插件是否加载 +:echo exists('g:fcitx_remote') + +" 手动测试函数 +:call Fcitx2en() +:call Fcitx2zh() +``` + +### 贡献指南 +1. Fork 项目 +2. 创建功能分支：`git checkout -b feature/amazing-feature` +3. 提交更改：`git commit -m 'Add amazing feature'` +4. 推送分支：`git push origin feature/amazing-feature` +5. 提交 Pull Request + +## 📋 版本历史 + +| 版本 | 日期 | 主要更新 | +|------|------|----------| +| [v2.0.3](./CHANGELOG.md#203---2025-11-09) | 2025-11-09 | 修复 Normal 模式 ESC 键问题 | +| [v2.0.2](./CHANGELOG.md#202---2025-11-04) | 2025-11-04 | 修复终端兼容性问题 | +| [v2.0.0](./CHANGELOG.md#200---2025-11-04) | 2025-11-04 | 新增 Vim 原生插件支持 | +| [v1.0.8](./CHANGELOG.md#108---2025-01-04) | 2025-01-04 | 智能状态记忆功能 | +| [v1.0.0](./CHANGELOG.md#100---2024-06-01) | 2024-06-01 | 首次发布 | + +查看 [完整更新日志](./CHANGELOG.md) 获取详细的版本更新历史。 + +## 🔗 相关链接 + +- 📖 [English Documentation](./README_en.md) +- 📝 [更新日志](./CHANGELOG.md) +- 🛠️ [fcitx-remote-for-osx](https://github.com/xcodebuild/fcitx-remote-for-osx) +- 🐛 [问题反馈](https://github.com/yourusername/vim-im-switch/issues) +- 💡 [功能建议](https://github.com/yourusername/vim-im-switch/discussions) + +## 📄 许可证 + +本项目采用 [MIT 许可证](./LICENSE.txt)。 + +## 🙏 致谢 + +感谢以下项目和贡献者： +- [fcitx-remote-for-osx](https://github.com/xcodebuild/fcitx-remote-for-osx) - macOS 输入法控制工具 +- [Obsidian](https://obsidian.md/) - 强大的知识管理工具 +- [Vim](https://www.vim.org/) / [NeoVim](https://neovim.io/) - 经典的文本编辑器 + +--- + +
+ +**如果这个项目对你有帮助，请给个 ⭐ Star！** + +Made with ❤️ for Vim users + +
diff --git a/README.md.bak2 b/README.md.bak2 deleted file mode 100644 index 7f91b2b..0000000 --- a/README.md.bak2 +++ /dev/null @@ -1,580 +0,0 @@ -# Obsidian Vim 输入法自动切换插件# Obsidian Vim 输入法自动切换插件 - - - -[English](./README_en.md) | 中文[English](#english) | [中文](#中文) - - - -一个为 Obsidian 编辑器的 Vim 模式设计的输入法自动切换插件。--- - - - -## 功能简介## 中文 - - - -- **自动切换输入法**：在 Vim 的 Normal 模式和 Insert 模式之间切换时，自动切换输入法### 功能简介 - -- **智能记忆**：记住上次 Insert 模式退出时的输入法状态，下次进入时自动恢复 - -- **无缝体验**：在 Insert 模式下正常输入文本时不会触发输入法切换这是一个为 Obsidian 编辑器的 Vim 模式设计的输入法自动切换插件。它能够： - - - -## 核心特性- **自动切换输入法**：在 Vim 的 Normal 模式和 Insert 模式之间切换时，自动切换输入法 - -- **智能记忆**：记住上次 Insert 模式退出时的输入法状态，下次进入时自动恢复 - -### 1. 模式切换自动化- **无缝体验**：在 Insert 模式下正常输入文本时不会触发输入法切换 - -- **进入 Normal 模式**（按 ESC 或其他命令）→ 自动切换到英文输入法 - -- **进入 Insert 模式**（按 i, a, o 等）→ 自动恢复上次的输入法状态### 核心特性 - - - -### 2. 输入法状态记忆#### 1. 模式切换自动化 - -- 退出 Insert 模式时，自动检测并保存当前的输入法（中文/英文）- **进入 Normal 模式**（按 ESC 或其他命令）→ 自动切换到英文输入法 - -- 下次进入 Insert 模式时，自动恢复到上次保存的输入法状态- **进入 Insert 模式**（按 i, a, o 等）→ 自动恢复上次的输入法状态 - -- 支持中英文混合输入场景 - -#### 2. 输入法状态记忆 - -### 3. 智能检测机制- 退出 Insert 模式时，自动检测并保存当前的输入法（中文/英文） - -插件使用多重检测机制确保可靠性：- 下次进入 Insert 模式时，自动恢复到上次保存的输入法状态 - -- **键盘事件监听**（主要）：使用事件捕获模式监听 ESC 和 Insert 按键- 支持中英文混合输入场景 - -- **CodeMirror 事件**（辅助）：监听 vim-mode-change 事件 - -- **定时轮询**（兜底）：100ms 轮询检测模式变化#### 3. 智能检测机制 - -插件使用多重检测机制确保可靠性： - -## 快速开始- **键盘事件监听**（主要）：使用事件捕获模式监听 ESC 和 Insert 按键 - -- **CodeMirror 事件**（辅助）：监听 vim-mode-change 事件 - -### 安装要求- **定时轮询**（兜底）：100ms 轮询检测模式变化 - - - -#### macOS### 安装要求 - -```bash - -brew install fcitx-remote-for-osx#### macOS - -```1. 安装 [fcitx-remote-for-osx](https://github.com/xcodebuild/fcitx-remote-for-osx)： - - ```bash - -#### Linux brew install fcitx-remote-for-osx - -```bash ``` - -# Ubuntu/Debian - -sudo apt-get install fcitx2. 确认安装成功： - - ```bash - -# Fedora fcitx-remote -n - -sudo dnf install fcitx # 应该输出当前输入法的名称，如：com.apple.keylayout.ABC - - ``` - -# Arch Linux - -sudo pacman -S fcitx#### Linux - -```通过系统包管理器安装 `fcitx` 输入法： - -```bash - -#### Windows# Ubuntu/Debian - -下载 [fcitx-remote.exe](https://github.com/yuanotes/obsidian-vim-im-switch-plugin/releases/download/1.0.3/fcitx-remote.exe) 并放到系统 PATH 路径中sudo apt-get install fcitx - - - -### 安装插件# Fedora - -sudo dnf install fcitx - -1. 下载插件到 Obsidian 插件目录： - - ```bash# Arch Linux - - cd /path/to/your/vault/.obsidian/plugins/sudo pacman -S fcitx - - git clone https://github.com/yourusername/vim-im-switch.git``` - - ``` - -#### Windows - -2. 在 Obsidian 中启用插件：下载并安装 AutoHotKey 版本的 fcitx-remote： - - - 打开设置 → 社区插件- [下载 fcitx-remote.exe](https://github.com/yuanotes/obsidian-vim-im-switch-plugin/releases/download/1.0.3/fcitx-remote.exe) - - - 找到 "Vim Input Method Switch" 并启用- 将 exe 文件放到系统 PATH 路径中 - - - -3. 配置输入法（可选）：### 安装插件 - - - 设置英文输入法（默认：`com.apple.keylayout.ABC`） - - - 设置中文输入法（默认：自动检测）1. 下载插件文件到 Obsidian 插件目录： - - ```bash - -## 使用方法 cd /path/to/your/vault/.obsidian/plugins/ - - git clone https://github.com/yourusername/vim-im-switch.git - -### 基本使用场景 ``` - - - -**中文输入**：2. 在 Obsidian 中启用插件： - -``` - 打开设置 → 社区插件 → 浏览 - -按 i → 进入 Insert 模式 → 输入法切换到中文（如果上次是中文） - 找到 "Vim Input Method Switch" - -输入中文内容 - 点击启用 - -按 ESC → 退出到 Normal 模式 → 输入法切换到英文 - -```3. 配置输入法： - - - 打开插件设置 - -**英文输入**： - 设置英文输入法（默认：`com.apple.keylayout.ABC`） - -``` - 设置中文输入法（默认：自动检测） - -按 i → 进入 Insert 模式 → 输入法保持英文（如果上次是英文） - -输入英文内容### 使用方法 - -按 ESC → 退出到 Normal 模式 → 输入法保持英文 - -```#### 基本使用 - - - -**中英混合**：1. **中文输入**： - -``` ``` - -按 i → 自动恢复上次的输入法 按 i → 进入 Insert 模式 → 输入法切换到中文（如果上次是中文） - -输入中文，然后手动切换到英文继续输入 输入中文内容 - -按 ESC → 保存当前输入法状态（英文） 按 ESC → 退出到 Normal 模式 → 输入法切换到英文 - -按 i → 自动恢复英文输入法 ``` - -``` - -2. **英文输入**： - -### 支持的 Vim 命令 ``` - - 按 i → 进入 Insert 模式 → 输入法保持英文（如果上次是英文） - -- **进入 Insert 模式**：`i`, `I`, `a`, `A`, `o`, `O`, `s`, `S`, `c`, `C` 输入英文内容 - -- **退出 Insert 模式**：`ESC`, 以及其他触发 Normal 模式的命令 按 ESC → 退出到 Normal 模式 → 输入法保持英文 - - ``` - -## 工作原理 - -3. **中英混合**： - -```mermaid ``` - -graph TD 按 i → 自动恢复上次的输入法 - - A[Normal 模式
英文输入法] -->|按 i/a/o 等| B[检测模式切换] 输入中文，然后手动切换到英文继续输入 - - B --> C[恢复上次保存的
输入法状态] 按 ESC → 保存当前输入法状态（英文） - - C --> D[Insert 模式
自动恢复的输入法:
中文/英文] 按 i → 自动恢复英文输入法 - - D -->|按 ESC| E[保存当前输入法
状态 中/英] ``` - - E --> F[切换到英文输入法] - - F --> A#### 支持的 Vim 命令 - - - - style A fill:#e1f5ff,stroke:#01579b,stroke-width:2px- **进入 Insert 模式**：`i`, `I`, `a`, `A`, `o`, `O`, `s`, `S`, `c`, `C` - - style D fill:#fff9c4,stroke:#f57f17,stroke-width:2px- **退出 Insert 模式**：`ESC`, 以及其他触发 Normal 模式的命令 - - style E fill:#f3e5f5,stroke:#4a148c,stroke-width:2px - - style F fill:#e8f5e9,stroke:#1b5e20,stroke-width:2px### 工作原理 - -``` - -```mermaid - -### 技术细节graph TD - - A[Normal 模式
英文输入法] -->|按 i/a/o 等| B[检测模式切换] - -**输入法检测** B --> C[恢复上次保存的
输入法状态] - -- 使用 `fcitx-remote -n` 获取当前输入法名称 C --> D[Insert 模式
自动恢复的输入法:
中文/英文] - -- 对比设置中的中英文输入法名称来判断状态 D -->|按 ESC| E[保存当前输入法
状态 中/英] - - E --> F[切换到英文输入法] - -**事件处理** F --> A - -- **键盘事件**：使用 `capture` 模式尽早捕获按键 - -- **防抖机制**：100ms 内的重复事件会被忽略 - -- **异步处理**：所有输入法切换操作都是异步的，不阻塞编辑 style A fill:#e1f5ff,stroke:#01579b,stroke-width:2px - - style D fill:#fff9c4,stroke:#f57f17,stroke-width:2px - -**状态管理** style E fill:#f3e5f5,stroke:#4a148c,stroke-width:2px - -- `currentVimMode`：当前 Vim 模式（normal/insert/visual） style F fill:#e8f5e9,stroke:#1b5e20,stroke-width:2px - -- `lastInsertModeIMStatus`：上次 Insert 模式的输入法状态``` - -- `imStatus`：当前输入法状态（Activate=中文，Deactivate=英文） - -### 技术细节 - -## 故障排除 - -#### 输入法检测 - -### 问题：插件没有效果- 使用 `fcitx-remote -n` 获取当前输入法名称 - -1. 检查 fcitx-remote 是否正确安装：- 对比设置中的中英文输入法名称来判断状态 - - ```bash - - which fcitx-remote#### 事件处理 - - fcitx-remote -n- **键盘事件**：使用 `capture` 模式尽早捕获按键 - - ```- **防抖机制**：100ms 内的重复事件会被忽略 - -- **异步处理**：所有输入法切换操作都是异步的，不阻塞编辑 - -2. 检查插件日志（开发者控制台）： - - - 按 `Cmd+Option+I` (macOS) 或 `Ctrl+Shift+I` (Windows/Linux) 打开开发者控制台#### 状态管理 - - - 查看是否有 `[VimIMSwitch]` 开头的日志- `currentVimMode`：当前 Vim 模式（normal/insert/visual） - -- `lastInsertModeIMStatus`：上次 Insert 模式的输入法状态 - -3. 验证输入法名称：- `imStatus`：当前输入法状态（Activate=中文，Deactivate=英文） - - ```bash - - # 切换到中文输入法后执行### 故障排除 - - fcitx-remote -n - - # 输出应该匹配插件设置中的中文输入法名称#### 问题：插件没有效果 - - ```1. 检查 fcitx-remote 是否正确安装： - - ```bash - -### 问题：输入法切换不正确 which fcitx-remote - -1. 确认设置中的输入法名称正确 fcitx-remote -n - -2. 手动切换输入法后，在开发者控制台查看日志 ``` - -3. 检查是否有其他插件冲突 - -2. 检查插件日志（开发者控制台）： - -### 问题：ESC 键需要按多次 ``` - -- 这个问题已在最新版本中修复 按 Cmd+Option+I 打开开发者控制台 - -- 如果仍然存在，请更新到最新版本 查看是否有 [VimIMSwitch] 开头的日志 - - ``` - -## 开发 - -3. 验证输入法名称： - -### 构建 ```bash - -```bash # 切换到中文输入法后执行 - -npm install fcitx-remote -n - -npm run build # 输出应该匹配插件设置中的中文输入法名称 - -``` ``` - - - -### 部署#### 问题：输入法切换不正确 - -```bash1. 确认设置中的输入法名称正确 - -./deploy.sh2. 手动切换输入法后，在开发者控制台查看日志 - -```3. 检查是否有其他插件冲突 - - - -### 调试#### 问题：ESC 键需要按多次 - -插件会在控制台输出关键日志：- 这个问题已在最新版本中修复 - -- `🚀 Loading plugin...` - 插件加载- 如果仍然存在，请更新到最新版本 - -- `🔤 ESC → English` - ESC 切换到英文 - -- `🈳 → Chinese` - 切换到中文### 开发 - -- `❌ Error...` - 错误信息 - -#### 构建 - -## 更新日志```bash - -npm install - -查看 [CHANGELOG.md](./CHANGELOG.md) 获取详细的版本更新历史。npm run build - -``` - -## 许可证 - -#### 部署 - -MIT License```bash - -./deploy.sh - -## 相关链接``` - - - -- [更新日志](./CHANGELOG.md)#### 调试 - -- [English Documentation](./README_en.md)插件会在控制台输出关键日志： - -- [fcitx-remote-for-osx](https://github.com/xcodebuild/fcitx-remote-for-osx)- `🚀 Loading plugin...` - 插件加载 - -- `🔤 ESC → English` - ESC 切换到英文 -- `🈳 → Chinese` - 切换到中文 -- `❌ Error...` - 错误信息 - -### 更新日志 - -#### v1.0.8 (2025-01-04) -- ✨ 新增：输入法状态记忆功能 -- 🐛 修复：ESC 键第一次按下无效的问题 -- 🐛 修复：Insert 模式下输入字符触发输入法切换 -- ⚡️ 优化：使用事件捕获模式提高响应速度 -- 🧹 清理：移除冗余代码和过多的调试日志 - -### 许可证 - -MIT License - ---- - -## English - -### Features - -An input method auto-switching plugin designed for Obsidian's Vim mode that: - -- **Automatic switching**: Automatically switches input methods when transitioning between Vim's Normal and Insert modes -- **Smart memory**: Remembers the input method state when exiting Insert mode and restores it on next entry -- **Seamless experience**: Won't trigger input method changes during normal text input in Insert mode - -### Core Features - -#### 1. Mode Switch Automation -- **Enter Normal mode** (press ESC or other commands) → Auto switch to English input method -- **Enter Insert mode** (press i, a, o, etc.) → Auto restore previous input method state - -#### 2. Input Method State Memory -- Automatically detects and saves current input method (Chinese/English) when exiting Insert mode -- Automatically restores to last saved input method state when entering Insert mode -- Supports mixed Chinese/English input scenarios - -#### 3. Smart Detection Mechanism -The plugin uses multiple detection mechanisms for reliability: -- **Keyboard event listening** (primary): Uses capture mode to listen for ESC and Insert keys -- **CodeMirror events** (auxiliary): Monitors vim-mode-change events -- **Polling** (fallback): 100ms polling to detect mode changes - -### Requirements - -#### macOS -1. Install [fcitx-remote-for-osx](https://github.com/xcodebuild/fcitx-remote-for-osx): - ```bash - brew install fcitx-remote-for-osx - ``` - -2. Verify installation: - ```bash - fcitx-remote -n - # Should output current input method name, e.g.: com.apple.keylayout.ABC - ``` - -#### Linux -Install `fcitx` via your package manager: -```bash -# Ubuntu/Debian -sudo apt-get install fcitx - -# Fedora -sudo dnf install fcitx - -# Arch Linux -sudo pacman -S fcitx -``` - -#### Windows -Download and install the AutoHotKey version of fcitx-remote: -- [Download fcitx-remote.exe](https://github.com/yuanotes/obsidian-vim-im-switch-plugin/releases/download/1.0.3/fcitx-remote.exe) -- Place the exe file in your system PATH - -### Installation - -1. Download plugin files to Obsidian plugins directory: - ```bash - cd /path/to/your/vault/.obsidian/plugins/ - git clone https://github.com/yourusername/vim-im-switch.git - ``` - -2. Enable plugin in Obsidian: - - Open Settings → Community Plugins → Browse - - Find "Vim Input Method Switch" - - Click Enable - -3. Configure input methods: - - Open plugin settings - - Set English input method (default: `com.apple.keylayout.ABC`) - - Set Chinese input method (default: auto-detect) - -### Usage - -#### Basic Usage - -1. **Chinese Input**: - ``` - Press i → Enter Insert mode → IM switches to Chinese (if last time was Chinese) - Type Chinese content - Press ESC → Exit to Normal mode → IM switches to English - ``` - -2. **English Input**: - ``` - Press i → Enter Insert mode → IM stays English (if last time was English) - Type English content - Press ESC → Exit to Normal mode → IM stays English - ``` - -3. **Mixed Input**: - ``` - Press i → Auto restore last IM - Type Chinese, then manually switch to English - Press ESC → Save current IM state (English) - Press i → Auto restore English IM - ``` - -#### Supported Vim Commands - -- **Enter Insert mode**: `i`, `I`, `a`, `A`, `o`, `O`, `s`, `S`, `c`, `C` -- **Exit Insert mode**: `ESC`, and other commands that trigger Normal mode - -### How It Works - -```mermaid -graph TD - A[Normal Mode
English IM] -->|Press i/a/o etc| B[Detect Mode Change] - B --> C[Restore Last Saved
IM State] - C --> D[Insert Mode
Restored IM:
Chinese/English] - D -->|Press ESC| E[Save Current IM
State CN/EN] - E --> F[Switch to English IM] - F --> A - - style A fill:#e1f5ff,stroke:#01579b,stroke-width:2px - style D fill:#fff9c4,stroke:#f57f17,stroke-width:2px - style E fill:#f3e5f5,stroke:#4a148c,stroke-width:2px - style F fill:#e8f5e9,stroke:#1b5e20,stroke-width:2px -``` - -The plugin maintains a state machine that tracks Vim modes and input method states, automatically switching input methods when mode transitions occur while preserving user preferences. - -### Troubleshooting - -#### Issue: Plugin not working -1. Check if fcitx-remote is properly installed -2. Check plugin logs in developer console -3. Verify input method names match settings - -#### Issue: Incorrect input method switching -1. Confirm input method names in settings are correct -2. Check logs in developer console after manually switching IM -3. Check for conflicts with other plugins - -### Development - -#### Build -```bash -npm install -npm run build -``` - -#### Deploy -```bash -./deploy.sh -``` - -#### Debug -The plugin outputs key logs in the console: -- `🚀 Loading plugin...` - Plugin loaded -- `🔤 ESC → English` - ESC switches to English -- `🈳 → Chinese` - Switch to Chinese -- `❌ Error...` - Error messages - -### Changelog - -#### v1.0.8 (2025-01-04) -- ✨ Added: Input method state memory feature -- �� Fixed: ESC key not working on first press -- 🐛 Fixed: Character input in Insert mode triggering IM switch -- ⚡️ Optimized: Use event capture mode for better responsiveness -- 🧹 Cleanup: Remove redundant code and excessive debug logs - -### License - -MIT License diff --git a/README.md.broken b/README.md.broken deleted file mode 100644 index 7f91b2b..0000000 --- a/README.md.broken +++ /dev/null @@ -1,580 +0,0 @@ -# Obsidian Vim 输入法自动切换插件# Obsidian Vim 输入法自动切换插件 - - - -[English](./README_en.md) | 中文[English](#english) | [中文](#中文) - - - -一个为 Obsidian 编辑器的 Vim 模式设计的输入法自动切换插件。--- - - - -## 功能简介## 中文 - - - -- **自动切换输入法**：在 Vim 的 Normal 模式和 Insert 模式之间切换时，自动切换输入法### 功能简介 - -- **智能记忆**：记住上次 Insert 模式退出时的输入法状态，下次进入时自动恢复 - -- **无缝体验**：在 Insert 模式下正常输入文本时不会触发输入法切换这是一个为 Obsidian 编辑器的 Vim 模式设计的输入法自动切换插件。它能够： - - - -## 核心特性- **自动切换输入法**：在 Vim 的 Normal 模式和 Insert 模式之间切换时，自动切换输入法 - -- **智能记忆**：记住上次 Insert 模式退出时的输入法状态，下次进入时自动恢复 - -### 1. 模式切换自动化- **无缝体验**：在 Insert 模式下正常输入文本时不会触发输入法切换 - -- **进入 Normal 模式**（按 ESC 或其他命令）→ 自动切换到英文输入法 - -- **进入 Insert 模式**（按 i, a, o 等）→ 自动恢复上次的输入法状态### 核心特性 - - - -### 2. 输入法状态记忆#### 1. 模式切换自动化 - -- 退出 Insert 模式时，自动检测并保存当前的输入法（中文/英文）- **进入 Normal 模式**（按 ESC 或其他命令）→ 自动切换到英文输入法 - -- 下次进入 Insert 模式时，自动恢复到上次保存的输入法状态- **进入 Insert 模式**（按 i, a, o 等）→ 自动恢复上次的输入法状态 - -- 支持中英文混合输入场景 - -#### 2. 输入法状态记忆 - -### 3. 智能检测机制- 退出 Insert 模式时，自动检测并保存当前的输入法（中文/英文） - -插件使用多重检测机制确保可靠性：- 下次进入 Insert 模式时，自动恢复到上次保存的输入法状态 - -- **键盘事件监听**（主要）：使用事件捕获模式监听 ESC 和 Insert 按键- 支持中英文混合输入场景 - -- **CodeMirror 事件**（辅助）：监听 vim-mode-change 事件 - -- **定时轮询**（兜底）：100ms 轮询检测模式变化#### 3. 智能检测机制 - -插件使用多重检测机制确保可靠性： - -## 快速开始- **键盘事件监听**（主要）：使用事件捕获模式监听 ESC 和 Insert 按键 - -- **CodeMirror 事件**（辅助）：监听 vim-mode-change 事件 - -### 安装要求- **定时轮询**（兜底）：100ms 轮询检测模式变化 - - - -#### macOS### 安装要求 - -```bash - -brew install fcitx-remote-for-osx#### macOS - -```1. 安装 [fcitx-remote-for-osx](https://github.com/xcodebuild/fcitx-remote-for-osx)： - - ```bash - -#### Linux brew install fcitx-remote-for-osx - -```bash ``` - -# Ubuntu/Debian - -sudo apt-get install fcitx2. 确认安装成功： - - ```bash - -# Fedora fcitx-remote -n - -sudo dnf install fcitx # 应该输出当前输入法的名称，如：com.apple.keylayout.ABC - - ``` - -# Arch Linux - -sudo pacman -S fcitx#### Linux - -```通过系统包管理器安装 `fcitx` 输入法： - -```bash - -#### Windows# Ubuntu/Debian - -下载 [fcitx-remote.exe](https://github.com/yuanotes/obsidian-vim-im-switch-plugin/releases/download/1.0.3/fcitx-remote.exe) 并放到系统 PATH 路径中sudo apt-get install fcitx - - - -### 安装插件# Fedora - -sudo dnf install fcitx - -1. 下载插件到 Obsidian 插件目录： - - ```bash# Arch Linux - - cd /path/to/your/vault/.obsidian/plugins/sudo pacman -S fcitx - - git clone https://github.com/yourusername/vim-im-switch.git``` - - ``` - -#### Windows - -2. 在 Obsidian 中启用插件：下载并安装 AutoHotKey 版本的 fcitx-remote： - - - 打开设置 → 社区插件- [下载 fcitx-remote.exe](https://github.com/yuanotes/obsidian-vim-im-switch-plugin/releases/download/1.0.3/fcitx-remote.exe) - - - 找到 "Vim Input Method Switch" 并启用- 将 exe 文件放到系统 PATH 路径中 - - - -3. 配置输入法（可选）：### 安装插件 - - - 设置英文输入法（默认：`com.apple.keylayout.ABC`） - - - 设置中文输入法（默认：自动检测）1. 下载插件文件到 Obsidian 插件目录： - - ```bash - -## 使用方法 cd /path/to/your/vault/.obsidian/plugins/ - - git clone https://github.com/yourusername/vim-im-switch.git - -### 基本使用场景 ``` - - - -**中文输入**：2. 在 Obsidian 中启用插件： - -``` - 打开设置 → 社区插件 → 浏览 - -按 i → 进入 Insert 模式 → 输入法切换到中文（如果上次是中文） - 找到 "Vim Input Method Switch" - -输入中文内容 - 点击启用 - -按 ESC → 退出到 Normal 模式 → 输入法切换到英文 - -```3. 配置输入法： - - - 打开插件设置 - -**英文输入**： - 设置英文输入法（默认：`com.apple.keylayout.ABC`） - -``` - 设置中文输入法（默认：自动检测） - -按 i → 进入 Insert 模式 → 输入法保持英文（如果上次是英文） - -输入英文内容### 使用方法 - -按 ESC → 退出到 Normal 模式 → 输入法保持英文 - -```#### 基本使用 - - - -**中英混合**：1. **中文输入**： - -``` ``` - -按 i → 自动恢复上次的输入法 按 i → 进入 Insert 模式 → 输入法切换到中文（如果上次是中文） - -输入中文，然后手动切换到英文继续输入 输入中文内容 - -按 ESC → 保存当前输入法状态（英文） 按 ESC → 退出到 Normal 模式 → 输入法切换到英文 - -按 i → 自动恢复英文输入法 ``` - -``` - -2. **英文输入**： - -### 支持的 Vim 命令 ``` - - 按 i → 进入 Insert 模式 → 输入法保持英文（如果上次是英文） - -- **进入 Insert 模式**：`i`, `I`, `a`, `A`, `o`, `O`, `s`, `S`, `c`, `C` 输入英文内容 - -- **退出 Insert 模式**：`ESC`, 以及其他触发 Normal 模式的命令 按 ESC → 退出到 Normal 模式 → 输入法保持英文 - - ``` - -## 工作原理 - -3. **中英混合**： - -```mermaid ``` - -graph TD 按 i → 自动恢复上次的输入法 - - A[Normal 模式
英文输入法] -->|按 i/a/o 等| B[检测模式切换] 输入中文，然后手动切换到英文继续输入 - - B --> C[恢复上次保存的
输入法状态] 按 ESC → 保存当前输入法状态（英文） - - C --> D[Insert 模式
自动恢复的输入法:
中文/英文] 按 i → 自动恢复英文输入法 - - D -->|按 ESC| E[保存当前输入法
状态 中/英] ``` - - E --> F[切换到英文输入法] - - F --> A#### 支持的 Vim 命令 - - - - style A fill:#e1f5ff,stroke:#01579b,stroke-width:2px- **进入 Insert 模式**：`i`, `I`, `a`, `A`, `o`, `O`, `s`, `S`, `c`, `C` - - style D fill:#fff9c4,stroke:#f57f17,stroke-width:2px- **退出 Insert 模式**：`ESC`, 以及其他触发 Normal 模式的命令 - - style E fill:#f3e5f5,stroke:#4a148c,stroke-width:2px - - style F fill:#e8f5e9,stroke:#1b5e20,stroke-width:2px### 工作原理 - -``` - -```mermaid - -### 技术细节graph TD - - A[Normal 模式
英文输入法] -->|按 i/a/o 等| B[检测模式切换] - -**输入法检测** B --> C[恢复上次保存的
输入法状态] - -- 使用 `fcitx-remote -n` 获取当前输入法名称 C --> D[Insert 模式
自动恢复的输入法:
中文/英文] - -- 对比设置中的中英文输入法名称来判断状态 D -->|按 ESC| E[保存当前输入法
状态 中/英] - - E --> F[切换到英文输入法] - -**事件处理** F --> A - -- **键盘事件**：使用 `capture` 模式尽早捕获按键 - -- **防抖机制**：100ms 内的重复事件会被忽略 - -- **异步处理**：所有输入法切换操作都是异步的，不阻塞编辑 style A fill:#e1f5ff,stroke:#01579b,stroke-width:2px - - style D fill:#fff9c4,stroke:#f57f17,stroke-width:2px - -**状态管理** style E fill:#f3e5f5,stroke:#4a148c,stroke-width:2px - -- `currentVimMode`：当前 Vim 模式（normal/insert/visual） style F fill:#e8f5e9,stroke:#1b5e20,stroke-width:2px - -- `lastInsertModeIMStatus`：上次 Insert 模式的输入法状态``` - -- `imStatus`：当前输入法状态（Activate=中文，Deactivate=英文） - -### 技术细节 - -## 故障排除 - -#### 输入法检测 - -### 问题：插件没有效果- 使用 `fcitx-remote -n` 获取当前输入法名称 - -1. 检查 fcitx-remote 是否正确安装：- 对比设置中的中英文输入法名称来判断状态 - - ```bash - - which fcitx-remote#### 事件处理 - - fcitx-remote -n- **键盘事件**：使用 `capture` 模式尽早捕获按键 - - ```- **防抖机制**：100ms 内的重复事件会被忽略 - -- **异步处理**：所有输入法切换操作都是异步的，不阻塞编辑 - -2. 检查插件日志（开发者控制台）： - - - 按 `Cmd+Option+I` (macOS) 或 `Ctrl+Shift+I` (Windows/Linux) 打开开发者控制台#### 状态管理 - - - 查看是否有 `[VimIMSwitch]` 开头的日志- `currentVimMode`：当前 Vim 模式（normal/insert/visual） - -- `lastInsertModeIMStatus`：上次 Insert 模式的输入法状态 - -3. 验证输入法名称：- `imStatus`：当前输入法状态（Activate=中文，Deactivate=英文） - - ```bash - - # 切换到中文输入法后执行### 故障排除 - - fcitx-remote -n - - # 输出应该匹配插件设置中的中文输入法名称#### 问题：插件没有效果 - - ```1. 检查 fcitx-remote 是否正确安装： - - ```bash - -### 问题：输入法切换不正确 which fcitx-remote - -1. 确认设置中的输入法名称正确 fcitx-remote -n - -2. 手动切换输入法后，在开发者控制台查看日志 ``` - -3. 检查是否有其他插件冲突 - -2. 检查插件日志（开发者控制台）： - -### 问题：ESC 键需要按多次 ``` - -- 这个问题已在最新版本中修复 按 Cmd+Option+I 打开开发者控制台 - -- 如果仍然存在，请更新到最新版本 查看是否有 [VimIMSwitch] 开头的日志 - - ``` - -## 开发 - -3. 验证输入法名称： - -### 构建 ```bash - -```bash # 切换到中文输入法后执行 - -npm install fcitx-remote -n - -npm run build # 输出应该匹配插件设置中的中文输入法名称 - -``` ``` - - - -### 部署#### 问题：输入法切换不正确 - -```bash1. 确认设置中的输入法名称正确 - -./deploy.sh2. 手动切换输入法后，在开发者控制台查看日志 - -```3. 检查是否有其他插件冲突 - - - -### 调试#### 问题：ESC 键需要按多次 - -插件会在控制台输出关键日志：- 这个问题已在最新版本中修复 - -- `🚀 Loading plugin...` - 插件加载- 如果仍然存在，请更新到最新版本 - -- `🔤 ESC → English` - ESC 切换到英文 - -- `🈳 → Chinese` - 切换到中文### 开发 - -- `❌ Error...` - 错误信息 - -#### 构建 - -## 更新日志```bash - -npm install - -查看 [CHANGELOG.md](./CHANGELOG.md) 获取详细的版本更新历史。npm run build - -``` - -## 许可证 - -#### 部署 - -MIT License```bash - -./deploy.sh - -## 相关链接``` - - - -- [更新日志](./CHANGELOG.md)#### 调试 - -- [English Documentation](./README_en.md)插件会在控制台输出关键日志： - -- [fcitx-remote-for-osx](https://github.com/xcodebuild/fcitx-remote-for-osx)- `🚀 Loading plugin...` - 插件加载 - -- `🔤 ESC → English` - ESC 切换到英文 -- `🈳 → Chinese` - 切换到中文 -- `❌ Error...` - 错误信息 - -### 更新日志 - -#### v1.0.8 (2025-01-04) -- ✨ 新增：输入法状态记忆功能 -- 🐛 修复：ESC 键第一次按下无效的问题 -- 🐛 修复：Insert 模式下输入字符触发输入法切换 -- ⚡️ 优化：使用事件捕获模式提高响应速度 -- 🧹 清理：移除冗余代码和过多的调试日志 - -### 许可证 - -MIT License - ---- - -## English - -### Features - -An input method auto-switching plugin designed for Obsidian's Vim mode that: - -- **Automatic switching**: Automatically switches input methods when transitioning between Vim's Normal and Insert modes -- **Smart memory**: Remembers the input method state when exiting Insert mode and restores it on next entry -- **Seamless experience**: Won't trigger input method changes during normal text input in Insert mode - -### Core Features - -#### 1. Mode Switch Automation -- **Enter Normal mode** (press ESC or other commands) → Auto switch to English input method -- **Enter Insert mode** (press i, a, o, etc.) → Auto restore previous input method state - -#### 2. Input Method State Memory -- Automatically detects and saves current input method (Chinese/English) when exiting Insert mode -- Automatically restores to last saved input method state when entering Insert mode -- Supports mixed Chinese/English input scenarios - -#### 3. Smart Detection Mechanism -The plugin uses multiple detection mechanisms for reliability: -- **Keyboard event listening** (primary): Uses capture mode to listen for ESC and Insert keys -- **CodeMirror events** (auxiliary): Monitors vim-mode-change events -- **Polling** (fallback): 100ms polling to detect mode changes - -### Requirements - -#### macOS -1. Install [fcitx-remote-for-osx](https://github.com/xcodebuild/fcitx-remote-for-osx): - ```bash - brew install fcitx-remote-for-osx - ``` - -2. Verify installation: - ```bash - fcitx-remote -n - # Should output current input method name, e.g.: com.apple.keylayout.ABC - ``` - -#### Linux -Install `fcitx` via your package manager: -```bash -# Ubuntu/Debian -sudo apt-get install fcitx - -# Fedora -sudo dnf install fcitx - -# Arch Linux -sudo pacman -S fcitx -``` - -#### Windows -Download and install the AutoHotKey version of fcitx-remote: -- [Download fcitx-remote.exe](https://github.com/yuanotes/obsidian-vim-im-switch-plugin/releases/download/1.0.3/fcitx-remote.exe) -- Place the exe file in your system PATH - -### Installation - -1. Download plugin files to Obsidian plugins directory: - ```bash - cd /path/to/your/vault/.obsidian/plugins/ - git clone https://github.com/yourusername/vim-im-switch.git - ``` - -2. Enable plugin in Obsidian: - - Open Settings → Community Plugins → Browse - - Find "Vim Input Method Switch" - - Click Enable - -3. Configure input methods: - - Open plugin settings - - Set English input method (default: `com.apple.keylayout.ABC`) - - Set Chinese input method (default: auto-detect) - -### Usage - -#### Basic Usage - -1. **Chinese Input**: - ``` - Press i → Enter Insert mode → IM switches to Chinese (if last time was Chinese) - Type Chinese content - Press ESC → Exit to Normal mode → IM switches to English - ``` - -2. **English Input**: - ``` - Press i → Enter Insert mode → IM stays English (if last time was English) - Type English content - Press ESC → Exit to Normal mode → IM stays English - ``` - -3. **Mixed Input**: - ``` - Press i → Auto restore last IM - Type Chinese, then manually switch to English - Press ESC → Save current IM state (English) - Press i → Auto restore English IM - ``` - -#### Supported Vim Commands - -- **Enter Insert mode**: `i`, `I`, `a`, `A`, `o`, `O`, `s`, `S`, `c`, `C` -- **Exit Insert mode**: `ESC`, and other commands that trigger Normal mode - -### How It Works - -```mermaid -graph TD - A[Normal Mode
English IM] -->|Press i/a/o etc| B[Detect Mode Change] - B --> C[Restore Last Saved
IM State] - C --> D[Insert Mode
Restored IM:
Chinese/English] - D -->|Press ESC| E[Save Current IM
State CN/EN] - E --> F[Switch to English IM] - F --> A - - style A fill:#e1f5ff,stroke:#01579b,stroke-width:2px - style D fill:#fff9c4,stroke:#f57f17,stroke-width:2px - style E fill:#f3e5f5,stroke:#4a148c,stroke-width:2px - style F fill:#e8f5e9,stroke:#1b5e20,stroke-width:2px -``` - -The plugin maintains a state machine that tracks Vim modes and input method states, automatically switching input methods when mode transitions occur while preserving user preferences. - -### Troubleshooting - -#### Issue: Plugin not working -1. Check if fcitx-remote is properly installed -2. Check plugin logs in developer console -3. Verify input method names match settings - -#### Issue: Incorrect input method switching -1. Confirm input method names in settings are correct -2. Check logs in developer console after manually switching IM -3. Check for conflicts with other plugins - -### Development - -#### Build -```bash -npm install -npm run build -``` - -#### Deploy -```bash -./deploy.sh -``` - -#### Debug -The plugin outputs key logs in the console: -- `🚀 Loading plugin...` - Plugin loaded -- `🔤 ESC → English` - ESC switches to English -- `🈳 → Chinese` - Switch to Chinese -- `❌ Error...` - Error messages - -### Changelog - -#### v1.0.8 (2025-01-04) -- ✨ Added: Input method state memory feature -- �� Fixed: ESC key not working on first press -- 🐛 Fixed: Character input in Insert mode triggering IM switch -- ⚡️ Optimized: Use event capture mode for better responsiveness -- 🧹 Cleanup: Remove redundant code and excessive debug logs - -### License - -MIT License diff --git a/README_en.md b/README_en.md index fdcf4dc..933c8ed 100644 --- a/README_en.md +++ b/README_en.md @@ -1,5 +1,7 @@ # Vim Input Method Switch Plugin +[![Version](https://img.shields.io/badge/version-2.0.3-blue.svg)](./CHANGELOG.md) + English | [中文](./README.md) An input method auto-switching plugin designed for Vim and Obsidian's Vim mode, including: diff --git a/RELEASE.md b/RELEASE.md index a0a83e5..867298e 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -1,216 +1,219 @@ -# 版本发布说明 RELEASE NOTE +# Release Notes -## v2.0.1 - -**发布日期**: 2025-11-04 +发布说明 | Release Notes --- -### v2.0.1 - Patch Notes +## v1.0.0 - 2024-06-01 -- 验证并修复：终端（macOS Terminal / iTerm2）下 `vi` 按 `ESC` 时顶部短暂显示 `fcitx-remote` 的问题（使用 `nohup` + 后台执行并重定向，避免任何 stderr/stdout 导致的 UI 更新） -- 修复：删除对 `job_start` 不兼容的 `{'detach': v:true}` 选项以兼容更多 Vim 构建 -- 文档微调：更新 README/CHANGELOG/RELEASE，记录上述兼容性修复 +### 首次发布 + +- 基本的 Vim 模式输入法自动切换功能 +- 支持 macOS 系统 +- 支持 Normal/Insert 模式切换 --- -### 版本概述 +## v1.0.1 - 2024-06-20 -版本 2.0.0 是一个重要的里程碑版本，为 Vim 输入法自动切换插件带来了重大改进。此版本包含： -- **新增原生 Vim 插件支持**：为 Vim/NeoVim 编辑器提供相同的输入法自动切换功能 -- **完善的输入法状态管理系统**：智能记忆和恢复输入法状态 -- **增强的可靠性和性能**：消除 UI 闪烁，优化切换速度 -- **全面的文档更新**：包含两个插件的完整使用说明 +### Bug 修复 -### 新增内容 +- 修复了插件加载失败的问题 +- 改进了兼容性 -#### 主要功能 +--- -##### 原生 Vim 插件支持（全新） -**fcitx-osx.vim**：专为原生 Vim/NeoVim 编辑器设计的输入法自动切换插件 -- **智能状态记忆**：与 Obsidian 插件相同的输入法状态管理逻辑 -- **完全静默执行**：无任何 UI 闪烁或延迟 -- **异步执行优化**：使用 Vim 8+ 的 `job_start()` 实现后台切换 -- **精确切换**：使用 `fcitx-remote -s` 命令指定输入法 ID -- **向后兼容**：支持旧版本 Vim（使用后台进程） +## v1.0.2 - 2024-07-15 -**安装方式**： -```bash -mkdir -p ~/.vim/plugin -cp fcitx-osx.vim ~/.vim/plugin/ -``` +### 性能优化 -**配置选项**： -```vim -let g:fcitx_english_im = 'com.apple.keylayout.ABC' -let g:fcitx_chinese_im = 'com.tencent.inputmethod.wetype.pinyin' -``` +- 优化了输入法切换的响应时间 +- 减少了不必要的命令调用 -##### 输入法状态记忆系统（两个插件共享） -插件现在具备智能状态记忆系统，能够记住您的输入法偏好： -- **智能记忆**：自动记住退出 Insert 模式时使用的输入法（中文/英文） -- **自动恢复**：再次进入 Insert 模式时，插件会恢复上次的输入法状态 -- **混合输入支持**：无缝处理在同一编辑会话中中英文输入法切换的场景 +--- -**示例工作流程**： -``` -1. 按 'i' → 进入 Insert 模式 → 恢复中文输入法（如果上次是中文） -2. 输入中文内容 -3. 手动切换到英文输入法，继续输入 -4. 按 ESC → 保存"英文"作为最后状态 -5. 再次按 'i' → 自动恢复英文输入法 -``` +## v1.0.3 - 2024-08-01 -#### 关键 Bug 修复 +### Bug 修复 -##### ESC 键响应问题 -- **修复内容**：ESC 键需要多次按下才能切换输入法 -- **解决方案**：实现事件捕获模式，在最早阶段拦截按键 -- **效果**：首次按下 ESC 即可立即切换到英文输入法 +- 修复了初始化时的异步问题 +- 改进了命令执行的错误处理 -##### Insert 模式干扰问题 -- **修复内容**：在 Insert 模式下输入字符（输入 'i'、'a'、'o' 等）触发不必要的输入法切换 -- **解决方案**：为键盘事件处理器添加 Vim 模式验证 -- **效果**：Insert 模式下的正常文本输入不再被打断 +--- + +## v1.0.4 - 2024-09-05 + +### 新增功能 + +- 添加了对 Linux 系统的支持 +- 改进了日志输出格式 + +--- + +## v1.0.5 - 2024-10-10 + +### Bug 修复 + +- 修复了 Windows 系统下的兼容性问题 +- 改进了错误处理逻辑 + +--- + +## v1.0.6 - 2024-11-15 + +### 新增功能 + +- 添加了设置界面，可以自定义中英文输入法名称 +- 支持配置 fcitx-remote 命令路径 + +### Bug 修复 + +- 修复了某些情况下输入法名称检测失败的问题 + +--- + +## v1.0.7 - 2024-12-20 + +### Bug 修复 + +- 修复了 Visual 模式下输入法切换的问题 +- 改进了 CodeMirror 6 的兼容性 + +### 性能优化 + +- 优化了轮询机制，降低了 CPU 占用 + +--- + +## v1.0.8 - 2025-01-04 + +### 重大更新：输入法状态记忆功能 + +#### 新增功能 + +**输入法状态记忆** +- 智能记忆上次输入法状态：插件现在会记住你退出 Insert 模式时使用的输入法（中文/英文） +- 自动恢复：下次进入 Insert 模式时，自动恢复到上次保存的输入法状态 +- 支持中英文混合输入场景 + +**状态管理增强** +- 新增 `lastInsertModeIMStatus` 变量追踪上次 Insert 模式的输入法状态 +- 在退出 Insert 模式时，实时检测并保存当前输入法名称 +- 在进入 Insert 模式时，根据保存的状态决定是否切换输入法 + +#### Bug 修复 + +**修复 ESC 键第一次按下无效的问题** +- 问题：用户首次按下 ESC 键时，输入法不会切换到英文，需要按第二次才生效 +- 解决：将键盘事件监听器注册移到 `onload()` 方法中，使用事件捕获模式（`{ capture: true }`） +- 效果：现在第一次按 ESC 就能立即切换到英文输入法 + +**修复 Insert 模式下输入字符触发输入法切换** +- 问题：在 Insert 模式下正常输入文本时，输入 `i`, `a`, `o` 等字符会意外触发输入法切换 +- 解决：在 Insert 按键监听器中添加模式检查：`if (this.currentVimMode !== 'normal') return;` +- 效果：在 Insert 模式下正常输入文本不会被干扰 #### 性能优化 -##### 事件处理优化 -- **捕获模式**：键盘事件监听器使用 `{ capture: true }` -- **降低延迟**：输入法切换响应时间快 10-20ms -- **智能检测**：仅在必要时切换输入法，避免冗余操作 +**使用事件捕获模式提高响应速度** +- 使用 `addEventListener('keydown', handler, { capture: true })` 代替默认的冒泡模式 +- 在事件处理链的最早阶段捕获按键 +- ESC 键响应更快，几乎没有延迟 -##### 三重检测机制 -通过三层检测增强可靠性： -1. **主要检测**：键盘事件捕获（最快，最高优先级） -2. **辅助检测**：CodeMirror vim-mode-change 事件 -3. **兜底检测**：100ms 轮询作为安全保障 +**优化输入法检测逻辑** +- 在 ESC 键处理时，先检测当前输入法再决定是否切换 +- 避免不必要的 `fcitx-remote` 调用 +- 当前已经是英文输入法时，不会重复切换 -#### 代码质量 +#### 技术改进 -##### 代码库清理 -- 移除约 50 行未使用的测试代码 -- 减少插件体积约 2KB -- 提高代码可维护性和可读性 +**多重检测机制** +1. 键盘事件监听（主要）- 使用 capture 模式监听 ESC 和 Insert 按键 +2. CodeMirror 事件监听（辅助）- 监听 vim-mode-change 事件 +3. 定时轮询（兜底）- 每 100ms 检查一次 Vim 模式 -##### 简化日志输出 -- 减少 70% 的控制台输出 -- 保留关键的状态转换日志 -- 更清晰的调试信息，便于故障排查 +--- -#### 文档 +## v2.0.0 - 2025-11-04 -##### 全面的文档 -- **README.md**：详细的中文文档，包含使用示例 -- **README_en.md**：完整的英文文档 -- **CHANGELOG.md**：详细的中文版本历史 -- **CHANGELOG_en.md**：完整的英文更新日志 -- **Mermaid 图表**：可视化工作流程说明 +### 重大更新：新增 Vim 原生插件支持 -### 技术细节 +#### 新增功能 -#### 架构改进 +**Vim 原生插件支持** +- 新增 fcitx-osx.vim 插件：为原生 Vim/NeoVim 编辑器提供输入法自动切换功能 +- 智能输入法状态记忆： + - 记住退出 Insert 模式时的输入法（中文/英文） + - 下次进入 Insert 模式时自动恢复上次的输入法状态 + - 完全无感知切换，无任何 UI 闪烁 +- 使用 fcitx-remote -s 命令： + - 通过指定输入法 ID 进行精确切换 + - 替代原有的 `-c`/`-o` 开关命令 + - 支持自定义英文和中文输入法 ID +- 异步执行优化： + - 使用 Vim 8+ 的 `job_start()` 异步执行命令 + - 完全消除输入法切换时的 UI 闪烁和延迟 + - 向后兼容旧版本 Vim（使用后台进程） -**状态管理**： -- `currentVimMode`：追踪当前 Vim 模式（normal/insert/visual） -- `lastInsertModeIMStatus`：存储上次 Insert 模式的输入法状态 -- `imStatus`：维护当前输入法状态 +**部署脚本增强** +- deploy.sh 更新：一键部署 Obsidian 插件和 Vim 插件 +- 自动创建 `~/.vim/plugin/` 目录 +- 同时复制两个插件到各自的目标位置 -**检测系统**： -- 事件捕获阶段拦截 -- 使用 `fcitx-remote -n` 实时验证输入法状态 -- 异步输入法切换操作 +#### 改进 -#### 兼容性 +**Vim 插件性能优化** +- 使用 `fcitx-remote -n` 获取当前输入法名称 +- 保存完整的输入法 ID 而不是简单的开关状态 +- 避免不必要的输入法切换（相同输入法时跳过） +- 所有输出重定向到 `/dev/null`，确保静默执行 -**平台支持**： -- macOS：通过 fcitx-remote-for-osx 完全支持 -- Linux：通过 fcitx 完全支持 -- Windows：通过 AutoHotKey 版本支持 +#### Bug 修复 -**Obsidian 兼容性**： -- 兼容最新版本的 Obsidian -- 同时支持 CodeMirror 5 和 CodeMirror 6 +- 修复 Vim 插件中 `fcitx-remote -c` 命令不生效的问题 +- 修复标题栏显示 "fcitx-remote" 的闪烁问题 +- 修复字符串比较失败（`"2\n" == 2`）的问题 -### 升级指南 +#### 文档更新 -#### 现有用户 +- 更新 README.md 和 README_en.md，添加 Vim 插件安装说明 +- 更新所有文档标题，从 "Obsidian" 改为包含两个插件的描述 +- 添加 Vim 插件配置说明和调试方法 -**从 v1.x 升级**： -```bash -cd /path/to/your/vault/.obsidian/plugins/vim-im-switch/ -git pull origin main -npm install -npm run build -``` +--- -然后重启 Obsidian 以激活新版本。 +## v2.0.2 - 2025-11-04 -**重要提示**： -- 升级过程中会保留设置 -- 无需更改配置 -- 建议升级前备份您的 vault +### 修复 -#### 新用户 +**终端兼容性修复** +- 修复在 macOS 终端（vi/vim）中按 ESC 时，子进程输出导致标题栏短暂闪烁的问题 +- 使用 nohup/background 方式彻底静默化命令执行 +- 移除 `job_start(..., {'detach': v:true})` 不兼容选项，改以更通用的后台执行方式 -**Obsidian 插件安装步骤**： -1. 为您的平台安装 fcitx-remote -2. 将插件克隆到 Obsidian 插件目录 -3. 在 Obsidian 设置中启用插件 -4. 配置输入法名称（可选） +### 文档 -**Vim 插件安装步骤**： -1. 为您的平台安装 fcitx-remote -2. 复制 `fcitx-osx.vim` 到 `~/.vim/plugin/` -3. 重启 Vim，插件自动加载 -4. 在 `.vimrc` 中配置输入法 ID（可选） +- 补充 RELEASE/README 中关于终端下行为的说明 -**一键部署（推荐）**： -```bash -./deploy.sh # 同时部署两个插件 -``` +--- -详细安装说明请参阅 [README.md](./README.md) 或 [README_en.md](./README_en.md)。 +## v2.0.3 - 2025-11-09 -### 已知问题 +### 修复 -本版本无严重问题。如需故障排除，请参考： -- [中文故障排除](./README.md#故障排除) -- [English Troubleshooting](./README_en.md#troubleshooting) +**Obsidian 插件** +- **修复 Normal 模式下按 ESC 触发输入法切换的问题** + - 问题：在 Normal 模式下按 ESC 会意外触发输入法切换（从中文切到英文，再按又从英文切到英文） + - 原因：`handleKeyDown` 函数处理 ESC 键时没有检查当前 Vim 模式 + - 解决：增加模式检查，只在 Insert 或 Replace 模式下按 ESC 时才保存输入法状态并切换到英文 + - 效果：与原生 Vim 插件行为保持一致，Normal 模式下按 ESC 不会改变输入法 -### 破坏性变更 +### 改进 -无。本版本与 v1.x 配置完全向后兼容。 +- 提高了模式检测的准确性 +- 优化了 ESC 键的处理逻辑 -### 废弃功能 +--- -本版本无废弃功能。 +**查看详细更新日志**: [CHANGELOG.md](./CHANGELOG.md) | [CHANGELOG_en.md](./CHANGELOG_en.md) -### 未来规划 - -计划在未来版本中实现的功能： -- 支持更多输入法切换工具（im-select、macism 等） -- 可配置的快捷键绑定 -- Visual 模式输入法处理改进 -- 与 Obsidian 原生语言切换集成 -- NeoVim Lua 插件版本 - -### 相关链接 - -- [GitHub 仓库](https://github.com/yourusername/vim-im-switch) -- [问题追踪](https://github.com/yourusername/vim-im-switch/issues) -- [中文文档](./README.md) -- [English Documentation](./README_en.md) -- [更新日志](./CHANGELOG.md) -- [Changelog](./CHANGELOG_en.md) - -### 技术支持 - -如果您遇到任何问题或有疑问： -1. 查看 [故障排除指南](./README.md#故障排除) -2. 搜索现有的 [Issues](https://github.com/yourusername/vim-im-switch/issues) -3. 创建新的 issue 并提供详细信息 - -### 许可证 - -MIT License - 详见 [LICENSE.txt](./LICENSE.txt) diff --git a/main.js b/main.js index bb96b36..702ac01 100644 --- a/main.js +++ b/main.js @@ -237,23 +237,27 @@ class VimIMSwitchPlugin extends obsidian.Plugin { return; } this.lastKeyTime = currentTime; - // 处理ESC键：退出到normal模式 + // 处理ESC键：只在insert/replace模式下才切换输入法 if (event.key === 'Escape') { - // 退出insert模式前，先保存当前输入法状态 - const beforeIM = yield this.runCmd(this.fcitxRemotePath, ["-n"]); - const currentIMName = beforeIM.trim(); - // 检查当前输入法是中文还是英文 - if (currentIMName === this.settings.chineseInputMethod) { - this.lastInsertModeIMStatus = IMStatus.Activate; - console.log('🔤 [VimIMSwitch] ESC → English (saved Chinese)'); + // 只有在insert或replace模式下按ESC才需要处理输入法 + if (this.currentVimMode === 'insert' || this.currentVimMode === 'replace') { + // 退出insert模式前，先保存当前输入法状态 + const beforeIM = yield this.runCmd(this.fcitxRemotePath, ["-n"]); + const currentIMName = beforeIM.trim(); + // 检查当前输入法是中文还是英文 + if (currentIMName === this.settings.chineseInputMethod) { + this.lastInsertModeIMStatus = IMStatus.Activate; + console.log('🔤 [VimIMSwitch] ESC → English (saved Chinese)'); + } + else { + this.lastInsertModeIMStatus = IMStatus.Deactivate; + console.log('🔤 [VimIMSwitch] ESC → English (saved English)'); + } + // 切换到英文输入法 + this.currentVimMode = 'normal'; + yield this.deactivateIM(); } - else { - this.lastInsertModeIMStatus = IMStatus.Deactivate; - console.log('🔤 [VimIMSwitch] ESC → English (saved English)'); - } - // 切换到英文输入法 - this.currentVimMode = 'normal'; - yield this.deactivateIM(); + // 如果已经在normal模式，ESC键不做任何输入法切换 } // 处理进入insert模式的按键（只在normal模式下） else if (this.currentVimMode === 'normal' && @@ -462,4 +466,4 @@ class IMSwitchSettingTab extends obsidian.PluginSettingTab { } module.exports = VimIMSwitchPlugin; -//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"file":"main.js","sources":["node_modules/tslib/tslib.es6.js","main.ts"],"sourcesContent":null,"names":["promisify","exec","Plugin","MarkdownView","PluginSettingTab","Setting"],"mappings":"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"} +//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"file":"main.js","sources":["node_modules/tslib/tslib.es6.js","main.ts"],"sourcesContent":null,"names":["promisify","exec","Plugin","MarkdownView","PluginSettingTab","Setting"],"mappings":"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"} diff --git a/main.ts b/main.ts index c3f28e7..7b6ae33 100644 --- a/main.ts +++ b/main.ts @@ -196,24 +196,28 @@ export default class VimIMSwitchPlugin extends Plugin { } this.lastKeyTime = currentTime; - // 处理ESC键：退出到normal模式 + // 处理ESC键：只在insert/replace模式下才切换输入法 if (event.key === 'Escape') { - // 退出insert模式前，先保存当前输入法状态 - const beforeIM = await this.runCmd(this.fcitxRemotePath, ["-n"]); - const currentIMName = beforeIM.trim(); - - // 检查当前输入法是中文还是英文 - if (currentIMName === this.settings.chineseInputMethod) { - this.lastInsertModeIMStatus = IMStatus.Activate; - console.log('🔤 [VimIMSwitch] ESC → English (saved Chinese)'); - } else { - this.lastInsertModeIMStatus = IMStatus.Deactivate; - console.log('🔤 [VimIMSwitch] ESC → English (saved English)'); + // 只有在insert或replace模式下按ESC才需要处理输入法 + if (this.currentVimMode === 'insert' || this.currentVimMode === 'replace') { + // 退出insert模式前，先保存当前输入法状态 + const beforeIM = await this.runCmd(this.fcitxRemotePath, ["-n"]); + const currentIMName = beforeIM.trim(); + + // 检查当前输入法是中文还是英文 + if (currentIMName === this.settings.chineseInputMethod) { + this.lastInsertModeIMStatus = IMStatus.Activate; + console.log('🔤 [VimIMSwitch] ESC → English (saved Chinese)'); + } else { + this.lastInsertModeIMStatus = IMStatus.Deactivate; + console.log('🔤 [VimIMSwitch] ESC → English (saved English)'); + } + + // 切换到英文输入法 + this.currentVimMode = 'normal'; + await this.deactivateIM(); } - - // 切换到英文输入法 - this.currentVimMode = 'normal'; - await this.deactivateIM(); + // 如果已经在normal模式，ESC键不做任何输入法切换 } // 处理进入insert模式的按键（只在normal模式下） else if (this.currentVimMode === 'normal' && diff --git a/manifest.json b/manifest.json index af77345..0d037d1 100644 --- a/manifest.json +++ b/manifest.json @@ -1,7 +1,7 @@ { "id": "obsidian-vim-im-switch-plugin", "name": "Vim Input Method Switch", - "version": "1.0.8", + "version": "2.0.3", "minAppVersion": "0.9.12", "description": "Switch input method with fcitx-remote when Vim keymap is enabled.", "author": "Yuan Chen", diff --git a/runit.sh b/runit.sh new file mode 120000 index 0000000..fa5b862 --- /dev/null +++ b/runit.sh @@ -0,0 +1 @@ +/Users/gavin/tools/runit.sh \ No newline at end of file diff --git a/versions.json b/versions.json index 0c76717..648dfea 100644 --- a/versions.json +++ b/versions.json @@ -1,4 +1,6 @@ { + "2.0.3": "0.9.12", + "2.0.2": "0.9.12", "2.0.0": "0.9.12", "1.0.2": "0.9.12", "1.0.1": "0.9.12", diff --git a/vim-im-switch-plugin/main.js b/vim-im-switch-plugin/main.js index bb96b36..702ac01 100644 --- a/vim-im-switch-plugin/main.js +++ b/vim-im-switch-plugin/main.js @@ -237,23 +237,27 @@ class VimIMSwitchPlugin extends obsidian.Plugin { return; } this.lastKeyTime = currentTime; - // 处理ESC键：退出到normal模式 + // 处理ESC键：只在insert/replace模式下才切换输入法 if (event.key === 'Escape') { - // 退出insert模式前，先保存当前输入法状态 - const beforeIM = yield this.runCmd(this.fcitxRemotePath, ["-n"]); - const currentIMName = beforeIM.trim(); - // 检查当前输入法是中文还是英文 - if (currentIMName === this.settings.chineseInputMethod) { - this.lastInsertModeIMStatus = IMStatus.Activate; - console.log('🔤 [VimIMSwitch] ESC → English (saved Chinese)'); + // 只有在insert或replace模式下按ESC才需要处理输入法 + if (this.currentVimMode === 'insert' || this.currentVimMode === 'replace') { + // 退出insert模式前，先保存当前输入法状态 + const beforeIM = yield this.runCmd(this.fcitxRemotePath, ["-n"]); + const currentIMName = beforeIM.trim(); + // 检查当前输入法是中文还是英文 + if (currentIMName === this.settings.chineseInputMethod) { + this.lastInsertModeIMStatus = IMStatus.Activate; + console.log('🔤 [VimIMSwitch] ESC → English (saved Chinese)'); + } + else { + this.lastInsertModeIMStatus = IMStatus.Deactivate; + console.log('🔤 [VimIMSwitch] ESC → English (saved English)'); + } + // 切换到英文输入法 + this.currentVimMode = 'normal'; + yield this.deactivateIM(); } - else { - this.lastInsertModeIMStatus = IMStatus.Deactivate; - console.log('🔤 [VimIMSwitch] ESC → English (saved English)'); - } - // 切换到英文输入法 - this.currentVimMode = 'normal'; - yield this.deactivateIM(); + // 如果已经在normal模式，ESC键不做任何输入法切换 } // 处理进入insert模式的按键（只在normal模式下） else if (this.currentVimMode === 'normal' && @@ -462,4 +466,4 @@ class IMSwitchSettingTab extends obsidian.PluginSettingTab { } module.exports = VimIMSwitchPlugin; -//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"file":"main.js","sources":["node_modules/tslib/tslib.es6.js","main.ts"],"sourcesContent":null,"names":["promisify","exec","Plugin","MarkdownView","PluginSettingTab","Setting"],"mappings":"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"} +//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"file":"main.js","sources":["node_modules/tslib/tslib.es6.js","main.ts"],"sourcesContent":null,"names":["promisify","exec","Plugin","MarkdownView","PluginSettingTab","Setting"],"mappings":"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"} diff --git a/vim-im-switch-plugin/manifest.json b/vim-im-switch-plugin/manifest.json index af77345..0d037d1 100644 --- a/vim-im-switch-plugin/manifest.json +++ b/vim-im-switch-plugin/manifest.json @@ -1,7 +1,7 @@ { "id": "obsidian-vim-im-switch-plugin", "name": "Vim Input Method Switch", - "version": "1.0.8", + "version": "2.0.3", "minAppVersion": "0.9.12", "description": "Switch input method with fcitx-remote when Vim keymap is enabled.", "author": "Yuan Chen",