From: Andreas Gerler <baron@bundesbrandschatzamt.de>
Date: Sun, 22 Dec 2024 12:03:30 +0000 (+0100)
Subject: update hcl-mode
X-Git-Url: http://git.bundesbrandschatzamt.de/?a=commitdiff_plain;h=b519a441310c44af3e72adda50447e7e44aff0e4;p=emacsconfig.git

update hcl-mode

Signed-off-by: Andreas Gerler <baron@bundesbrandschatzamt.de>
---

diff --git a/elpa/hcl-mode-20230302.1029/hcl-mode-autoloads.el b/elpa/hcl-mode-20230302.1029/hcl-mode-autoloads.el
deleted file mode 100644
index 53a39f56..00000000
--- a/elpa/hcl-mode-20230302.1029/hcl-mode-autoloads.el
+++ /dev/null
@@ -1,31 +0,0 @@
-;;; hcl-mode-autoloads.el --- automatically extracted autoloads  -*- lexical-binding: t -*-
-;;
-;;; Code:
-
-(add-to-list 'load-path (directory-file-name
-                         (or (file-name-directory #$) (car load-path))))
-
-
-;;;### (autoloads nil "hcl-mode" "hcl-mode.el" (0 0 0 0))
-;;; Generated autoloads from hcl-mode.el
-
-(autoload 'hcl-mode "hcl-mode" "\
-Major mode for editing hcl configuration file
-
-\(fn)" t nil)
-
-(add-to-list 'auto-mode-alist '("\\.hcl\\'" . hcl-mode))
-
-(add-to-list 'auto-mode-alist '("\\.nomad\\'" . hcl-mode))
-
-(register-definition-prefixes "hcl-mode" '("hcl-"))
-
-;;;***
-
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; coding: utf-8
-;; End:
-;;; hcl-mode-autoloads.el ends here
diff --git a/elpa/hcl-mode-20230302.1029/hcl-mode-pkg.el b/elpa/hcl-mode-20230302.1029/hcl-mode-pkg.el
deleted file mode 100644
index 7a97bfd5..00000000
--- a/elpa/hcl-mode-20230302.1029/hcl-mode-pkg.el
+++ /dev/null
@@ -1,2 +0,0 @@
-;;; Generated package description from hcl-mode.el  -*- no-byte-compile: t -*-
-(define-package "hcl-mode" "20230302.1029" "Major mode for Hashicorp" '((emacs "24.3")) :commit "35784854efd29fa8c9fe827654d747a2ace5cb19" :authors '(("Syohei YOSHIDA" . "syohex@gmail.com")) :maintainers '(("Steve Purcell" . "steve@sanityinc.com")) :maintainer '("Steve Purcell" . "steve@sanityinc.com") :url "https://github.com/purcell/emacs-hcl-mode")
diff --git a/elpa/hcl-mode-20240220.1534/hcl-mode-autoloads.el b/elpa/hcl-mode-20240220.1534/hcl-mode-autoloads.el
new file mode 100644
index 00000000..64709e66
--- /dev/null
+++ b/elpa/hcl-mode-20240220.1534/hcl-mode-autoloads.el
@@ -0,0 +1,34 @@
+;;; hcl-mode-autoloads.el --- automatically extracted autoloads (do not edit)   -*- lexical-binding: t -*-
+;; Generated by the `loaddefs-generate' function.
+
+;; This file is part of GNU Emacs.
+
+;;; Code:
+
+(add-to-list 'load-path (or (and load-file-name (directory-file-name (file-name-directory load-file-name))) (car load-path)))
+
+
+
+;;; Generated autoloads from hcl-mode.el
+
+(autoload 'hcl-mode "hcl-mode" "\
+Major mode for editing hcl configuration file
+
+(fn)" t)
+(add-to-list 'auto-mode-alist '("\\.hcl\\'" . hcl-mode))
+(add-to-list 'auto-mode-alist '("\\.nomad\\'" . hcl-mode))
+(register-definition-prefixes "hcl-mode" '("hcl-"))
+
+;;; End of scraped data
+
+(provide 'hcl-mode-autoloads)
+
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; no-native-compile: t
+;; coding: utf-8-emacs-unix
+;; End:
+
+;;; hcl-mode-autoloads.el ends here
diff --git a/elpa/hcl-mode-20240220.1534/hcl-mode-pkg.el b/elpa/hcl-mode-20240220.1534/hcl-mode-pkg.el
new file mode 100644
index 00000000..b8d9587c
--- /dev/null
+++ b/elpa/hcl-mode-20240220.1534/hcl-mode-pkg.el
@@ -0,0 +1,9 @@
+;; -*- no-byte-compile: t; lexical-binding: nil -*-
+(define-package "hcl-mode" "20240220.1534"
+  "Major mode for Hashicorp."
+  '((emacs "24.3"))
+  :url "https://github.com/hcl-emacs/hcl-mode"
+  :commit "b2a03a446c1fe324ff494c28b9321486fa6fc672"
+  :revdesc "b2a03a446c1f"
+  :authors '(("Syohei YOSHIDA" . "syohex@gmail.com"))
+  :maintainers '(("Steve Purcell" . "steve@sanityinc.com")))
diff --git a/elpa/hcl-mode-20240220.1534/hcl-mode.el b/elpa/hcl-mode-20240220.1534/hcl-mode.el
new file mode 100644
index 00000000..302190c2
--- /dev/null
+++ b/elpa/hcl-mode-20240220.1534/hcl-mode.el
@@ -0,0 +1,248 @@
+;;; hcl-mode.el --- Major mode for Hashicorp -*- lexical-binding: t -*-
+
+;; Copyright (C) 2017 by Syohei YOSHIDA
+;; Copyright (C) 2020 by Steve Purcell
+
+;; Author: Syohei YOSHIDA <syohex@gmail.com>
+;; Maintainer: Steve Purcell <steve@sanityinc.com>
+;; URL: https://github.com/purcell/emacs-hcl-mode
+;; Package-Version: 20240220.1534
+;; Package-Revision: b2a03a446c1f
+;; Package-Requires: ((emacs "24.3"))
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; hcl-mode provides a major-mode of hcl file.
+
+;;; Code:
+
+(require 'cl-lib)
+(require 'rx)
+
+(defgroup hcl nil
+  "Major mode for Hashicorp Configuration Language."
+  :group 'languages)
+
+(defcustom hcl-indent-level 2
+  "The tab width to use when indenting."
+  :type 'integer)
+
+(defconst hcl--block-regexp
+  "^\\s-*[^{]+{")
+
+;; String Interpolation(This regexp is taken from ruby-mode)
+(defconst hcl--string-interpolation-regexp
+  "\\${[^}\n\\\\]*\\(?:\\\\.[^}\n\\\\]*\\)*}")
+
+(defconst hcl--identifier-regexp
+  "\\_<\\(\\sw+\\(?:\\s_+\\sw+\\)*\\)\\_>")
+
+(defconst hcl--assignment-regexp
+  (concat hcl--identifier-regexp "\\s-*=\\(?:[^>=]\\)"))
+
+(defconst hcl--map-regexp
+  (concat hcl--identifier-regexp "\\s-*{"))
+
+(defconst hcl--boolean-regexp
+  (concat "\\(?:^\\|[^.]\\)"
+          (regexp-opt '("true" "false" "on" "off" "yes" "no")
+                      'words)))
+
+(defconst hcl-font-lock-keywords
+  `((,hcl--assignment-regexp 1 font-lock-variable-name-face)
+    (,hcl--boolean-regexp . font-lock-constant-face)
+    (,hcl--map-regexp 1 font-lock-type-face)
+    (hcl--string-interpolation-matcher 0 font-lock-variable-name-face t)))
+
+(defsubst hcl--paren-level ()
+  (car (syntax-ppss)))
+
+(defsubst hcl--in-string-or-comment-p ()
+  (nth 8 (syntax-ppss)))
+
+(cl-defun hcl--string-interpolation-matcher (lim)
+  (while (re-search-forward hcl--string-interpolation-regexp lim t)
+    (when (nth 3 (syntax-ppss))
+      (cl-return-from hcl--string-interpolation-matcher (point)))))
+
+(defun hcl--block-indentation ()
+  (let ((curline (line-number-at-pos)))
+    (save-excursion
+      (condition-case nil
+          (progn
+            (backward-up-list)
+            (unless (= curline (line-number-at-pos))
+              (current-indentation)))
+        (scan-error nil)))))
+
+(defun hcl--previous-indentation ()
+  (save-excursion
+    (forward-line -1)
+    (let (finish)
+      (while (not finish)
+        (cond ((bobp) (setq finish t))
+              ((hcl--in-string-or-comment-p) (forward-line -1))
+              (t
+               (let ((line (buffer-substring-no-properties
+                            (line-beginning-position) (line-end-position))))
+                 (if (not (string-match-p "\\`\\s-*\\'" line))
+                     (setq finish t)
+                   (forward-line -1))))))
+      (current-indentation))))
+
+(defun hcl-calculate-indentation ()
+  (let ((block-indentation (hcl--block-indentation)))
+    (if block-indentation
+        (if (looking-at "[]}]")
+            block-indentation
+          (+ block-indentation hcl-indent-level))
+      (hcl--previous-indentation))))
+
+(defun hcl-indent-line ()
+  "Indent current line as Hcl configuration."
+  (interactive)
+  (let* ((curpoint (point))
+         (pos (- (point-max) curpoint)))
+    (back-to-indentation)
+    (if (hcl--in-string-or-comment-p)
+        (goto-char curpoint)
+      (indent-line-to (hcl-calculate-indentation))
+      (when (> (- (point-max) pos) (point))
+        (goto-char (- (point-max) pos))))))
+
+(defun hcl-beginning-of-defun (&optional count)
+  (interactive "p")
+  (setq count (or count 1))
+  (let ((match 0)
+        finish)
+    (while (and (not finish)
+                (re-search-backward hcl--block-regexp nil t))
+      (unless (hcl--in-string-or-comment-p)
+        (cl-incf match)
+        (when (= match count)
+          (setq finish t))))))
+
+(defun hcl-end-of-defun (&optional count)
+  (interactive "p")
+  (setq count (or count 1))
+  (let ((paren-level (hcl--paren-level)))
+    (when (or (and (looking-at-p "}") (= paren-level 1))
+              (= paren-level 0))
+      (re-search-forward hcl--block-regexp nil t)))
+  (dotimes (_i count)
+    (when (looking-at-p hcl--block-regexp)
+      (goto-char (line-end-position)))
+    (hcl-beginning-of-defun 1)
+    (skip-chars-forward "^{")
+    (forward-char 1)
+    (let ((orig-level (hcl--paren-level)))
+      (while (and (>= (hcl--paren-level) orig-level)
+                  (< (point) (point-max)))
+        (skip-chars-forward "^}")
+        (forward-line +1)))))
+
+(eval-and-compile
+  (defconst hcl--here-doc-beg-re
+    "[^<]<<-?\\s-*\\\\?\\(\\(?:['\"][^'\"]+['\"]\\|\\sw\\|[-/~._]\\)+\\)\\(\n\\)"))
+
+(defun hcl--syntax-propertize-heredoc (end)
+  (let ((ppss (syntax-ppss)))
+    (when (eq t (nth 3 ppss))
+      (let ((key (get-text-property (nth 8 ppss) 'hcl-here-doc-marker))
+            (case-fold-search nil))
+        (when (re-search-forward
+               (concat "^\\(?:[ \t]*\\)" (regexp-quote key) "\\(\n\\)")
+               end 'move)
+          (let ((eol (match-beginning 1)))
+            (put-text-property eol (1+ eol)
+                               'syntax-table (string-to-syntax "|"))))))))
+
+(defun hcl--font-lock-open-heredoc (start string eol)
+  (unless (or (memq (char-before start) '(?< ?>))
+	      (save-excursion
+                (goto-char start)
+                (hcl--in-string-or-comment-p)))
+    (let ((str (replace-regexp-in-string "['\"]" "" string)))
+      (put-text-property eol (1+ eol) 'hcl-here-doc-marker str)
+      (prog1 (string-to-syntax "|")
+        (goto-char (+ 2 start))))))
+
+(defun hcl--syntax-propertize-function (start end)
+  (goto-char start)
+  (hcl--syntax-propertize-heredoc end)
+  (funcall
+   (syntax-propertize-rules
+    (hcl--here-doc-beg-re
+     (2 (hcl--font-lock-open-heredoc
+         (match-beginning 0) (match-string 1) (match-beginning 2))))
+    ("\\s|" (0 (prog1 nil (hcl--syntax-propertize-heredoc end)))))
+   (point) end))
+
+(defvar hcl-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map (kbd "C-M-a") 'hcl-beginning-of-defun)
+    (define-key map (kbd "C-M-e") 'hcl-end-of-defun)
+    map)
+  "Keymap for Hcl major mode.")
+
+(defconst hcl-mode-syntax-table
+  (let ((table (make-syntax-table)))
+    (prog1
+        table
+      (modify-syntax-entry ?_ "_" table)
+      (modify-syntax-entry ?- "_" table)
+      (modify-syntax-entry ?= "." table)
+
+      ;; Comments
+      ;; Single line comment
+      (modify-syntax-entry ?# "< b" table)
+      (modify-syntax-entry ?\n "> b" table)
+
+      ;; multiple line comment(/* ... */) taken from `go-mode'
+      (modify-syntax-entry ?/  ". 124b" table)
+      (modify-syntax-entry ?*  ". 23" table)))
+  "Syntax table for `hcl-mode'.")
+
+;;;###autoload
+(define-derived-mode hcl-mode prog-mode "HCL"
+  "Major mode for editing hcl configuration file"
+
+  (setq font-lock-defaults '((hcl-font-lock-keywords)))
+
+  (setq-local comment-start "#")
+  (setq-local comment-use-syntax t)
+  (setq-local comment-start-skip "\\(//+\\|/\\*+\\)\\s *")
+
+  ;; indentation
+  (make-local-variable 'hcl-indent-level)
+  (setq-local indent-line-function 'hcl-indent-line)
+
+  (setq-local beginning-of-defun-function #'hcl-beginning-of-defun)
+  (setq-local end-of-defun-function #'hcl-end-of-defun)
+
+  (setq-local syntax-propertize-function #'hcl--syntax-propertize-function)
+
+  ;; electric-mode
+  (setq-local electric-indent-chars (append "{}[]" electric-indent-chars)))
+
+;;;###autoload
+(progn
+  (add-to-list 'auto-mode-alist '("\\.hcl\\'" . hcl-mode))
+  (add-to-list 'auto-mode-alist '("\\.nomad\\'" . hcl-mode)))
+
+(provide 'hcl-mode)
+
+;;; hcl-mode.el ends here