Various Scala fixes
This commit is contained in:
commit
378beebd1f
|
@ -8,15 +8,13 @@
|
|||
"List of all packages to install and/or initialize. Built-in packages
|
||||
which require an initialization must be listed explicitly in the list.")
|
||||
|
||||
(defun spacemacs/init-ensime ()
|
||||
(defun scala/init-ensime ()
|
||||
(use-package ensime
|
||||
:commands (ensime-mode)
|
||||
:init
|
||||
(add-hook 'scala-mode-hook 'ensime-mode)
|
||||
:config
|
||||
(progn
|
||||
(evil-define-key 'normal scala-mode-map "J" 'spacemacs/scala-join-line)
|
||||
|
||||
(evil-define-key 'normal ensime-popup-buffer-map
|
||||
(kbd "q") 'ensime-popup-buffer-quit-function)
|
||||
|
||||
|
@ -30,21 +28,20 @@ which require an initialization must be listed explicitly in the list.")
|
|||
(kbd "TAB") 'forward-button
|
||||
(kbd "<backtab>") 'backward-button
|
||||
(kbd "M-n") 'forward-button
|
||||
(kbd "M-p") 'backward-button)
|
||||
(kbd "M-p") 'backward-button
|
||||
(kbd "n") 'forward-button
|
||||
(kbd "N") 'backward-button)
|
||||
|
||||
;; Don't use scala checker if ensime mode is active, since it provides
|
||||
;; better error checking.
|
||||
|
||||
(eval-after-load 'flycheck
|
||||
'(progn
|
||||
(defun spacemacs/flycheck-use-scalastyle ()
|
||||
(when ensime-mode
|
||||
(flycheck-select-checker 'scala-scalastyle)))
|
||||
(flycheck-select-checker 'scala-scalastyle))
|
||||
|
||||
(add-hook 'flycheck-before-syntax-check-hook
|
||||
'spacemacs/flycheck-use-scalastyle))))))
|
||||
(add-hook 'ensime-mode-hook 'spacemacs/flycheck-use-scalastyle))))))
|
||||
|
||||
(defun spacemacs/init-scala-mode2 ()
|
||||
(defun scala/init-scala-mode2 ()
|
||||
(use-package scala-mode2
|
||||
:defer t
|
||||
:init
|
||||
|
@ -52,11 +49,13 @@ which require an initialization must be listed explicitly in the list.")
|
|||
(add-to-list 'completion-ignored-extensions ext))
|
||||
:config
|
||||
(progn
|
||||
(evil-define-key 'normal scala-mode-map "J" 'spacemacs/scala-join-line)
|
||||
|
||||
;; Compatibility with `aggressive-indent'
|
||||
(custom-set-variables
|
||||
(scala-indent:align-forms t)
|
||||
(scala-indent:align-parameters t)
|
||||
(scala-indent:default-run-on-strategy scala-indent:operator-strategy))
|
||||
'(scala-indent:align-forms t)
|
||||
'(scala-indent:align-parameters t)
|
||||
'(scala-indent:default-run-on-strategy scala-indent:operator-strategy))
|
||||
|
||||
(defadvice scala-indent:indent-code-line (around retain-trailing-ws activate)
|
||||
"Keep trailing-whitespace when indenting."
|
||||
|
|
Loading…
Reference in a new issue