diff options
| author | john muhl <jm@pub.pink> | 2025-02-24 15:21:38 -0600 |
|---|---|---|
| committer | Stefan Kangas <stefankangas@gmail.com> | 2025-02-26 04:52:15 +0100 |
| commit | 8bc933b64e0582def4c19b4cc633eaabdff625ce (patch) | |
| tree | c7c60ff7c071db87e5b1f5c635d151b56d25b7d5 | |
| parent | 539772135222755255a3c8ca0cdda73dc4d742b2 (diff) | |
; 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." `((lua (function ,(rx (or "function_declaration" "function_definition"))) - (keyword ,(regexp-opt lua-ts--keywords - 'symbols)) + (keyword ,(regexp-opt lua-ts--keywords 'symbols)) (loop-statement ,(rx (or "do_statement" "for_statement" "repeat_statement" @@ -812,18 +811,10 @@ Calls REPORT-FN directly." keyword loop-statement ,(rx (or "arguments" - "break_statement" - "expression_list" - "false" - "identifier" - "nil" - "number" "parameters" "parenthesized_expression" "string" - "table_constructor" - "true" - "vararg_expression")))) + "table_constructor")))) (text "comment")))) ;; 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 Name: forward-sexp moves over strings =-= -print("|1, 2, 3") +print(|"1, 2, 3") =-= -print("1, 2, 3|") +print("1, 2, 3"|) =-=-= Name: forward-sexp moves over tables @@ -557,9 +557,9 @@ function f|(a, b) end Name: backward-sexp moves over strings =-= -print("1, 2, 3|") +print("1, 2, 3"|) =-= -print("|1, 2, 3") +print(|"1, 2, 3") =-=-= Name: backward-sexp moves over tables @@ -601,3 +601,53 @@ end| end end =-=-= + +Name: backward-sexp moves over do statements + +=-= +do + print(a + 1) +end| +=-= +|do + print(a + 1) +end +=-=-= + +Name: backward-sexp moves over for statements + +=-= +for k,v in pairs({}) do + print(k, v) +end| +=-= +|for k,v in pairs({}) do + print(k, v) +end +=-=-= + +Name: backward-sexp moves over repeat statements + +=-= +repeat + n = n + 1 +until n > 10| +=-= +|repeat + n = n + 1 +until n > 10 +=-=-= + +Name: backward-sexp moves over while statements + +=-= +while n < 99 +do + n = n+1 +end| +=-= +|while n < 99 +do + n = n+1 +end +=-=-= |