Merge branch 'topic/th_fix' into 'master'

reznikmm · reznikmm · commit 8bf337449b06 · 2025-04-25T15:41:17.000Z
Filter indirect children out of `type_hierarchy/subtypes`

Closes #1623

See merge request eng/ide/ada_language_server!2003
diff --git a/source/ada/lsp-ada_type_hierarchy_subtypes.adb b/source/ada/lsp-ada_type_hierarchy_subtypes.adb
@@ -62,6 +62,16 @@ package body LSP.Ada_Type_Hierarchy_Subtypes is
         in out LSP.Client_Message_Receivers.Client_Message_Receiver'Class;
       Status : out LSP.Server_Jobs.Execution_Status);
 
+   use type Libadalang.Analysis.Basic_Decl;
+
+   function Is_Derived_From
+     (Child  : Libadalang.Analysis.Type_Decl;
+      Parent : Libadalang.Analysis.Basic_Decl) return Boolean
+   is
+     (for some Item of Child.P_Base_Types => Item.P_Canonical_Part = Parent);
+   --
+   --  Check if Child id a direct childr of Parent.
+
    ----------------
    -- Create_Job --
    ----------------
@@ -142,7 +152,9 @@ package body LSP.Ada_Type_Hierarchy_Subtypes is
 
                Loc := Self.Parent.Context.To_LSP_Location (Name.P_Basic_Decl);
 
-               if not Self.Filter.Contains (Loc) then
+               if not Self.Filter.Contains (Loc)
+                 and Is_Derived_From (Tipe, Self.Decl.P_Canonical_Part)
+               then
                   Item :=
                     (name           => VSS.Strings.To_Virtual_String
                        (Name.Text),
diff --git a/testsuite/ada_lsp/type_hierarchy/grand_children.ads b/testsuite/ada_lsp/type_hierarchy/grand_children.ads
@@ -0,0 +1,4 @@
+with Other;
+package Grand_Children is
+   type Grand_Child is new Other.Circle with null record;
+end Grand_Children;
diff --git a/testsuite/ada_lsp/type_hierarchy/test.json b/testsuite/ada_lsp/type_hierarchy/test.json
@@ -142,20 +142,6 @@
                         "end": { "line": 7, "character": 12 }
                      }
                   },
-                  {
-                     "name": "Abstract_Shape",
-                     "kind": 5,
-                     "detail": "at base_types.ads (3:9)",
-                     "uri": "$URI{base_types.ads}",
-                     "range": {
-                        "start": { "line": 2, "character": 3 },
-                        "end": { "line": 2, "character": 23 }
-                     },
-                     "selectionRange": {
-                        "start": { "line": 2, "character": 8 },
-                        "end": { "line": 2, "character": 22 }
-                     }
-                  },
                   {
                      "name": "Circle",
                      "kind": 5,
@@ -252,20 +238,6 @@
                         "end": { "line": 3, "character": 24 }
                      }
                   },
-                  {
-                     "name": "Private_Type",
-                     "kind": 5,
-                     "detail": "at base_types.ads (9:9)",
-                     "uri": "$URI{base_types.ads}",
-                     "range": {
-                        "start": { "line": 8, "character": 3 },
-                        "end": { "line": 8, "character": 32 }
-                     },
-                     "selectionRange": {
-                        "start": { "line": 8, "character": 8 },
-                        "end": { "line": 8, "character": 20 }
-                     }
-                  },
                   {
                      "name": "New_Private_Type",
                      "kind": 5,
@@ -540,20 +512,6 @@
                         "end": { "line": 3, "character": 24 }
                      }
                   },
-                  {
-                     "name": "Private_Type",
-                     "kind": 5,
-                     "detail": "at base_types.ads (9:9)",
-                     "uri": "$URI{base_types.ads}",
-                     "range": {
-                        "start": { "line": 8, "character": 3 },
-                        "end": { "line": 8, "character": 32 }
-                     },
-                     "selectionRange": {
-                        "start": { "line": 8, "character": 8 },
-                        "end": { "line": 8, "character": 20 }
-                     }
-                  },
                   {
                      "name": "New_Private_Type",
                      "kind": 5,
