atuleu/home
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

repairs golang mode

Browse Source
This commit is contained in:
Alexandre Tuleu
2022-10-28 17:03:36 +02:00
parent cee4734645
commit 76b9a837b3
1 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
.emacs
View File

@@ -189,6 +189,8 @@
) )
(custom-set-faces (custom-set-faces
'(lsp-ui-doc-background ((t (:background "#373B41"))))) '(lsp-ui-doc-background ((t (:background "#373B41")))))
(add-to-list 'lsp-disabled-clients 'pyls)
(add-to-list 'lsp-enabled-clients 'jedi)
:bind ( :bind (
("C-c C-d" . lsp-ui-doc-toggle) ("C-c C-d" . lsp-ui-doc-toggle)
) )
@@ -235,9 +237,9 @@
(python-mode . (lambda () (setq-local company-prescient-sort-length-enable nil))) (python-mode . (lambda () (setq-local company-prescient-sort-length-enable nil)))
(python-mode . (lambda () (setq-local fill-column 88))) (python-mode . (lambda () (setq-local fill-column 88)))
(python-mode . lsp-deferred) (python-mode . lsp-deferred)
;; (lsp-managed-mode . (lambda () (lsp-managed-mode . (lambda ()
;; (when (derived-mode-p 'python-mode) (when (derived-mode-p 'python-mode)
;; (setq atu/flycheck-local-cache '((lsp . ((next-checkers . (python-flake8))))))))) (setq atu/flycheck-local-cache '((lsp . ((next-checkers . (python-flake8)))))))))
) )
@@ -248,6 +250,7 @@
"Gets .direnv from project root python venv if any" "Gets .direnv from project root python venv if any"
(when-let* ((root-dir (projectile-project-root)) (when-let* ((root-dir (projectile-project-root))
(direnv (concat (file-name-as-directory root-dir) ".direnv")) (direnv (concat (file-name-as-directory root-dir) ".direnv"))
(direnv-exists (file-directory-p direnv))
(venvs (directory-files direnv t "python-.*"))) (venvs (directory-files direnv t "python-.*")))
(car (last venvs))) (car (last venvs)))
) )
@@ -322,26 +325,20 @@
) )
(use-package lsp-jedi (use-package lsp-jedi )
:config
(with-eval-after-load "lsp-mode"
(add-to-list 'lsp-disabled-clients 'pyls) (use-package blacken
(add-to-list 'lsp-enabled-clients 'jedi) :commands blacken-mode blacken-buffer
) :hook
(python-mode . blacken-mode)
) )
(use-package py-isort
;; (use-package blacken :commands py-isort-buffer
;; :commands blacken-mode blacken-buffer :hook
;; :hook (before-save-hook . py-isort-before-save)
;; (python-mode . blacken-mode) )
;; )
;; (use-package py-isort
;; :commands py-isort-buffer
;; :hook
;; (before-save-hook . py-isort-before-save)
;; )
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; C/C++ ;; C/C++
@@ -445,9 +442,7 @@
(use-package go-mode (use-package go-mode
:after (projectile) :after (projectile)
:config :config
(setq gofmt-command "goimports")
(unbind-key "C-c C-d" go-mode-map) (unbind-key "C-c C-d" go-mode-map)
(add-hook 'before-save-hook 'gofmt-before-save)
;;(setq compile-command "go build && go test -coverprofile=cover.out && go tool cover -html cover.out -o /tmp/cover.html") ;;(setq compile-command "go build && go test -coverprofile=cover.out && go tool cover -html cover.out -o /tmp/cover.html")
(defun go-compile-command () (defun go-compile-command ()
"returns a string to compile a go project" "returns a string to compile a go project"
@@ -460,7 +455,13 @@
(projectile-update-project-type (projectile-update-project-type
'go 'go
:compile 'go-compile-command) :compile 'go-compile-command)
:hook
(go-mode . lsp-deferred)
(go-mode . (lambda ()
(add-hook 'before-save-hook #'lsp-format-buffer t t)
(add-hook 'before-save-hook #'lsp-organize-imports t t)))
) )
(use-package glsl-mode) (use-package glsl-mode)
(use-package opencl-mode) (use-package opencl-mode)