Skip to content

Add new types and date constant regex #38

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
psibi merged 1 commit into from
Jan 5, 2025
Merged

Add new types and date constant regex #38

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion dhall-mode.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
(defvar dhall-mode-keywords (regexp-opt '("if" "then" "else" "let" "in" "using" "as") 'symbols))

(defvar dhall-mode-types
(regexp-opt '("Optional" "Bool" "Natural" "Integer" "Double" "Text" "List" "Type") 'symbols))
(regexp-opt '("Optional" "Bool" "Natural" "Integer" "Double" "Text" "List" "Type" "Date" "Time" "TimeZone" "Bytes") 'symbols))

(defconst dhall-mode-constants (regexp-opt '("True" "False") 'symbols))
(defconst dhall-mode-numerals "\\_<[+\\-][1-9]+\\_>")
Expand All @@ -94,6 +94,7 @@
(defconst dhall-mode-variables "\\([a-zA-Z_][a-zA-Z_0-9\\-]*\\)[[:space:]]*=")
(defconst dhall-mode-urls "\\_<\\(?:https?\\|file\\):[^[:space:]]+")
(defconst dhall-mode-shas "\\_<sha256:[a-f0-9]+\\_>")
(defconst dhall-mode-date "[0-9]\\{4\\}-[0-9][0-9]-[0-9][0-9]")

(defconst dhall-mode-font-lock-keywords
`( ;; Variables
Expand All @@ -104,6 +105,7 @@
(,dhall-mode-operators . font-lock-builtin-face)
(,dhall-mode-variables . (1 font-lock-variable-name-face))
(,dhall-mode-keywords . font-lock-keyword-face)
(,dhall-mode-date . font-lock-constant-face)
(,dhall-mode-doubles . font-lock-constant-face)
(,dhall-mode-numerals . font-lock-constant-face)))

Expand Down Expand Up @@ -140,19 +142,19 @@

(defcustom dhall-format-arguments nil
"Provide a list of arguments for the formatter e.g. \='(\"--ascii\")."
:type 'list

Check failure on line 145 in dhall-mode.el

View workflow job for this annotation

GitHub Actions / check (snapshot, false) 

in defcustom for ‘dhall-format-arguments’: ‘list’ without arguments
:group 'dhall
:safe 'listp)

(defcustom dhall-freeze-arguments nil
"Provide a list of arguments for freeze e.g. ='(\"--transitive\")."
:type 'list

Check failure on line 151 in dhall-mode.el

View workflow job for this annotation

GitHub Actions / check (snapshot, false) 

in defcustom for ‘dhall-freeze-arguments’: ‘list’ without arguments
:group 'dhall
:safe 'listp)

(defcustom dhall-lint-arguments nil
"Provide a list of arguments for the linter e.g. \='(\"--transitive\")."
:type 'list

Check failure on line 157 in dhall-mode.el

View workflow job for this annotation

GitHub Actions / check (snapshot, false) 

in defcustom for ‘dhall-lint-arguments’: ‘list’ without arguments
:group 'dhall
:safe 'listp)

Expand Down
Loading