From 0e5b6a5f3ffafaf71d00a605b5fe1e728e024cbe Mon Sep 17 00:00:00 2001
From: Haojian Wu <hokein.wu@gmail.com>
Date: Mon, 5 Jan 2026 22:00:11 +0100
Subject: [PATCH] outline: Fix nesting issue for variable declarations (#45797)

Before:

<img width="665" height="116" alt="image"
src="https://github.com/user-attachments/assets/3c0b6ea4-f030-4fef-a0eb-8251ce16a651"
/>

After:

<img width="601" height="104" alt="image"
src="https://github.com/user-attachments/assets/31659c75-6f73-40e7-9d3b-c4ae99357b12"
/>

The fix is similar to https://github.com/zed-industries/zed/pull/36076.

Release Notes:

- Fix outline nesting issue for variable declarations in C++
---
 crates/languages/src/cpp/outline.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/crates/languages/src/cpp/outline.scm b/crates/languages/src/cpp/outline.scm
index c8973665581472d59bd478f8a95d4881f7b431e8..e8e242ef9c2ee1e961831ec8a993d2b071af8aea 100644
--- a/crates/languages/src/cpp/outline.scm
+++ b/crates/languages/src/cpp/outline.scm
@@ -37,7 +37,9 @@
     (type_qualifier)? @context
     type: (_) @context
     declarator: (init_declarator
-      declarator: (_) @name)) @item
+      ; The declaration may define multiple variables, using @item on the
+      ; declarator so that they get distinct ranges.
+      declarator: (_) @item @name))
 
 (function_definition
     (type_qualifier)? @context