From 2044f250aef78135ce1b9614027d6d40c45d5777 Mon Sep 17 00:00:00 2001 From: John Isom Date: Mon, 27 Jul 2020 20:39:44 -0600 Subject: Fix indentation rule for javascript.kak --- rc/filetype/javascript.kak | 2 ++ 1 file changed, 2 insertions(+) (limited to 'rc/filetype/javascript.kak') diff --git a/rc/filetype/javascript.kak b/rc/filetype/javascript.kak index 191ae95d..aae3b89f 100644 --- a/rc/filetype/javascript.kak +++ b/rc/filetype/javascript.kak @@ -62,6 +62,8 @@ define-command -hidden javascript-indent-on-new-line %< try %{ execute-keys -draft k : javascript-trim-indent } # indent after lines beginning / ending with opener token try %_ execute-keys -draft k ^\h*[[{]|[[{]$ j _ + # deindent closing token(s) when after cursor + try %_ execute-keys -draft ^\h*[}\]]+\h*$ hm 1 _ > > -- cgit v1.2.3 From d7e97022284fd386e2058083861ee1220661bc65 Mon Sep 17 00:00:00 2001 From: John Isom Date: Tue, 28 Jul 2020 15:18:57 -0600 Subject: Fix my closer tokens issues in javascript.kak --- rc/filetype/javascript.kak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'rc/filetype/javascript.kak') diff --git a/rc/filetype/javascript.kak b/rc/filetype/javascript.kak index aae3b89f..a3d19357 100644 --- a/rc/filetype/javascript.kak +++ b/rc/filetype/javascript.kak @@ -63,7 +63,7 @@ define-command -hidden javascript-indent-on-new-line %< # indent after lines beginning / ending with opener token try %_ execute-keys -draft k ^\h*[[{]|[[{]$ j _ # deindent closing token(s) when after cursor - try %_ execute-keys -draft ^\h*[}\]]+\h*$ hm 1 _ + try %_ execute-keys -draft ^\h*[}\]]+\;?\h*$ \; [}\]] m 1 _ > > -- cgit v1.2.3 From 60a1b0cfcb461d3fdaec16feac1fa8fb44cc2f6d Mon Sep 17 00:00:00 2001 From: John Isom Date: Tue, 28 Jul 2020 15:33:20 -0600 Subject: Update deindenting in javascript.kak --- rc/filetype/javascript.kak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'rc/filetype/javascript.kak') diff --git a/rc/filetype/javascript.kak b/rc/filetype/javascript.kak index a3d19357..4f1b0723 100644 --- a/rc/filetype/javascript.kak +++ b/rc/filetype/javascript.kak @@ -63,7 +63,7 @@ define-command -hidden javascript-indent-on-new-line %< # indent after lines beginning / ending with opener token try %_ execute-keys -draft k ^\h*[[{]|[[{]$ j _ # deindent closing token(s) when after cursor - try %_ execute-keys -draft ^\h*[}\]]+\;?\h*$ \; [}\]] m 1 _ + try %_ execute-keys -draft ^\h*[}\]]+\h*\;?\h*$ \; [}\]] m 1 _ > > -- cgit v1.2.3 From 27705d402f93588b35a1ea83853c7f402e8d4816 Mon Sep 17 00:00:00 2001 From: John Isom Date: Wed, 29 Jul 2020 09:28:32 -0600 Subject: Update deindenting in javascript.kak --- rc/filetype/javascript.kak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'rc/filetype/javascript.kak') diff --git a/rc/filetype/javascript.kak b/rc/filetype/javascript.kak index 4f1b0723..bd9f586a 100644 --- a/rc/filetype/javascript.kak +++ b/rc/filetype/javascript.kak @@ -63,7 +63,7 @@ define-command -hidden javascript-indent-on-new-line %< # indent after lines beginning / ending with opener token try %_ execute-keys -draft k ^\h*[[{]|[[{]$ j _ # deindent closing token(s) when after cursor - try %_ execute-keys -draft ^\h*[}\]]+\h*\;?\h*$ \; [}\]] m 1 _ + try %_ execute-keys -draft ^\h*[})\]]+ \; gh / [})\]] m 1 _ > > -- cgit v1.2.3 From 2b86826d5a1fd35bb6be17a79dfe43fa7e58f633 Mon Sep 17 00:00:00 2001 From: John Isom Date: Wed, 29 Jul 2020 09:28:46 -0600 Subject: Fix already-existing error in javascript.kak --- rc/filetype/javascript.kak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'rc/filetype/javascript.kak') diff --git a/rc/filetype/javascript.kak b/rc/filetype/javascript.kak index bd9f586a..a3bc0654 100644 --- a/rc/filetype/javascript.kak +++ b/rc/filetype/javascript.kak @@ -61,7 +61,7 @@ define-command -hidden javascript-indent-on-new-line %< # filter previous line try %{ execute-keys -draft k : javascript-trim-indent } # indent after lines beginning / ending with opener token - try %_ execute-keys -draft k ^\h*[[{]|[[{]$ j _ + try %_ execute-keys -draft k ^\h*[[({]|[[({]$ j _ # deindent closing token(s) when after cursor try %_ execute-keys -draft ^\h*[})\]]+ \; gh / [})\]] m 1 _ > -- cgit v1.2.3 From 528feb3422913400dbd20da25fb362bf594a282f Mon Sep 17 00:00:00 2001 From: John Isom Date: Wed, 29 Jul 2020 09:34:29 -0600 Subject: Update deindenting in dart.kak and javascript.kak --- rc/filetype/javascript.kak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'rc/filetype/javascript.kak') diff --git a/rc/filetype/javascript.kak b/rc/filetype/javascript.kak index a3bc0654..c7feb46b 100644 --- a/rc/filetype/javascript.kak +++ b/rc/filetype/javascript.kak @@ -63,7 +63,7 @@ define-command -hidden javascript-indent-on-new-line %< # indent after lines beginning / ending with opener token try %_ execute-keys -draft k ^\h*[[({]|[[({]$ j _ # deindent closing token(s) when after cursor - try %_ execute-keys -draft ^\h*[})\]]+ \; gh / [})\]] m 1 _ + try %_ execute-keys -draft ^\h*[})\]] gh / [})\]] m 1 _ > > -- cgit v1.2.3 From 29e94c46e0a0bc895b767a0da42ae20954f26a78 Mon Sep 17 00:00:00 2001 From: John Isom Date: Wed, 29 Jul 2020 15:04:14 -0600 Subject: Fix already-existing bug in javascript.kak --- rc/filetype/javascript.kak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'rc/filetype/javascript.kak') diff --git a/rc/filetype/javascript.kak b/rc/filetype/javascript.kak index c7feb46b..fdac14af 100644 --- a/rc/filetype/javascript.kak +++ b/rc/filetype/javascript.kak @@ -61,7 +61,7 @@ define-command -hidden javascript-indent-on-new-line %< # filter previous line try %{ execute-keys -draft k : javascript-trim-indent } # indent after lines beginning / ending with opener token - try %_ execute-keys -draft k ^\h*[[({]|[[({]$ j _ + try %_ execute-keys -draft k s [[({] [\])}] j _ # deindent closing token(s) when after cursor try %_ execute-keys -draft ^\h*[})\]] gh / [})\]] m 1 _ > -- cgit v1.2.3