refactor(lsp): extract platform-specific utilities and improve code consistency

- Extract platform detection logic into shared utility functions (getExecutableName, getNpmCommand)
- Remove trailing whitespace throughout LSP installer and manager modules
- Improve code consistency by centralizing platform-specific command resolution
- Update imports to use new utility functions from pathUtils
- Simplify npm command resolution by delegating to shared utility
- Enhance maintainability by reducing platform-specific logic duplication across modules

Author: adnaan-worker

src/main/lsp/installer.ts

@@ -12,6 +12,7 @@
 
 import { logger } from '@shared/utils/Logger'
 import { toAppError } from '@shared/utils/errorHandler'
+import { getExecutableName } from '@shared/utils/pathUtils'
 import { spawn, ChildProcess } from 'child_process'
 import * as path from 'path'
 import * as fs from 'fs'
@@ -66,7 +67,7 @@ async function findNearestRoot(
   excludePatterns?: string[]
 ): Promise<string | undefined> {
   let currentDir = startDir
-  
+
   while (currentDir.length >= stopDir.length) {
     // 检查排除模式
     if (excludePatterns) {
@@ -77,20 +78,20 @@ async function findNearestRoot(
         }
       }
     }
-    
+
     // 检查目标模式
     for (const pattern of patterns) {
       const targetPath = path.join(currentDir, pattern)
       if (fs.existsSync(targetPath)) {
         return currentDir
       }
     }
-    
+
     const parentDir = path.dirname(currentDir)
     if (parentDir === currentDir) break
     currentDir = parentDir
   }
-  
+
   return undefined
 }
 
@@ -156,8 +157,7 @@ async function getGoplsCommand(): Promise<{ command: string; args: string[] } |
   }
 
   // 检查 GOPATH/bin
-  const isWindows = process.platform === 'win32'
-  const goplsName = isWindows ? 'gopls.exe' : 'gopls'
+  const goplsName = getExecutableName('gopls')
   const goPathBin = process.env.GOPATH ? path.join(process.env.GOPATH, 'bin', goplsName) : null
 
   if (goPathBin && fs.existsSync(goPathBin)) {
@@ -173,8 +173,7 @@ async function getRustAnalyzerCommand(): Promise<{ command: string; args: string
     return { command: 'rust-analyzer', args: [] }
   }
 
-  const isWindows = process.platform === 'win32'
-  const raName = isWindows ? 'rust-analyzer.exe' : 'rust-analyzer'
+  const raName = getExecutableName('rust-analyzer')
   const cargoHome =
     process.env.CARGO_HOME || path.join(process.env.HOME || process.env.USERPROFILE || '', '.cargo')
   const raPath = path.join(cargoHome, 'bin', raName)
@@ -204,7 +203,7 @@ async function getVueServerCommand(): Promise<{ command: string; args: string[]
   if (commandExists('vue-language-server')) {
     return { command: 'vue-language-server', args: ['--stdio'] }
   }
-  
+
   return null
 }
 
@@ -241,6 +240,21 @@ async function getDenoCommand(): Promise<{ command: string; args: string[] } | n
   return null
 }
 
+// PHP LSP (intelephense)
+async function getPhpServerCommand(): Promise<{ command: string; args: string[] } | null> {
+  const serverPath = getInstalledServerPath('php')
+  if (serverPath) {
+    return { command: process.execPath, args: [serverPath, '--stdio'] }
+  }
+
+  // 检查全局安装的 intelephense
+  if (commandExists('intelephense')) {
+    return { command: 'intelephense', args: ['--stdio'] }
+  }
+
+  return null
+}
+
 // ============ 服务器配置 ============
 
 const LSP_SERVERS: LspServerConfig[] = [
@@ -314,7 +328,7 @@ const LSP_SERVERS: LspServerConfig[] = [
       const fileDir = path.dirname(filePath)
       const crateRoot = await findNearestRoot(fileDir, workspacePath, ['Cargo.toml', 'Cargo.lock'])
       if (!crateRoot) return workspacePath
-      
+
       // 向上查找 workspace 根目录
       let currentDir = crateRoot
       while (currentDir.length >= workspacePath.length) {
@@ -331,7 +345,7 @@ const LSP_SERVERS: LspServerConfig[] = [
         if (parentDir === currentDir) break
         currentDir = parentDir
       }
-      
+
       return crateRoot
     },
   },
@@ -395,6 +409,21 @@ const LSP_SERVERS: LspServerConfig[] = [
       return root || null // 找不到 deno.json 返回 null，表示不应该使用 Deno LSP
     },
   },
