branch: elpa/scala-mode
commit d81bc2885bf9ef02e13d0fe80acb6024cd9730c5
Author: Heikki Vesalainen <heikkivesalai...@yahoo.com>
Commit: Heikki Vesalainen <heikkivesalai...@yahoo.com>
indenting code lines also removes trailing whitespace
---
scala-mode-indent.el | 4 +++-
scala-mode-lib.el | 6 ++++++
scala-mode-map.el | 7 ++-----
3 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/scala-mode-indent.el b/scala-mode-indent.el
index c0e2512..b88d8c1 100644
--- a/scala-mode-indent.el
+++ b/scala-mode-indent.el
@@ -624,7 +624,9 @@ strings"
(scala-indent:toggle-effective-run-on-strategy)
(scala-indent:reset-effective-run-on-strategy)))
; (message "run-on-strategy is %s" (scala-indent:run-on-strategy))
- (scala-indent:indent-line-to (scala-indent:calculate-indent-for-line)))
+ (scala-indent:indent-line-to (scala-indent:calculate-indent-for-line))
+ (scala-lib:delete-trailing-whitespace)
+ )
(defun scala-indent:indent-line (&optional strategy)
"Indents the current line."
diff --git a/scala-mode-lib.el b/scala-mode-lib.el
index 373f493..8f8a2c6 100644
--- a/scala-mode-lib.el
+++ b/scala-mode-lib.el
@@ -14,3 +14,9 @@
,@body
(point)))
+(defun scala-lib:delete-trailing-whitespace ()
+ (save-excursion
+ (end-of-line)
+ (skip-syntax-backward " ")
+ (unless (bolp)
+ (delete-char (- (line-end-position) (point))))))
diff --git a/scala-mode-map.el b/scala-mode-map.el
index 6c44f45..bb4dabc 100644
--- a/scala-mode-map.el
+++ b/scala-mode-map.el
@@ -26,14 +26,11 @@
(let ((keymap (make-sparse-keymap)))
(scala-mode-map:define-keys
keymap
- (([backspace] 'backward-delete-char-untabify)
-
+ (
+ ([backtab] 'scala-indent:indent-with-reluctant-strategy)
;; TODO: remove, use forward-sexp-function insetead
- ([backtab] 'scala-indent:indent-with-reluctant-strategy)
((kbd "C-M-b") 'scala-syntax:backward-sexp)
-
([(control c)(control r)] 'scala-indent:rotate-run-on-strategy)
- ;; ("\r" 'scala-newline)
([(control c)(control c)] 'comment-region)
;; ("}" 'scala-electric-brace)
))
