From c2df185d4928e78c879f9bc45ffb1793e9876358 Mon Sep 17 00:00:00 2001 From: Wilfred Hughes Date: Sun, 28 Apr 2024 22:36:23 -0700 Subject: [PATCH] Update Lua parser Closes #701 --- CHANGELOG.md | 2 +- build.rs | 2 +- vendored_parsers/highlights/lua.scm | 77 +---------------------------- 3 files changed, 3 insertions(+), 78 deletions(-) mode change 100644 => 120000 vendored_parsers/highlights/lua.scm diff --git a/CHANGELOG.md b/CHANGELOG.md index b381b2a3a..105f2a255 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,7 +12,7 @@ Since difftastic is now conservative with parse errors (DFT_PARSE_ERROR_LIMIT is 0 by default), this seems like a better tradeoff. -Updated CSS parser. +Updated CSS and Lua parsers. ### Diffing diff --git a/build.rs b/build.rs index 60ac10eb7..aa92ffcc5 100644 --- a/build.rs +++ b/build.rs @@ -221,7 +221,7 @@ fn main() { TreeSitterParser { name: "tree-sitter-lua", src_dir: "vendored_parsers/tree-sitter-lua-src", - extra_files: vec!["scanner.cc"], + extra_files: vec!["scanner.c"], }, TreeSitterParser { name: "tree-sitter-make", diff --git a/vendored_parsers/highlights/lua.scm b/vendored_parsers/highlights/lua.scm deleted file mode 100644 index 6c4323b30..000000000 --- a/vendored_parsers/highlights/lua.scm +++ /dev/null @@ -1,76 +0,0 @@ -;; Keywords - -[ - "goto" - "in" - "local" - "return" - "and" - "not" - "or" - "function" - "if" - "elseif" - "else" - "then" - "for" - "do" - "end" - "repeat" - "until" - "while" -] @keyword - -[ - "+" - "-" - "*" - "/" - "%" - "^" - "#" - "==" - "~=" - "<=" - ">=" - "<" - ">" - "=" - "&" - "~" - "|" - "<<" - ">>" - "//" - ".." -] @operator - -;; Variables - -(identifier) @variable - -((identifier) @variable.builtin - (#match? @variable.builtin "self")) - -;; Constants - -((identifier) @constant - (#match? @constant "^[A-Z][A-Z_0-9]*$")) - -(nil) @constant.builtin - -[ - (false) - (true) -] @boolean - -;; Others - -(comment) @comment - -(number) @number - -(string) @string - -;; Error -(ERROR) @error diff --git a/vendored_parsers/highlights/lua.scm b/vendored_parsers/highlights/lua.scm new file mode 120000 index 000000000..1cc185a7e --- /dev/null +++ b/vendored_parsers/highlights/lua.scm @@ -0,0 +1 @@ +../tree-sitter-lua/queries/highlights.scm \ No newline at end of file