chore: apply PR review feedback (formatting and clippy)

- Fix formatting across multiple files using 'cargo fmt'.
- Collapse nested 'if let' statements into single chains with 'and_then' or 'let_chains'.
- Remove redundant closures.
- Fix unused variable warning in 'src/references/mod.rs'.

Author: MingJen

src/definition/member/mod.rs

@@ -811,13 +811,13 @@ impl Backend {
         let mut current = Some(class.clone());
         for _ in 0..MAX_INHERITANCE_DEPTH {
             let Some(curr) = current else { break };
-            if let Some(laravel) = curr.laravel() {
-                if let Some(builder) = &laravel.custom_builder {
-                    if let Some(name) = builder.base_name() {
-                        builder_fqn = name.to_string();
-                        break;
-                    }
-                }
+            if let Some(name) = curr
+                .laravel()
+                .and_then(|l| l.custom_builder.as_ref())
+                .and_then(|b| b.base_name())
+            {
+                builder_fqn = name.to_string();
+                break;
             }
             current = curr
                 .parent_class

src/references/mod.rs

@@ -144,7 +144,8 @@ impl Backend {
                         });
 
                     // Resolve the enclosing class to scope the search.
-                    let hierarchy = self.resolve_member_declaration_hierarchy(uri, span_start, name, is_static);
+                    let hierarchy =
+                        self.resolve_member_declaration_hierarchy(uri, span_start, name, is_static);
                     return self.find_member_references(
                         name,
                         is_static,
@@ -176,8 +177,13 @@ impl Backend {
             } => {
                 // Resolve the subject to determine the class hierarchy
                 // so we only return references on related classes.
-                let hierarchy =
-                    self.resolve_member_access_hierarchy(uri, subject_text, *is_static, span_start, member_name);
+                let hierarchy = self.resolve_member_access_hierarchy(
+                    uri,
+                    subject_text,
+                    *is_static,
+                    span_start,
+                    member_name,
+                );
 
                 self.find_member_references(
                     member_name,
@@ -196,7 +202,8 @@ impl Backend {
             }
             SymbolKind::MemberDeclaration { name, is_static } => {
                 // Resolve the enclosing class to scope the search.
-                let hierarchy = self.resolve_member_declaration_hierarchy(uri, span_start, name, *is_static);
+                let hierarchy =
+                    self.resolve_member_declaration_hierarchy(uri, span_start, name, *is_static);
                 self.find_member_references(
                     name,
                     *is_static,
@@ -1334,14 +1341,13 @@ impl Backend {
         // add that builder to the hierarchy.
         let mut extensions = Vec::new();
         for fqn in &hierarchy {
-            if let Some(cls) = class_loader(fqn) {
-                if let Some(laravel) = cls.laravel() {
-                    if let Some(builder) = &laravel.custom_builder {
-                        if let Some(builder_fqn) = builder.base_name() {
-                            extensions.push(normalize_fqn(builder_fqn).to_string());
-                        }
-                    }
-                }
+            if let Some(cls) = class_loader(fqn)
+                && let Some(builder_fqn) = cls
+                    .laravel()
+                    .and_then(|l| l.custom_builder.as_ref())
+                    .and_then(|b| b.base_name())
+            {
+                extensions.push(normalize_fqn(builder_fqn).to_string());
             }
         }
         for ext_fqn in extensions {
@@ -1358,14 +1364,18 @@ impl Backend {
             let class_index = self.fqn_class_index.read();
             for (class_fqn, class_info) in class_index.iter() {
                 if let Some(laravel) = class_info.laravel() {
-                    if let Some(builder) = &laravel.custom_builder {
-                        if let Some(builder_fqn) = builder.base_name() {
-                            let normalized = normalize_fqn(builder_fqn);
-                            if hierarchy.contains(normalized.as_str()) {
-                                model_seeds.push(class_fqn.clone());
-                            }
+                    if let Some(normalized) = laravel
+                        .custom_builder
+                        .as_ref()
+                        .and_then(|b| b.base_name())
+                        .map(normalize_fqn)
+                    {
+                        if hierarchy.contains(normalized.as_str()) {
+                            model_seeds.push(class_fqn.clone());
                         }
-                    } else if hierarchy.contains(crate::virtual_members::laravel::ELOQUENT_BUILDER_FQN) {
+                    } else if hierarchy
+                        .contains(crate::virtual_members::laravel::ELOQUENT_BUILDER_FQN)
+                    {
                         // All models use the base Eloquent Builder by default.
                         model_seeds.push(class_fqn.clone());
                     }
@@ -1429,26 +1439,32 @@ impl Backend {
 
         // Laravel forwarded methods
         if let Some(laravel) = cls.laravel() {
-            if let Some(builder) = &laravel.custom_builder {
-                if let Some(builder_fqn) = builder.base_name() {
-                    if let Some(builder_cls) = class_loader(builder_fqn) {
-                        // Forwarded methods are instance methods on the builder
-                        // but called statically on the model.
-                        if builder_cls.methods.iter().any(|m| {
-                            m.name.eq_ignore_ascii_case(name) && (!is_static || !m.is_static)
-                        }) {
-                            return true;
-                        }
-                    }
+            if let Some(builder_cls) = laravel
+                .custom_builder
+                .as_ref()
+                .and_then(|b| b.base_name())
+                .and_then(class_loader)
+            {
+                // Forwarded methods are instance methods on the builder
+                // but called statically on the model.
+                if builder_cls
+                    .methods
+                    .iter()
+                    .any(|m| m.name.eq_ignore_ascii_case(name) && (!is_static || !m.is_static))
+                {
+                    return true;
                 }
             }
             // Standard builder forwarding
-            if let Some(builder_cls) = class_loader(crate::virtual_members::laravel::ELOQUENT_BUILDER_FQN) {
-                if builder_cls.methods.iter().any(|m| {
-                    m.name.eq_ignore_ascii_case(name) && (!is_static || !m.is_static)
-                }) {
-                    return true;
-                }
+            if class_loader(crate::virtual_members::laravel::ELOQUENT_BUILDER_FQN)
+                .filter(|bc| {
+                    bc.methods
+                        .iter()
+                        .any(|m| m.name.eq_ignore_ascii_case(name) && (!is_static || !m.is_static))
+                })
+                .is_some()
+            {
+                return true;
             }
         }
 

src/virtual_members/laravel/builder.rs

@@ -99,13 +99,13 @@ pub(super) fn build_builder_forwarded_methods(
     let mut current = Some(class.clone());
     for _ in 0..MAX_INHERITANCE_DEPTH {
         let Some(curr) = current else { break };
-        if let Some(laravel) = curr.laravel() {
-            if let Some(builder) = &laravel.custom_builder {
-                if let Some(name) = builder.base_name() {
-                    requested_builder_fqn = name.to_string();
-                    break;
-                }
-            }
+        if let Some(name) = curr
+            .laravel()
+            .and_then(|l| l.custom_builder.as_ref())
+            .and_then(|b| b.base_name())
+        {
+            requested_builder_fqn = name.to_string();
+            break;
         }
         current = curr
             .parent_class

tests/integration/laravel_custom_builder.rs

@@ -820,7 +820,6 @@ class User extends Model {}
     );
 }
 
-
 #[tokio::test]
 async fn test_goto_definition_custom_builder_inherited_attribute() {
     let (backend, dir) = create_psr4_workspace(

tests/integration/laravel_references.rs

@@ -100,7 +100,7 @@ User::query()->active();
     }
 
     let builder_uri = Url::from_file_path(dir.path().join("src/Models/UserBuilder.php")).unwrap();
-    
+
     // Find references for UserBuilder::active() declaration (line 5, col 21)
     let params = ReferenceParams {
         text_document_position: TextDocumentPositionParams {
@@ -113,18 +113,39 @@ User::query()->active();
             include_declaration: true,
         },
     };
-    
-    let locations = backend.references(params).await.unwrap().unwrap_or_default();
-    
+
+    let locations = backend
+        .references(params)
+        .await
+        .unwrap()
+        .unwrap_or_default();
+
     let usage_uri = Url::from_file_path(dir.path().join("usage.php")).unwrap();
     let usage_locs: Vec<_> = locations.iter().filter(|l| l.uri == usage_uri).collect();
-    
+
     let lines: Vec<_> = usage_locs.iter().map(|l| l.range.start.line).collect();
-    
-    assert!(lines.contains(&4), "Should find User::active(). Found at lines: {:?}", lines);
-    assert!(lines.contains(&6), "Should find User::query()->active(). Found at lines: {:?}", lines);
-    assert!(!lines.contains(&5), "Should NOT find Post::active(). Found at lines: {:?}", lines);
-    assert_eq!(usage_locs.len(), 2, "Should find exactly 2 references in usage.php, but found: {:?}", lines);
+
+    assert!(
+        lines.contains(&4),
+        "Should find User::active(). Found at lines: {:?}",
+        lines
+    );
+    assert!(
+        lines.contains(&6),
+        "Should find User::query()->active(). Found at lines: {:?}",
+        lines
+    );
+    assert!(
+        !lines.contains(&5),
+        "Should NOT find Post::active(). Found at lines: {:?}",
+        lines
+    );
+    assert_eq!(
+        usage_locs.len(),
+        2,
+        "Should find exactly 2 references in usage.php, but found: {:?}",
+        lines
+    );
 }
 
 #[tokio::test]
@@ -225,7 +246,7 @@ User::query()->active();
     }
 
     let usage_uri = Url::from_file_path(dir.path().join("usage.php")).unwrap();
-    
+
     // Find references for User::active() usage (line 4, col 6)
     let params = ReferenceParams {
         text_document_position: TextDocumentPositionParams {
@@ -238,20 +259,48 @@ User::query()->active();
             include_declaration: true,
         },
     };
-    
-    let locations = backend.references(params).await.unwrap().unwrap_or_default();
-    
+
+    let locations = backend
+        .references(params)
+        .await
+        .unwrap()
+        .unwrap_or_default();
+
     let usage_locs: Vec<_> = locations.iter().filter(|l| l.uri == usage_uri).collect();
     let lines: Vec<_> = usage_locs.iter().map(|l| l.range.start.line).collect();
-    
-    assert!(lines.contains(&4), "Should find User::active(). Found at lines: {:?}", lines);
-    assert!(lines.contains(&6), "Should find User::query()->active(). Found at lines: {:?}", lines);
-    assert!(!lines.contains(&5), "Should NOT find Post::active(). Found at lines: {:?}", lines);
-    assert_eq!(usage_locs.len(), 2, "Should find exactly 2 references in usage.php, but found: {:?}", lines);
+
+    assert!(
+        lines.contains(&4),
+        "Should find User::active(). Found at lines: {:?}",
+        lines
+    );
+    assert!(
+        lines.contains(&6),
+        "Should find User::query()->active(). Found at lines: {:?}",
+        lines
+    );
+    assert!(
+        !lines.contains(&5),
+        "Should NOT find Post::active(). Found at lines: {:?}",
+        lines
+    );
+    assert_eq!(
+        usage_locs.len(),
+        2,
+        "Should find exactly 2 references in usage.php, but found: {:?}",
+        lines
+    );
 
     // Also should find the declaration in UserBuilder.php
-    let builder_locs: Vec<_> = locations.iter().filter(|l| l.uri.to_string().contains("UserBuilder.php")).collect();
-    assert_eq!(builder_locs.len(), 1, "Should find declaration in UserBuilder.php");
+    let builder_locs: Vec<_> = locations
+        .iter()
+        .filter(|l| l.uri.to_string().contains("UserBuilder.php"))
+        .collect();
+    assert_eq!(
+        builder_locs.len(),
+        1,
+        "Should find declaration in UserBuilder.php"
+    );
 }
 
 #[tokio::test]
@@ -335,7 +384,7 @@ Member::query()->active();
     }
 
     let builder_uri = Url::from_file_path(dir.path().join("src/Models/UserBuilder.php")).unwrap();
-    
+
     // Find references for UserBuilder::active() declaration (line 5, col 21)
     let params = ReferenceParams {
         text_document_position: TextDocumentPositionParams {
@@ -348,14 +397,30 @@ Member::query()->active();
             include_declaration: true,
         },
     };
-    
-    let locations = backend.references(params).await.unwrap().unwrap_or_default();
-    
+
+    let locations = backend
+        .references(params)
+        .await
+        .unwrap()
+        .unwrap_or_default();
+
     let usage_uri = Url::from_file_path(dir.path().join("usage.php")).unwrap();
     let usage_locs: Vec<_> = locations.iter().filter(|l| l.uri == usage_uri).collect();
     let lines: Vec<_> = usage_locs.iter().map(|l| l.range.start.line).collect();
-    
-    assert!(lines.contains(&3), "Should find Member::active(). Found at lines: {:?}", lines);
-    assert!(lines.contains(&4), "Should find Member::query()->active(). Found at lines: {:?}", lines);
-    assert_eq!(usage_locs.len(), 2, "Should find exactly 2 references in usage.php");
+
+    assert!(
+        lines.contains(&3),
+        "Should find Member::active(). Found at lines: {:?}",
+        lines
+    );
+    assert!(
+        lines.contains(&4),
+        "Should find Member::query()->active(). Found at lines: {:?}",
+        lines
+    );
+    assert_eq!(
+        usage_locs.len(),
+        2,
+        "Should find exactly 2 references in usage.php"
+    );
 }