mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-06 03:40:56 -08:00
Code Issues Projects Releases Wiki Activity

Merge from origin/emacs-30

Browse source 
2a45f0bceb * lisp/progmodes/heex-ts-mode.el (heex-ts): Fix :group name.
9750333dde Fix typescript-ts-mode indentation (bug#77803)
This commit is contained in:
Michael Albinus 2025-04-19 10:00:04 +02:00
commit 9ea9c5a73e
3 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lisp/progmodes/heex-ts-mode.el
View file

@ -56,7 +56,7 @@
(defgroup heex-ts nil (defgroup heex-ts nil
"Major mode for editing HEEx code." "Major mode for editing HEEx code."
:prefix "heex-ts-" :prefix "heex-ts-"
:group 'langauges) :group 'languages)
(defcustom heex-ts-indent-offset 2 (defcustom heex-ts-indent-offset 2
"Indentation of HEEx statements." "Indentation of HEEx statements."

2
lisp/progmodes/typescript-ts-mode.el
View file

@ -153,7 +153,7 @@ Argument LANGUAGE is either `typescript' or `tsx'."
((parent-is "type_arguments") parent-bol typescript-ts-mode-indent-offset) ((parent-is "type_arguments") parent-bol typescript-ts-mode-indent-offset)
((parent-is "type_parameters") parent-bol typescript-ts-mode-indent-offset) ((parent-is "type_parameters") parent-bol typescript-ts-mode-indent-offset)
((parent-is ,(rx (or "variable" "lexical") "_" (or "declaration" "declarator"))) ((parent-is ,(rx (or "variable" "lexical") "_" (or "declaration" "declarator")))
typescript-ts-mode--anchor-decl 1) parent-bol typescript-ts-mode-indent-offset)
((parent-is "arguments") parent-bol typescript-ts-mode-indent-offset) ((parent-is "arguments") parent-bol typescript-ts-mode-indent-offset)
((parent-is "array") parent-bol typescript-ts-mode-indent-offset) ((parent-is "array") parent-bol typescript-ts-mode-indent-offset)
((parent-is "formal_parameters") parent-bol typescript-ts-mode-indent-offset) ((parent-is "formal_parameters") parent-bol typescript-ts-mode-indent-offset)

28
test/lisp/progmodes/typescript-ts-mode-resources/indent.erts
View file

@ -67,22 +67,22 @@ Name: Lexical and variable declarations
=-= =-=
const foo = () => { const foo = () => {
let x = 1, let x = 1,
yyyy: { yyyy: {
[k: string | number]: string, [k: string | number]: string,
} = { } = {
"foo": "foo", "foo": "foo",
"bar": "bar", "bar": "bar",
}; };
var obar = 1, var obar = 1,
fo: { [x: any]: any } = { fo: { [x: any]: any } = {
"a": 1, "a": 1,
"b": 2, "b": 2,
}; };
const cccc = 1, const cccc = 1,
bbb = { bbb = {
"x": 0 "x": 0
}, },
ddddd = 0; ddddd = 0;
// First decls with value starting on same line // First decls with value starting on same line
const a = (x: string): string => { const a = (x: string): string => {
return x + x; return x + x;