Merge branch 'master' of https://github.com/ncaq/.emacs.d

Author: ncaq

init.el

@@ -1009,24 +1009,25 @@ python, ruby, rustはスネークケースを含むのでruby(pythonはrubyのal
 
 (leaf d-mode
   :ensure t
-  :after cc-vars                        ; require c-default-style
-  :custom
-  (c-default-style . (cons '(d-mode . "java") c-default-style))
-  (dfmt-flags . '("--max_line_length=80"))
-  :bind (:d-mode-map
-         ([remap indent-whole-buffer] . dfmt-region-or-buffer)
-         ([remap save-buffer] . 'save-buffer-and-dfmt))
-  :defun dfmt-buffer
-  :init
-  (defun save-buffer-and-dfmt ()
-    "セーブした後dfmt-bufferする.
-dfmt-bufferを先にしたりbefore-save-hookを使ったりすると,
-保存がキャンセルされてflycheckの恩恵を受けられない.
-"
-    (interactive)
-    (when (buffer-modified-p)
-      (save-buffer)
-      (when (and (dfmt-buffer) (buffer-modified-p)) (save-buffer)))))
+  :after cc-vars
+  :defvar c-default-style
+  :config
+  (add-to-list 'c-default-style '(d-mode . "java"))
+  (leaf dfmt
+    :ensure t
+    :require t
+    :after d-mode
+    :bind (:d-mode-map
+           ([remap indent-whole-buffer] . dfmt-buffer)
+           ([remap save-buffer] . dfmt-save-buffer)))
+  (leaf company-dcd
+    :ensure t
+    :after d-mode
+    :hook (d-mode-hook . company-dcd-mode)
+    :bind
+    :bind (:company-dcd-mode-map
+           ("C-c C-d" . company-dcd-show-ddoc-with-buffer)
+           ("M-." . company-dcd-goto-definition))))
 
 ;;; Docker