bug#60123: 29.0.60; json-ts-mode does not increase indentation inside arrays

bug#60123: 29.0.60; json-ts-mode does not increase indentation inside arrays

[Jostein Kjønigsen]

[-- Attachment #1: Type: text/plain, Size: 9374 bytes --]

When editing arrays in json-ts-mode, and pressing newline, json-ts-mode 
does not increase indent.

Attached is a patch which fixes this behaviour.

--


In GNU Emacs 29.0.60 (build 7, x86_64-pc-linux-gnu, GTK+ Version
  3.24.33, cairo version 1.16.0) of 2022-12-15 built on dev-jostein
Repository revision: 98ea7054a71d73f2eaaa802645a932580ede9ec9
Repository branch: emacs-29
Windowing system distributor 'The X.Org Foundation', version 11.0.12201001
System Description: Ubuntu 22.04.1 LTS

Configured using:
  'configure --with-json --with-tree-sitter'

Configured features:
ACL CAIRO DBUS FREETYPE GIF GLIB GMP GNUTLS GPM GSETTINGS HARFBUZZ JPEG
JSON LCMS2 LIBOTF LIBSELINUX LIBSYSTEMD LIBXML2 M17N_FLT MODULES NOTIFY
INOTIFY PDUMPER PNG RSVG SECCOMP SOUND THREADS TIFF TOOLKIT_SCROLL_BARS
TREE_SITTER X11 XDBE XIM XINPUT2 XPM GTK3 ZLIB

Important settings:
   value of $LC_MONETARY: nb_NO.UTF-8
   value of $LC_NUMERIC: nb_NO.UTF-8
   value of $LC_TIME: nb_NO.UTF-8
   value of $LANG: en_US.UTF-8
   locale-coding-system: utf-8-unix

Major mode: TypeScript

Minor modes in effect:
   global-undo-tree-mode: t
   undo-tree-mode: t
   global-git-commit-mode: t
   magit-auto-revert-mode: t
   electric-pair-mode: t
   highlight-symbol-mode: t
   flycheck-mode: t
   editorconfig-mode: t
   company-mode: t
   eglot--managed-mode: t
   flymake-mode: t
   which-function-mode: t
   helm-mode: t
   helm-minibuffer-history-mode: t
   shell-dirtrack-mode: t
   helm--remap-mouse-mode: t
   async-bytecomp-package-mode: t
   delete-selection-mode: t
   global-auto-revert-mode: t
   yas-global-mode: t
   yas-minor-mode: t
   global-nlinum-mode: t
   nlinum-mode: t
   ido-yes-or-no-mode: t
   override-global-mode: t
   server-mode: t
   global-hl-line-mode: t
   pixel-scroll-precision-mode: t
   doom-modeline-mode: t
   tooltip-mode: t
   global-eldoc-mode: t
   eldoc-mode: t
   show-paren-mode: t
   electric-indent-mode: t
   mouse-wheel-mode: t
   menu-bar-mode: t
   file-name-shadow-mode: t
   global-font-lock-mode: t
   font-lock-mode: t
   blink-cursor-mode: t
   column-number-mode: t
   line-number-mode: t
   transient-mark-mode: t
   auto-composition-mode: t
   auto-encryption-mode: t
   auto-compression-mode: t
   hs-minor-mode: t

Load-path shadows:
/home/jostein/.emacs.d/elpa/transient-20221202.1727/transient hides 
/home/jostein/build/emacs/lisp/transient

Features:
(shadow sort emacsbug mc-hide-unmatched-lines-mode mc-mark-more
mc-cycle-cursors multiple-cursors-core rect expand-region
text-mode-expansions cc-mode-expansions the-org-mode-expansions
js-mode-expansions er-basic-expansions expand-region-core
expand-region-custom goto-addr vc-hg vc-bzr vc-src vc-sccs vc-cvs vc-rcs
log-view vc mule-util undo-tree queue helm-bookmark helm-net
helm-adaptive magit-bookmark bookmark mail-extr misearch multi-isearch
bug-reference helm-command helm-elisp helm-eval edebug helm-info
json-ts-mode magit-extras magit-submodule magit-obsolete magit-blame
magit-stash magit-reflog magit-bisect magit-push magit-pull magit-fetch
magit-clone magit-remote magit-commit magit-sequence magit-notes
magit-worktree magit-tag magit-merge magit-branch magit-reset
magit-files magit-refs magit-status magit magit-repos magit-apply
magit-wip magit-log magit-diff smerge-mode diff git-commit log-edit
pcvs-util magit-core magit-autorevert magit-margin magit-transient
magit-process with-editor magit-mode transient magit-git magit-base
magit-section crm compat-27 compat-26 flyspell ispell org-element
org-persist org-id org-refile avl-tree oc-basic ol-eww ol-rmail ol-mhe
ol-irc ol-info ol-gnus nnselect gnus-art mm-uu mml2015 mm-view mml-smime
smime gnutls dig gnus-sum gnus-group gnus-undo gnus-start gnus-dbus
gnus-cloud nnimap nnmail mail-source utf7 nnoo gnus-spec gnus-int
gnus-range message sendmail yank-media rfc822 mml mml-sec epa epg
rfc6068 epg-config mm-decode mm-bodies mm-encode mail-parse rfc2231
rfc2047 rfc2045 ietf-drums mailabbrev gmm-utils mailheader gnus-win
ol-docview doc-view jka-compr ol-bibtex bibtex ol-bbdb ol-w3m ol-doi
org-link-doi dired-aux pulse face-remap executable markdown-mode color
disp-table elec-pair typescript-ts-mode js cc-mode cc-fonts cc-guess
cc-menus cc-cmds cc-styles cc-align cc-engine cc-vars cc-defs treesit
vc-git diff-mode vc-dispatcher vc-svn winner ffap tramp-archive
tramp-gvfs tramp-cache time-stamp zeroconf dbus add-log
ido-completing-read+ memoize minibuf-eldef elisp-slime-nav paredit
highlight-symbol flycheck editorconfig editorconfig-core
editorconfig-core-handle editorconfig-fnmatch company-oddmuse
company-keywords company-etags etags fileloop generator company-gtags
company-dabbrev-code company-dabbrev company-files company-clang
company-capf company-cmake company-semantic company-template
company-bbdb company eglot derived external-completion array jsonrpc ert
ewoc debug backtrace flymake-proc flymake warnings which-func hideshow
eww url-queue thingatpt shr pixel-fill kinsoku url-file svg xml dom puny
mm-url gnus nnheader gnus-util mail-utils range mm-util mail-prsvr
helm-imenu pcase imenu ob-plantuml org ob ob-tangle ob-ref ob-lob
ob-table ob-exp org-macro org-src ob-comint org-pcomplete org-list
org-footnote org-faces org-entities noutline outline ob-emacs-lisp
ob-core ob-eval org-cycle org-table ol org-fold org-fold-core org-keys
oc org-loaddefs find-func cal-menu calendar cal-loaddefs org-version
org-compat org-macs helm-mode helm-misc helm-files image-dired
image-dired-tags image-dired-external image-dired-util xdg image-mode
dired dired-loaddefs exif tramp tramp-loaddefs trampver
tramp-integration cus-edit pp cus-load icons wid-edit files-x
tramp-compat shell pcomplete parse-time iso8601 time-date ls-lisp
helm-buffers helm-occur helm-tags helm-locate helm-grep helm-regexp
format-spec helm-utils helm-help helm-types helm helm-global-bindings
helm-easymenu helm-core async-bytecomp helm-source helm-multi-match
helm-lib async helm-config delsel autorevert filenotify yasnippet nlinum
linum ido-yes-or-no advice ido edmacro kmacro use-package-bind-key
bind-key easy-mmode xref project server hl-line pixel-scroll cua-base
compile-eslint compile comint ansi-osc ansi-color ring doom-modeline
doom-modeline-segments doom-modeline-env doom-modeline-core
all-the-icons all-the-icons-faces data-material data-weathericons
data-octicons data-fileicons data-faicons data-alltheicons shrink-path
rx f f-shortdoc shortdoc text-property-search s dash compat compat-macs
dracula-theme cl-extra help-mode use-package-ensure use-package-core
finder-inf expand-region-autoloads ido-yes-or-no-autoloads
doom-modeline-autoloads elisp-slime-nav-autoloads
multiple-cursors-autoloads dracula-theme-autoloads
crontab-mode-autoloads highlight-symbol-autoloads
ssh-config-mode-autoloads dap-mode-autoloads lsp-treemacs-autoloads
treemacs-autoloads cfrs-autoloads posframe-autoloads
powershell-autoloads company-web-autoloads shrink-path-autoloads
paredit-autoloads bui-autoloads all-the-icons-autoloads
rust-mode-autoloads yaml-mode-autoloads helm-autoloads popup-autoloads
helm-core-autoloads async-autoloads lsp-docker-autoloads yaml-autoloads
lsp-mode-autoloads spinner-autoloads f-autoloads hydra-autoloads
nlinum-autoloads ht-autoloads undo-tree-autoloads queue-autoloads
ace-window-autoloads avy-autoloads cmake-mode-autoloads
bmx-mode-autoloads s-autoloads company-autoloads
ido-completing-read+-autoloads memoize-autoloads lv-autoloads
magit-autoloads magit-section-autoloads git-commit-autoloads
with-editor-autoloads transient-autoloads compat-autoloads
editorconfig-autoloads yasnippet-autoloads web-completion-data-autoloads
cargo-autoloads markdown-mode-autoloads pfuture-autoloads
flycheck-autoloads pkg-info-autoloads epl-autoloads info dash-autoloads
package browse-url url url-proxy url-privacy url-expand url-methods
url-history url-cookie generate-lisp-file url-domsuf url-util mailcap
url-handlers url-parse auth-source cl-seq eieio eieio-core cl-macs
password-cache json subr-x map byte-opt gv bytecomp byte-compile
url-vars cl-loaddefs cl-lib rmc iso-transl tooltip cconv eldoc paren
electric uniquify ediff-hook vc-hooks lisp-float-type elisp-mode mwheel
term/x-win x-win term/common-win x-dnd tool-bar dnd fontset image
regexp-opt fringe tabulated-list replace newcomment text-mode lisp-mode
prog-mode register page tab-bar menu-bar rfn-eshadow isearch easymenu
timer select scroll-bar mouse jit-lock font-lock syntax font-core
term/tty-colors frame minibuffer nadvice seq simple cl-generic
indonesian philippine cham georgian utf-8-lang misc-lang vietnamese
tibetan thai tai-viet lao korean japanese eucjp-ms cp51932 hebrew greek
romanian slovak czech european ethiopic indian cyrillic chinese
composite emoji-zwj charscript charprop case-table epa-hook
jka-cmpr-hook help abbrev obarray oclosure cl-preloaded button loaddefs
theme-loaddefs faces cus-face macroexp files window text-properties
overlay sha1 md5 base64 format env code-pages mule custom widget keymap
hashtable-print-readable backquote threads dbusbind inotify lcms2
dynamic-setting system-font-setting font-render-setting cairo
move-toolbar gtk x-toolkit xinput2 x multi-tty make-network-process
emacs)

Memory information:
nil

-- 
*Jostein Kjønigsen*
jostein.kjønigsen.no <https://jostein.kjønigsen.no>
jostein@kjonigsen.net - jostein@gmail.com

[-- Attachment #2: 0003-Fix-indentation-in-json-ts-mode.patch --]
[-- Type: text/x-patch, Size: 1012 bytes --]

From c8920a2b6b333e43fb65162dd59dceab68d4ea59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jostein=20Kj=C3=B8nigsen?= <jostein@kjonigsen.net>
Date: Fri, 16 Dec 2022 16:01:41 +0100
Subject: [PATCH 3/3] Fix indentation in json-ts-mode

lisp/progmodes/json-ts-mode.el: add indentation rules for arrays
---
 lisp/progmodes/json-ts-mode.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lisp/progmodes/json-ts-mode.el b/lisp/progmodes/json-ts-mode.el
index 6fb982e37bd..6c2f3805872 100644
--- a/lisp/progmodes/json-ts-mode.el
+++ b/lisp/progmodes/json-ts-mode.el
@@ -70,7 +70,8 @@ json-ts--indent-rules
      ((node-is "}") parent-bol 0)
      ((node-is ")") parent-bol 0)
      ((node-is "]") parent-bol 0)
-     ((parent-is "object") parent-bol json-ts-mode-indent-offset))))
+     ((parent-is "object") parent-bol json-ts-mode-indent-offset)
+     ((parent-is "array") parent-bol json-ts-mode-indent-offset))))
 
 (defvar json-ts-mode--font-lock-settings
   (treesit-font-lock-rules
-- 
2.34.1

bug#60123: 29.0.60; json-ts-mode does not increase indentation inside arrays

[Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors]

Jostein Kjønigsen <jostein@secure.kjonigsen.net> writes:

> When editing arrays in json-ts-mode, and pressing newline, json-ts-mode does not
> increase indent.
>
> Attached is a patch which fixes this behaviour.

LGTM!

Yuan? O:-)

Theo

bug#60123: 29.0.60; json-ts-mode does not increase indentation inside arrays

[Yuan Fu]

Theodor Thornhill <theo@thornhill.no> writes:

> Jostein Kjønigsen <jostein@secure.kjonigsen.net> writes:
>
>> When editing arrays in json-ts-mode, and pressing newline, json-ts-mode does not
>> increase indent.
>>
>> Attached is a patch which fixes this behaviour.
>
> LGTM!
>
> Yuan? O:-)
>
> Theo

Applied, thanks!

Yuan