diff --git a/package.json b/package.json
index 97d9af9..b3c0f68 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "codeforge",
   "private": true,
-  "version": "26.1.0",
+  "version": "26.2.0",
   "type": "module",
   "scripts": {
     "dev": "vite",
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index 90f98bf..f4f47d7 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -4,7 +4,7 @@ version = 4
 
 [[package]]
 name = "CodeForge"
-version = "26.1.0"
+version = "26.2.0"
 dependencies = [
  "async-trait",
  "chrono",
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index 36b63e5..2206837 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "CodeForge"
-version = "26.1.0"
+version = "26.2.0"
 description = "CodeForge 是一款轻量级、高性能的桌面代码执行器，专为开发者、学生和编程爱好者设计。"
 authors = ["devlive-community"]
 edition = "2024"
diff --git a/src-tauri/src/lsp.rs b/src-tauri/src/lsp.rs
index 233c87d..af6c8c0 100644
--- a/src-tauri/src/lsp.rs
+++ b/src-tauri/src/lsp.rs
@@ -5,13 +5,14 @@ use serde::Serialize;
 use std::collections::HashMap;
 use std::io::{BufReader, Read, Write};
 use std::path::PathBuf;
-use std::process::{Child, ChildStdin, Command, Stdio};
+use std::process::{Child, Command, Stdio};
 use std::sync::Mutex as StdMutex;
 use tauri::{AppHandle, Emitter, State};
 
 struct Server {
     child: Child,
-    stdin: ChildStdin,
+    // 写入通过独立线程，避免 stdin 写阻塞主线程（语言服务器索引时可能来不及读）
+    tx: std::sync::mpsc::Sender<Vec<u8>>,
 }
 
 pub struct LspState {
@@ -27,9 +28,9 @@ impl LspState {
 }
 
 #[derive(Clone, Serialize)]
-struct LspEvent {
+struct LspBatch {
     language: String,
-    message: String,
+    messages: Vec<String>,
 }
 
 /// 语言 -> (可执行名, 参数)。新增语言在此加一行。
@@ -49,6 +50,13 @@ fn server_cmd(language: &str) -> Option<(&'static str, Vec<&'static str>)> {
         "html" => Some(("vscode-html-language-server", vec!["--stdio"])),
         "css" => Some(("vscode-css-language-server", vec!["--stdio"])),
         "json" => Some(("vscode-json-language-server", vec!["--stdio"])),
+        "java" => Some(("jdtls", vec![])),
+        "kotlin" => Some(("kotlin-language-server", vec![])),
+        "swift" => Some(("sourcekit-lsp", vec![])),
+        "scala" => Some(("metals", vec![])),
+        "yaml" => Some(("yaml-language-server", vec!["--stdio"])),
+        "shell" => Some(("bash-language-server", vec!["start"])),
+        "haskell" => Some(("haskell-language-server-wrapper", vec!["--lsp"])),
         _ => None,
     }
 }
@@ -106,6 +114,43 @@ fn server_defs() -> Vec<(&'static str, &'static str, &'static str, &'static str)
             "vscode-html-language-server",
             "npm i -g vscode-langservers-extracted",
         ),
+        ("java", "Java (jdtls)", "jdtls", "brew install jdtls"),
+        (
+            "kotlin",
+            "Kotlin",
+            "kotlin-language-server",
+            "brew install kotlin-language-server",
+        ),
+        (
+            "swift",
+            "Swift (sourcekit-lsp)",
+            "sourcekit-lsp",
+            "xcode-select --install",
+        ),
+        (
+            "scala",
+            "Scala (metals)",
+            "metals",
+            "coursier install metals",
+        ),
+        (
+            "yaml",
+            "YAML",
+            "yaml-language-server",
+            "npm i -g yaml-language-server",
+        ),
+        (
+            "shell",
+            "Shell / Bash",
+            "bash-language-server",
+            "npm i -g bash-language-server",
+        ),
+        (
+            "haskell",
+            "Haskell (HLS)",
+            "haskell-language-server-wrapper",
+            "ghcup install hls",
+        ),
     ]
 }
 
