Skip to content

Update jsonnet-mode.el #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
timfel wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update jsonnet-mode.el #35

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions jsonnet-mode.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,7 +513,7 @@ If not inside of a multiline string, return nil."
;; Experimental algorithm
(defun jsonnet--indent-in-parens ()
"Compute the indent of the current line, given it is inside parentheses."
(if (jsonnet--line-matches-regex-p "^\s*)") 0 2))
(if (jsonnet--line-matches-regex-p "^\s*)") 0 jsonnet-indent-level))

(defun jsonnet--indent-in-braces ()
"Compute the indent of the current line, given it is inside braces."
Expand All @@ -522,11 +522,11 @@ If not inside of a multiline string, return nil."
((save-excursion
(forward-line -1)
(jsonnet--line-matches-regex-p ":\s*$")) 4)
(t 2)))
(t jsonnet-indent-level)))

(defun jsonnet--indent-in-brackets ()
"Compute the indent of the current line, given it is inside braces."
(if (jsonnet--line-matches-regex-p "^\s*]") 0 2))
(if (jsonnet--line-matches-regex-p "^\s*]") 0 jsonnet-indent-level))

(defun jsonnet--indent-toplevel ()
"Compute the indent of the current line, given it is not inside any delimiter."
Expand Down Expand Up @@ -558,7 +558,7 @@ If not inside of a multiline string, return nil."
((jsonnet--find-current-multiline-string)
(let ((multiline-string-ends (jsonnet--line-matches-regex-p "^\s*|||")))
(goto-char (jsonnet--find-current-multiline-string))
(+ (current-indentation) (if multiline-string-ends 0 2))))
(+ (current-indentation) (if multiline-string-ends 0 jsonnet-indent-level))))
;; Otherwise, indent according to the kind of delimiter we are nested in.
(t
(let ((state (syntax-ppss)))
Expand Down