Skip to content
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

Various indentation fixes: typos, differentiating new lines, support for do and extension #7

Merged
merged 7 commits into from
Jul 6, 2023
Merged

Various indentation fixes: typos, differentiating new lines, support for do and extension #7

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ad122e4
fix typo in function name
maemre Apr 1, 2023
56d1f77
indent after declarations
maemre Apr 1, 2023
5323a09
do not push nil into the analysis stack
maemre Apr 1, 2023
9df2ba4
disable aggressive paren rule temporarily
maemre Apr 3, 2023
be4ef5c
preliminary indentation support for `extension`
maemre Jun 5, 2023
417dd61
add support for `do` as an align keyword like `then` and `else`.
maemre Jun 5, 2023
5eef13b
Preserve line numbers for blank lines.
maemre Jun 5, 2023
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
36 changes: 28 additions & 8 deletions scala-mode-indent.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,9 @@ and the empty line")
(regexp-opt '("abstract" "catch" "case" "class" "def" "do" "else" "final"
"finally" "for" "if" "implicit" "import" "lazy" "new" "object"
"override" "package" "private" "protected" "return" "sealed"
"throw" "trait" "try" "type" "val" "var" "while" "yield" "inline")
"throw" "trait" "try" "type" "val" "var" "while" "yield" "inline"
"extension"
)
'words)
"Words that we don't want to continue the previous line")

Expand Down Expand Up @@ -370,7 +372,7 @@ is not on a run-on line."
"\\|:\\(" scala-syntax:after-reserved-symbol-re "\\)"))

(defconst scala-indent:forms-align-re
(regexp-opt '("yield" "then" "else" "catch" "finally") 'words))
(regexp-opt '("do" "yield" "then" "else" "catch" "finally") 'words))

(defun scala-indent:forms-align-p (&optional point)
"Returns `scala-syntax:beginning-of-code-line' for the line on
Expand Down Expand Up @@ -434,10 +436,17 @@ Returns point or (point-min) if not inside a block."
;; <hitting the beginning of a block when starting in the middle> { (
(`(?\{) 'left-boundary) ;; too aggressive?
(`(?\{ ,_ . ,_) 'left-boundary)
(`(?\( ,_ . ,_) 'left-boundary)
; (`(?\( ,_ . ,_) 'left-boundary)
;; <dot chaining>
(`(?\n ?.) 'dot-chain)
(`(?\n ?. . ,_) 'dot-chain)
;; extension
;;
;; FIXME: This is a hack that just checks if the previous line contains
;; extension. The check for extension should check whether this is a
;; single-def extension and for balanced parentheses, etc. to determine
;; whether we emit a block token.
((and `(extension . ,tail) (guard (memq ?\n tail))) 'block)
;; =
(`(= ?\n . ,_) 'decl-lhs)
((and `(= ,_ . ,tail) (guard (memq ?\n tail))) 'after-decl)
Expand Down Expand Up @@ -511,6 +520,7 @@ Returns point or (point-min) if not inside a block."
(`(with) 'block)
;; yield
(`(yield . ,_) 'yield-from-comp)
(`(do . ,_) 'yield-from-comp)
))

(defun scala-indent:relative-indent-by-elem (syntax-elem)
Expand All @@ -537,7 +547,7 @@ Returns point or (point-min) if not inside a block."
(`(decl else) -2)
(`(decl . ,_) 2)
;; decl-lhs
(`(decl-lhs decl . ,_) 0)
(`(decl-lhs decl . ,_) 2)
(`(decl-lhs dot-chain) 4)
(`(dot-chain dot-chain) 0)
(`(decl-lhs for-comp) 0)
Expand Down Expand Up @@ -653,7 +663,7 @@ Returns point or (point-min) if not inside a block."
(setq last-indentation (current-indentation))
(while (looking-at-p "\\.") (backward-char))
;; ")." is a funny case where we actually do want to be on the dot
(if (looking-at-p ")") (forwar-char))
(if (looking-at-p ")") (forward-char))
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yikes, how did I miss that

(scala-syntax:backward-sexp-forcing)))
(let* ((x (or (scala-indent:skip-back-over-modifiers (point) stack)
(list (point) stack)))
Expand Down Expand Up @@ -736,10 +746,17 @@ tokenization. The parser is not anything like well-formalized, but it can start
at an arbitrary point in the buffer, and except in pathological cases, look at
relatively few lines in order to make a good guess; and it is tolerant to a
certain amount of incorrect or in-progress syntactic forms."
(let* ((initResult (scala-indent:find-analysis-start point))
(let* ((line-no
;; Get the line number while taking blanks into account. This allows
;; differentiating between indenting at a blank line and re-indenting
;; at the line right before it.
(line-number-at-pos
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good thought. This extra piece of information seems useful.

(save-excursion
(when point (goto-char point))
(point))))
(initResult (scala-indent:find-analysis-start point))
(point (car initResult))
(stack (cadr initResult))
(line-no (line-number-at-pos point))
(analysis (scala-indent:analyze-context point stack))
(syntax-elem (list (nth 0 analysis)))
(ctxt-line (nth 1 analysis))
Expand All @@ -756,7 +773,10 @@ certain amount of incorrect or in-progress syntactic forms."
(setq point (nth 2 x))
t)
(setq analysis (scala-indent:analyze-context point stack))
(setq syntax-elem (cons (nth 0 analysis) syntax-elem))
(setq syntax-elem
(if (nth 0 analysis)
(cons (nth 0 analysis) syntax-elem)
syntax-elem))
(setq ctxt-line (nth 1 analysis))
(setq ctxt-indent (nth 2 analysis))
(setq prev-indent (nth 3 analysis))
Expand Down