Move use of ess with julia to julia layer

syl20bnr · Mar 15, 2018 · dde0cfd · dde0cfd
1 parent 95c5839
commit dde0cfd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/layers/+lang/ess/packages.el b/layers/+lang/ess/packages.el
@@ -36,7 +36,6 @@
            ("\\.do\\'"           . STA-mode)
            ("\\.ado\\'"          . STA-mode)
            ("\\.[Ss][Aa][Ss]\\'" . SAS-mode)
-           ("\\.jl\\'"           . ess-julia-mode)
            ("\\.[Ss]t\\'"        . S-transcript-mode)
            ("\\.Sout"            . S-transcript-mode)
            ("\\.[Rr]out"         . R-transcript-mode)
@@ -50,7 +49,6 @@
     :commands (R stata julia SAS)
     :init
     (progn
-      (spacemacs/register-repl 'ess-site 'julia)
       (spacemacs/register-repl 'ess-site 'R)
       (spacemacs/register-repl 'ess-site 'SAS)
       (spacemacs/register-repl 'ess-site 'stata)

diff --git a/layers/+lang/julia/funcs.el b/layers/+lang/julia/funcs.el
@@ -22,7 +22,7 @@
   (julia-repl-mode))
 
 (defun spacemacs//julia-setup-ess ()
-  nil)
+  (add-to-list auto-mode-alist ("\\.jl\\'" . ess-julia-mode)))
 
 (defun spacemacs//julia-setup-lsp ()
   "Start lsp-mode and configure for buffer."

diff --git a/layers/+lang/julia/packages.el b/layers/+lang/julia/packages.el
@@ -17,6 +17,7 @@
                                  :repo "non-Jedi/lsp-julia"))
     flycheck
     company-lsp
+    ess
     ))
 
 (defun julia/init-julia-mode ()
@@ -88,4 +89,7 @@
 
 (defun julia/post-init-flycheck ()
   (spacemacs/enable-flycheck 'julia-mode))
+
+(defun julia/post-init-ess ()
+  (spacemacs/register-repl 'ess-site 'julia))
 ;;; packages.el ends here