Merge branch 'topic/955' into 'master'

Fix navigation on top-level generic subp instantiation. Closes AdaCore#955 See merge request eng/libadalang/libadalang!1278
okellogg · Apr 6, 2023 · f4a5456 · f4a5456
2 parents d1bd8d8 + f41519e
commit f4a5456
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 1 deletion.
diff --git a/ada/ast.py b/ada/ast.py
@@ -3179,7 +3179,7 @@ def basic_decl_next_part_for_decl():
                         b.is_a(
                             T.BasePackageDecl,
                             T.GenericPackageDecl,
-                            T.GenericPackageInstantiation,
+                            T.GenericInstantiation,
                             T.PackageRenamingDecl,
                             T.SubpRenamingDecl,
                             T.GenericRenamingDecl

diff --git a/testsuite/tests/navigation/subp_inst_next_part/subp.ads b/testsuite/tests/navigation/subp_inst_next_part/subp.ads
@@ -0,0 +1,8 @@
+with Subp_G;
+
+--  The result should be 'None' but should not raise an error saying
+--  that file 'Subp.adb' is not found, since we don't expect to have a body
+--  for this unit.
+
+procedure Subp is new Subp_G;
+--% node.p_next_part_for_decl()
diff --git a/testsuite/tests/navigation/subp_inst_next_part/subp_g.adb b/testsuite/tests/navigation/subp_inst_next_part/subp_g.adb
@@ -0,0 +1,4 @@
+procedure Subp_G is
+begin
+   null;
+end Subp_G;
diff --git a/testsuite/tests/navigation/subp_inst_next_part/subp_g.ads b/testsuite/tests/navigation/subp_inst_next_part/subp_g.ads
@@ -0,0 +1,2 @@
+generic
+procedure Subp_G;
diff --git a/testsuite/tests/navigation/subp_inst_next_part/test.out b/testsuite/tests/navigation/subp_inst_next_part/test.out
@@ -0,0 +1,5 @@
+Working on node <GenericSubpInstantiation ["Subp"] subp.ads:7:1-7:30>
+=====================================================================
+
+Eval 'node.p_next_part_for_decl()'
+Result: None
diff --git a/testsuite/tests/navigation/subp_inst_next_part/test.yaml b/testsuite/tests/navigation/subp_inst_next_part/test.yaml
@@ -0,0 +1,2 @@
+driver: inline-playground
+input_sources: [subp.ads]
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		driver: inline-playground
		input_sources: [subp.ads]