spacemacs-ivy: Fix imenu jumping for ivy split

Make spacemacs/jump-in-buffer aware of ivy and move jI into the
spacemacs-helm layer

layers/+completion/spacemacs-helm/packages.el

@@ -221,6 +221,7 @@ Removes the automatic guessing of the initial value based on thing at point. "
         "hl"   'helm-resume
         "hm"   'helm-man-woman
         "iu"   'helm-ucs
+        "jI"   'helm-imenu-in-all-buffers
         "ry"   'helm-show-kill-ring
         "rr"   'helm-register
         "rm"   'helm-all-mark-rings

layers/+completion/spacemacs-ivy/packages.el

@@ -165,6 +165,7 @@ not been implemented for the spacemacs-ivy layer yet."
       "hdv" 'counsel-describe-variable
       ;; insert
       "iu"  'counsel-unicode-char
+      ;; jump
       ;; projects
       "pp"  'projectile-switch-project
       ;; jumping
@@ -194,8 +195,9 @@ not been implemented for the spacemacs-ivy layer yet."
       "skF" 'spacemacs/search-ack-region-or-symbol
       "skp" 'spacemacs/search-project-ack
       "skP" 'spacemacs/search-project-ack-region-or-symbol)
-    ;; Commands to port
-    (spacemacs//ivy-command-not-implemented-yet "?")))
+    ;; TODO: Commands to port
+    (spacemacs//ivy-command-not-implemented-yet "?")
+    (spacemacs//ivy-command-not-implemented-yet "jI")))
 
 (defun spacemacs-ivy/init-flx ())
 

layers/+distribution/spacemacs-base/funcs.el

@@ -65,11 +65,16 @@
 
 (defun spacemacs/jump-in-buffer ()
   (interactive)
-  (cond
-   ((eq major-mode 'org-mode)
-    (call-interactively 'helm-org-in-buffer-headings))
-   (t
-    (call-interactively 'helm-semantic-or-imenu))))
+  (call-interactively
+   (cond
+    ((and (configuration-layer/layer-usedp 'spacemacs-helm)
+          (eq major-mode 'org-mode))
+     'helm-org-in-buffer-headings)
+    ((configuration-layer/layer-usedp 'spacemacs-helm)
+     'helm-semantic-or-imenu)
+    ((configuration-layer/layer-usedp 'spacemacs-ivy)
+     'counsel-imenu)
+    (t 'imenu))))
 
 (defun spacemacs/split-and-new-line ()
   "Split a quoted string or s-expression and insert a new line with

layers/+distribution/spacemacs-base/keybindings.el

@@ -139,7 +139,6 @@
   "jD" 'dired-jump-other-window
   "jf" 'find-function-at-point
   "ji" 'spacemacs/jump-in-buffer
-  "jI" 'helm-imenu-in-all-buffers
   "jv" 'find-variable-at-point)
 
 ;; Compilation ----------------------------------------------------------------