Merge pull request #41 from qianmoQ/dev-25.0.2

feat (ui): 支持编辑器行号配置

Author: qianmoQ

src-tauri/src/config.rs

@@ -12,10 +12,12 @@ static CONFIG_MANAGER: Mutex<Option<ConfigManager>> = Mutex::new(None);
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct EditorConfig {
-    pub indent_with_tab: Option<bool>, // 是否使用 tab 缩进
-    pub tab_size: Option<u32>,         // tab 缩进, 空格数，默认为 2
-    pub theme: Option<String>,         // 编辑器主题
-    pub font_size: Option<u32>,        // 编辑器字体大小
+    pub indent_with_tab: Option<bool>,    // 是否使用 tab 缩进
+    pub tab_size: Option<u32>,            // tab 缩进, 空格数，默认为 2
+    pub theme: Option<String>,            // 编辑器主题
+    pub font_size: Option<u32>,           // 编辑器字体大小
+    pub show_line_numbers: Option<bool>,  // 是否显示行号
+    pub show_function_help: Option<bool>, // 是否显示函数帮助
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -41,6 +43,8 @@ impl Default for AppConfig {
                 tab_size: Some(2),
                 theme: Some("githubLight".to_string()),
                 font_size: Some(14),
+                show_line_numbers: Some(true),
+                show_function_help: Some(false),
             }),
         }
     }
@@ -97,6 +101,8 @@ impl ConfigManager {
                                 tab_size: Some(2),
                                 theme: Some("githubLight".to_string()),
                                 font_size: Some(14),
+                                show_line_numbers: Some(true),
+                                show_function_help: Some(false),
                             });
                             println!("读取配置 -> 添加默认 editor 配置");
                         }
@@ -201,6 +207,8 @@ impl ConfigManager {
                 tab_size: Some(2),
                 theme: Some("githubLight".to_string()),
                 font_size: Some(14),
+                show_line_numbers: Some(true),
+                show_function_help: Some(false),
             }),
         }
     }

src/components/setting/Editor.vue

@@ -4,6 +4,14 @@
       <Switch v-model="editorConfig.indent_with_tab"/>
     </Label>
 
+    <Label label="是否显示行号">
+      <Switch v-model="editorConfig.show_line_numbers"/>
+    </Label>
+
+    <Label label="是否显示函数帮助信息">
+      <Switch v-model="editorConfig.show_function_help"/>
+    </Label>
+
     <Label label="缩进空格数">
       <Number v-model="editorConfig.tab_size" :min="1" :max="8" placeholder="缩进空格数"/>
     </Label>

src/composables/useCodeMirrorEditor.ts

