Inline hover variable type resolution into completion pipeline

Author: AJenbo

src/code_actions/extract_function.rs

@@ -432,7 +432,7 @@ fn resolve_var_type(
 
     let current_class = find_class_at_offset(&ctx.classes, cursor_offset);
 
-    crate::hover::variable_type::resolve_variable_type(
+    crate::completion::variable::resolution::resolve_variable_php_type(
         var_name,
         content,
         cursor_offset,

src/completion/phpdoc/generation.rs

@@ -1735,7 +1735,7 @@ pub(crate) fn infer_inline_variable_type(
 
     let current_class = crate::util::find_class_at_offset(all_classes, cursor_offset);
 
-    crate::hover::variable_type::resolve_variable_type(
+    crate::completion::variable::resolution::resolve_variable_php_type(
         var_name,
         effective_content,
         cursor_offset,

src/completion/resolver.rs

@@ -1056,15 +1056,16 @@ pub(crate) fn resolve_subject_outcome(
     // For bare variables, try the hover fallback for UnresolvableClass
     // detection only.
     if let SubjectExpr::Variable(var_name) = &expr
-        && let Some(resolved_type) = crate::hover::variable_type::resolve_variable_type(
-            var_name,
-            ctx.content,
-            ctx.cursor_offset,
-            ctx.current_class,
-            ctx.all_classes,
-            ctx.class_loader,
-            Loaders::with_function(ctx.function_loader),
-        )
+        && let Some(resolved_type) =
+            crate::completion::variable::resolution::resolve_variable_php_type(
+                var_name,
+                ctx.content,
+                ctx.cursor_offset,
+                ctx.current_class,
+                ctx.all_classes,
+                ctx.class_loader,
+                Loaders::with_function(ctx.function_loader),
+            )
         && let Some(unresolved) = check_unresolvable_class_name(&resolved_type, ctx.class_loader)
     {
         return SubjectOutcome::UnresolvableClass(unresolved);

src/completion/variable/raw_type_inference.rs

@@ -158,7 +158,7 @@ fn infer_element_type<'b>(
                 .iter()
                 .find(|c| c.name == ctx.current_class.name)
                 .map(|c| c.as_ref());
-            crate::hover::variable_type::resolve_variable_type(
+            crate::completion::variable::resolution::resolve_variable_php_type(
                 &var_text,
                 ctx.content,
                 offset as u32,

src/hover/mod.rs

@@ -9,7 +9,6 @@
 //! powers completion.
 
 mod formatting;
-pub(crate) mod variable_type;
 
 use std::sync::Arc;
 use tower_lsp::lsp_types::*;
@@ -982,15 +981,17 @@ impl Backend {
         // Try the type-string path first.  This preserves generic
         // parameters (e.g. `Generator<int, Pencil>`) and scalar types
         // (e.g. `int`) that the ClassInfo-based path would lose.
-        if let Some(resolved_type) = variable_type::resolve_variable_type(
-            &var_name,
-            content,
-            cursor_offset,
-            current_class,
-            &ctx.classes,
-            &class_loader,
-            loaders,
-        ) {
+        if let Some(resolved_type) =
+            crate::completion::variable::resolution::resolve_variable_php_type(
+                &var_name,
+                content,
+                cursor_offset,
+                current_class,
+                &ctx.classes,
+                &class_loader,
+                loaders,
+            )
+        {
             // When the type is a template parameter, show its variance
             // and bound (e.g. "**template-covariant** `TNode` of `AstNode`")
             // above the code block so the user sees the constraint.