[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/scala-mode aebc5b0 017/217: Fixes #7: indenting of block l
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/scala-mode aebc5b0 017/217: Fixes #7: indenting of block lines when at last char of buffer |
Date: |
Sun, 29 Aug 2021 11:30:35 -0400 (EDT) |
branch: elpa/scala-mode
commit aebc5b0af95f3bfd9e76cb50b3cfd98b6fa50062
Author: Heikki Vesalainen <heikkivesalainen@yahoo.com>
Commit: Heikki Vesalainen <heikkivesalainen@yahoo.com>
Fixes #7: indenting of block lines when at last char of buffer
---
scala-mode-indent.el | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/scala-mode-indent.el b/scala-mode-indent.el
index b766547..8e617c1 100644
--- a/scala-mode-indent.el
+++ b/scala-mode-indent.el
@@ -427,7 +427,7 @@ symbol, or nil if not."
(point)))))
(defun scala-indent:resolve-body-step (start &optional anchor)
- (if (= (char-after start) ?\{)
+ (if (and (not (= start (point-max))) (= (char-after start) ?\{))
0
scala-indent:step))
@@ -473,7 +473,9 @@ anchor for calculating block indent for current point (or
point
(goto-char anchor)
(scala-syntax:has-char-before ?= block-beg))))
scala-indent:step 0)))
- (cond
+ (cond
+ ;; at end of buffer
+ ((= start (point-max)) (+ scala-indent:step lead))
;; block close parentheses line up with anchor in normal case
((= (char-syntax (char-after start)) ?\))
(+ 0 lead))
- [nongnu] branch elpa/scala-mode created (now 598cb68), ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode 5ba0a78 005/217: run-on and list indent primitives, ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode ca7308a 002/217: Initial commit with README and Example.scala outlining how it will work, ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode a8b0936 003/217: Working on syntax, ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode 6f1b748 001/217: Example.scala to show how we intend to indent, ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode 3413883 004/217: run-on-p, ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode f0cc3d4 006/217: working on indent rules, ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode f17fa95 007/217: approaching a functioning indent engine, ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode 4dbaa5f 010/217: picked some of Erik's fontlock magic for an interim solution, ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode 84e5c8a 013/217: regression fix, ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode aebc5b0 017/217: Fixes #7: indenting of block lines when at last char of buffer,
ELPA Syncer <=
- [nongnu] elpa/scala-mode c3ea76f 009/217: fixed indenting of if body (and probably other things), ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode ba3c9ca 020/217: renamed README to README.md, ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode 9f74c7d 015/217: Partial fix to #5., ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode 84d9c10 011/217: highlight string escapes, ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode 150e3d2 012/217: updated README with some TODOs, ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode 64c496a 016/217: Fixed #4: numbers in ids, ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode 6bc98fd 024/217: Update README.md, ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode b0c821d 023/217: Working on README, ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode 7faea31 027/217: also handle .sbt files, ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode 0930f14 026/217: Update README.md, ELPA Syncer, 2021/08/29