+  {
+    name: 'php',
+    languages: ['php'],
+    getCommand: getPhpServerCommand,
+    // 智能根目录检测：查找 PHP 项目配置文件
+    findRoot: async (filePath, workspacePath) => {
+      const fileDir = path.dirname(filePath)
+      const root = await findNearestRoot(
+        fileDir,
+        workspacePath,
+        ['composer.json', 'composer.lock', 'phpunit.xml', 'phpstan.neon']
+      )
+      return root || workspacePath
+    },
+  },
 ]
 
 // ============ LSP 管理器 ============
@@ -405,10 +434,10 @@ class LspManager {
   private documentVersions: Map<string, number> = new Map() // 启用文档版本管理
   private diagnosticsCache: CacheService<any[]>
   private startingServers: Set<string> = new Set()
-  
+
   // 跟踪每个服务器打开的文档
   private serverOpenedDocuments: Map<string, Map<string, { languageId: string; version: number; text: string }>> = new Map()
-  
+
   // 空闲关闭配置
   private serverLastActivity: Map<string, number> = new Map()
   private idleCheckInterval: NodeJS.Timeout | null = null
@@ -438,7 +467,7 @@ class LspManager {
         this.languageToServer.set(lang, config.name)
       }
     }
-    
+
     // 启动空闲检查定时器
     this.startIdleCheck()
   }
