From e1edbcb3d9d83c0024c6f23518b1ebfdb77e8fab Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sat, 19 Oct 2019 15:01:37 -0400 Subject: [PATCH] Remove dtrt-indent entries for crystal, rust & scala They were merged upstream in jscheid/dtrt-indent/pull/49 --- modules/lang/crystal/config.el | 4 +--- modules/lang/rust/config.el | 5 ----- modules/lang/scala/config.el | 3 --- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/modules/lang/crystal/config.el b/modules/lang/crystal/config.el index 3af3368cf..be955030f 100644 --- a/modules/lang/crystal/config.el +++ b/modules/lang/crystal/config.el @@ -7,9 +7,7 @@ (set-eval-handler! 'crystal-mode '((:command . "crystal") (:exec . "%c %s") - (:description . "Run Crystal script"))) - (after! dtrt-indent - (add-to-list 'dtrt-indent-hook-mapping-list '(crystal-mode ruby crystal-indent-level)))) + (:description . "Run Crystal script")))) (use-package! flycheck-crystal diff --git a/modules/lang/rust/config.el b/modules/lang/rust/config.el index 56be0bef5..671e6e24b 100644 --- a/modules/lang/rust/config.el +++ b/modules/lang/rust/config.el @@ -21,11 +21,6 @@ (when (featurep! +lsp) (add-hook 'rust-mode-local-vars-hook #'lsp!)) - ;; TODO PR these upstream - (after! dtrt-indent - (pushnew! dtrt-indent-hook-mapping-list - '(rust-mode default rust-indent-offset) - '(rustic-mode default rustic-indent-offset))) (when (featurep! :tools editorconfig) (after! editorconfig (pushnew! editorconfig-indentation-alist diff --git a/modules/lang/scala/config.el b/modules/lang/scala/config.el index 0fdfb7c87..4d4dcb099 100644 --- a/modules/lang/scala/config.el +++ b/modules/lang/scala/config.el @@ -8,9 +8,6 @@ (setq-hook! 'scala-mode-hook comment-line-break-function #'+scala-comment-indent-new-line) - (after! dtrt-indent - (add-to-list 'dtrt-indent-hook-mapping-list '(scala-mode c/c++/java scala-indent:step))) - (when (featurep! +lsp) (add-hook 'scala-mode-local-vars-hook #'lsp!)))