From patchwork Thu Aug 11 06:07:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 41547 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id C28A527BBE9; Thu, 11 Aug 2022 07:09:47 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3F7C427BBEA for ; Thu, 11 Aug 2022 07:09:46 +0100 (BST) Received: from localhost ([::1]:46646 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oM1O5-0004fi-DN for patchwork@mira.cbaines.net; Thu, 11 Aug 2022 02:09:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59660) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oM1NP-0004ea-5Z for guix-patches@gnu.org; Thu, 11 Aug 2022 02:09:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33208) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oM1NO-0005eU-Aw for guix-patches@gnu.org; Thu, 11 Aug 2022 02:09:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oM1NN-0004aM-Vz for guix-patches@gnu.org; Thu, 11 Aug 2022 02:09:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57069] [PATCH v2] etc: Add tempel snippets. References: <87a68dpvre.fsf@ngraves.fr> In-Reply-To: <87a68dpvre.fsf@ngraves.fr> Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 Aug 2022 06:09:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57069 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 57069@debbugs.gnu.org Cc: ngraves@ngraves.fr Received: via spool by 57069-submit@debbugs.gnu.org id=B57069.166019809917571 (code B ref 57069); Thu, 11 Aug 2022 06:09:01 +0000 Received: (at 57069) by debbugs.gnu.org; 11 Aug 2022 06:08:19 +0000 Received: from localhost ([127.0.0.1]:51188 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oM1Mg-0004ZK-Qr for submit@debbugs.gnu.org; Thu, 11 Aug 2022 02:08:19 -0400 Received: from 5.mo575.mail-out.ovh.net ([46.105.62.179]:44519) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oM1Md-0004Z9-Tk for 57069@debbugs.gnu.org; Thu, 11 Aug 2022 02:08:17 -0400 Received: from player759.ha.ovh.net (unknown [10.108.16.216]) by mo575.mail-out.ovh.net (Postfix) with ESMTP id D2334234B9 for <57069@debbugs.gnu.org>; Thu, 11 Aug 2022 06:08:13 +0000 (UTC) Received: from ngraves.fr (met42-h01-213-44-161-47.dsl.sta.abo.bbox.fr [213.44.161.47]) (Authenticated sender: ngraves@ngraves.fr) by player759.ha.ovh.net (Postfix) with ESMTPSA id F08C72D79E2AB; Thu, 11 Aug 2022 06:08:10 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-102R004fbd6c660-c34d-40cd-82f2-48647e5acc49, C23DEB4C4233A3DF9626E2F59CB7FD1D65C1FBBF) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 213.44.161.47 Date: Thu, 11 Aug 2022 08:07:45 +0200 Message-Id: <20220811060745.6892-1-ngraves@ngraves.fr> X-Mailer: git-send-email 2.37.1 MIME-Version: 1.0 X-Ovh-Tracer-Id: 11298405568794190562 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 49 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvfedrvdegfedguddtjecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecuogfuuhhsphgvtghtffhomhgrihhnucdlgeelmdenucfjughrpefhvfevufffkffoggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepffduveejleejheehieduteduvdeugeevieetjeekgfeutefftefhieffheelleelnecuffhomhgrihhnpehgihhthhhusgdrihhopdhgihhthhhusgdrtghomhdpmhgrghhithdrvhgtnecukfhppedtrddtrddtrddtpddvudefrdeggedrudeiuddrgeejnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmohguvgepshhmthhpohhuthdphhgvlhhopehplhgrhigvrhejheelrdhhrgdrohhvhhdrnhgvthdpihhnvghtpedtrddtrddtrddtpdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepheejtdeileesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheejhe X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves X-getmail-retrieved-from-mailbox: Patches * doc/contributing.texi: - adding configuration description for tempel snippets. - adapting yasnippet configuration to directory move. * etc/snippets/tempel/*.eld: adding alternative to current yasnippets. * etc/snippets*-mode: moved to /etc/snippets/yas/*-mode not to conflit with tempel snippets. --- doc/contributing.texi | 17 ++- etc/snippets/tempel/scheme-mode.eld | 113 ++++++++++++++++++ etc/snippets/tempel/text-mode.eld | 101 ++++++++++++++++ .../{ => yas}/scheme-mode/guix-bzr-reference | 0 .../{ => yas}/scheme-mode/guix-cvs-reference | 0 .../{ => yas}/scheme-mode/guix-git-reference | 0 .../{ => yas}/scheme-mode/guix-hg-reference | 0 .../{ => yas}/scheme-mode/guix-origin | 0 .../{ => yas}/scheme-mode/guix-package | 0 .../{ => yas}/scheme-mode/guix-svn-reference | 0 .../guix-commit-message-add-cl-package | 0 .../text-mode/guix-commit-message-add-package | 0 .../guix-commit-message-remove-package | 0 .../guix-commit-message-rename-package | 0 .../guix-commit-message-update-package | 0 .../guix-commit-message-use-https-home-page | 0 16 files changed, 226 insertions(+), 5 deletions(-) create mode 100644 etc/snippets/tempel/scheme-mode.eld create mode 100644 etc/snippets/tempel/text-mode.eld rename etc/snippets/{ => yas}/scheme-mode/guix-bzr-reference (100%) rename etc/snippets/{ => yas}/scheme-mode/guix-cvs-reference (100%) rename etc/snippets/{ => yas}/scheme-mode/guix-git-reference (100%) rename etc/snippets/{ => yas}/scheme-mode/guix-hg-reference (100%) rename etc/snippets/{ => yas}/scheme-mode/guix-origin (100%) rename etc/snippets/{ => yas}/scheme-mode/guix-package (100%) rename etc/snippets/{ => yas}/scheme-mode/guix-svn-reference (100%) rename etc/snippets/{ => yas}/text-mode/guix-commit-message-add-cl-package (100%) rename etc/snippets/{ => yas}/text-mode/guix-commit-message-add-package (100%) rename etc/snippets/{ => yas}/text-mode/guix-commit-message-remove-package (100%) rename etc/snippets/{ => yas}/text-mode/guix-commit-message-rename-package (100%) rename etc/snippets/{ => yas}/text-mode/guix-commit-message-update-package (100%) rename etc/snippets/{ => yas}/text-mode/guix-commit-message-use-https-home-page (100%) diff --git a/doc/contributing.texi b/doc/contributing.texi index 02c7c5ae59..808d71e40a 100644 --- a/doc/contributing.texi +++ b/doc/contributing.texi @@ -320,15 +320,22 @@ s-expression, etc. @cindex reducing boilerplate We also provide templates for common git commit messages and package definitions in the @file{etc/snippets} directory. These templates can -be used with @url{https://joaotavora.github.io/yasnippet/, YASnippet} to -expand short trigger strings to interactive text snippets. You may want -to add the snippets directory to the @var{yas-snippet-dirs} variable in -Emacs. +be used to expand short trigger strings to interactive text snippets, +with either @url{https://joaotavora.github.io/yasnippet/, YASnippet} or +@url{https://github.com/minad/tempel/, Tempel}. You may want to add the +@file{etc/snippets/yas} (respectively @file{etc/snippets/tempel/*.eld} +or selected files) snippets directory to the @var{yas-snippet-dirs} +(@var{tempel-path} resp.) variable in Emacs. @lisp ;; @r{Assuming the Guix checkout is in ~/src/guix.} +;; @r{Yasnippet} (with-eval-after-load 'yasnippet - (add-to-list 'yas-snippet-dirs "~/src/guix/etc/snippets")) + (add-to-list 'yas-snippet-dirs "~/src/guix/etc/snippets/yas")) +;;@r{Tempel} +(with-eval-after-load 'tempel + (add-to-list 'tempel-path + "~/src/guix/etc/snippets/tempel/*.eld")) @end lisp The commit message snippets depend on @url{https://magit.vc/, Magit} to diff --git a/etc/snippets/tempel/scheme-mode.eld b/etc/snippets/tempel/scheme-mode.eld new file mode 100644 index 0000000000..5fcd7030b8 --- /dev/null +++ b/etc/snippets/tempel/scheme-mode.eld @@ -0,0 +1,113 @@ +-*- mode: lisp-data -*- + +scheme-mode + +(package... + "(define-public " (s name) n> + "(package" n> + "(name \"" (s name) "\")" n> + "(version \"" p "\")" n> + "(source origin..." p ")" n> + "(build-system \"" + (p (completing-read "build-system:" + '("android-ndk" + "ant" + "asdf" + "cargo" + "chicken" + "clojure" + "cmake" + "copy" + "dub" + "dune" + "emacs" + "font" + "glib-or-gtk" + "gnu" + "go" + "guile" + "haskell" + "julia" + "linux-module" + "maven" + "meson" + "minetest" + "minify" + "node" + "ocaml" + "perl" + "python" + "qt" + "r" + "rakudo" + "rebar" + "renpy" + "ruby" + "scons" + "texlive" + "trivial" + "waf") + nil t) "-build-system") + "\")" n> + "(home-page \"" p "\")" n> + "(synopsis \"" p "\")" n> + "(description \"" p "\")" n> + "(license " p ")))" n) + +(origin... + "(origin" n> + "(method \"" + (p (completing-read "method:" + '("url-fetch" + "url-fetch/tarbomb" + "url-fetch/zipbomb" + "cvs-fetch" + "git-fetch" + "hg-fetch" + "svn-fetch" + "bzr-fetch") + nil t) method) "\")" n> + "(uri " (cl-case (intern method) + ('git-fetch "git-reference...") + ('svn-fetch "svn-reference...") + ('hg-fetch "hg-reference...") + ('cvs-fetch "cvs-reference...") + ('bzr-fetch "bzr-reference...") + (t "(string-append \"https://")) + p + (if (equal (substring method 0 9) "url-fetch") "\")") + ")" n> + (cl-case (intern method) + ('git-fetch "(file-name (git-file-name name version))\n") + ('hg-fetch "(file-name (hg-file-name name version))\n") + ('svn-fetch "(file-name (string-append name \"-\" version \"-checkout\"))\n") + ('cvs-fetch "(file-name (string-append name \"-\" version \"-checkout\"))\n") + ('bzr-fetch "(file-name (string-append name \"-\" version \"-checkout\"))\n") + (t "")) > + "(sha256" n> "(base32 \"" p "\")))") + +(git-reference... + "(git-reference" n> + "(url \"" p "\")" n> + "(commit \"" p "\"))") + +(svn-reference... + "(svn-reference" n> + "(url \"" p "\")" n> + "(revision \"" p "\"))") + +(cvs-reference... + "(cvs-reference" n> + "(root-directory \"" p "\")" n> + "(module \"" p "\")" n> + "(revision \"" p "\"))") + +(hg-reference... + "(hg-reference" n> + "(url \"" p "\")" n> + "(changeset \"" p "\"))") + +(bzr-reference... + "(bzr-reference" n> + "(url \"" p "\")" n> + "(revision \"" p "\"))") diff --git a/etc/snippets/tempel/text-mode.eld b/etc/snippets/tempel/text-mode.eld new file mode 100644 index 0000000000..a51a6719d7 --- /dev/null +++ b/etc/snippets/tempel/text-mode.eld @@ -0,0 +1,101 @@ +-*- mode: lisp-data -*- + +text-mode :when (git-commit-mode) + +(add + "gnu: Add " + (p + (with-temp-buffer + (magit-git-wash #'magit-diff-wash-diffs + "diff" "--staged") + (goto-char (point-min)) + (when (re-search-forward "\\+(define-public \\(\\S-+\\)" nil 'noerror) + (match-string-no-properties 1))) + var ) "." n n + "* " (car (magit-staged-files)) " (" (s var ) "): New variable.") + +(remove + "gnu: Remove " + (p (with-temp-buffer + (magit-git-wash #'magit-diff-wash-diffs + "diff" "--staged") + (goto-char (point-min)) + (when (re-search-forward "\\-(define-public \\(\\S-+\\)" nil 'noerror) + (match-string-no-properties 1))) + var) "." n n + "* " (car (magit-staged-files)) " (" (s var) "): Delete variable.") + +(rename + "gnu: " + (p (with-temp-buffer + (magit-git-wash #'magit-diff-wash-diffs + "diff" "--staged") + (beginning-of-buffer) + (when (search-forward "-(define-public " nil 'noerror) + (thing-at-point 'sexp 'no-properties))) + prev-var) + ": Rename package to " + (p (with-temp-buffer + (magit-git-wash #'magit-diff-wash-diffs + "diff" "--staged") + (beginning-of-buffer) + (when (search-forward "+(define-public " nil 'noerror) + (thing-at-point 'sexp 'no-properties))) + new-var) "." n n + "* " (car (magit-staged-files)) " (" (s prev-var) "): Define in terms of" n + "'deprecated-package'." n + "(" (s new-var) "): New variable, formerly known as \"" (s prev-var) "\".") + +(update + "gnu: " + (p (with-temp-buffer + (magit-git-wash #'magit-diff-wash-diffs + "diff" "--staged") + (goto-char (point-min)) + (when (re-search-forward "^[ ]*(define-public \\(\\S-+\\)" nil 'noerror) + (match-string-no-properties 1))) + var) + ": Update to " + (p (with-temp-buffer + (magit-git-wash #'magit-diff-wash-diffs + "diff" "--staged") + (goto-char (point-min)) + (search-forward "name" nil 'noerror) + (search-forward "+" nil 'noerror) ; first change + (when (and (search-forward "version " nil 'noerror) + (looking-at-p "\"")) + (let ((end (save-excursion (search-forward "\")" nil 'noerror)))) + (when end + (forward-char) + (buffer-substring-no-properties (point) (- end 2)))))) + version) "." n n + "* " (car (magit-staged-files)) " (" (s var) "): Update to " (s version) "." + (mapconcat (lambda (file) (concat "* " file)) (cdr (magit-staged-files))) n) + +(addcl + "gnu: Add cl-" + (p (replace-regexp-in-string + "^cl-" "" (with-temp-buffer + (magit-git-wash #'magit-diff-wash-diffs + "diff" "--staged") + (beginning-of-buffer) + (when (search-forward "+(define-public " nil 'noerror) + (replace-regexp-in-string + "^sbcl-" "" + (thing-at-point 'sexp 'no-properties))))) + var) "." n n + "* " (car (magit-staged-files)) + " (cl-" (s var) ", ecl-" (s var) ", sbcl-" (s var) "): New variables.") + +(https + "gnu: " + (p (with-temp-buffer + (magit-git-wash #'magit-diff-wash-diffs + "diff" "--staged") + (goto-char (point-min)) + (when (re-search-forward "^[ ]*(define-public \\(\\S-+\\)" nil 'noerror) + (match-string-no-properties 1))) + var) + ": Use HTTPS home page." n n + "* " (car (magit-staged-files)) " (" (s var) ")[home-page]: Use HTTPS." n + (mapconcat (lambda (file) (concat "* " file)) (cdr (magit-staged-files))) n) diff --git a/etc/snippets/scheme-mode/guix-bzr-reference b/etc/snippets/yas/scheme-mode/guix-bzr-reference similarity index 100% rename from etc/snippets/scheme-mode/guix-bzr-reference rename to etc/snippets/yas/scheme-mode/guix-bzr-reference diff --git a/etc/snippets/scheme-mode/guix-cvs-reference b/etc/snippets/yas/scheme-mode/guix-cvs-reference similarity index 100% rename from etc/snippets/scheme-mode/guix-cvs-reference rename to etc/snippets/yas/scheme-mode/guix-cvs-reference diff --git a/etc/snippets/scheme-mode/guix-git-reference b/etc/snippets/yas/scheme-mode/guix-git-reference similarity index 100% rename from etc/snippets/scheme-mode/guix-git-reference rename to etc/snippets/yas/scheme-mode/guix-git-reference diff --git a/etc/snippets/scheme-mode/guix-hg-reference b/etc/snippets/yas/scheme-mode/guix-hg-reference similarity index 100% rename from etc/snippets/scheme-mode/guix-hg-reference rename to etc/snippets/yas/scheme-mode/guix-hg-reference diff --git a/etc/snippets/scheme-mode/guix-origin b/etc/snippets/yas/scheme-mode/guix-origin similarity index 100% rename from etc/snippets/scheme-mode/guix-origin rename to etc/snippets/yas/scheme-mode/guix-origin diff --git a/etc/snippets/scheme-mode/guix-package b/etc/snippets/yas/scheme-mode/guix-package similarity index 100% rename from etc/snippets/scheme-mode/guix-package rename to etc/snippets/yas/scheme-mode/guix-package diff --git a/etc/snippets/scheme-mode/guix-svn-reference b/etc/snippets/yas/scheme-mode/guix-svn-reference similarity index 100% rename from etc/snippets/scheme-mode/guix-svn-reference rename to etc/snippets/yas/scheme-mode/guix-svn-reference diff --git a/etc/snippets/text-mode/guix-commit-message-add-cl-package b/etc/snippets/yas/text-mode/guix-commit-message-add-cl-package similarity index 100% rename from etc/snippets/text-mode/guix-commit-message-add-cl-package rename to etc/snippets/yas/text-mode/guix-commit-message-add-cl-package diff --git a/etc/snippets/text-mode/guix-commit-message-add-package b/etc/snippets/yas/text-mode/guix-commit-message-add-package similarity index 100% rename from etc/snippets/text-mode/guix-commit-message-add-package rename to etc/snippets/yas/text-mode/guix-commit-message-add-package diff --git a/etc/snippets/text-mode/guix-commit-message-remove-package b/etc/snippets/yas/text-mode/guix-commit-message-remove-package similarity index 100% rename from etc/snippets/text-mode/guix-commit-message-remove-package rename to etc/snippets/yas/text-mode/guix-commit-message-remove-package diff --git a/etc/snippets/text-mode/guix-commit-message-rename-package b/etc/snippets/yas/text-mode/guix-commit-message-rename-package similarity index 100% rename from etc/snippets/text-mode/guix-commit-message-rename-package rename to etc/snippets/yas/text-mode/guix-commit-message-rename-package diff --git a/etc/snippets/text-mode/guix-commit-message-update-package b/etc/snippets/yas/text-mode/guix-commit-message-update-package similarity index 100% rename from etc/snippets/text-mode/guix-commit-message-update-package rename to etc/snippets/yas/text-mode/guix-commit-message-update-package diff --git a/etc/snippets/text-mode/guix-commit-message-use-https-home-page b/etc/snippets/yas/text-mode/guix-commit-message-use-https-home-page similarity index 100% rename from etc/snippets/text-mode/guix-commit-message-use-https-home-page rename to etc/snippets/yas/text-mode/guix-commit-message-use-https-home-page