@@ -308,21 +353,45 @@ pub fn lsp_start(
     let stdout = child.stdout.take().ok_or("无法获取 stdout")?;
     let stderr = child.stderr.take();
 
-    // 读取线程：解析 Content-Length 帧，原样转发 JSON 给前端
-    let app_reader = app.clone();
+    // 读取线程：解析 Content-Length 帧，把消息体丢进 channel
+    let (msg_tx, msg_rx) = std::sync::mpsc::channel::<String>();
     let lang_reader = language.clone();
     std::thread::spawn(move || {
         let mut reader = BufReader::new(stdout);
         while let Some(body) = read_message(&mut reader) {
+            if msg_tx.send(body).is_err() {
+                break;
+            }
+        }
+        // 发送端 drop → 下面的 emitter 收到 Err 后发 lsp:exit
+        let _ = &lang_reader;
+    });
+
+    // 发射线程：合批转发。索引时语言服务器会突发成千上万条通知，
+    // 逐条 emit 会让 webview 主线程被 IPC 反序列化压垮（编辑器/环境检查随之卡死）。
+    // 这里把"此刻已排队"的消息一次性打包成一个事件，空闲时则单条即时下发。
+    let app_reader = app.clone();
+    let lang_emit = language.clone();
+    std::thread::spawn(move || {
+        // 阻塞等待第一条；channel 关闭(语言服务器退出)时 recv 返回 Err，循环结束
+        while let Ok(first) = msg_rx.recv() {
+            let mut batch = vec![first];
+            // 排空当前已到达的消息，凑成一批（上限防止单批过大）
+            while let Ok(m) = msg_rx.try_recv() {
+                batch.push(m);
+                if batch.len() >= 512 {
+                    break;
+                }
+            }
             let _ = app_reader.emit(
-                "lsp:message",
-                LspEvent {
-                    language: lang_reader.clone(),
-                    message: body,
+                "lsp:messages",
+                LspBatch {
+                    language: lang_emit.clone(),
+                    messages: batch,
                 },
             );
         }
-        let _ = app_reader.emit("lsp:exit", lang_reader.clone());
+        let _ = app_reader.emit("lsp:exit", lang_emit.clone());
     });
 
     // 排空 stderr，避免阻塞
@@ -337,11 +406,27 @@ pub fn lsp_start(
         });
     }
 
+    // 写入线程：独占 stdin，从 channel 取帧写入。
+    // 这样 lsp_send 只需把帧塞进 channel（瞬时返回），即便语言服务器索引时
+    // 不读 stdin 导致管道写阻塞，也只阻塞这个后台线程，不会卡住主线程的命令循环。
+    let (tx, rx) = std::sync::mpsc::channel::<Vec<u8>>();
+    std::thread::spawn(move || {
+        let mut stdin = stdin;
+        while let Ok(frame) = rx.recv() {
+            if stdin.write_all(&frame).is_err() {
+                break;
+            }
+            if stdin.flush().is_err() {
+                break;
+            }
+        }
+    });
+
     state
         .servers
         .lock()
         .map_err(|e| e.to_string())?
-        .insert(language, Server { child, stdin });
+        .insert(language, Server { child, tx });
     Ok(true)
 }
 
@@ -352,16 +437,16 @@ pub fn lsp_send(
     language: String,
     message: String,
 ) -> Result<(), String> {
-    let mut servers = state.servers.lock().map_err(|e| e.to_string())?;
+    let servers = state.servers.lock().map_err(|e| e.to_string())?;
     let server = servers
-        .get_mut(&language)
+        .get(&language)
         .ok_or_else(|| "语言服务器未启动".to_string())?;
     let frame = format!("Content-Length: {}\r\n\r\n{}", message.len(), message);
+    // 仅入队，不在持锁/主线程上做阻塞写
     server
-        .stdin
-        .write_all(frame.as_bytes())
-        .map_err(|e| e.to_string())?;
-    server.stdin.flush().map_err(|e| e.to_string())?;
+        .tx
+        .send(frame.into_bytes())
+        .map_err(|_| "语言服务器写入通道已关闭".to_string())?;
     Ok(())
 }
 
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index 405ce35..11ab8f6 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2",
   "productName": "CodeForge",
