Skip to content

Fix gleam-ts-install-grammar for older library ABI versions. #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 30, 2025
Merged

Fix gleam-ts-install-grammar for older library ABI versions. #47

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4fb5301
Fix gleam-ts-install-grammar for older library ABI versions.
phmx Sep 1, 2025
f232aef
echo keyword is supported since version v1.1.0
phmx Sep 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 42 additions & 23 deletions gleam-ts-mode.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,20 @@
'((t (:inherit font-lock-variable-name-face)))
"Font used for highlighting Gleam modules.")

(defvar gleam-ts--grammar-revision
(if (and (treesit-available-p) (< (treesit-library-abi-version) 15))
"v1.0.0"
"main")
"Treesitter grammar (gleam-lang/tree-sitter-gleam repo) revision.")

(defun gleam-ts--grammar-supports-echo-keyword-p ()
"Determines whether grammar library version supports the `echo' keyword."
(let ((version-p (string-match-p "^v?[0-9]+\\(\\.[0-9]+\\)*$" gleam-ts--grammar-revision)))
(if version-p
(let ((version (string-trim-left gleam-ts--grammar-revision "v")))
(not (version< version "1.1.0")))
t)))

(defvar gleam-ts--font-lock-settings
(treesit-font-lock-rules
:feature 'comment
Expand Down Expand Up @@ -130,25 +144,29 @@

:feature 'keyword
:language 'gleam
'([
(visibility_modifier)
(opacity_modifier)
"as"
"assert"
"case"
"const"
;; Deprecated
"external"
"fn"
"if"
"import"
"let"
"panic"
"todo"
"type"
"use"
"echo"
] @font-lock-keyword-face)
(let* ((basic-keywords
[
(visibility_modifier)
(opacity_modifier)
"as"
"assert"
"case"
"const"
;; Deprecated
"external"
"fn"
"if"
"import"
"let"
"panic"
"todo"
"type"
"use"
])
(keywords (if (gleam-ts--grammar-supports-echo-keyword-p)
(append basic-keywords "echo")
basic-keywords)))
(list keywords '@font-lock-keyword-face))

:feature 'operator
:language 'gleam
Expand Down Expand Up @@ -308,10 +326,11 @@ otherwise, it aligns with the initial expression."
"Install the Gleam tree-sitter grammar."
(interactive)
(if (and (treesit-available-p) (boundp 'treesit-language-source-alist))
(let ((treesit-language-source-alist
(cons
'(gleam . ("https://github.com/gleam-lang/tree-sitter-gleam"))
treesit-language-source-alist)))
(let* ((language-source (list "https://github.com/gleam-lang/tree-sitter-gleam" :revision gleam-ts--grammar-revision))
(treesit-language-source-alist
(cons
(cons 'gleam language-source)
treesit-language-source-alist)))
(treesit-install-language-grammar 'gleam))
(display-warning 'treesit "Emacs' treesit package does not appear to be available")))

Expand Down