Commit Graph

13038 Commits

Author SHA1 Message Date
Henrik Lissner
1dae2bf916 fix(tree-sitter): remap to ts-mode w/o base mode
If the base major mode doesn't exist, let's assume we want no
fallthrough for this major mode (in the event the grammar isn't ready)
and simply push forward anyway, even if a missing grammar results in a
broken state.

This will particularly affect major modes like `typescript-mode` (which
simply won't be installed if +tree-sitter is enabled) and
`go-{mod,work}-ts-mode` (for which no base major modes exist).

The difference (generally) between most base and ts-modes is
performance, not features, so "gracefully failing back to the base mode"
makes sense UX-wise, but `typescript-mode` notably inferior to
`typescript-ts-mode` (particularly in its TSX support). Beginners may
misidentify its shortcomings as bugs, so it's better to simply error out
early so the user can be made aware of the problem sooner and less
ambiguously.
2025-08-31 16:20:14 +02:00
Henrik Lissner
5cda3ed25a merge: branch 'feature/treesit'
Fix: #7742
Fix: #7623
Fix: #7593
2025-08-31 14:55:37 +02:00
Henrik Lissner
571766e6ba fix(qt): eglot support
Also refactor module out of autoload.el into config.el (now that it's
non-trivial).

Ref: doomemacs/community#24
2025-08-31 14:47:03 +02:00
Henrik Lissner
94a1fe64a8 fix(tree-sitter): suppress "Can't find grammar" warnings
In Emacs <=30, top-level `treesit-ready-p` calls in various *-ts-mode
packages (like lua-ts-mode or ruby-ts-mode) are commonplace, and they
throw up a warning popup if the grammar isn't available at load time.
This is intrusive. Instead, this forces it to log to *Messages* instead
before falling back to the normal major mode.

Fortunately, these top-level `treesit-ready-p` calls have been removed
in most *-ts-mode packages in 31+, but this still impacts users on <=30
or using third party *-ts-modes that haven't adapted.

However, this doesn't suppress the warning when opening a *-ts-mode.el
file (thanks to the byte-compiler).
2025-08-31 14:41:40 +02:00
Henrik Lissner
86b6ba81ac fix(go): go-{mod,work}-ts-mode 2025-08-31 14:40:58 +02:00
Henrik Lissner
d545fccf47 fix(:lang): missing grammar recipes
I removed the grammar recipes in 3b58741 to avoid redundancy with the
upstream recipes, but didn't realize that those upstream recipes weren't
added until Emacs 31, so users on 30 and older would get errors when
trying to install any missing grammars.

This also establishes a hard dependency between :lang (php +tree-sitter)
and :lang ({javascript,web} +tree-sitter).

Amend: 3b58741522
2025-08-31 14:39:38 +02:00
Henrik Lissner
d9fd5cb8f3 fix(tree-sitter): treesit-enabled-modes: sort arity in <30
`sort`s signature changed in Emacs 30 from:

  (sort SEQ PREDICATE)

To

  (sort SEQ &key KEY LESSP REVERSE IN-PLACE)

Amend: 6009c2b838
2025-08-31 14:34:45 +02:00
Henrik Lissner
83eba01bff refactor(python): string= first, then executable-find
The latter is a little slower depending on the order of $PATH.
2025-08-31 09:50:05 +02:00
Henrik Lissner
7dd66cc3d7 fix(php): remove unused async dependency
No longer needed without php-extras (removed in 9e5e4cf).

Amend: 9e5e4cf78b
2025-08-30 15:48:29 +02:00
Henrik Lissner
6084404a07 docs(beancount): flesh out module readme 2025-08-30 11:58:22 +02:00
Henrik Lissner
d77d39ab46 refactor(scala): remove redundant config
Amend: c5dd2847ff
2025-08-30 10:30:26 +02:00
Henrik Lissner
bcb2c56dd9 fix(haskell): haskell-ts-mode: repl & eglot integration
Amend: 47fe11cd76
2025-08-30 10:30:26 +02:00
Henrik Lissner
0ba85c8f77 refactor(lua): DRY tree-sitter config 2025-08-30 10:30:26 +02:00
Henrik Lissner
ab4dace692 refactor(:lang): remove redudant mode-alist lines
Amend: 3b58741522
2025-08-30 10:30:26 +02:00
Henrik Lissner
2870697e1a fix(go,nix,zig): dynamic keymap interpolation errors
Amend: 7c6e1950e8
Amend: 5b37bfee23
Amend: 9acc5f48b6
2025-08-30 10:30:21 +02:00
Henrik Lissner
7dcedc16b5 refactor(tree-sitter): major mode remapping
This approach simplifies the hacks and uses fewer moving parts to be
less error prone (or prone to potentially overwriting user/module
configuration).
2025-08-30 09:41:25 +02:00
Henrik Lissner
9e5e4cf78b refactor!(php): remove php-extras
BREAKING CHANGE: The PHP API data file no longer exists on php.net, and
there is no substitute, and php-extras is no longer maintained, so this
package is defunct and leaves php buffers in an error state. This
deprives non-LSP users from eldoc and naive code completion. The
alternative is to simply adopt LSP.
2025-08-30 00:56:03 +02:00
Jonas Jelten
b1826a0c64 bump: :ui workspaces
Bad-ptr/persp-mode.el@f146ddccaf -> Bad-ptr/persp-mode.el@82680795b3

this fixes a nasty bug where new eglot workspaces corrupt the previous
one. symptoms of this can be your definition jump source buffer being
read-only and renamed to:
`*EGLOT (jump-destination-project/(your-lang-mode)) stderr*`
2025-08-30 00:49:00 +02:00
Henrik Lissner
3044812ac1 fix(clojure): remove vestiges of tree-sitter
Amend: 2adbdf1360
2025-08-29 18:23:18 +02:00
Henrik Lissner
31f5b60f5e fix(php): dynamic mode map interpolation error
Amend: 9073b24878
Close: #8448
Co-authored-by: ribaricplusplus <ribaricplusplus@users.noreply.github.com>
2025-08-29 17:56:55 +02:00
Henrik Lissner
702d976665 docs(tree-sitter): document module hacks 2025-08-29 14:37:10 +02:00
Henrik Lissner
cd5dd5279e fix(tree-sitter): major mode remapping on first-load
Also refactors +tree-sitter--major-mode-remaps-alist to be lighter.
2025-08-29 14:35:49 +02:00
Henrik Lissner
bd0bee92cc feat!(javascript): add treesit support
BREAKING CHANGE: This commit removes a number of core packages and
features from this module and only replaces a handful of them, so that
we can lean more on LSP and tree-sitter. To be specific:

- We used to rely on `rjsx-mode` (derived from js2-mode) for total
  JS/JSX support (though imperfect; Emacs was starved for options at the
  time). This has now been replaced with `js-ts-mode` (built-in after
  Emacs 29), falling back to `js-mode` (very rudimentary, but a decent
  fallback).
- This also meant the removal of `js2-mode`, which `skewer-mode`,
  `js2-refactor`, and `xref-js2` depended on, so those were removed
  too, and have *somewhat* been replaced with LSP integration (offers
  jump-to-definition/references and *some* refactoring actions, but no
  replacement for skewer's functionality).
- Typescript support no longer relies on the jury-rigged, web-mode-derived
  major mode (because TSX support in the upstream `typescript-mode`
  isn't great). We now use `typescript-ts-mode` (built-in into Emacs
  29.1+), falling back to `typescript-mode`.
- JSX/TSX support now *requires* tree-sitter (and Emacs 29.1+), where
  `tsx-ts-mode` is available and outshines all the alternatives (at the
  time of writing).

Due to the absolute chaos that is webdev, this module sacrifices some of
the graceful-degradation I've implemented for other modules and creates
a hard requirement on tree-sitter and Emacs 29.1+ for JSX/TSX. It still
tries to degrade gracefully for plain JS and TS, but the module's doctor
and docs will actively recommend tree-sitter.

Close: #5278
Fix: #6172
Fix: #7042
Close: #8447
Co-authored-by: ribaricplusplus <ribaricplusplus@users.noreply.github.com>
2025-08-29 14:35:49 +02:00
Stephen Brennan
ed27f91822 tweak(notmuch): include the user's name in From: header
The notmuch/compose function allows selecting between the email
addresses that the user has configured, but the email address is used
directly in the From header. Messages display much nicer in people's
inbox when the From contains a name in addition to an emeail address, so
construct the From header with the user's name as well as the chosen
email address.

Signed-off-by: Stephen Brennan <stephen@brennan.io>
2025-08-29 13:02:48 +02:00
Henrik Lissner
d20c5f1273 docs(haskell): mention haskell-ts-mode package
Amend: 47fe11cd76
2025-08-28 14:32:08 +02:00
Henrik Lissner
f782b79797 feat(graphql): add treesit support 2025-08-28 14:32:08 +02:00
Henrik Lissner
64b4e565c3 refactor(tree-sitter): remove redundant grammars
Already registered by csharp and web module packages.

Amend: 5bf132a80f
Amend: c403bb5e2f
2025-08-28 14:32:08 +02:00
Henrik Lissner
93c085fa13 feat(qt): add treesit (and lsp) support 2025-08-28 14:32:08 +02:00
Henrik Lissner
cfadd8f6a4 feat(sml): add treesit (and lsp) support 2025-08-28 14:00:59 +02:00
Henrik Lissner
5bf132a80f feat(web): add treesit support (for html/css) 2025-08-27 17:38:40 +02:00
Henrik Lissner
6b203d74c9 refactor(sh): remove tree-sitter support
bash-ts-mode is inferior to shell-script-mode's syntax highlighting and
no other *-ts-mode modes are available for other shells (though,
there *are* powershell and nushell ts-modes; I'll investigate those
later).
2025-08-27 17:32:56 +02:00
Henrik Lissner
07e7c699cf feat(java): add treesit support 2025-08-27 17:29:58 +02:00
Henrik Lissner
6ca155ea11 refactor(ess): remove tree-sitter support
No *-ts-mode exists for ess-r-mode (or any other ess mode, afaik). The
ess module will fall back to font-lock rules so this is not a breaking
changing.
2025-08-27 17:29:58 +02:00
Henrik Lissner
bf85767975 refactor(graphviz): remove tree-sitter support
No *-ts-mode exists for graphviz-dot-mode. The graphviz module will fall
back to font-lock rules so this is not a breaking changing.
2025-08-27 17:29:58 +02:00
Henrik Lissner
3d2abf8b05 feat(erlang): add treesit support 2025-08-27 17:29:58 +02:00
Henrik Lissner
bee45157c6 refactor(elm): remove tree-sitter support
No *-ts-mode exists for elm-mode. The elm module will fall back to
font-lock rules so this is not a breaking changing.
2025-08-27 17:29:58 +02:00
Henrik Lissner
c1ac8bc37a refactor(ocaml): remove tree-sitter support
No *-ts-mode exists for tuareg-mode. There *is* a ocaml-ts-mode, but
it's too rudimentary. The ocaml module will fall back to font-lock rules
so this is not a breaking changing.
2025-08-27 17:29:28 +02:00
Henrik Lissner
47fe11cd76 feat(haskell): add treesit support 2025-08-27 17:29:14 +02:00
Henrik Lissner
086a0d30d0 feat(rust): add treesit support 2025-08-27 16:57:39 +02:00
Henrik Lissner
3b58741522 refactor(tree-sitter): centralize grammar config & hacks
Easier to track and maintain.
2025-08-27 16:57:28 +02:00
Henrik Lissner
058cb20a12 bump: :completion
LuigiPiucco/nerd-icons-corfu@55b17ee20a -> LuigiPiucco/nerd-icons-corfu@f821e953b1
bbatsov/helm-projectile@041076e35a -> bbatsov/helm-projectile@41bc1c1973
company-mode/company-mode@1924eabfa7 -> company-mode/company-mode@ca045bc544
emacs-helm/helm-descbinds@c12bc85ef3 -> emacs-helm/helm-descbinds@0aff44bada
emacs-helm/helm@90cd6ad68c -> emacs-helm/helm@c8d147be4d
minad/cape@c9191ee9e1 -> minad/cape@97641dcd1e
minad/consult-flycheck@8067363ee3 -> minad/consult-flycheck@398a85b5df
minad/consult@7146596b56 -> minad/consult@c8bbb3f1e2
minad/corfu@53aa6c85be -> minad/corfu@6b1ceef882
minad/marginalia@0e7097051c -> minad/marginalia@30e6813c81
minad/vertico@b43b594bb3 -> minad/vertico@718f8584d0
oantolin/embark@2941f2ea36 -> oantolin/embark@1371a1e33e
oantolin/orderless@254f241248 -> oantolin/orderless@31812d9252
radian-software/prescient.el@7dd5b53886 -> radian-software/prescient.el@87e2d2f2dd
rainstormstudio/nerd-icons-completion@e15e21a263 -> rainstormstudio/nerd-icons-completion@5625ef374d
seagle0128/nerd-icons-ivy-rich@83c7b60595 -> seagle0128/nerd-icons-ivy-rich@0cedc990e9
2025-08-27 16:30:47 +02:00
Henrik Lissner
4154ad885f revert: diff-hl
dgutov/diff-hl@39f076efa8 -> dgutov/diff-hl@0fe1bc0fd8

diff-hl introduced changes that require Emacs 31+ that can't be
trivially advised out or worked around. Until it's resolved upstream,
I've reverted diff-hl to one commit behind dgutov/diff-hl@7a89c85b89.

Fix: #8464
Ref: dgutov/diff-hl@7a89c85b89
Amend: a1121acc94
2025-08-27 15:42:25 +02:00
Henrik Lissner
6009c2b838 fix(tree-sitter): backport treesit-{enabled-modes,major-mode-remap-alist}
And ignore `treesit-major-mode-remap-alist`, because they could
interfere with our UX improvements.
2025-08-23 18:43:14 +02:00
Henrik Lissner
13ffb0fed3 refactor(org): remove +org-fix-newline-and-indent-in-src-blocks-a
Our rebinding of RET to +org/return in insert mode, already
accompolishes was this advice sets out to do.
2025-08-23 12:33:24 +02:00
Henrik Lissner
41876aa036 refactor(org): remove +org-fix-window-excursions-a
Changes upstream (to honour display-buffer-alist) seem to have addressed
what this advice was deployed for.

Ref: #6061
2025-08-23 12:31:11 +02:00
Henrik Lissner
5217ba75a2 refactor(org): remove +org--respect-org-auto-align-tags-a
`org-auto-align-tags` checks were added upstream in all editing
commands, so this advice is no longer needed.

Ref: emacs-straight/org-mode@aa71facf6d
2025-08-23 11:59:01 +02:00
Henrik Lissner
2129fffc79 bump: :lang beancount emacs-lisp markdown
Wilfred/elisp-def@1ad4baccbf -> Wilfred/elisp-def@2451ed6594
ardumont/markdown-toc@1b0c5ae7f3 -> ardumont/markdown-toc@e3429d3014
beancount/beancount-mode@ddd4b87257 -> beancount/beancount-mode@eb8b9b72a7
jorgenschaefer/emacs-buttercup@c467c659b2 -> jorgenschaefer/emacs-buttercup@cc5a2ab7c7
jrblevin/markdown-mode@90ad4af79a -> jrblevin/markdown-mode@d51c469133
seagle0128/grip-mode@96a927dce6 -> seagle0128/grip-mode@11fecd5b38
2025-08-21 16:47:37 +02:00
Henrik Lissner
cde7dbbb0f fix(lsp): eglot-booster-io-only only when needed
On older Emacsen, we want all the help eglot-booster can give.

Ref: #8463
Amend: 1ede94c88a
2025-08-21 16:47:37 +02:00
Henrik Lissner
79c8621091 fix(lsp): disable lsp-mode + emacs-lsp-booster advice
This is temporary until a better solution is found.

This advice does nothing for lsp-mode without the accompanying
`jsonrpc--json-read` advice eglot-booster uses. Needs more testing to
make sure it's worth the trouble on Emacs 30+ and is compatible with
`lsp-use-plists`.

Ref: #8463
Amend: 1ede94c88a
2025-08-21 16:46:37 +02:00
Henrik Lissner
c7d5ad622e docs(lsp): mention +booster
Ref: #8463
2025-08-21 16:33:33 +02:00