Encode SPL suggestions the same as other suggestions

Author: AJenbo

build.rs

@@ -237,7 +237,26 @@ fn parse_map_entry(line: &str) -> Option<(String, String)> {
     let key = lhs.trim().strip_prefix('\'')?.strip_suffix('\'')?;
     let value = rhs.trim().strip_prefix('\'')?.strip_suffix('\'')?;
 
-    Some((key.to_string(), value.to_string()))
+    // Unescape PHP single-quoted string escapes:
+    //   `\\` → `\`   and   `\'` → `'`
+    // This is needed because the PhpStormStubsMap.php file uses PHP
+    // single-quoted strings where namespace separators are written as
+    // `\\` (e.g. `'Couchbase\\GetUserOptions'` → `Couchbase\GetUserOptions`).
+    let key = php_unescape_single_quoted(key);
+    let value = php_unescape_single_quoted(value);
+
+    Some((key, value))
+}
+
+/// Unescape a PHP single-quoted string value.
+///
+/// PHP single-quoted strings only recognise two escape sequences:
+///   - `\\` → `\`
+///   - `\'` → `'`
+fn php_unescape_single_quoted(s: &str) -> String {
+    s.replace("\\\\", "\x00")
+        .replace("\\'", "'")
+        .replace('\x00', "\\")
 }
 
 /// Escape a string for embedding in a Rust string literal.

src/completion/builder.rs

@@ -409,13 +409,14 @@ impl Backend {
             if !seen_fqns.insert(name.to_string()) {
                 continue;
             }
+            let short_name = name.rsplit('\\').next().unwrap_or(name);
             items.push(CompletionItem {
-                label: name.to_string(),
+                label: short_name.to_string(),
                 kind: Some(CompletionItemKind::CLASS),
                 detail: Some(name.to_string()),
-                insert_text: Some(name.to_string()),
-                filter_text: Some(name.to_string()),
-                sort_text: Some(format!("2_{}", name.to_lowercase())),
+                insert_text: Some(short_name.to_string()),
+                filter_text: Some(short_name.to_string()),
+                sort_text: Some(format!("2_{}", short_name.to_lowercase())),
                 ..CompletionItem::default()
             });
         }

tests/completion_class_names.rs

@@ -447,7 +447,13 @@ async fn test_class_name_completion_from_classmap() {
     );
 
     // Check that detail shows the FQN
-    let collection = classes.iter().find(|i| i.label == "Collection").unwrap();
+    let collection = classes
+        .iter()
+        .find(|i| {
+            i.label == "Collection"
+                && i.detail.as_deref() == Some("Illuminate\\Support\\Collection")
+        })
+        .expect("Should have a Collection item with FQN Illuminate\\Support\\Collection in detail");
     assert_eq!(
         collection.detail.as_deref(),
         Some("Illuminate\\Support\\Collection"),