Merge pull request #64 from Gleek/master

Set treesit-defun-type-regexp to help with defun navigation

Author: zonuexe

php-ts-mode.el

@@ -331,6 +331,16 @@ Currently there are `php-mode' and `php-ts-mode'."
 
   (setq-local treesit-defun-name-function #'php-ts-mode--defun-name)
 
+  ;; Navigation
+  (setq-local treesit-defun-type-regexp
+              (regexp-opt '("class_declaration"
+                            "enum_declaration"
+                            "function_definition"
+                            "interface_declaration"
+                            "method_declaration"
+                            "namespace_definition"
+                            "trait_declaration")))
+
   ;; Font-lock.
   (setq-local treesit-font-lock-settings php-ts-mode--font-lock-settings)
   (setq-local treesit-font-lock-feature-list

tests/php-ts-mode-resources/movement.erts

@@ -1,121 +1,63 @@
 Code:
   (lambda ()
     (php-ts-mode)
-    (forward-sentence 1))
+    (beginning-of-defun))
 
-Point-Char: |
+Name: beginning-of-defun moves to method start
 
-Name: forward-sentence moves over method invocation
+Point-Char: |
 
 =-=
-class Basic
-{
-  public function basic(): void
-  {
-    |echo "some text: {$text}";
-  }
-}
-=-=
-class Basic
-{
-  public function basic(): void
-  {
-    echo "some text: {$text}";|
-  }
-}
-=-=-=
-
-Name: forward-sentence moves over if
+<?php
 
-=-=
 class Basic
 {
-  public function basic(): void
-  {
-    |if ($x) {
-
+    public function basic(): void
+    {
+        return;|
     }
-    echo "some text: {$text}";
-    return;
-  }
 }
 =-=
+<?php
+
 class Basic
 {
-  public function basic(): void
-  {
-    if ($x) {
-
-    }|
-    echo "some text: {$text}";
-    return;
-  }
+|    public function basic(): void
+    {
+        return;
+    }
 }
 =-=-=
 
 Code:
   (lambda ()
     (php-ts-mode)
-    (forward-sentence 2))
-
-Name: forward-sentence moves over multiple statements
-
-=-=
-class Basic {
-  public function basic(): void {
-    |return;
-    return;
-  }
-}
-=-=
-class Basic {
-  public function basic(): void {
-    return;
-    return;|
-  }
-}
-=-=-=
+    (end-of-defun))
 
-Code:
-  (lambda ()
-    (php-ts-mode)
-    (backward-sentence 1))
+Name: end-of-defun moves to method end
 
-Name: backward-sentence moves over one statement
+Point-Char: |
 
 =-=
-class Basic {
-  public function basic(): void {
-    return;|
-  }
-}
-=-=
-class Basic {
-  public function basic(): void {
-    |return;
-  }
-}
-=-=-=
-
-Code:
-  (lambda ()
-    (php-ts-mode)
-    (beginning-of-defun))
-
-Name: beginning-of-defun moves to defun start
+<?php
 
-=-=
-class Basic {
-  public function basic(): void {
-    return;|
-  }
+class Basic
+{
+    public function basic(): void
+    {
+        return;|
+    }
 }
 =-=
-class Basic {
-|  public function basic(): void {
-    return;
-  }
-}
+<?php
+
+class Basic
+{
+    public function basic(): void
+    {
+        return;
+    }
+|}
 =-=-=
 
 Code:
@@ -124,39 +66,62 @@ Code:
     (beginning-of-defun)
     (beginning-of-defun))
 
-Name: beginning-of-defun moves to class
+Name: beginning-of-defun twice moves to class start
+
+Point-Char: |
 
 =-=
-class Basic {
-  public function basic(): void {
-    return;|
-  }
+<?php
+
+class Basic
+{
+    public function basic(): void
+    {
+        return;|
+    }
 }
 =-=
-|class Basic {
-  public function basic(): void {
-    return;
-  }
+<?php
+
+|class Basic
+{
+    public function basic(): void
+    {
+        return;
+    }
 }
 =-=-=
 
 Code:
   (lambda ()
     (php-ts-mode)
+    (end-of-defun)
     (end-of-defun))
 
-Name: end-of-defun moves to defun end
+Name: end-of-defun twice moves to class block end
+
+Point-Char: |
 
 =-=
-class Basic {
-  public funtion basic(): void {
-    return;|
-  }
+<?php
+
+class Basic
+{
+    public function basic(): void
+    {
+        return;|
+    }
 }
+
 =-=
-class Basic {
-  public function basic(): void {
-    return;
-  }
-|}
+<?php
+
+class Basic
+{
+    public function basic(): void
+    {
+        return;
+    }
+}
+|
 =-=-=

tests/php-ts-mode-tests.el

@@ -33,9 +33,9 @@
   (ert-test-erts-file (ert-resource-file "indent.erts")))
 
 ; FIXME: implement basic movements
-;(ert-deftest php-ts-mode-test-movement ()
-;  (skip-unless (treesit-ready-p 'php))
-; (ert-test-erts-file (ert-resource-file "movement.erts")))
+(ert-deftest php-ts-mode-test-movement ()
+ (skip-unless (treesit-ready-p 'php))
+(ert-test-erts-file (ert-resource-file "movement.erts")))
 
 (provide 'php-ts-mode-tests)
 ;;; php-ts-mode-tests.el ends here