From cfc1a81a4932f58bf1c29b482383e5cf1847b5d7 Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Sat, 27 May 2023 13:17:00 -0400 Subject: [PATCH] Update dockerfile support to use treesitter. --- ansible/roles/emacs/files/base-extensions.el | 2 -- ansible/roles/emacs/files/init.el | 2 ++ ansible/roles/emacs/files/lang-dockerfile.el | 9 +++++++++ ansible/roles/emacs/tasks/peruser.yaml | 1 + 4 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 ansible/roles/emacs/files/lang-dockerfile.el diff --git a/ansible/roles/emacs/files/base-extensions.el b/ansible/roles/emacs/files/base-extensions.el index 1721911..f6ed90f 100644 --- a/ansible/roles/emacs/files/base-extensions.el +++ b/ansible/roles/emacs/files/base-extensions.el @@ -64,8 +64,6 @@ (setq tramp-default-method "ssh") -(use-package dockerfile-mode) - (use-package nginx-mode :config (setq nginx-indent-level 4)) diff --git a/ansible/roles/emacs/files/init.el b/ansible/roles/emacs/files/init.el index 4c559f5..7eab63c 100644 --- a/ansible/roles/emacs/files/init.el +++ b/ansible/roles/emacs/files/init.el @@ -30,4 +30,6 @@ ;; (require 'lang-c) +(require 'lang-dockerfile) + (load-directory autoload-directory) diff --git a/ansible/roles/emacs/files/lang-dockerfile.el b/ansible/roles/emacs/files/lang-dockerfile.el new file mode 100644 index 0000000..283723d --- /dev/null +++ b/ansible/roles/emacs/files/lang-dockerfile.el @@ -0,0 +1,9 @@ +(use-package dockerfile-mode + :commands (dockerfile-mode dockerfile-ts-mode) + :init + (add-to-list 'major-mode-remap-alist '(dockerfile-mode . dockerfile-ts-mode)) + (add-to-list 'treesit-language-source-alist '(dockerfile "https://github.com/camdencheek/tree-sitter-dockerfile")) + (unless (treesit-ready-p 'dockerfile) (treesit-install-language-grammar 'dockerfile)) + ) + +(provide 'lang-dockerfile) diff --git a/ansible/roles/emacs/tasks/peruser.yaml b/ansible/roles/emacs/tasks/peruser.yaml index 8792297..1b68896 100644 --- a/ansible/roles/emacs/tasks/peruser.yaml +++ b/ansible/roles/emacs/tasks/peruser.yaml @@ -38,6 +38,7 @@ - common-lsp.el - lang-bash.el - lang-c.el + - lang-dockerfile.el - lang-go.el - lang-javascript.el - lang-lua.el