summaryrefslogtreecommitdiffstats
path: root/lisp/init-go.el
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2020-05-13 21:58:25 +0200
committerMartin Polden <mpolden@mpolden.no>2020-05-13 21:58:25 +0200
commit710a9c75c7fd714d2f9783ab515902f8ae72a19e (patch)
tree5a50f8565110051383f23fb8f2ddd6871df0f642 /lisp/init-go.el
parentbef64fa29867c006a3bedc110a6caa3852ad7b90 (diff)
Enable eglot imenu integration
Now works with gopls.
Diffstat (limited to 'lisp/init-go.el')
-rw-r--r--lisp/init-go.el30
1 files changed, 1 insertions, 29 deletions
diff --git a/lisp/init-go.el b/lisp/init-go.el
index 499da78..c7308a5 100644
--- a/lisp/init-go.el
+++ b/lisp/init-go.el
@@ -1,34 +1,6 @@
-(defun go-mode-create-imenu-index ()
- "Create and return an imenu index alist. Unlike the default
-alist created by go-mode, this method creates an alist where
-items follow a style that is consistent with other prog-modes."
- (let* ((patterns '(("type" "^type *\\([^ \t\n\r\f]*\\)" 1)))
- (type-index (imenu--generic-function patterns))
- (func-index))
- (save-excursion
- (goto-char (point-min))
- (while (re-search-forward go-func-meth-regexp (point-max) t)
- (let* ((var (match-string-no-properties 1))
- (func (match-string-no-properties 2))
- (name (if var
- (concat (substring var 0 -1) "." func)
- func))
- (beg (match-beginning 0))
- (marker (copy-marker beg))
- (item (cons name marker)))
- (setq func-index (cons item func-index)))))
- (nconc type-index (list (cons "func" func-index)))))
-
-(defun go-mode-create-flat-imenu-index ()
- "Return a flat imenu index alist. See `go-mode-create-imenu-index'."
- (apply 'nconc (mapcar 'cdr (go-mode-create-imenu-index))))
-
(defun go-mode-buffer-local-variables ()
;; adjust fill-column
- (setq-local fill-column 120)
- ;; use flat imenu index
- (setq-local imenu-create-index-function
- #'go-mode-create-flat-imenu-index))
+ (setq-local fill-column 120))
(use-package go-mode
:hook (go-mode . go-mode-buffer-local-variables))