Improve declaration-based indentation.

When an incomplete package was next to the "end" keyword of the
project, it may be considered a valid package and therefore include
the end of the project declaration in the re-indentation of the
package.  In order to prevent this from happening, the package name
and end name must now match before the declaration-based indentation
will be applied.

Additionally, to provide a hint to the user, the end name of a package
is only syntax highlighted when both package name and end name match.
This provides a visual clue to the user of the mismatched names.

Additional tests have been added to check for improper
declaration-based indentation as well as testing the syntax
highlighting for package declarations.

Author: brownts

gpr-ts-mode.el

@@ -4,7 +4,7 @@
 
 ;; Author: Troy Brown <[email protected]>
 ;; Created: February 2023
-;; Version: 0.6.1
+;; Version: 0.6.2
 ;; Keywords: gpr gnat ada languages tree-sitter
 ;; URL: https://github.com/brownts/gpr-ts-mode
 ;; Package-Requires: ((emacs "29.1"))
@@ -352,8 +352,15 @@ Return nil if no child of that type is found."
                       'include-node)))
                (when (and (gpr-ts-mode--declaration-p candidate)
                           (not (treesit-search-subtree candidate "ERROR")))
-                 (cons (treesit-node-start candidate)
-                       (treesit-node-end candidate))))))))
+                 ;; Prevent interpreting a project declaration "end"
+                 ;; next to an incomplete package declaration as a
+                 ;; valid package declaration by checking if the names
+                 ;; match.
+                 (unless
+                     (and (gpr-ts-mode--package-declaration-p candidate)
+                          (not (gpr-ts-mode--package-declaration-names-match-p candidate)))
+                   (cons (treesit-node-start candidate)
+                         (treesit-node-end candidate)))))))))
     (if region
         (progn
           (treesit-indent-region (car region) (cdr region))
@@ -541,8 +548,10 @@ Return nil if no child of that type is found."
    ;; Definition
    :language 'gpr
    :feature 'definition
-   '((package_declaration
-      [name: (identifier) endname: (identifier)] @font-lock-function-name-face)
+   '((package_declaration name: (identifier) @font-lock-function-name-face)
+     ((package_declaration endname: (identifier) @font-lock-function-name-face)
+      @package-declaration
+      (:pred gpr-ts-mode--package-declaration-names-match-p @package-declaration))
      (typed_string_declaration name: (identifier) @font-lock-type-face)
      (variable_declaration name: (identifier) @font-lock-variable-name-face)
      (attribute_declaration name: (identifier) @font-lock-property-name-face))
@@ -614,6 +623,14 @@ Return nil if no child of that type is found."
         (packages (mapcar #'downcase gpr-ts-mode-package-names)))
     (seq-find (apply-partially #'string-equal identifier) packages)))
 
+(defun gpr-ts-mode--package-declaration-names-match-p (node)
+  "Check if names match in package declaration NODE."
+  (when (gpr-ts-mode--package-declaration-p node)
+    (let ((name (treesit-node-child-by-field-name node "name"))
+          (endname (treesit-node-child-by-field-name node "endname")))
+      (string-equal-ignore-case (treesit-node-text name t)
+                                (treesit-node-text endname t)))))
+
 
 ;;; Imenu
 

test/gpr-ts-mode-tests.el

@@ -143,14 +143,18 @@ Use BINDING to navigate with optional prefix ARG."
   (let ((current-prefix-arg arg))
     (call-interactively (key-binding (kbd binding)))))
 
-(defun newline-transform (&optional expect-error)
+(defun newline-transform (&optional expect-error declaration)
   "Newline transform function for test.
 
 If EXPECT-ERROR is non-nil, then check for an error in the parse tree,
-otherwise check that there is no error in the parse tree."
+otherwise check that there is no error in the parse tree.  If
+DECLARATION is non-nil use declaration indentation strategy, otherwise
+use line indentation strategy."
   (default-transform expect-error)
   (setq-local indent-tabs-mode nil)
-  (setq-local gpr-ts-mode-indent-strategy 'line)
+  (if declaration
+      (setq-local gpr-ts-mode-indent-strategy 'declaration)
+    (setq-local gpr-ts-mode-indent-strategy 'line))
   (call-interactively #'newline))
 
 (dolist (file (directory-files (ert-resource-directory)

test/resources/font-lock-package_declaration.gpr

@@ -0,0 +1,39 @@
+with "shared";
+
+project Test is
+   package Package_A is
+      -- ^           ^ font-lock-keyword-face
+      --   ^ font-lock-function-name-face
+   end Package_A;
+   -- <- font-lock-keyword-face
+   --  ^ font-lock-function-name-face
+   --           ^ font-lock-delimiter-face
+
+   package Package_B renames Shared.Package_B;
+   -- ^              ^ font-lock-keyword-face
+   --      ^ font-lock-function-name-face
+   --                        ^ nil
+   --                              ^         ^ font-lock-delimiter-face
+   --                               ^ font-lock-function-call-face
+
+   package Package_C extends Shared.Package_C is
+      -- ^           ^                        ^ font-lock-keyword-face
+      --   ^ font-lock-function-name-face
+      --                     ^ nil
+      --                           ^ font-lock-delimiter-face
+      --                            ^ font-lock-function-call-face
+   end Package_C;
+   -- <- font-lock-keyword-face
+   --  ^ font-lock-function-name-face
+   --           ^ font-lock-delimiter-face
+
+   package Different_Case is
+      --   ^ font-lock-function-name-face
+   end different_case;
+   --  ^ font-lock-function-name-face
+
+   package Mismatched is
+      --   ^ font-lock-function-name-face
+   end Doesnt_Match;
+   --  ^ nil
+end Test;

test/resources/indent-package_declaration-nl.erts

@@ -0,0 +1,16 @@
+Code: (lambda () (newline-transform 'expect-error 'declaration))
+
+Name: Incomplete package next to project "end"
+
+Point-Char: |
+
+=-=
+project Test is
+   package Package_A is|
+end Test;
+=-=
+project Test is
+   package Package_A is
+      |
+end Test;
+=-=-=