-  "version": "26.1.0",
+  "version": "26.2.0",
   "identifier": "org.devlive.codeforge",
   "build": {
     "beforeDevCommand": "pnpm dev",
diff --git a/src/App.vue b/src/App.vue
index 589c822..b4b79b2 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -263,7 +263,7 @@
               @close="showTerminal = false; terminalMounted = false"/>
 
     <!-- 状态栏 -->
-    <StatusBar class="flex-shrink-0" :env-info="envInfo" :is-loading="isLoadingEnvInfo" :execution-time="lastExecutionTime" :code-length="(code || '').length" @check-environment="refreshEnvInfo" @toggle-terminal="toggleTerminal"/>
+    <StatusBar class="flex-shrink-0" :env-info="envInfo" :is-loading="isLoadingEnvInfo" :execution-time="lastExecutionTime" :code-length="(code || '').length" @check-environment="refreshEnvInfo" @toggle-terminal="toggleTerminal" @toggle-problems="showDiagnostics = !showDiagnostics"/>
 
     <!-- 关于组件 -->
     <About v-if="showAbout" @close="closeAbout"/>
@@ -360,18 +360,47 @@
               @refresh="refreshGitStatus"
               @close="showGit = false"/>
 
+    <!-- LSP 问题面板 -->
+    <DiagnosticsPanel v-if="showDiagnostics"
+                      @go="(line, col) => gotoLine(line, col)"
+                      @close="showDiagnostics = false"/>
+
+    <!-- 编辑器 LSP 右键菜单 -->
+    <div v-if="editorCtx.visible" class="fixed inset-0 z-50" @click="closeEditorCtx" @contextmenu.prevent="closeEditorCtx">
+      <div class="absolute bg-white dark:bg-gray-800 dark:text-gray-100 rounded-md shadow-lg border border-gray-200 dark:border-gray-700 py-1 text-sm min-w-[170px]"
+           :style="{ top: `${editorCtx.y}px`, left: `${editorCtx.x}px` }"
+           @click.stop>
+        <button class="flex w-full items-center justify-between px-3 py-1.5 hover:bg-gray-100 dark:hover:bg-gray-700 cursor-pointer" @click="runEditorCommand(runGotoDefinition)">
+          <span>跳转到定义</span><span class="text-gray-400 text-xs ml-6">F12</span>
+        </button>
+        <button class="flex w-full items-center justify-between px-3 py-1.5 hover:bg-gray-100 dark:hover:bg-gray-700 cursor-pointer" @click="runEditorCommand(renameSymbol)">
+          <span>重命名符号</span><span class="text-gray-400 text-xs ml-6">F2</span>
+        </button>
+        <div class="border-t border-gray-100 dark:border-gray-700 my-1"></div>
+        <button class="flex w-full items-center justify-between px-3 py-1.5 hover:bg-gray-100 dark:hover:bg-gray-700 cursor-pointer" @click="runEditorCommand(formatDocument)">
+          <span>格式化文档</span><span class="text-gray-400 text-xs ml-6">⇧⌥F</span>
+        </button>
+        <button class="w-full text-left px-3 py-1.5 hover:bg-gray-100 dark:hover:bg-gray-700 cursor-pointer" @click="runEditorCommand(formatSelection)">
+          格式化选中
+        </button>
+      </div>
+    </div>
+
     <!-- Toast 组件 -->
     <Toast/>
   </div>
 </template>
 
 <script setup lang="ts">
-import {computed, nextTick, onMounted, onUnmounted, ref, watch} from 'vue'
+import {computed, nextTick, onMounted, onUnmounted, reactive, ref, shallowRef, watch} from 'vue'
 import {debounce} from 'lodash-es'
+import {formatDocument, formatSelection, renameSymbol} from 'codemirror-languageserver'
+import {runGotoDefinition, lspSupportsLanguage} from './editor/lspExtension'
 import {ChevronRight, Code2, CornerDownRight, Eye, FolderOpen, GitBranch, GitCompare, History, ListTree, Maximize2, Monitor, Moon, PanelBottom, PanelLeft, PanelRight, Play, Plus, Save, Search, Settings as SettingsIcon, Sparkles, Sun, Terminal as TerminalIcon, X} from 'lucide-vue-next'
 import {ExecutionResult, LayoutMode, SplitDirection} from './types/app.ts'
 import AppHeader from './components/AppHeader.vue'
 import CodeEditor from './components/CodeEditor.vue'
+import DiagnosticsPanel from './components/DiagnosticsPanel.vue'
 import ConsoleOutput from './components/ConsoleOutput.vue'
 import WebOutput from "./components/WebOutput.vue";
 import JsonView from "./components/JsonView.vue";
@@ -942,7 +971,11 @@ const confirmApplyAi = () => {
 }
 
 // 当前 CodeMirror view（用于在光标处插入生成的代码）
-const editorView = ref<any>(null)
+// shallowRef：EditorView 是含 LSP client/plugin 等大量可变内部状态的对象，
+// 绝不能被 Vue 深度响应式代理。否则 watch(editorView) 会在 view 内部每次 mutation 时触发，
+// 与 applyDiffMarkers 的 dispatch 形成 mutation→watch→dispatch→mutation 无限循环导致整页卡死
+// （LSP 接入后 client 持续 mutate 会立刻触发该循环）。
+const editorView = shallowRef<any>(null)
 
 // AI 自然语言生成 / 选区改写
 const showGenerate = ref(false)
@@ -981,14 +1014,16 @@ const openSearch = () => {
   showSearch.value = true
 }
 
-const gotoLine = (line: number) => {
+const gotoLine = (line: number, character?: number) => {
   const view = editorView.value
   if (!view) {
     return
   }
   const target = Math.max(1, Math.min(line, view.state.doc.lines))
   const l = view.state.doc.line(target)
-  view.dispatch({selection: {anchor: l.from}, scrollIntoView: true})
+  // 带列号时精确定位到列（夹在行内），否则定位到行首
+  const anchor = character != null ? Math.min(l.from + character, l.to) : l.from
+  view.dispatch({selection: {anchor}, scrollIntoView: true})
   view.focus()
 }
 
@@ -1040,6 +1075,51 @@ const openSearchResult = async (path: string, line: number) => {
   gotoLine(line)
 }
 
+// LSP 跨文件跳转定义：编辑器扩展派发 lsp:open-location，这里打开目标文件并定位
+const onLspOpenLocation = async (e: Event) => {
+  const detail = (e as CustomEvent).detail as {path: string; line: number; character?: number}
+  if (!detail?.path) {
+    return
+  }
+  await smartOpen(detail.path)
+  await nextTick()
+  gotoLine(detail.line, detail.character)
+}
+
+// LSP 问题面板显隐
+const showDiagnostics = ref(false)
+
+// ===== 编辑器 LSP 右键菜单（跳转定义 / 重命名 / 格式化）=====
+const editorCtx = reactive({visible: false, x: 0, y: 0})
+const closeEditorCtx = () => {
+  editorCtx.visible = false
+}
+const onEditorContext = (e: MouseEvent) => {
+  const target = e.target as HTMLElement | null
+  // 仅在编辑器内容区、且当前语言支持 LSP 时弹出
+  if (!target?.closest('.cm-content') || !lspSupportsLanguage(currentLanguage.value) || !editorView.value) {
+    return
+  }
+  e.preventDefault()
+  // 将光标移到右键处，使命令作用于点击位置
+  const view = editorView.value
+  const pos = view.posAtCoords({x: e.clientX, y: e.clientY})
+  if (pos != null) {
+    view.dispatch({selection: {anchor: pos}})
+  }
+  // 夹取到视口内，避免贴边裁切（菜单约 180×180）
+  editorCtx.x = Math.min(e.clientX, window.innerWidth - 190)
+  editorCtx.y = Math.min(e.clientY, window.innerHeight - 190)
+  editorCtx.visible = true
+}
+const runEditorCommand = (cmd: (v: any) => boolean) => {
+  closeEditorCtx()
+  // 不在此处 focus 编辑器：重命名会弹出需要焦点的内联输入框
+  if (editorView.value) {
+    cmd(editorView.value)
+  }
+}
+
 // 全局替换后：刷新涉及到的已打开标签（保留有未保存修改的标签）
 const reloadAffectedFiles = async (paths: string[]) => {
   const set = new Set(paths)
@@ -1653,6 +1733,8 @@ onMounted(async () => {
   await restoreSession()
 
   window.addEventListener('keydown', onGlobalKeydown, true)
+  window.addEventListener('lsp:open-location', onLspOpenLocation)
+  window.addEventListener('contextmenu', onEditorContext)
 
   // 触发 app-ready 事件，通知主进程
   window.dispatchEvent(new CustomEvent('app-ready'))
@@ -1661,5 +1743,7 @@ onMounted(async () => {
 onUnmounted(() => {
   cleanupEventListeners()
   window.removeEventListener('keydown', onGlobalKeydown, true)
+  window.removeEventListener('lsp:open-location', onLspOpenLocation)
+  window.removeEventListener('contextmenu', onEditorContext)
 })
 </script>
diff --git a/src/components/DiagnosticsPanel.vue b/src/components/DiagnosticsPanel.vue
new file mode 100644
index 0000000..138b667
--- /dev/null
+++ b/src/components/DiagnosticsPanel.vue
@@ -0,0 +1,51 @@
+<template>
+  <div class="fixed left-0 right-0 bottom-0 z-40 h-56 bg-white dark:bg-gray-900 border-t border-gray-200 dark:border-gray-700 shadow-2xl flex flex-col">
+    <!-- 头部 -->
+    <div class="flex items-center justify-between px-4 py-2 border-b border-gray-200 dark:border-gray-700 flex-shrink-0">
+      <div class="flex items-center gap-3 text-sm font-medium text-gray-700 dark:text-gray-200">
+        <span>问题</span>
+        <span v-if="errorCount" class="flex items-center gap-1 text-xs text-red-500">
+          <XCircle class="w-3.5 h-3.5"/>{{ errorCount }}
+        </span>
+        <span v-if="warningCount" class="flex items-center gap-1 text-xs text-amber-500">
+          <AlertTriangle class="w-3.5 h-3.5"/>{{ warningCount }}
+        </span>
+      </div>
+      <button class="text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 cursor-pointer" title="关闭" @click="emit('close')">
+        <X class="w-4 h-4"/>
+      </button>
+    </div>
+
+    <!-- 列表 -->
+    <div class="flex-1 overflow-y-auto text-sm">
+      <div v-if="!diagnostics.length" class="px-4 py-6 text-center text-gray-400">
+        没有发现问题
+      </div>
+      <button v-for="(d, i) in diagnostics" :key="i"
+              class="flex w-full items-start gap-2 px-4 py-1.5 text-left hover:bg-gray-100 dark:hover:bg-gray-800 cursor-pointer"
+              @click="emit('go', d.line, d.col)">
+        <component :is="iconOf(d.severity)" class="w-4 h-4 mt-0.5 flex-shrink-0" :class="colorOf(d.severity)"/>
+        <span class="flex-1 text-gray-700 dark:text-gray-200 break-words">{{ d.message }}</span>
+        <span class="text-xs text-gray-400 flex-shrink-0 mt-0.5">[{{ d.line }}:{{ d.col }}]</span>
+      </button>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import {computed} from 'vue'
+import {AlertTriangle, Info, X, XCircle} from 'lucide-vue-next'
+import {diagnostics} from '../editor/lspDiagnostics'
+
+const emit = defineEmits<{
+  go: [line: number, col: number]
+  close: []
+}>()
+
+const errorCount = computed(() => diagnostics.value.filter(d => d.severity === 'error').length)
+const warningCount = computed(() => diagnostics.value.filter(d => d.severity === 'warning').length)
+
+const iconOf = (sev: string) => (sev === 'error' ? XCircle : sev === 'warning' ? AlertTriangle : Info)
+const colorOf = (sev: string) =>
+  sev === 'error' ? 'text-red-500' : sev === 'warning' ? 'text-amber-500' : 'text-blue-500'
+</script>
diff --git a/src/components/GitPanel.vue b/src/components/GitPanel.vue
index 8d44316..612f03e 100644
--- a/src/components/GitPanel.vue
+++ b/src/components/GitPanel.vue
@@ -67,11 +67,13 @@
           </button>
         </div>
         <div class="flex items-center gap-2">
-          <Button size="sm" :disabled="!canCommit" @click="commit">
+          <Button size="sm" :loading="pending === 'commit'" :disabled="busy || !canCommit" @click="commit">
             提交{{ staged.length ? ` (${staged.length})` : '' }}
           </Button>
-          <Button size="sm" type="secondary" :disabled="busy" @click="commitAndPush">提交并推送</Button>
-          <Button size="sm" type="secondary" :disabled="busy" @click="push">
+          <Button size="sm" type="secondary" :loading="pending === 'commitPush'" :disabled="busy" @click="commitAndPush">
+            提交并推送
+          </Button>
+          <Button size="sm" type="secondary" :loading="pending === 'push'" :disabled="busy" @click="push">
             推送{{ status.ahead ? ` (↑${status.ahead})` : '' }}
           </Button>
         </div>
@@ -101,7 +103,9 @@ const status = ref<GitStatusData>({is_repo: false, branch: '', ahead: 0, behind:
 const branches = ref<string[]>([])
 const message = ref('')
 const loading = ref(false)
-const busy = ref(false)
+// 正在进行的提交/推送动作，用于按钮加载状态；busy 据此派生
+const pending = ref<'commit' | 'push' | 'commitPush' | null>(null)
+const busy = computed(() => pending.value !== null)
 const generating = ref(false)
 
 // 文件视为已暂存：index 列非空且非未跟踪
@@ -155,29 +159,37 @@ const unstage = async (paths: string[]) => {
 const stageAll = () => stage(unstaged.value.map(f => f.path))
 const unstageAll = () => unstage(staged.value.map(f => f.path))
 
+// 仅执行 git 调用，不管 pending（供组合动作复用）
+const doCommit = async () => {
+  await invoke('git_commit', {root: props.rootDir, message: message.value.trim()})
+  message.value = ''
+}
+const doPush = async () => {
+  await invoke('git_push', {root: props.rootDir})
+}
+
 const commit = async () => {
   if (!canCommit.value) {
     return
   }
-  busy.value = true
+  pending.value = 'commit'
   try {
-    await invoke('git_commit', {root: props.rootDir, message: message.value.trim()})
+    await doCommit()
     toast.success('已提交')
-    message.value = ''
     await refresh()
   }
   catch (error) {
     toast.error('提交失败: ' + error)
   }
   finally {
-    busy.value = false
+    pending.value = null
   }
 }
 
 const push = async () => {
-  busy.value = true
+  pending.value = 'push'
   try {
-    await invoke('git_push', {root: props.rootDir})
+    await doPush()
     toast.success('已推送')
     await refresh()
   }
@@ -185,7 +197,7 @@ const push = async () => {
     toast.error('推送失败: ' + error)
   }
   finally {
-    busy.value = false
+    pending.value = null
   }
 }
 
@@ -194,8 +206,19 @@ const commitAndPush = async () => {
     toast.info('请填写提交信息并暂存改动')
     return
   }
-  await commit()
-  await push()
+  pending.value = 'commitPush'
+  try {
+    await doCommit()
+    await doPush()
+    toast.success('已提交并推送')
+    await refresh()
+  }
+  catch (error) {
+    toast.error('提交并推送失败: ' + error)
+  }
+  finally {
+    pending.value = null
+  }
 }
 
 const onBranchChange = async (e: Event) => {
diff --git a/src/components/StatusBar.vue b/src/components/StatusBar.vue
index ae03b36..6d41bce 100644
--- a/src/components/StatusBar.vue
+++ b/src/components/StatusBar.vue
@@ -22,13 +22,19 @@
     </div>
 
     <div class="flex items-center space-x-4">
-      <!-- LSP 状态 -->
-      <div v-if="lspState.status !== 'off'" class="flex items-center space-x-1"
-           :title="lspState.status === 'connecting' ? `语言服务索引中：${lspState.language}` : `语言服务已就绪：${lspState.language}`">
-        <RefreshCw v-if="lspState.status === 'connecting'" class="w-3 h-3 animate-spin"/>
-        <span v-else class="w-1.5 h-1.5 rounded-full bg-emerald-300"/>
-        <span>{{ lspState.status === 'connecting' ? 'LSP 索引中' : 'LSP' }}</span>
-      </div>
+      <!-- LSP 状态（点击开关问题面板）-->
+      <button v-if="lspState.status !== 'off'"
+              class="flex items-center space-x-2 px-1 rounded cursor-pointer hover:bg-white/20 transition-colors"
+              :title="lspState.status === 'connecting' ? `语言服务索引中：${lspState.language}` : `语言服务已就绪：${lspState.language}（点击查看问题）`"
+              @click="emit('toggleProblems')">
+        <span class="flex items-center space-x-1">
+          <RefreshCw v-if="lspState.status === 'connecting'" class="w-3 h-3 animate-spin"/>
+          <span v-else class="w-1.5 h-1.5 rounded-full bg-emerald-300"/>
+          <span>{{ lspState.status === 'connecting' ? 'LSP 索引中' : 'LSP' }}</span>
+        </span>
+        <span v-if="errorCount" class="flex items-center space-x-0.5"><XCircle class="w-3 h-3"/><span>{{ errorCount }}</span></span>
+        <span v-if="warningCount" class="flex items-center space-x-0.5"><AlertTriangle class="w-3 h-3"/><span>{{ warningCount }}</span></span>
+      </button>
 
       <div class="flex items-center space-x-2">
         <Hash class="w-3 h-3 font-normal"/>
@@ -46,10 +52,11 @@
 </template>
 
 <script setup lang="ts">
-import { Clock, Hash, RefreshCw, Terminal as TerminalIcon } from 'lucide-vue-next'
+import { AlertTriangle, Clock, Hash, RefreshCw, Terminal as TerminalIcon, XCircle } from 'lucide-vue-next'
 import { computed, toRefs } from 'vue'
 import { useStatusBar } from '../composables/useStatusBar'
 import { lspState } from '../editor/lspStatus'
+import { diagnostics } from '../editor/lspDiagnostics'
 import { useShortcuts } from '../composables/useShortcuts'
 
 const props = defineProps<{
@@ -67,8 +74,12 @@ const props = defineProps<{
 const emit = defineEmits<{
   checkEnvironment: []
   toggleTerminal: []
+  toggleProblems: []
 }>()
 
+const errorCount = computed(() => diagnostics.value.filter(d => d.severity === 'error').length)
+const warningCount = computed(() => diagnostics.value.filter(d => d.severity === 'warning').length)
+
 const { envInfo, isLoading } = toRefs(props)
 
 // 终端快捷键提示（跟随用户自定义绑定）
diff --git a/src/composables/useCodeMirrorEditor.ts b/src/composables/useCodeMirrorEditor.ts
index 3abdcb9..2aed75a 100644
--- a/src/composables/useCodeMirrorEditor.ts
+++ b/src/composables/useCodeMirrorEditor.ts
@@ -1,4 +1,4 @@
-import {nextTick, ref, watch} from 'vue'
+import {nextTick, ref, shallowRef, watch} from 'vue'
 import {debounce} from 'lodash-es'
 import {useTheme} from './useTheme'
 import {python} from '@codemirror/lang-python'
@@ -154,7 +154,10 @@ export function useCodeMirrorEditor(props: Props)
 
     // 状态管理
     const isReady = ref(false)
-    const extensions = ref<any[]>([])
+    // shallowRef：扩展里含 CodeMirror/LSP 客户端等大量可变内部状态的对象，
+    // 绝不能被 Vue 深层响应式代理（会拖垮性能并触发"诊断→重建→重连"无限循环导致页面卡死）。
+    // 仅在显式整体赋值 extensions.value = result 时才触发重建。
+    const extensions = shallowRef<any[]>([])
     const editorConfig = ref<EditorConfig>({})
     const defaultConfig = {
         theme: 'githubLight',
@@ -441,7 +444,10 @@ export function useCodeMirrorEditor(props: Props)
         // LSP 语义能力（补全/悬浮/诊断/跳转/重命名）；草稿用 untitled 文档，无服务器时为 null
         if (props.language) {
             try {
-                const lsp = await createLspExtensions(props.language, props.filePath, props.rootDir)
+                const lsp = await createLspExtensions(props.language, props.filePath, props.rootDir, {
+                    tabSize: editorConfig.value?.tab_size ?? 4,
+                    insertSpaces: !editorConfig.value?.indent_with_tab
+                })
                 if (lsp) {
                     result.push(lsp)
                 }
diff --git a/src/editor/lspCompletion.ts b/src/editor/lspCompletion.ts
deleted file mode 100644
index 185efb5..0000000
--- a/src/editor/lspCompletion.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-// 显式接入 LSP 自动补全：补全源 + 输入即触发 + 键位（Ctrl+Space 触发、Enter/Tab 接受）
-import {autocompletion, completionKeymap, type CompletionContext, type CompletionResult} from '@codemirror/autocomplete'
-import {keymap} from '@codemirror/view'
-import {Prec} from '@codemirror/state'
-import {languageServerPlugin} from 'codemirror-languageserver'
-
-const offsetToPos = (doc: any, offset: number) => {
-  const line = doc.lineAt(offset)
-  return {line: line.number - 1, character: offset - line.from}
-}
-
-// 向 LSP 请求补全（复用库内 plugin 的 requestCompletion）
-const lspSource = async (ctx: CompletionContext): Promise<CompletionResult | null> => {
-  const {state, pos, explicit, view} = ctx
-  const plugin: any = view?.plugin(languageServerPlugin as any)
-  if (!plugin?.requestCompletion) {
-    return null
-  }
-  const line = state.doc.lineAt(pos)
-  const before = line.text[pos - line.from - 1]
-  const triggers: string[] | undefined = plugin.client?.capabilities?.completionProvider?.triggerCharacters
-  let triggerKind = 1 // Invoked
-  let triggerCharacter: string | undefined
-  if (!explicit && triggers && before && triggers.includes(before)) {
-    triggerKind = 2 // TriggerCharacter
-    triggerCharacter = before
-  }
-  // 非显式触发且不在单词中：不打扰
-  if (!explicit && triggerKind === 1 && !ctx.matchBefore(/[\w.]$/)) {
-    return null
-  }
-  try {
-    return await plugin.requestCompletion(ctx, offsetToPos(state.doc, pos), {triggerKind, triggerCharacter})
-  }
-  catch {
-    return null
-  }
-}
-
-// 高优先级，确保 LSP 补全源生效；并补上补全键位
-export const lspCompletion = [
-  Prec.highest(autocompletion({override: [lspSource], activateOnTyping: true, defaultKeymap: false})),
-  Prec.high(keymap.of(completionKeymap))
-]
diff --git a/src/editor/lspDiagnostics.ts b/src/editor/lspDiagnostics.ts
new file mode 100644
index 0000000..2dab150
--- /dev/null
+++ b/src/editor/lspDiagnostics.ts
@@ -0,0 +1,41 @@
+// 把编辑器内的 LSP 诊断聚合到响应式 store，供「问题面板」展示与跳转。
+// 收集做去抖：索引期诊断高频刷新，只在停顿后聚合一次，顺带降低渲染压力。
+import {ref} from 'vue'
+import {EditorView} from '@codemirror/view'
+import {forEachDiagnostic} from '@codemirror/lint'
+
+export interface DiagItem {
+  severity: string // 'error' | 'warning' | 'info' | 'hint'
+  message: string
+  line: number     // 1 基行号
+  col: number      // 1 基列号
+  from: number     // 文档偏移，用于排序
+}
+
+// 当前(活动)编辑器的诊断列表
+export const diagnostics = ref<DiagItem[]>([])
+
+let timer: ReturnType<typeof setTimeout> | null = null
+
+// 在每次编辑器更新后去抖重算诊断列表
+export const diagnosticsCollector = EditorView.updateListener.of((update) => {
+  const view = update.view
+  if (timer) {
+    clearTimeout(timer)
+  }
+  timer = setTimeout(() => {
+    const items: DiagItem[] = []
+    forEachDiagnostic(view.state, (d, from) => {
+      const line = view.state.doc.lineAt(from)
+      items.push({
+        severity: d.severity,
+        message: d.message,
+        line: line.number,
+        col: from - line.from + 1,
+        from
+      })
+    })
+    items.sort((a, b) => a.from - b.from)
+    diagnostics.value = items
+  }, 200)
+})
diff --git a/src/editor/lspExtension.ts b/src/editor/lspExtension.ts
index 4d92efa..e132229 100644
--- a/src/editor/lspExtension.ts
+++ b/src/editor/lspExtension.ts
@@ -1,10 +1,72 @@
-// 根据语言/文件构建 CodeMirror LSP 扩展（补全、悬浮、诊断、跳转、重命名）
+// 根据语言/文件构建 CodeMirror LSP 扩展（补全、悬浮、诊断、跳转、重命名、格式化）
 import {invoke} from '@tauri-apps/api/core'
-import {LanguageServerClient, languageServerWithTransport} from 'codemirror-languageserver'
+import {
+  LanguageServerClient,
+  languageServerWithTransport,
+  languageServerPlugin,
+  formatDocument,
+  formatSelection,
+  formattingOptions,
+  renameSymbol
+} from 'codemirror-languageserver'
+import {keymap, EditorView} from '@codemirror/view'
+import {Prec} from '@codemirror/state'
 import {TauriLspTransport} from './lspTransport'
 import {setLspState} from './lspStatus'
 import {lspCustomHover} from './lspHover'
-import {lspCompletion} from './lspCompletion'
+import {diagnosticsCollector} from './lspDiagnostics'
+
+// CodeMirror 偏移量 → LSP 0 基行列
+const offsetToLspPos = (doc: any, offset: number) => {
+  const line = doc.lineAt(offset)
+  return {line: line.number - 1, character: offset - line.from}
+}
+
+// file:// URI 还原为本地路径（toUri 的逆操作）
+const uriToPath = (uri: string): string | null => {
+  if (!uri.startsWith('file://')) {
+    return null
+  }
+  let p = decodeURIComponent(uri.slice('file://'.length))
+  // Windows: file:///C:/... → C:/...
+  if (/^\/[A-Za-z]:/.test(p)) {
+    p = p.slice(1)
+  }
+  return p
+}
+
+/**
+ * 在指定位置（默认光标处）请求跳转定义。
+ * 同文件交给库内部移动光标；跨文件则派发 lsp:open-location 由 App 打开目标文件并定位。
+ * 供 F12 键位、Cmd+Click 与右键菜单共用。
+ */
+export const runGotoDefinition = (view: EditorView, pos?: number): boolean => {
+  const plugin: any = view.plugin(languageServerPlugin as any)
+  if (!plugin?.requestDefinition) {
+    return false
+  }
+  const at = pos ?? view.state.selection.main.head
+  const currentUri = plugin.documentUri
+  Promise.resolve(plugin.requestDefinition(view, offsetToLspPos(view.state.doc, at)))
+    .then((loc: any) => {
+      if (!loc?.uri || loc.uri === currentUri) {
+        return
+      }
+      const targetPath = uriToPath(loc.uri)
+      if (!targetPath) {
+        return
+      }
+      window.dispatchEvent(new CustomEvent('lsp:open-location', {
+        detail: {
+          path: targetPath,
+          line: (loc.range?.start?.line ?? 0) + 1,
+          character: loc.range?.start?.character ?? 0
+        }
+      }))
+    })
+    .catch(() => {})
+  return true
+}
 
 // 代次：每次构建 LSP 扩展自增，过期 client 的回调据此忽略
 let stateGen = 0
@@ -32,14 +94,23 @@ const LANGUAGE_ID: Record<string, string> = {
   ruby: 'ruby',
   html: 'html',
   css: 'css',
-  json: 'json'
+  json: 'json',
+  java: 'java',
+  kotlin: 'kotlin',
+  swift: 'swift',
+  scala: 'scala',
+  yaml: 'yaml',
+  shell: 'shellscript',
+  haskell: 'haskell'
 }
 
 // 草稿(未保存)时用的文件扩展名，构造 untitled 文档 URI
 const LANGUAGE_EXT: Record<string, string> = {
   python: 'py', typescript: 'ts', javascript: 'js', rust: 'rs', go: 'go',
   c: 'c', cpp: 'cpp', 'objective-c': 'm', 'objective-cpp': 'mm',
-  lua: 'lua', php: 'php', ruby: 'rb', html: 'html', css: 'css', json: 'json'
+  lua: 'lua', php: 'php', ruby: 'rb', html: 'html', css: 'css', json: 'json',
+  java: 'java', kotlin: 'kt', swift: 'swift', scala: 'scala', yaml: 'yaml',
+  shellscript: 'sh', haskell: 'hs'
 }
 
 export const lspSupportsLanguage = (language?: string): boolean =>
@@ -54,7 +125,8 @@ const toUri = (p: string): string =>
 export async function createLspExtensions(
   language: string | undefined,
   filePath: string | null | undefined,
-  rootDir?: string | null
+  rootDir?: string | null,
+  fmtOptions?: {tabSize?: number; insertSpaces?: boolean}
 ): Promise<any | null> {
   if (!language) {
     return null
@@ -120,8 +192,48 @@ export async function createLspExtensions(
       allowHTMLContent: true,
       autoClose: true
     })
-    // 自绘悬浮 + 显式 LSP 补全(本编辑器未启用 basicSetup, 需自带补全键位与源)
-    return [base, lspCustomHover, lspCompletion]
+    // base 已内置：补全(源+键位)、悬浮、文档高亮、跳转定义(F12/Cmd+Click)、
+    // 重命名基建(renameExtension)。不要重复添加这些，否则触发配置冲突。
+    // 此处仅补 base 未绑定的触发键与未接入的能力：
+    //   - F2：触发重命名(base 有 renameExtension 但未绑键)
+    //   - Shift-Alt-F / Mod-Shift-I：格式化整篇文档(base 未接入格式化)
+    //   - Mod-K Mod-F：格式化选中区域
+    //   - formattingOptions：将格式化的缩进与编辑器配置对齐
+    const lspKeymap = keymap.of([
+      {key: 'F2', run: renameSymbol},
+      {key: 'Shift-Alt-f', run: formatDocument},
+      {key: 'Mod-Shift-i', run: formatDocument},
+      {key: 'Mod-k Mod-f', run: formatSelection}
+    ])
+    const fmt = formattingOptions.of({
+      tabSize: fmtOptions?.tabSize ?? 4,
+      insertSpaces: fmtOptions?.insertSpaces ?? true
+    })
+
+    // 跨文件跳转定义：库自带的 F12 / Cmd+Click 只处理同文件，跨文件时丢弃结果。
+    // 这里用 runGotoDefinition 接管——同文件交给库内部移动光标，跨文件派发事件由 App 打开。
+    // Prec.highest 确保覆盖 base 内置的 F12 绑定与 Cmd+Click 处理器
+    const gotoKeymap = Prec.highest(keymap.of([
+      {key: 'F12', run: (v) => runGotoDefinition(v), preventDefault: true}
+    ]))
+    const gotoMouse = Prec.highest(EditorView.domEventHandlers({
+      mousedown: (event, view) => {
+        if (!event.ctrlKey && !event.metaKey) {
+          return false
+        }
+        const pos = view.posAtCoords({x: event.clientX, y: event.clientY})
+        if (pos == null) {
+          return false
+        }
+        const ok = runGotoDefinition(view, pos)
+        if (ok) {
+          event.preventDefault()
+        }
+        return ok
+      }
+    }))
+
+    return [base, lspCustomHover, lspKeymap, fmt, gotoKeymap, gotoMouse, diagnosticsCollector]
   }
   catch {
     return null
diff --git a/src/editor/lspTransport.ts b/src/editor/lspTransport.ts
index 491793e..5dc3697 100644
--- a/src/editor/lspTransport.ts
+++ b/src/editor/lspTransport.ts
@@ -17,9 +17,11 @@ export class TauriLspTransport implements Transport {
   }
 
   private async init() {
-    const un1 = await listen<{ language: string; message: string }>('lsp:message', (e) => {
+    const un1 = await listen<{ language: string; messages: string[] }>('lsp:messages', (e) => {
       if (e.payload.language === this.language) {
-        this.msgCb?.(e.payload.message)
+        for (const m of e.payload.messages) {
+          this.msgCb?.(m)
+        }
       }
     })
     const un2 = await listen<string>('lsp:exit', (e) => {