Skip to content

Add support for Nix, Typst, and Vhdl #389

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

Open
WiredMic wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Add support for Nix, Typst, and Vhdl #389

Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
447e5ad
feat: add nix-ts support
WiredMic Feb 15, 2026
ca1e0a0
feat: add typst-ts support
WiredMic Feb 15, 2026
f91b50f
feat: add vhdl & vhdl-ts support
WiredMic Feb 15, 2026
eade69a
feat: add vhdl & vhdl-ts support
WiredMic Feb 15, 2026
61dedb6
Removed unneeded configs
WiredMic Feb 15, 2026
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
13 changes: 11 additions & 2 deletions editorconfig.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,7 @@ This hook will be run even when there are no matching sections in
(meson-mode meson-indent-basic)
(mips-mode mips-tab-width)
(mustache-mode mustache-basic-offset)
(nix-ts-mode nix-ts-mode-indent-offset)
Copy link
Collaborator

@monnier monnier Feb 15, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If nix-ts-mode followed the convention of using FOO-indent-offset (instead of FOO-mode-indent-offset), your patch would not be needed. So I suggest a bug report to the nix-ts-mode maintainers.

Copy link
Author

@WiredMic WiredMic Feb 15, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have send a bug report upstream.
nix-community/nix-ts-mode#69

Copy link

@purcell purcell Feb 15, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi Stefan, I'm a committer on nix-ts-mode, and I could conceivably help get this changed via aliasing and deprecation, but I've seen the same pattern in other popular modes out there, e.g. toml-ts-mode. It seems strange to require the -mode- not to be there, as that is a reasonable part of a variable name. I personally think it would be better to adjust the heuristic here.

(nxml-mode . editorconfig--get-indentation-nxml-mode)
(objc-mode c-basic-offset)
(octave-mode octave-block-offset)
Expand Down Expand Up @@ -266,12 +267,15 @@ This hook will be run even when there are no matching sections in
(templ-ts-mode go-ts-mode-indent-offset js-indent-level)
(toml-ts-mode toml-ts-mode-indent-offset)
(typescript-ts-base-mode typescript-ts-mode-indent-offset)
(typst-ts-mode typst-ts-indent-offset)
(verilog-mode verilog-indent-level
verilog-indent-level-behavioral
verilog-indent-level-declaration
verilog-indent-level-module
verilog-cexp-indent
verilog-case-indent)
(vhdl-mode . editorconfig--get-indentation-vhdl-mode)
(vhdl-ts-mode vhdl-ts-indent-level)
(web-mode . editorconfig--get-indentation-web-mode)
(yaml-ts-mode yaml-indent-offset))
"Alist of indentation setting methods by modes.
Expand Down Expand Up @@ -305,7 +309,7 @@ When variable `buffer-file-name' matches any of the regexps, then
(with-eval-after-load 'recentf
(add-to-list 'editorconfig-exclude-regexps
(rx-to-string '(seq string-start
(eval (file-truename (expand-file-name recentf-save-file))))
(eval (file-truename (expand-file-name recentf-save-file))))
t)))

(defcustom editorconfig-trim-whitespaces-mode
Expand Down Expand Up @@ -413,6 +417,11 @@ Make a message by passing ARGS to `format-message'."
(t t))
`((lisp-indent-offset . ,size))))

(defun editorconfig--get-indentation-vhdl-mode (size)
"Set VHDL indentation to SIZE and handle its custom indent-tabs-mode."
`((vhdl-basic-offset . ,size)
(vhdl-indent-tabs-mode . ,indent-tabs-mode)))

Copy link
Collaborator

@monnier monnier Feb 15, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do you have (vhdl-indent-tabs-mode . ,indent-tabs-mode) here?
As for vhdl-basic-offset it should be auto-discovered by editorconfig--default-indent-size-function.

Copy link
Author

@WiredMic WiredMic Feb 15, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

vhdl-indent-tabs-mode overrides indent-tabs-mode , so if it is not also set then it can override a configuration with space.

vhdl-indent-tabs-mode is a variable defined in ‘vhdl-mode.el’.

Its value is nil

Non-nil means indentation can insert tabs.
Overrides local variable ‘indent-tabs-mode’.

From line 4471.

      If option `vhdl-indent-tabs-mode' is nil, spaces are used instead of
    tabs.  \\[tabify] and \\[untabify] allow the conversion of spaces to
    tabs and vice versa.

(cl-defun editorconfig--should-set (symbol)
"Determine if editorconfig should set SYMBOL."
(display-warning '(editorconfig editorconfig--should-set)
Expand Down Expand Up @@ -444,7 +453,7 @@ set them to.
Major modes are expected to set this buffer-locally.")

(defun editorconfig--default-indent-size-function (size)
"Guess which variables to set to for the indentation step to have size SIZE.
"Guess which variables to set to for the indentation step to have size SIZE.
This relies on `editorconfig-indentation-alist' supplemented with a crude
heuristic for those modes not found there."
(let ((parents (if (fboundp 'derived-mode-all-parents) ;Emacs-30
Expand Down