optimize formatter

Author: CppCXY

crates/xmake_formatter/src/style_ruler/basic_space.rs

@@ -15,6 +15,22 @@ impl StyleRuler for BasicSpaceRuler {
                 let syntax_id = LuaSyntaxId::from_token(&token);
                 match token.kind().to_token() {
                     LuaTokenKind::TkLeftParen | LuaTokenKind::TkLeftBracket => {
+                        if let Some(prev_token) = get_prev_sibling_token_without_space(&token) {
+                            match prev_token.kind().to_token() {
+                                LuaTokenKind::TkName
+                                | LuaTokenKind::TkRightParen
+                                | LuaTokenKind::TkRightBracket => {
+                                    f.add_token_left_expected(syntax_id, TokenExpected::Space(0));
+                                }
+                                LuaTokenKind::TkString
+                                | LuaTokenKind::TkRightBrace
+                                | LuaTokenKind::TkLongString => {
+                                    f.add_token_left_expected(syntax_id, TokenExpected::Space(1));
+                                }
+                                _ => {}
+                            }
+                        }
+
                         f.add_token_right_expected(syntax_id, TokenExpected::Space(0));
                     }
                     LuaTokenKind::TkRightBracket | LuaTokenKind::TkRightParen => {
@@ -123,3 +139,15 @@ fn is_parent_syntax(token: &LuaSyntaxToken, kind: LuaSyntaxKind) -> bool {
     }
     false
 }
+
+fn get_prev_sibling_token_without_space(token: &LuaSyntaxToken) -> Option<LuaSyntaxToken> {
+    let mut current = token.clone();
+    while let Some(prev) = current.prev_token() {
+        if prev.kind().to_token() != LuaTokenKind::TkWhitespace {
+            return Some(prev);
+        }
+        current = prev;
+    }
+
+    None
+}

crates/xmake_ls/src/handlers/document_range_formatting/mod.rs

@@ -85,6 +85,7 @@ pub async fn on_range_formatting_handler(
     Some(vec![text_edit])
 }
 
+#[allow(unused)]
 pub struct DocumentRangeFormattingCapabilities;
 
 impl RegisterCapabilities for DocumentRangeFormattingCapabilities {

crates/xmake_ls/src/handlers/mod.rs

@@ -73,7 +73,7 @@ capabilities!(modules: {
     document_selection_range => DocumentSelectionRangeCapabilities,
     document_highlight => DocumentHighlightCapabilities,
     document_formatting => DocumentFormattingCapabilities,
-    document_range_formatting => DocumentRangeFormattingCapabilities,
+    // document_range_formatting => DocumentRangeFormattingCapabilities,
     // document_type_format => DocumentTypeFormattingCapabilities,
     completion => CompletionCapabilities,
     inlay_hint => InlayHintCapabilities,

crates/xmake_wrapper/src/lib.rs

@@ -75,16 +75,8 @@ impl XmakeWrapper {
             return Some(xmake_path);
         }
 
-        // 尝试从环境变量获取 xmake 路径
-        if let Ok(xmake_root) = std::env::var("XMAKE_ROOT") {
-            let xmake_exe = PathBuf::from(xmake_root).join("bin").join("xmake");
-            if xmake_exe.exists() {
-                return Some(xmake_exe);
-            }
-        }
-
         if let Ok(xmake_home) = std::env::var("XMAKE_HOME") {
-            let xmake_exe = PathBuf::from(xmake_home).join("bin").join("xmake");
+            let xmake_exe = PathBuf::from(xmake_home).join("xmake");
             if xmake_exe.exists() {
                 return Some(xmake_exe);
             }