@@ -60,14 +60,8 @@ import {
 import { invoke } from '@tauri-apps/api/core'
 import { useToast } from '../plugins/toast'
 import { StreamLanguage } from '@codemirror/language'
-
-interface EditorConfig
-{
-    theme?: string
-    indent_with_tab?: boolean
-    tab_size?: number
-    font_size?: number
-}
+import { EditorConfig } from '../types/app.ts'
+import { EditorView, hoverTooltip } from '@codemirror/view'
 
 interface Props
 {
@@ -83,6 +77,14 @@ export function useCodeMirrorEditor(props: Props)
     const isReady = ref(false)
     const extensions = ref<any[]>([])
     const editorConfig = ref<EditorConfig>({})
+    const defaultConfig = {
+        theme: 'githubLight',
+        indent_with_tab: true,
+        tab_size: 2,
+        font_size: 14,
+        show_line_numbers: false,
+        show_function_help: false
+    }
 
     // 主题映射
     const themeMap: Record<string, any> = {
@@ -180,8 +182,44 @@ export function useCodeMirrorEditor(props: Props)
         }
     }
 
+    // 隐藏行号的主题扩展
+    const hideLineNumbersTheme = EditorView.theme({
+        '.cm-lineNumbers': {
+            display: 'none !important'
+        },
+        '.cm-gutters': {
+            display: 'none !important'
+        }
+    })
+
+    // 显示函数提示扩展
+    const showFunctionHelpHover = hoverTooltip((view, pos, side) => {
+        let { from, to, text } = view.state.doc.lineAt(pos)
+        let start = pos, end = pos
+        while (start > from && /\w/.test(text[start - from - 1])) {
+            start--
+        }
+        while (end < to && /\w/.test(text[end - from])) {
+            end++
+        }
+        if (start == pos && side < 0 || end == pos && side > 0) {
+            return null
+        }
+        return {
+            pos: start,
+            end,
+            above: true,
+            create(_view)
+            {
+                let dom = document.createElement('div')
+                dom.textContent = text.slice(start - from, end - from)
+                return { dom }
+            }
+        }
+    }, { hoverTime: 500 })
+
     // 更新扩展的函数
-    const updateExtensions = async () => {
+    const updateExtensions = async (showLineNumbers?: boolean, showFunctionHelp?: boolean) => {
         const result = []
 
         // 添加主题扩展
@@ -196,6 +234,18 @@ export function useCodeMirrorEditor(props: Props)
             }
         }
 
+        // 处理行号显示逻辑
+        const shouldShowLineNumbers = showLineNumbers ?? editorConfig.value?.show_line_numbers ?? false
+        // 如果配置为不显示行号，则添加隐藏行号的扩展
+        if (!shouldShowLineNumbers) {
+            result.push(hideLineNumbersTheme)
+        }
+
+        const shouldShowFunctionHelp = showFunctionHelp ?? editorConfig.value?.show_function_help ?? false
+        if (shouldShowFunctionHelp) {
+            result.push(showFunctionHelpHover)
+        }
+
         extensions.value = result
 
         // 如果组件还没准备好，等待下一个 tick 后设置为准备好
@@ -219,26 +269,14 @@ export function useCodeMirrorEditor(props: Props)
             }
             else {
                 // 如果没有配置，使用默认配置
-                editorConfig.value = {
-                    theme: 'githubLight',
-                    indent_with_tab: true,
-                    tab_size: 2,
-                    font_size: 14
-                }
+                editorConfig.value = defaultConfig
                 await updateExtensions()
             }
         }
         catch (error) {
             console.error('获取配置失败:', error)
             toast.error('获取配置失败 - 错误信息: ' + error)
-
-            // 失败时使用默认配置
-            editorConfig.value = {
-                theme: 'githubLight',
-                indent_with_tab: true,
-                tab_size: 2,
-                font_size: 14
-            }
+            editorConfig.value = defaultConfig
             await updateExtensions()
         }
     }
@@ -296,6 +334,18 @@ export function useCodeMirrorEditor(props: Props)
         await reRenderEditor()
     }, { immediate: false })
 
+    // 监听行号显示配置变化
+    watch(() => editorConfig.value?.show_line_numbers, async () => {
+        console.log('行号显示配置变化:', editorConfig.value?.show_line_numbers)
+        await reRenderEditor()
+    }, { immediate: false })
+
+    // 监听函数帮助配置变化
+    watch(() => editorConfig.value?.show_function_help, async () => {
+        console.log('函数帮助配置变化:', editorConfig.value?.show_function_help)
+        await reRenderEditor()
+    })
+
     return {
         // 状态
         isReady,
@@ -313,4 +363,4 @@ export function useCodeMirrorEditor(props: Props)
         getThemeExtension,
         getLanguageExtension
     }
-}
+}

src/composables/useEditorConfig.ts

@@ -2,14 +2,7 @@ import { ref, watch } from 'vue'
 import { debounce } from 'lodash-es'
 import { invoke } from '@tauri-apps/api/core'
 import { useToast } from '../plugins/toast'
-
-interface EditorConfig
-{
-    tab_size?: number
-    theme?: string
-    indent_with_tab?: boolean
-    font_size?: number
-}
+import { EditorConfig } from '../types/app.ts'
 
 interface ThemeOption
 {

src/types/app.ts

@@ -44,3 +44,13 @@ export interface AppInfo
     platform: string
     arch: string
 }
+
+export interface EditorConfig
+{
+    theme?: string
+    indent_with_tab?: boolean
+    tab_size?: number
+    font_size?: number
+    show_line_numbers?: boolean
+    show_function_help?: boolean
+}