@@ -452,7 +481,7 @@ class LspManager {
 
   private startIdleCheck() {
     if (this.idleCheckInterval) return
-    
+
     this.idleCheckInterval = setInterval(() => {
       const now = Date.now()
       for (const [key, lastActivity] of this.serverLastActivity) {
@@ -555,7 +584,7 @@ class LspManager {
       // 自动重启逻辑（改进版）
       if (code !== 0 && code !== null && inst) {
         const now = Date.now()
-        
+
         // 如果距离上次崩溃超过冷却时间，重置计数
         if (now - inst.lastCrashTime > LspManager.CRASH_COOLDOWN_MS) {
           inst.crashCount = 1
@@ -568,7 +597,7 @@ class LspManager {
         if (inst.crashCount <= LspManager.MAX_CRASH_COUNT) {
           const delay = Math.min(1000 * inst.crashCount, 5000) // 递增延迟，最大 5 秒
           logger.lsp.warn(`[LSP ${key}] Server crashed (${inst.crashCount}/${LspManager.MAX_CRASH_COUNT}), restarting in ${delay}ms...`)
-          
+
           setTimeout(() => {
             // 再次检查是否应该重启（可能用户已手动停止）
             if (!this.servers.has(key)) {
@@ -716,7 +745,7 @@ class LspManager {
   sendRequest(key: string, method: string, params: any, timeoutMs = 30000): Promise<any> {
     // 更新活动时间
     this.updateActivity(key)
-    
+
     return new Promise((resolve, reject) => {
       const instance = this.servers.get(key)
       if (!instance?.process?.stdin || !instance.process.stdin.writable) {
@@ -747,7 +776,7 @@ class LspManager {
   sendNotification(key: string, method: string, params: any): void {
     // 更新活动时间
     this.updateActivity(key)
-    
+
     const instance = this.servers.get(key)
     if (!instance?.process?.stdin || !instance.process.stdin.writable) return
     const body = JSON.stringify({ jsonrpc: '2.0', method, params })
@@ -797,9 +826,9 @@ class LspManager {
           dynamicRegistration: false,
         },
       },
-      workspace: { 
-        workspaceFolders: true, 
-        applyEdit: true, 
+      workspace: {
+        workspaceFolders: true,
+        applyEdit: true,
         configuration: true,
         // 文件监视支持
         didChangeWatchedFiles: {
@@ -812,16 +841,16 @@ class LspManager {
   async stopServerByKey(key: string): Promise<void> {
     const instance = this.servers.get(key)
     if (!instance?.process) return
-    
+
     // 清除该服务器相关的诊断缓存（按前缀删除）
     const workspaceUri = `file:///${instance.workspacePath.replace(/\\/g, '/')}`
     const altUri = workspaceUri.replace('file:///', 'file://')
-    
+
     // 获取要删除的 URI 列表
     const urisToDelete = this.diagnosticsCache.keys().filter(
       uri => uri.startsWith(workspaceUri) || uri.startsWith(altUri)
     )
-    
+
     for (const uri of urisToDelete) {
       this.diagnosticsCache.delete(uri)
       // 通知前端清除诊断
@@ -833,18 +862,18 @@ class LspManager {
         }
       })
     }
-    
+
     // 清除文档跟踪（服务器关闭后文档状态无效）
     this.serverOpenedDocuments.delete(key)
-    
+
     try {
       await this.sendRequest(key, 'shutdown', null, 3000)
       this.sendNotification(key, 'exit', null)
     } catch { }
     instance.process.kill()
     this.servers.delete(key)
     this.serverLastActivity.delete(key)
-    
+
     logger.lsp.info(`[LSP ${key}] Server stopped and diagnostics cleared`)
   }
 

src/main/lspManager.ts

@@ -34,6 +34,7 @@ const LANGUAGE_TO_SERVER: Record<string, string> = {
   c: 'clangd',
   cpp: 'clangd',
   vue: 'vue',
+  php: 'php',
 }
 
 // 服务器显示名称
@@ -47,6 +48,7 @@ const SERVER_NAMES: Record<string, string> = {
   rust: 'rust-analyzer',
   clangd: 'clangd (C/C++)',
   vue: 'Vue Language Server',
+  php: 'Intelephense (PHP)',
 }
 
 // 安装说明
@@ -60,6 +62,7 @@ const INSTALL_HINTS: Record<string, { auto: boolean; hint: string; builtin?: boo
   rust: { auto: false, hint: '请运行: rustup component add rust-analyzer' },
   clangd: { auto: false, hint: '请安装 LLVM/Clang' },
   vue: { auto: true, hint: '可自动安装' },
+  php: { auto: true, hint: '可自动安装 Intelephense' },
 }
 
 export default function LspStatusIndicator() {
@@ -80,7 +83,7 @@ export default function LspStatusIndicator() {
 
   // 获取服务器状态
   useEffect(() => {
-    api.lsp.getServerStatus().then(setServerStatus).catch(() => {})
+    api.lsp.getServerStatus().then(setServerStatus).catch(() => { })
   }, [])
 
   // 安装服务器

src/renderer/components/layout/LspStatusIndicator.tsx

@@ -22,7 +22,7 @@ export default function TitleBar() {
         ${isMac ? 'pl-[76px] pr-4' : 'pl-4 pr-4'}
       `}>
         {/* Logo - Clickable to show about */}
-        <div 
+        <div
           onClick={() => setShowAbout(true)}
           className="no-drag flex items-center gap-2.5 opacity-80 hover:opacity-100 transition-all cursor-pointer group"
         >
@@ -77,22 +77,22 @@ export default function TitleBar() {
         {/* Windows Controls */}
         {!isMac && (
           <div className="no-drag flex items-center h-full pl-2 border-l border-white/5">
-            <div className="flex items-center">
+            <div className="flex items-center gap-0.5">
               <button
                 onClick={() => api.window.minimize()}
-                className="w-10 h-8 flex items-center justify-center text-text-muted hover:text-text-primary hover:bg-white/5 transition-all group"
+                className="w-9 h-8 rounded-lg flex items-center justify-center text-text-muted hover:text-text-primary hover:bg-white/5 transition-all group"
               >
                 <Minus className="w-4 h-4 opacity-70 group-hover:opacity-100" />
               </button>
               <button
                 onClick={() => api.window.maximize()}
-                className="w-10 h-8 flex items-center justify-center text-text-muted hover:text-text-primary hover:bg-white/5 transition-all group"
+                className="w-9 h-8 rounded-lg flex items-center justify-center text-text-muted hover:text-text-primary hover:bg-white/5 transition-all group"
               >
                 <Square className="w-3 h-3 opacity-70 group-hover:opacity-100" />
               </button>
               <button
                 onClick={() => api.window.close()}
-                className="w-10 h-8 flex items-center justify-center text-text-muted hover:text-white hover:bg-red-500/90 transition-all group"
+                className="w-9 h-8 rounded-lg flex items-center justify-center text-text-muted hover:text-white hover:bg-red-500/90 transition-all group"
               >
                 <X className="w-4 h-4 opacity-70 group-hover:opacity-100" />
               </button>

src/renderer/components/layout/TitleBar.tsx

@@ -185,13 +185,13 @@ export const VirtualFileTree = memo(function VirtualFileTree({
 
     for (const normalizedPath of pathsToExpand) {
       // 在当前层级的 items 中查找匹配的目录
-      const targetDir = currentItems.find(item => 
+      const targetDir = currentItems.find(item =>
         item.isDirectory && pathEquals(item.path, normalizedPath)
       )
 
       if (targetDir) {
         pathsToExpandActual.push(targetDir.path)
-        
+
         // 展开该目录
         const isExpanded = expandedFolders.has(targetDir.path)
         if (!isExpanded) {
@@ -323,7 +323,7 @@ export const VirtualFileTree = memo(function VirtualFileTree({
     } else {
       // 检查文件类型
       const fileType = getFileType(node.item.path)
-      
+
       if (fileType === 'image' || fileType === 'binary') {
         // 图片和二进制文件不需要读取内容，直接打开
         openFile(node.item.path, '')
@@ -507,9 +507,13 @@ export const VirtualFileTree = memo(function VirtualFileTree({
               }
             }}
             onKeyDown={(e) => {
-              if (keybindingService.matches(e, 'list.select') && e.currentTarget.value.trim()) {
+              // 输入法组合中不处理回车
+              if (e.nativeEvent.isComposing) return
+
+              if (e.key === 'Enter' && e.currentTarget.value.trim()) {
+                e.preventDefault()
                 onCreateSubmit(creatingIn.path, e.currentTarget.value.trim(), creatingIn.type)
-              } else if (keybindingService.matches(e, 'list.cancel')) {
+              } else if (e.key === 'Escape') {
                 onCancelCreate()
               }
             }}
@@ -594,8 +598,14 @@ export const VirtualFileTree = memo(function VirtualFileTree({
             onChange={(e) => setRenameValue(e.target.value)}
             onBlur={handleRenameSubmit}
             onKeyDown={(e) => {
-              if (keybindingService.matches(e, 'list.select')) handleRenameSubmit()
-              if (keybindingService.matches(e, 'list.cancel')) setRenamingPath(null)
+              // 输入法组合中不处理回车
+              if (e.nativeEvent.isComposing) return
+
+              if (e.key === 'Enter') {
+                e.preventDefault()
+                handleRenameSubmit()
+              }
+              if (e.key === 'Escape') setRenamingPath(null)
             }}
             onClick={(e) => e.stopPropagation()}
             className="flex-1 h-5 text-[13px] px-1 py-0"

src/renderer/components/tree/VirtualFileTree.tsx

@@ -132,13 +132,13 @@ class KeybindingService {
                 const parsed = JSON.parse(localData)
                 this.overrides = new Map(Object.entries(parsed))
                 // 异步同步到文件（不阻塞）
-                api.settings.set('keybindings', parsed).catch(() => {})
+                api.settings.set('keybindings', parsed).catch(() => { })
                 return
             }
         } catch (e) {
             // localStorage 读取失败，继续从文件读取
         }
-        
+
         // 从文件读取
         try {
             const saved = await api.settings.get('keybindings') as Record<string, string>