Add support for vendor classes

Author: AJenbo

src/composer.rs

@@ -1,3 +1,4 @@
+use std::fs;
 /// Composer autoload support.
 ///
 /// This module handles parsing `composer.json` to extract PSR-4 autoload
@@ -32,7 +33,7 @@ pub struct Psr4Mapping {
 /// contains no PSR-4 mappings.
 pub fn parse_composer_json(workspace_root: &Path) -> Vec<Psr4Mapping> {
     let composer_path = workspace_root.join("composer.json");
-    let content = match std::fs::read_to_string(&composer_path) {
+    let content = match fs::read_to_string(&composer_path) {
         Ok(c) => c,
         Err(_) => return Vec::new(),
     };
@@ -56,12 +57,126 @@ pub fn parse_composer_json(workspace_root: &Path) -> Vec<Psr4Mapping> {
         }
     }
 
+    // Also load vendor autoload mappings (from composer install output)
+    let vendor_dir = get_vendor_dir(&json);
+    let vendor_mappings = parse_vendor_autoload_psr4(workspace_root, &vendor_dir);
+    mappings.extend(vendor_mappings);
+
     // Sort by prefix length descending so longest-prefix-first matching works
     mappings.sort_by(|a, b| b.prefix.len().cmp(&a.prefix.len()));
 
     mappings
 }
 
+/// Read the configured vendor directory from a parsed `composer.json` value.
+///
+/// Looks at `config.vendor-dir`; defaults to `"vendor"` when absent.
+fn get_vendor_dir(composer_json: &serde_json::Value) -> String {
+    composer_json
+        .get("config")
+        .and_then(|c| c.get("vendor-dir"))
+        .and_then(|v| v.as_str())
+        .map(|s| s.trim_end_matches('/').to_string())
+        .unwrap_or_else(|| "vendor".to_string())
+}
+
+/// Parse `<vendor>/composer/autoload_psr4.php` and return PSR-4 mappings.
+///
+/// This file is generated by `composer install` / `composer dump-autoload`.
+/// If the file does not exist (e.g. composer install has not been run) an
+/// empty `Vec` is returned — the absence is silently tolerated.
+///
+/// The file contains lines like:
+/// ```text
+///     'Namespace\\' => array($vendorDir . '/org/pkg/src'),
+///     'Other\\' => array($baseDir . '/lib'),
+/// ```
+///
+/// `$vendorDir` is resolved to `<vendor_dir>` (relative to workspace root).
+/// `$baseDir` is resolved to the workspace root (i.e. paths are kept relative).
+pub fn parse_vendor_autoload_psr4(workspace_root: &Path, vendor_dir: &str) -> Vec<Psr4Mapping> {
+    let autoload_path = workspace_root
+        .join(vendor_dir)
+        .join("composer")
+        .join("autoload_psr4.php");
+
+    let content = match fs::read_to_string(&autoload_path) {
+        Ok(c) => c,
+        Err(_) => return Vec::new(),
+    };
+
+    let mut mappings = Vec::new();
+
+    for line in content.lines() {
+        let trimmed = line.trim();
+
+        // Match lines of the form:  'Prefix\\' => array(...),
+        if let Some(rest) = trimmed.strip_prefix('\'')
+            && let Some(arrow_pos) = rest.find("' => array(")
+        {
+            // Unescape PHP single-quoted string escapes:
+            //   \\  →  \
+            //   \'  →  '
+            let prefix_raw = rest[..arrow_pos]
+                .replace("\\\\'", "'")
+                .replace("\\\\", "\\");
+            let array_start = arrow_pos + "' => array(".len();
+
+            // Find the closing paren
+            let array_content = if let Some(end) = rest[array_start..].rfind(')') {
+                &rest[array_start..array_start + end]
+            } else {
+                continue;
+            };
+
+            // Normalise the namespace prefix
+            let normalised_prefix = if prefix_raw.ends_with('\\') {
+                prefix_raw.clone()
+            } else if prefix_raw.is_empty() {
+                String::new()
+            } else {
+                format!("{}\\", prefix_raw)
+            };
+
+            // Parse each path entry in the array, separated by commas.
+            // Entries look like:  $vendorDir . '/org/pkg/src'
+            //                 or: $baseDir . '/lib'
+            for entry in array_content.split(',') {
+                let entry = entry.trim();
+                if let Some(base_path) = resolve_autoload_path_entry(entry, vendor_dir) {
+                    mappings.push(Psr4Mapping {
+                        prefix: normalised_prefix.clone(),
+                        base_path: normalise_path(&base_path),
+                    });
+                }
+            }
+        }
+    }
+
+    mappings
+}
+
+/// Resolve a single path entry from `autoload_psr4.php`.
+///
+/// Handles `$vendorDir . '/path'` and `$baseDir . '/path'`.
+fn resolve_autoload_path_entry(entry: &str, vendor_dir: &str) -> Option<String> {
+    let entry = entry.trim();
+
+    if let Some(rest) = entry.strip_prefix("$vendorDir . '") {
+        // $vendorDir . '/org/pkg/src'
+        let path = rest.strip_suffix('\'')?;
+        let path = path.strip_prefix('/').unwrap_or(path);
+        Some(format!("{}/{}", vendor_dir, path))
+    } else if let Some(rest) = entry.strip_prefix("$baseDir . '") {
+        // $baseDir . '/lib'
+        let path = rest.strip_suffix('\'')?;
+        let path = path.strip_prefix('/').unwrap_or(path);
+        Some(path.to_string())
+    } else {
+        None
+    }
+}
+
 /// Extract PSR-4 entries from a single prefix → path(s) pair.
 ///
 /// The value can be either a string (`"src/"`) or an array of strings

src/server.rs

@@ -73,7 +73,7 @@ impl LanguageServer for Backend {
             self.log(
                 MessageType::INFO,
                 format!(
-                    "PHPantomLSP initialized! Loaded {} PSR-4 mapping(s) from composer.json",
+                    "PHPantomLSP initialized! Loaded {} PSR-4 mapping(s)",
                     mapping_count
                 ),
             )

tests/composer.rs

@@ -1,4 +1,6 @@
-use phpantom_lsp::composer::{normalise_path, parse_composer_json, resolve_class_path};
+use phpantom_lsp::composer::{
+    normalise_path, parse_composer_json, parse_vendor_autoload_psr4, resolve_class_path,
+};
 use std::fs;
 use std::path::Path;
 
@@ -318,6 +320,232 @@ fn test_normalise_path_converts_backslashes() {
     assert_eq!(normalise_path("src\\Klarna\\"), "src/Klarna/");
 }
 
+#[test]
+fn test_vendor_autoload_basic() {
+    let ws = TestWorkspace::new(r#"{"name": "test/project"}"#);
+
+    // Create the vendor autoload file
+    ws.create_php_file(
+        "vendor/composer/autoload_psr4.php",
+        r#"<?php
+
+// autoload_psr4.php @generated by Composer
+
+$vendorDir = dirname(__DIR__);
+$baseDir = dirname($vendorDir);
+
+return array(
+    'voku\\' => array($vendorDir . '/voku/portable-ascii/src/voku'),
+    'Webmozart\\Assert\\' => array($vendorDir . '/webmozart/assert/src'),
+);
+"#,
+    );
+
+    let mappings = parse_vendor_autoload_psr4(ws.root(), "vendor");
+    assert_eq!(mappings.len(), 2);
+
+    assert_eq!(mappings[0].prefix, "voku\\");
+    assert_eq!(
+        mappings[0].base_path,
+        "vendor/voku/portable-ascii/src/voku/"
+    );
+
+    assert_eq!(mappings[1].prefix, "Webmozart\\Assert\\");
+    assert_eq!(mappings[1].base_path, "vendor/webmozart/assert/src/");
+}
+
+#[test]
+fn test_vendor_autoload_multiple_paths_per_prefix() {
+    let ws = TestWorkspace::new(r#"{"name": "test/project"}"#);
+
+    ws.create_php_file(
+        "vendor/composer/autoload_psr4.php",
+        r#"<?php
+
+$vendorDir = dirname(__DIR__);
+$baseDir = dirname($vendorDir);
+
+return array(
+    'phpDocumentor\\Reflection\\' => array($vendorDir . '/phpdocumentor/reflection-docblock/src', $vendorDir . '/phpdocumentor/type-resolver/src', $vendorDir . '/phpdocumentor/reflection-common/src'),
+);
+"#,
+    );
+
+    let mappings = parse_vendor_autoload_psr4(ws.root(), "vendor");
+    assert_eq!(mappings.len(), 3);
+
+    assert!(
+        mappings
+            .iter()
+            .all(|m| m.prefix == "phpDocumentor\\Reflection\\")
+    );
+    assert_eq!(
+        mappings[0].base_path,
+        "vendor/phpdocumentor/reflection-docblock/src/"
+    );
+    assert_eq!(
+        mappings[1].base_path,
+        "vendor/phpdocumentor/type-resolver/src/"
+    );
+    assert_eq!(
+        mappings[2].base_path,
+        "vendor/phpdocumentor/reflection-common/src/"
+    );
+}
+
+#[test]
+fn test_vendor_autoload_basedir_entries() {
+    let ws = TestWorkspace::new(r#"{"name": "test/project"}"#);
+
+    ws.create_php_file(
+        "vendor/composer/autoload_psr4.php",
+        r#"<?php
+
+$vendorDir = dirname(__DIR__);
+$baseDir = dirname($vendorDir);
+
+return array(
+    'App\\' => array($baseDir . '/src'),
+    'App\\Tests\\' => array($baseDir . '/tests'),
+);
+"#,
+    );
+
+    let mappings = parse_vendor_autoload_psr4(ws.root(), "vendor");
+    assert_eq!(mappings.len(), 2);
+
+    assert_eq!(mappings[0].prefix, "App\\");
+    assert_eq!(mappings[0].base_path, "src/");
+
+    assert_eq!(mappings[1].prefix, "App\\Tests\\");
+    assert_eq!(mappings[1].base_path, "tests/");
+}
+
+#[test]
+fn test_vendor_autoload_missing_file_returns_empty() {
+    let ws = TestWorkspace::new(r#"{"name": "test/project"}"#);
+    // No vendor directory at all — should not panic
+    let mappings = parse_vendor_autoload_psr4(ws.root(), "vendor");
+    assert!(mappings.is_empty());
+}
+
+#[test]
+fn test_vendor_autoload_custom_vendor_dir() {
+    let ws = TestWorkspace::new(
+        r#"{
+            "config": {
+                "vendor-dir": "php-packages"
+            }
+        }"#,
+    );
+
+    ws.create_php_file(
+        "php-packages/composer/autoload_psr4.php",
+        r#"<?php
+
+$vendorDir = dirname(__DIR__);
+$baseDir = dirname($vendorDir);
+
+return array(
+    'Monolog\\' => array($vendorDir . '/monolog/monolog/src/Monolog'),
+);
+"#,
+    );
+
+    // parse_composer_json should pick up the custom vendor-dir and find the vendor autoload
+    let mappings = parse_composer_json(ws.root());
+    assert_eq!(mappings.len(), 1);
+    assert_eq!(mappings[0].prefix, "Monolog\\");
+    assert_eq!(
+        mappings[0].base_path,
+        "php-packages/monolog/monolog/src/Monolog/"
+    );
+}
+
+#[test]
+fn test_vendor_autoload_integrated_with_composer_json() {
+    let ws = TestWorkspace::new(
+        r#"{
+            "autoload": {
+                "psr-4": {
+                    "App\\": "src/"
+                }
+            }
+        }"#,
+    );
+
+    ws.create_php_file(
+        "vendor/composer/autoload_psr4.php",
+        r#"<?php
+
+$vendorDir = dirname(__DIR__);
+$baseDir = dirname($vendorDir);
+
+return array(
+    'App\\' => array($baseDir . '/src'),
+    'Monolog\\' => array($vendorDir . '/monolog/monolog/src/Monolog'),
+);
+"#,
+    );
+
+    let mappings = parse_composer_json(ws.root());
+
+    // Should have App\ from composer.json, plus App\ and Monolog\ from vendor autoload
+    assert!(mappings.len() >= 2);
+
+    // Monolog should be present (from vendor autoload)
+    let monolog = mappings.iter().find(|m| m.prefix == "Monolog\\");
+    assert!(monolog.is_some());
+    assert_eq!(
+        monolog.unwrap().base_path,
+        "vendor/monolog/monolog/src/Monolog/"
+    );
+
+    // App\ from composer.json should be present
+    let app_entries: Vec<_> = mappings.iter().filter(|m| m.prefix == "App\\").collect();
+    assert!(app_entries.len() >= 1);
+    assert!(app_entries.iter().any(|m| m.base_path == "src/"));
+}
+
+#[test]
+fn test_vendor_autoload_resolve_vendor_class() {
+    let ws = TestWorkspace::new(
+        r#"{
+            "autoload": {
+                "psr-4": {
+                    "App\\": "src/"
+                }
+            }
+        }"#,
+    );
+
+    ws.create_php_file(
+        "vendor/composer/autoload_psr4.php",
+        r#"<?php
+
+$vendorDir = dirname(__DIR__);
+$baseDir = dirname($vendorDir);
+
+return array(
+    'Monolog\\' => array($vendorDir . '/monolog/monolog/src/Monolog'),
+);
+"#,
+    );
+
+    // Create the actual vendor PHP file so resolve_class_path can find it
+    ws.create_php_file(
+        "vendor/monolog/monolog/src/Monolog/Logger.php",
+        "<?php\nnamespace Monolog;\nclass Logger {}\n",
+    );
+
+    let mappings = parse_composer_json(ws.root());
+    let result = resolve_class_path(&mappings, ws.root(), "Monolog\\Logger");
+
+    assert!(result.is_some());
+    let path = result.unwrap();
+    assert!(path.ends_with("vendor/monolog/monolog/src/Monolog/Logger.php"));
+}
+
 #[test]
 fn test_prefix_without_trailing_backslash() {
     let ws = TestWorkspace::new(