scala-mode2 => scala-mode
This commit is contained in:
parent
823d3b5107
commit
35af21c704
2 changed files with 4 additions and 4 deletions
2
Cask
2
Cask
|
@ -222,7 +222,7 @@
|
||||||
(depends-on "flycheck-rust")
|
(depends-on "flycheck-rust")
|
||||||
|
|
||||||
;; Scala -- modules/module-scala.el
|
;; Scala -- modules/module-scala.el
|
||||||
(depends-on "scala-mode2")
|
(depends-on "scala-mode")
|
||||||
(depends-on "sbt-mode")
|
(depends-on "sbt-mode")
|
||||||
(depends-on "ensime")
|
(depends-on "ensime")
|
||||||
|
|
||||||
|
|
|
@ -1,14 +1,14 @@
|
||||||
;;; module-scala.el
|
;;; module-scala.el
|
||||||
|
|
||||||
(use-package scala-mode2
|
(use-package scala-mode
|
||||||
:mode ("\\.s\\(cala\\|bt\\)$" . scala-mode)
|
:mode "\\.s\\(cala\\|bt\\)$"
|
||||||
:init (add-hook 'scala-mode-hook 'turn-on-eldoc-mode)
|
:init (add-hook 'scala-mode-hook 'turn-on-eldoc-mode)
|
||||||
:config
|
:config
|
||||||
(def-company-backend! scala-mode '(ensime-company (company-yasnippet)))
|
(def-company-backend! scala-mode '(ensime-company (company-yasnippet)))
|
||||||
(def-docset! scala-mode "scala"))
|
(def-docset! scala-mode "scala"))
|
||||||
|
|
||||||
(use-package sbt-mode
|
(use-package sbt-mode
|
||||||
:after scala-mode2)
|
:after scala-mode)
|
||||||
|
|
||||||
(use-package ensime
|
(use-package ensime
|
||||||
:commands (ensime ensime-mode ensime-scala-mode-hook)
|
:commands (ensime ensime-mode ensime-scala-mode-hook)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue