aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/progmodes/js.el (follow)
Commit message (Expand)AuthorAgeFilesLines
* Add non-TS modes as extra parent of TS modes (bug#68246)Stefan Monnier2024-03-091-0/+2
* Merge from origin/emacs-29Eli Zaretskii2024-02-031-6/+21
|\
| * ; Fix last changeEli Zaretskii2024-02-031-2/+2
| * Fix incompatibility with tree-sitter-javascript >= 0.20.2Vincenzo Pupillo2024-02-031-6/+21
* | (js-json-mode): Don't derive from `js-mode` (bug#67463)Stefan Monnier2024-01-141-1/+6
* | Merge from savannah/emacs-29Po Lu2024-01-021-1/+1
|\ \ | |/
| * ; Add 2024 to copyright yearsPo Lu2024-01-021-1/+1
* | Merge from origin/emacs-29Eli Zaretskii2023-12-161-18/+11
|\ \ | |/
| * js-ts-mode: Fix font-lock rules conflictDmitry Gutov2023-12-131-18/+6
| * Add indentation rules for bracketless statements in js-ts-modeNoah Peart2023-12-121-0/+5
* | Merge from origin/emacs-29Eli Zaretskii2023-12-101-1/+1
|\ \ | |/
| * Add font-locking for hash-bang lines in js-ts-modenverno2023-12-101-1/+1
* | Merge from origin/emacs-29Eli Zaretskii2023-12-091-17/+9
|\ \ | |/
| * js-ts-mode: Highlight function parameters inside destructuringDmitry Gutov2023-12-081-1/+4
| * js-ts-mode: Highlight property shorthands in assignmentsDmitry Gutov2023-12-081-2/+4
| * (js--treesit-font-lock-settings): Highlight parameters in function expressionDmitry Gutov2023-12-081-8/+1
| * (js--treesit-font-lock-settings): Remove some duplicatesDmitry Gutov2023-12-081-7/+1
* | Remove 'M-.' binding from js-mode and js-ts-modeDmitry Gutov2023-11-031-9/+0
* | ; * lisp/progmodes/js.el (js--treesit-sexp-nodes): Fix docstring.Yuan Fu2023-10-211-1/+1
* | Merge from origin/emacs-29Eli Zaretskii2023-09-161-0/+2
|\ \ | |/
| * Tweak s-p-f for js-ts-modeDmitry Gutov2023-09-131-0/+2
* | Merge from origin/emacs-29Eli Zaretskii2023-09-021-0/+24
|\ \ | |/
| * Add syntax-propertize-function to js-ts-modeDmitry Gutov2023-09-011-0/+24
* | Obsolete treesit-block/sexp/sentence/text-type-regexpYuan Fu2023-09-011-10/+7
* | Merge from origin/emacs-29Jim Porter2023-08-211-31/+4
|\ \ | |/
| * Fix jsx font-lock in older tree-sitter-js grammarsdannyfreeman2023-08-171-31/+4
* | Merge from origin/emacs-29Eli Zaretskii2023-08-121-1/+1
|\ \ | |/
| * Properly expand the JSX indentation rules in 'js-ts-mode'dannyfreeman2023-08-101-1/+1
| * Backport: Fix some tree-sitter :match regexpsBasil L. Contovounesios2023-07-301-3/+3
* | Merge from origin/emacs-29Eli Zaretskii2023-07-311-17/+44
|\ \ | |/
| * Update JSX support due to upstream changes (bug#64647)Vincenzo Pupillo2023-07-221-17/+44
* | Merge from origin/emacs-29Eli Zaretskii2023-07-011-27/+34
|\ \ | |/
| * Make js-beginning-of-defun return non-nil on successDaniel Martín2023-06-291-27/+34
| * Revert "Fix some tree-sitter :match regexps"Basil L. Contovounesios2023-06-171-3/+3
| * Fix some tree-sitter :match regexpsBasil L. Contovounesios2023-06-171-3/+3
* | Fix some tree-sitter :match regexpsBasil L. Contovounesios2023-06-171-3/+3
* | Merge from origin/emacs-29Eli Zaretskii2023-06-171-2/+2
|\ \ | |/
| * Fix bol/bos anchors in tree-sitter :match regexpsBasil L. Contovounesios2023-06-131-2/+2
* | Merge from origin/emacs-29Stefan Kangas2023-02-281-6/+6
|\ \ | |/
| * Rename the newly added -ref- faces to -use-Dmitry Gutov2023-02-281-6/+6
* | Merge from origin/emacs-29Stefan Kangas2023-02-251-19/+16
|\ \ | |/
| * Add more/finer faces for tree-sitterDmitry Gutov2023-02-251-19/+16
* | Merge from origin/emacs-29Stefan Kangas2023-02-211-2/+4
|\ \ | |/
| * Adjust jsx indentationTheodor Thornhill2023-02-191-2/+4
* | Merge from origin/emacs-29Stefan Kangas2023-02-151-0/+1
|\ \ | |/
| * Don't indent template_string contents (bug#61503)Theodor Thornhill2023-02-141-0/+1
* | Merge from origin/emacs-29Stefan Kangas2023-01-281-2/+11
|\ \ | |/
| * Fix errors in fontification of JavaScript import-statements (bug#61083)Jostein Kjønigsen2023-01-271-2/+11
* | Merge from origin/emacs-29Stefan Kangas2023-01-231-4/+4
|\ \ | |/
| * Move c-like common utils into own library (bug#60961)Theodor Thornhill2023-01-211-4/+4