Split large files

Author: AJenbo

docs/todo/refactor.md

@@ -214,23 +214,6 @@ Each item must include:
 
 ## Outstanding items
 
-### Split `unknown_members.rs` (5,755 lines)
-
-- **What to do:** `src/diagnostics/unknown_members.rs` is the second
-  largest file in the project. Sprint 5 adds four new diagnostic
-  modules (D4, D10, D11, D12, D14) and one large diagnostic feature
-  (D15) that will use `unknown_members` as a reference. Identify
-  natural seams — the file likely contains resolution helpers, display
-  formatting, and per-member-kind logic that can be split into
-  submodules (e.g. `diagnostics/unknown_members/resolution.rs`,
-  `diagnostics/unknown_members/helpers.rs`). The goal is to get the
-  main file under 3,000 lines so new diagnostic work has a clean
-  model to follow.
-- **Which files to change:** `src/diagnostics/unknown_members.rs`
-  (split into submodules under `src/diagnostics/unknown_members/`).
-- **Why it matters for the sprint:** Sprint 5 is diagnostics-heavy
-  (D4, D10, D11, D12, D14, D15). A 5,700-line diagnostic file sets a
-  bad precedent for new diagnostic modules and makes it harder to
-  extract shared helpers that the new modules will need.
+No outstanding items.
 
 

src/completion/source/throws_analysis.rs

@@ -1081,60 +1081,62 @@ pub(crate) fn find_uncaught_throw_types_with_context(
 
     // 1. Direct `throw new Type(…)` statements
     for throw in &throws {
-        if let Some(exc_type) = normalize_throw_type(&throw.type_name) {
-            if !is_caught_by(&catches, throw.offset, &exc_type) && seen.insert(exc_type.to_string())
-            {
-                uncaught.push(exc_type);
-            }
+        if let Some(exc_type) = normalize_throw_type(&throw.type_name)
+            && !is_caught_by(&catches, throw.offset, &exc_type)
+            && seen.insert(exc_type.to_string())
+        {
+            uncaught.push(exc_type);
         }
     }
 
     // 2. `throw $this->method()` -- return type of method is the thrown type
     for te in &throw_expr_types {
-        if let Some(exc_type) = normalize_throw_type(&te.type_name) {
-            if !is_caught_by(&catches, te.offset, &exc_type) && seen.insert(exc_type.to_string()) {
-                uncaught.push(exc_type);
-            }
+        if let Some(exc_type) = normalize_throw_type(&te.type_name)
+            && !is_caught_by(&catches, te.offset, &exc_type)
+            && seen.insert(exc_type.to_string())
+        {
+            uncaught.push(exc_type);
         }
     }
 
     // 3. Propagated @throws from called methods (same-file text search)
     for prop in &propagated {
-        if let Some(exc_type) = normalize_throw_type(&prop.type_name) {
-            if !is_caught_by(&catches, prop.offset, &exc_type) && seen.insert(exc_type.to_string())
-            {
-                uncaught.push(exc_type);
-            }
+        if let Some(exc_type) = normalize_throw_type(&prop.type_name)
+            && !is_caught_by(&catches, prop.offset, &exc_type)
+            && seen.insert(exc_type.to_string())
+        {
+            uncaught.push(exc_type);
         }
     }
 
     // 4. Inline `/** @throws ExceptionType */` annotations in the body
     let inline = find_inline_throws_annotations(&body);
     for info in &inline {
-        if let Some(exc_type) = normalize_throw_type(&info.type_name) {
-            if !is_caught_by(&catches, info.offset, &exc_type) && seen.insert(exc_type.to_string())
-            {
-                uncaught.push(exc_type);
-            }
+        if let Some(exc_type) = normalize_throw_type(&info.type_name)
+            && !is_caught_by(&catches, info.offset, &exc_type)
+            && seen.insert(exc_type.to_string())
+        {
+            uncaught.push(exc_type);
         }
     }
 
     // 5. `throw $variable` — resolved from catch clause variable type
     for tv in &throw_vars {
-        if let Some(exc_type) = normalize_throw_type(&tv.type_name) {
-            if !is_caught_by(&catches, tv.offset, &exc_type) && seen.insert(exc_type.to_string()) {
-                uncaught.push(exc_type);
-            }
+        if let Some(exc_type) = normalize_throw_type(&tv.type_name)
+            && !is_caught_by(&catches, tv.offset, &exc_type)
+            && seen.insert(exc_type.to_string())
+        {
+            uncaught.push(exc_type);
         }
     }
 
     // 6. Cross-file propagated @throws from all call patterns
     for prop in &cross_file_propagated {
-        if let Some(exc_type) = normalize_throw_type(&prop.type_name) {
-            if !is_caught_by(&catches, prop.offset, &exc_type) && seen.insert(exc_type.to_string())
-            {
-                uncaught.push(exc_type);
-            }
+        if let Some(exc_type) = normalize_throw_type(&prop.type_name)
+            && !is_caught_by(&catches, prop.offset, &exc_type)
+            && seen.insert(exc_type.to_string())
+        {
+            uncaught.push(exc_type);
         }
     }
 

src/completion/variable/resolution.rs

@@ -3080,8 +3080,7 @@ pub(in crate::completion) fn check_expression_for_assignment<'b>(
         if let Expression::ArrayAccess(array_access) = assignment.lhs {
             // Extract the base variable name and chain of keys from
             // potentially nested array accesses like `$var['a']['b']['c']`.
-            if let Some((base_name, key_chain)) =
-                extract_nested_array_access_chain(array_access)
+            if let Some((base_name, key_chain)) = extract_nested_array_access_chain(array_access)
                 && base_name == var_name
             {
                 // ── Skip when cursor is inside the RHS ────────