From 350ad5d1b6865301749af95fa8f2fddf87f38f5a Mon Sep 17 00:00:00 2001 From: Hugo Guerrier Date: Thu, 5 Dec 2024 15:47:42 +0100 Subject: [PATCH] Fix the 'nested_paths' rule --- lkql_checker/share/lkql/nested_paths.lkql | 2 +- testsuite/tests/checks/nested_paths/paths.adb | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lkql_checker/share/lkql/nested_paths.lkql b/lkql_checker/share/lkql/nested_paths.lkql index 9c50ac16d..f63b7385a 100644 --- a/lkql_checker/share/lkql/nested_paths.lkql +++ b/lkql_checker/share/lkql/nested_paths.lkql @@ -49,7 +49,7 @@ fun nested_paths(node) = if_stmt.f_alternatives[1] == null # Has an "else" part - and if_stmt.f_else_part.f_stmts[1] != null + and if_stmt.f_else_part != null and not has_last_breaking_stmt(node) and has_last_breaking_stmt(if if_stmt.f_then_stmts == node diff --git a/testsuite/tests/checks/nested_paths/paths.adb b/testsuite/tests/checks/nested_paths/paths.adb index 1830dedd2..d7fa6c90b 100644 --- a/testsuite/tests/checks/nested_paths/paths.adb +++ b/testsuite/tests/checks/nested_paths/paths.adb @@ -93,4 +93,8 @@ begin else I := I + 1; -- NOFLAG end if; + + if Cond then + null; -- NOFLAG + end if; end Paths;