Show hover for Blade echo delimiters as e() function

Author: AJenbo

docs/CHANGELOG.md

@@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 - **Blade hover positions.** Hover ranges in `.blade.php` files are now translated back to original Blade coordinates, so the editor highlights the correct symbol under the cursor.
+- **Blade echo delimiter hover.** Hovering on `{{` or `}}` in Blade templates now shows hover for the `e()` function instead of incorrectly showing hover for the expression inside the echo.
 - **Standalone `@var` completion.** Variables typed only via a standalone `/** @var Type $var */` docblock (with no preceding assignment) now resolve for member completion and go-to-definition. This fixes completion inside Blade templates that use `@php /** @var \App\Models\Foo $var */ @endphp`.
 - **Foreach loop variable resolution in Blade.** Loop variables (e.g. `$user` in `@foreach($users->active() as $user)`) now resolve their element type correctly when the iterable is typed via a standalone `@var` docblock. Template parameter bounds (e.g. `@template TModel of BlogAuthor`) are substituted through the inheritance chain.
 

docs/todo/bugs.md

@@ -8,16 +8,6 @@ pipeline so it produces correct data. Downstream consumers
 to second-guess upstream output.
 
 
-## B17. Blade `{{` hover shows inner expression instead of `e()`
-
-Hovering on the `{{` delimiter in a Blade template should show
-hover info for the implicit `e()` (htmlspecialchars) call that
-Blade compiles to. Currently it shows hover for the expression
-inside the echo (e.g. `config(...)`) because the position mapping
-offsets into the virtual PHP content rather than recognising the
-delimiter itself.
-
-
 ## B16. PDOStatement fetch mode-dependent return types
 
 **Blocked on:** [phpstorm-stubs#1882](https://github.com/JetBrains/phpstorm-stubs/pull/1882)

src/blade/mod.rs

@@ -115,3 +115,91 @@ fn extract_string_literal(s: &str) -> Option<&str> {
         None
     }
 }
+
+use tower_lsp::lsp_types::{Hover, HoverContents, MarkupContent, MarkupKind, Position, Range};
+
+impl crate::Backend {
+    /// If the cursor is on a `{{`, `}}`, `{!!`, or `!!}` Blade echo delimiter,
+    /// return a hover describing the implicit `e()` call (for escaped echo)
+    /// or raw output (for unescaped echo).
+    pub(crate) fn blade_echo_delimiter_hover(
+        &self,
+        uri: &str,
+        position: Position,
+    ) -> Option<Hover> {
+        let content = self.get_file_content(uri)?;
+        let line = content.lines().nth(position.line as usize)?;
+        let col = position.character as usize;
+
+        // Check if cursor is on `{{` (escaped echo open)
+        if col < line.len()
+            && line.get(col..col + 2) == Some("{{")
+            && line.get(col..col + 3) != Some("{!!")
+        {
+            return Some(self.blade_e_hover(position, 2));
+        }
+        // Also match if cursor is on the second `{` of `{{`
+        if col > 0
+            && line.get(col - 1..col + 1) == Some("{{")
+            && (col < 2 || line.get(col - 1..col + 2) != Some("{!!"))
+        {
+            return Some(self.blade_e_hover(
+                Position {
+                    line: position.line,
+                    character: (col - 1) as u32,
+                },
+                2,
+            ));
+        }
+        // `}}` closing delimiter
+        if col < line.len()
+            && line.get(col..col + 2) == Some("}}")
+            && (col == 0 || line.as_bytes().get(col - 1) != Some(&b'!'))
+        {
+            return Some(self.blade_e_hover(position, 2));
+        }
+        if col > 0
+            && line.get(col - 1..col + 1) == Some("}}")
+            && (col < 2 || line.as_bytes().get(col - 2) != Some(&b'!'))
+        {
+            return Some(self.blade_e_hover(
+                Position {
+                    line: position.line,
+                    character: (col - 1) as u32,
+                },
+                2,
+            ));
+        }
+
+        None
+    }
+
+    /// Build hover content for `{{ }}` (escaped echo via `e()`).
+    fn blade_e_hover(&self, start: Position, len: u32) -> Hover {
+        // Try to resolve the actual `e()` function from the project/stubs.
+        let empty_use_map = std::collections::HashMap::new();
+        let loader = self.function_loader_with(&empty_use_map, &None);
+        let content = if let Some(func) = loader("e") {
+            crate::hover::hover_for_function(&func, None)
+                .contents
+        } else {
+            HoverContents::Markup(MarkupContent {
+                kind: MarkupKind::Markdown,
+                value: "Blade escaped echo. Output is passed through `e()` (`htmlspecialchars`).\n\n\
+                    ```php\n<?php\nfunction e(mixed $value, bool $doubleEncode = true): string;\n```"
+                    .to_string(),
+            })
+        };
+        Hover {
+            contents: content,
+            range: Some(Range {
+                start,
+                end: Position {
+                    line: start.line,
+                    character: start.character + len,
+                },
+            }),
+        }
+    }
+
+}

src/server.rs

@@ -640,6 +640,17 @@ impl LanguageServer for Backend {
         let backend = self.clone_for_blocking();
         let uri_clone = uri.clone();
         tokio::task::spawn_blocking(move || {
+            // For Blade files, check if the cursor is on a `{{` or `{!!` echo
+            // delimiter. If so, return hover for `e()` (escaped echo) or a
+            // raw-echo explanation, rather than falling through to the virtual
+            // PHP content where the position maps into boilerplate.
+            if crate::blade::is_blade_file(&uri_clone)
+                && let Some(hover) =
+                    backend.blade_echo_delimiter_hover(&uri_clone, position)
+            {
+                return Ok(Some(hover));
+            }
+
             backend.handle_with_position("hover", &uri_clone, position, |content, pos| {
                 let mut hover = backend.handle_hover(&uri_clone, content, pos)?;
                 if crate::blade::is_blade_file(&uri_clone)