diff options
| author | john muhl | 2025-02-24 15:21:38 -0600 |
|---|---|---|
| committer | Stefan Kangas | 2025-02-26 04:52:15 +0100 |
| commit | 8bc933b64e0582def4c19b4cc633eaabdff625ce (patch) | |
| tree | c7c60ff7c071db87e5b1f5c635d151b56d25b7d5 | |
| parent | 539772135222755255a3c8ca0cdda73dc4d742b2 (diff) | |
| download | emacs-8bc933b64e0582def4c19b4cc633eaabdff625ce.tar.gz emacs-8bc933b64e0582def4c19b4cc633eaabdff625ce.zip | |
; Cleanup sexp things in 'lua-ts-mode'
* lisp/progmodes/lua-ts-mode.el (lua-ts-mode): Remove some
nonsensical entries from 'treesit-thing-settings'.
* test/lisp/progmodes/lua-ts-mode-resources/movement.erts:
Add missing tests for 'backward-sexp'. (Bug#76534)
| -rw-r--r-- | lisp/progmodes/lua-ts-mode.el | 13 | ||||
| -rw-r--r-- | test/lisp/progmodes/lua-ts-mode-resources/movement.erts | 58 |
2 files changed, 56 insertions, 15 deletions
diff --git a/lisp/progmodes/lua-ts-mode.el b/lisp/progmodes/lua-ts-mode.el index f02fefa8f94..de93d0fdaba 100644 --- a/lisp/progmodes/lua-ts-mode.el +++ b/lisp/progmodes/lua-ts-mode.el | |||
| @@ -793,8 +793,7 @@ Calls REPORT-FN directly." | |||
| 793 | `((lua | 793 | `((lua |
| 794 | (function ,(rx (or "function_declaration" | 794 | (function ,(rx (or "function_declaration" |
| 795 | "function_definition"))) | 795 | "function_definition"))) |
| 796 | (keyword ,(regexp-opt lua-ts--keywords | 796 | (keyword ,(regexp-opt lua-ts--keywords 'symbols)) |
| 797 | 'symbols)) | ||
| 798 | (loop-statement ,(rx (or "do_statement" | 797 | (loop-statement ,(rx (or "do_statement" |
| 799 | "for_statement" | 798 | "for_statement" |
| 800 | "repeat_statement" | 799 | "repeat_statement" |
| @@ -812,18 +811,10 @@ Calls REPORT-FN directly." | |||
| 812 | keyword | 811 | keyword |
| 813 | loop-statement | 812 | loop-statement |
| 814 | ,(rx (or "arguments" | 813 | ,(rx (or "arguments" |
| 815 | "break_statement" | ||
| 816 | "expression_list" | ||
| 817 | "false" | ||
| 818 | "identifier" | ||
| 819 | "nil" | ||
| 820 | "number" | ||
| 821 | "parameters" | 814 | "parameters" |
| 822 | "parenthesized_expression" | 815 | "parenthesized_expression" |
| 823 | "string" | 816 | "string" |
| 824 | "table_constructor" | 817 | "table_constructor")))) |
| 825 | "true" | ||
| 826 | "vararg_expression")))) | ||
| 827 | (text "comment")))) | 818 | (text "comment")))) |
| 828 | 819 | ||
| 829 | ;; Imenu/Outline/Which-function. | 820 | ;; Imenu/Outline/Which-function. |
diff --git a/test/lisp/progmodes/lua-ts-mode-resources/movement.erts b/test/lisp/progmodes/lua-ts-mode-resources/movement.erts index 11e86f12926..6e2ffb21d0e 100644 --- a/test/lisp/progmodes/lua-ts-mode-resources/movement.erts +++ b/test/lisp/progmodes/lua-ts-mode-resources/movement.erts | |||
| @@ -436,9 +436,9 @@ function f(a, b)| end | |||
| 436 | Name: forward-sexp moves over strings | 436 | Name: forward-sexp moves over strings |
| 437 | 437 | ||
| 438 | =-= | 438 | =-= |
| 439 | print("|1, 2, 3") | 439 | print(|"1, 2, 3") |
| 440 | =-= | 440 | =-= |
| 441 | print("1, 2, 3|") | 441 | print("1, 2, 3"|) |
| 442 | =-=-= | 442 | =-=-= |
| 443 | 443 | ||
| 444 | Name: forward-sexp moves over tables | 444 | Name: forward-sexp moves over tables |
| @@ -557,9 +557,9 @@ function f|(a, b) end | |||
| 557 | Name: backward-sexp moves over strings | 557 | Name: backward-sexp moves over strings |
| 558 | 558 | ||
| 559 | =-= | 559 | =-= |
| 560 | print("1, 2, 3|") | 560 | print("1, 2, 3"|) |
| 561 | =-= | 561 | =-= |
| 562 | print("|1, 2, 3") | 562 | print(|"1, 2, 3") |
| 563 | =-=-= | 563 | =-=-= |
| 564 | 564 | ||
| 565 | Name: backward-sexp moves over tables | 565 | Name: backward-sexp moves over tables |
| @@ -601,3 +601,53 @@ end| | |||
| 601 | end | 601 | end |
| 602 | end | 602 | end |
| 603 | =-=-= | 603 | =-=-= |
| 604 | |||
| 605 | Name: backward-sexp moves over do statements | ||
| 606 | |||
| 607 | =-= | ||
| 608 | do | ||
| 609 | print(a + 1) | ||
| 610 | end| | ||
| 611 | =-= | ||
| 612 | |do | ||
| 613 | print(a + 1) | ||
| 614 | end | ||
| 615 | =-=-= | ||
| 616 | |||
| 617 | Name: backward-sexp moves over for statements | ||
| 618 | |||
| 619 | =-= | ||
| 620 | for k,v in pairs({}) do | ||
| 621 | print(k, v) | ||
| 622 | end| | ||
| 623 | =-= | ||
| 624 | |for k,v in pairs({}) do | ||
| 625 | print(k, v) | ||
| 626 | end | ||
| 627 | =-=-= | ||
| 628 | |||
| 629 | Name: backward-sexp moves over repeat statements | ||
| 630 | |||
| 631 | =-= | ||
| 632 | repeat | ||
| 633 | n = n + 1 | ||
| 634 | until n > 10| | ||
| 635 | =-= | ||
| 636 | |repeat | ||
| 637 | n = n + 1 | ||
| 638 | until n > 10 | ||
| 639 | =-=-= | ||
| 640 | |||
| 641 | Name: backward-sexp moves over while statements | ||
| 642 | |||
| 643 | =-= | ||
| 644 | while n < 99 | ||
| 645 | do | ||
| 646 | n = n+1 | ||
| 647 | end| | ||
| 648 | =-= | ||
| 649 | |while n < 99 | ||
| 650 | do | ||
| 651 | n = n+1 | ||
| 652 | end | ||
| 653 | =-=-= | ||