Skip to content

Commit a549475

Browse files
committed
Updated lsp-mode, Go lsp config
Following the official gopls guidelines. No company-lsp and use the lsp-mode helpers for autoformatting and organising imports.
1 parent 4990f53 commit a549475

File tree

4 files changed

+7
-10
lines changed

4 files changed

+7
-10
lines changed

lisp/company-config.el

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
(use-package company
22
:straight t
3+
:demand t
34
:config
45
(setq company-minimum-prefix-length 1) ; start completing after 1 char
5-
(setq company-idle-delay .3) ; decrease delay before autocompletion popup shows
6+
(setq company-idle-delay .1) ; decrease delay before autocompletion popup shows
67
(setq company-tooltip-limit 20) ; bigger popup window
78
(setq company-echo-delay 0) ; remove annoying blinking
89
(setq company-tooltip-align-annotations t)
@@ -15,13 +16,13 @@
1516
;; Abort company-mode when exiting insert mode
1617
(add-hook 'evil-insert-state-exit-hook 'company-abort)
1718

19+
(global-company-mode)
20+
1821
:bind (:map evil-insert-state-map
1922
("TAB" . company-indent-or-complete-common)
2023
("M-/" . company-complete)
2124
:map company-active-map
2225
("C-n" . company-select-next)
2326
("C-p" . company-select-previous)))
2427

25-
(global-company-mode)
26-
2728
(provide 'company-config)

lisp/go-config.el

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
(defun init-go-mode ()
1313
(interactive)
1414
(lsp-deferred)
15+
(add-hook 'before-save-hook #'lsp-format-buffer t t)
16+
(add-hook 'before-save-hook #'lsp-organize-imports t t)
1517
(setq tab-width 4)
1618
(ethan-wspace-mode -1))
1719
:hook (go-mode . init-go-mode)
18-
:hook (before-save . gofmt-before-save)
19-
:config (setq gofmt-command "gofmt")
2020
:bind (:map go-mode-map
2121
("<f9>" . compile)))
2222

lisp/lsp-config.el

-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,4 @@
77
("M-l ." . lsp-find-references)
88
("M-l r" . lsp-rename)))
99

10-
(use-package company-lsp
11-
:straight t)
12-
1310
(provide 'lsp-config)

straight/versions/default.el

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
("auto-complete" . "2e83566ddfa758c69afe50b8a1c62a66f47471e3")
44
("blacken" . "a09f8e2564739792a1b86bc8a6ce41039db3bbf8")
55
("company-jedi" . "5232fbc1fdbfc81b1dd883afb720338c3e39556b")
6-
("company-lsp" . "f921ffa0cdc542c21dc3dd85f2c93df4288e83bd")
76
("company-mode" . "6333fc4ebbbf4d28e834de8715561e984f149ecb")
87
("cython" . "b6523acc0b51fb4136f239600197ba9e634c2c8e")
98
("dash.el" . "fe9bbc2414af645d255de68cd59cf0edd5d8548b")
@@ -37,7 +36,7 @@
3736
("ht.el" . "fff8c43f0e03d5b98deb9f988522b839ce2ca253")
3837
("hydra" . "16fa8d109ec5799931a793b2e866ea9d593bee84")
3938
("let-alist" . "ef3c02fa292b6e32769945bbbfb7f2e5ac574b64")
40-
("lsp-mode" . "1b40992834f90334efcb1767af2b450b4eda87b3")
39+
("lsp-mode" . "a9654470a6f316e69140dbbb77d471b3cdc219b0")
4140
("lua-mode" . "658bf8f6c2bdcfe41cd14f5fb651563b41d0fbaa")
4241
("magit" . "d27d6e467857ed4a78c7cf7d609561df789e2a6c")
4342
("markdown-mode" . "7d201ff262279801477aa754ff17a71a757ae68a")

0 commit comments

Comments
 (0)