branch: elpa/scala-mode
commit 387e93c70a3703e55f717d3285912ad12cfee947
Author: Heikki Vesalainen <heikki.vesalai...@iki.fi>
Commit: Sam Halliday <sam.halli...@gmail.com>
revert 618f0fbef4d3d94156f834a66e36c79f07a54e02, fixes #118 (#119)
---
scala-mode-indent.el | 5 +++++
scala-mode-map.el | 2 ++
2 files changed, 7 insertions(+)
diff --git a/scala-mode-indent.el b/scala-mode-indent.el
index d7269b8..cc59e96 100644
--- a/scala-mode-indent.el
+++ b/scala-mode-indent.el
@@ -845,6 +845,11 @@ comment is outside the comment region. "
(+ (match-beginning 0) 1)))
(current-column))))
+(defun scala-indent:indent-on-parentheses ()
+ (when (and (= (char-syntax (char-before)) ?\))
+ (= (save-excursion (back-to-indentation) (point)) (1- (point))))
+ (scala-indent:indent-line)))
+
(defconst scala-indent:indent-on-words-re
(concat "^\\s *"
(regexp-opt '("catch" "case" "else" "finally" "yield") 'words)))
diff --git a/scala-mode-map.el b/scala-mode-map.el
index 08e5991..615c8fd 100644
--- a/scala-mode-map.el
+++ b/scala-mode-map.el
@@ -13,6 +13,8 @@
(defun scala-mode-map:add-self-insert-hooks ()
(add-hook 'post-self-insert-hook
+ 'scala-indent:indent-on-parentheses)
+ (add-hook 'post-self-insert-hook
'scala-indent:indent-on-special-words)
(add-hook 'post-self-insert-hook
'scala-indent:indent-on-scaladoc-asterisk)
