From 5199ddbfcffb3927a1eacc0909a00ac51708cf77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 14 Nov 2016 18:06:48 +0100
Subject: [PATCH] Rename moved scala functions

Functions under the ensime layer should start with `ensime/'
---
 layers/+lang/ensime/funcs.el   | 22 +++++++++++-----------
 layers/+lang/scala/packages.el | 12 ++++++------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/layers/+lang/ensime/funcs.el b/layers/+lang/ensime/funcs.el
index 36155eb91..2f2fc3de1 100644
--- a/layers/+lang/ensime/funcs.el
+++ b/layers/+lang/ensime/funcs.el
@@ -15,7 +15,7 @@
 (autoload 'ensime-config-find "ensime-config")
 (autoload 'projectile-project-p "projectile")
 
-(defun scala/configure-ensime ()
+(defun ensime/configure ()
   "Ensure the file exists before starting `ensime-mode'."
   (cond
    ((and (buffer-file-name) (file-exists-p (buffer-file-name)))
@@ -23,9 +23,9 @@
    ((buffer-file-name)
     (add-hook 'after-save-hook (lambda () (ensime-mode +1)) nil t))))
 
-(defun scala/maybe-start-ensime ()
+(defun ensime/maybe-start ()
   (when (buffer-file-name)
-    (let ((ensime-buffer (scala/ensime-buffer-for-file (buffer-file-name)))
+    (let ((ensime-buffer (ensime/buffer-for-file (buffer-file-name)))
           (file (ensime-config-find-file (buffer-file-name)))
           (is-source-file (s-matches? (rx (or "/src/" "/test/")) (buffer-file-name))))
 
@@ -34,7 +34,7 @@
           (save-window-excursion
             (ensime)))))))
 
-(defun scala/ensime-buffer-for-file (file)
+(defun ensime/buffer-for-file (file)
   "Find the Ensime server buffer corresponding to FILE."
   (let ((default-directory (file-name-directory file)))
     (-when-let (project-name (projectile-project-p))
@@ -43,7 +43,7 @@
                       (s-contains? (file-name-nondirectory project-name) bufname)))
                (buffer-list)))))
 
-(defun scala/enable-eldoc ()
+(defun ensime/enable-eldoc ()
   (setq-local eldoc-documentation-function
               (lambda ()
                 (when (ensime-connected-p)
@@ -83,7 +83,7 @@ point to the position of the join."
     (when join-pos
       (goto-char join-pos))))
 
-(defun scala/completing-dot ()
+(defun ensime/completing-dot ()
   "Insert a period and show company completions."
   (interactive "*")
   (when (s-matches? (rx (+ (not space)))
@@ -95,20 +95,20 @@ point to the position of the join."
 
 ;;; Flyspell
 
-(defun scala/flyspell-verify ()
+(defun ensime/flyspell-verify ()
   "Prevent common flyspell false positives in scala-mode."
   (and (flyspell-generic-progmode-verify)
        (not (s-matches? (rx bol (* space) "package") (current-line)))))
 
-(defun scala/configure-flyspell ()
-  (setq-local flyspell-generic-check-word-predicate 'scala/flyspell-verify))
+(defun ensime/configure-flyspell ()
+  (setq-local flyspell-generic-check-word-predicate 'ensime/flyspell-verify))
 
-(defun scala/yank-type-at-point ()
+(defun ensime/yank-type-at-point ()
   "Yank to kill ring and print short type name at point to the minibuffer."
   (interactive)
   (ensime-type-at-point t nil))
 
-(defun scala/yank-type-at-point-full-name ()
+(defun ensime/yank-type-at-point-full-name ()
   "Yank to kill ring and print full type name at point to the minibuffer."
   (interactive)
   (ensime-type-at-point t t))
diff --git a/layers/+lang/scala/packages.el b/layers/+lang/scala/packages.el
index 75871e0ab..5689639ba 100644
--- a/layers/+lang/scala/packages.el
+++ b/layers/+lang/scala/packages.el
@@ -30,11 +30,11 @@
     (progn
       (spacemacs/register-repl 'ensime 'ensime-inf-switch "ensime")
       (when scala-enable-eldoc
-        (add-hook 'ensime-mode-hook 'scala/enable-eldoc))
-      (add-hook 'scala-mode-hook 'scala/configure-flyspell)
-      (add-hook 'scala-mode-hook 'scala/configure-ensime)
+        (add-hook 'ensime-mode-hook 'ensime/enable-eldoc))
+      (add-hook 'scala-mode-hook 'ensime/configure-flyspell)
+      (add-hook 'scala-mode-hook 'ensime/configure)
       (when scala-auto-start-ensime
-        (add-hook 'scala-mode-hook 'scala/maybe-start-ensime))
+        (add-hook 'scala-mode-hook 'ensime/maybe-start))
       (add-to-list 'spacemacs-jump-handlers-scala-mode 'ensime-edit-definition))
     :config
     (progn
@@ -120,8 +120,8 @@
         "sr"     'ensime-inf-eval-region
         "sR"     'ensime-inf-eval-region-switch
 
-        "yT"     'scala/yank-type-at-point-full-name
-        "yt"     'scala/yank-type-at-point
+        "yT"     'ensime/yank-type-at-point-full-name
+        "yt"     'ensime/yank-type-at-point
 
         "z"      'ensime-expand-selection-command
         )