From 09a4099586657170cbdcff071b2d0fac5ed133b7 Mon Sep 17 00:00:00 2001 From: Tom Willemse Date: Thu, 28 May 2026 02:12:40 -0700 Subject: oni-yasnippet: Move all snippets to ‘oni-yasnippet’ There is no real point in having them all separate. Having them all in a single place makes them much easier to manage. --- oni-twig/Eldev | 13 --------- oni-twig/oni-twig.el | 59 --------------------------------------- oni-twig/snippets/twig-mode/_self | 5 ---- oni-twig/snippets/twig-mode/blk | 7 ----- oni-twig/snippets/twig-mode/def | 7 ----- oni-twig/snippets/twig-mode/ext | 5 ---- oni-twig/snippets/twig-mode/for | 7 ----- oni-twig/snippets/twig-mode/if | 7 ----- oni-twig/snippets/twig-mode/ife | 9 ------ oni-twig/snippets/twig-mode/iif | 5 ---- oni-twig/snippets/twig-mode/imp | 7 ----- oni-twig/snippets/twig-mode/mac | 7 ----- oni-twig/snippets/twig-mode/set | 5 ---- 13 files changed, 143 deletions(-) delete mode 100644 oni-twig/Eldev delete mode 100644 oni-twig/oni-twig.el delete mode 100644 oni-twig/snippets/twig-mode/_self delete mode 100644 oni-twig/snippets/twig-mode/blk delete mode 100644 oni-twig/snippets/twig-mode/def delete mode 100644 oni-twig/snippets/twig-mode/ext delete mode 100644 oni-twig/snippets/twig-mode/for delete mode 100644 oni-twig/snippets/twig-mode/if delete mode 100644 oni-twig/snippets/twig-mode/ife delete mode 100644 oni-twig/snippets/twig-mode/iif delete mode 100644 oni-twig/snippets/twig-mode/imp delete mode 100644 oni-twig/snippets/twig-mode/mac delete mode 100644 oni-twig/snippets/twig-mode/set (limited to 'oni-twig') diff --git a/oni-twig/Eldev b/oni-twig/Eldev deleted file mode 100644 index 1ba3134..0000000 --- a/oni-twig/Eldev +++ /dev/null @@ -1,13 +0,0 @@ -; -*- mode: emacs-lisp; lexical-binding: t -*- - -;; Uncomment some calls below as needed for your project. -(eldev-use-package-archive 'gnu-elpa) -;(eldev-use-package-archive 'nongnu-elpa) -(eldev-use-package-archive 'melpa) -(eldev-use-package-archive `("oni" . ,(expand-file-name "../bin"))) - -(eldev-use-plugin 'autoloads) - -(setf eldev-files-to-package - `(:or ,eldev-files-to-package - '("*.el" "./snippets/**/*"))) diff --git a/oni-twig/oni-twig.el b/oni-twig/oni-twig.el deleted file mode 100644 index ed147bf..0000000 --- a/oni-twig/oni-twig.el +++ /dev/null @@ -1,59 +0,0 @@ -;;; oni-twig.el --- Twig configuration -*- lexical-binding: t; -*- - -;; Copyright (C) 2019 Tom Willemse - -;; Author: Tom Willemse -;; Keywords: local -;; Version: 2021.1201.134109 -;; Package-Requires: (twig-mode oni-yasnippet) - -;; 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 . - -;;; Commentary: - -;; Configuration for ‘twig-mode’. - -;;; Code: - -(require 'yasnippet) - -(defconst oni-twig-root - (file-name-directory - (or load-file-name - (buffer-file-name))) - "The directory where ‘oni-twig’ was loaded from.") - -(defconst oni-twig-snippets-dir - (expand-file-name "snippets" oni-twig-root) - "The directory where ‘oni-twig’ stores its snippets.") - -(defun oni-twig-snippets-initialize () - "Initialize the snippets for ‘oni-twig’." - (when (boundp 'yas-snippet-dirs) - (add-to-list 'yas-snippet-dirs oni-twig-snippets-dir)) - (yas-load-directory oni-twig-snippets-dir)) - -(defun oni-twig--auto-fill-mode () - "Enable ‘auto-fill-mode’ only for comments." - (setq-local comment-auto-fill-only-comments t) - (auto-fill-mode)) - -(add-hook 'twig-mode-hook 'oni-twig--auto-fill-mode) - -(with-eval-after-load 'twig-mode - (with-eval-after-load 'yasnippet - (oni-twig-snippets-initialize))) - -(provide 'oni-twig) -;;; oni-twig.el ends here diff --git a/oni-twig/snippets/twig-mode/_self b/oni-twig/snippets/twig-mode/_self deleted file mode 100644 index c441690..0000000 --- a/oni-twig/snippets/twig-mode/_self +++ /dev/null @@ -1,5 +0,0 @@ -# -*- mode: snippet; require-final-newline: nil -*- -# name: _self -# key: _self -# -- -{% import _self as ${1:`(file-name-nondirectory (file-name-sans-extension buffer-file-name))`} %} \ No newline at end of file diff --git a/oni-twig/snippets/twig-mode/blk b/oni-twig/snippets/twig-mode/blk deleted file mode 100644 index bb100a3..0000000 --- a/oni-twig/snippets/twig-mode/blk +++ /dev/null @@ -1,7 +0,0 @@ -# -*- mode: snippet; require-final-newline: nil -*- -# name: block -# key: blk -# -- -{% block $1 %} - $0 -{% endblock %} \ No newline at end of file diff --git a/oni-twig/snippets/twig-mode/def b/oni-twig/snippets/twig-mode/def deleted file mode 100644 index 78dead4..0000000 --- a/oni-twig/snippets/twig-mode/def +++ /dev/null @@ -1,7 +0,0 @@ -# -*- mode: snippet; require-final-newline: nil -*- -# name: default value -# key: def -# -- -{% if $1 is not defined %} - {% set $1 = $2 %} -{% endif %} \ No newline at end of file diff --git a/oni-twig/snippets/twig-mode/ext b/oni-twig/snippets/twig-mode/ext deleted file mode 100644 index 501cae8..0000000 --- a/oni-twig/snippets/twig-mode/ext +++ /dev/null @@ -1,5 +0,0 @@ -# -*- mode: snippet; require-final-newline: nil -*- -# name: extends -# key: ext -# -- -{% extends "$1" %} \ No newline at end of file diff --git a/oni-twig/snippets/twig-mode/for b/oni-twig/snippets/twig-mode/for deleted file mode 100644 index 01c0cc5..0000000 --- a/oni-twig/snippets/twig-mode/for +++ /dev/null @@ -1,7 +0,0 @@ -# -*- mode: snippet; require-final-newline: nil -*- -# name: for -# key: for -# -- -{% for $1 in $2 %} - `yas-selected-text`$0 -{% endfor %} \ No newline at end of file diff --git a/oni-twig/snippets/twig-mode/if b/oni-twig/snippets/twig-mode/if deleted file mode 100644 index a9385d9..0000000 --- a/oni-twig/snippets/twig-mode/if +++ /dev/null @@ -1,7 +0,0 @@ -# -*- mode: snippet; require-final-newline: nil -*- -# name: if -# key: if -# -- -{% if $1 %} - $0 -{% endif %} \ No newline at end of file diff --git a/oni-twig/snippets/twig-mode/ife b/oni-twig/snippets/twig-mode/ife deleted file mode 100644 index a4d18f3..0000000 --- a/oni-twig/snippets/twig-mode/ife +++ /dev/null @@ -1,9 +0,0 @@ -# -*- mode: snippet; require-final-newline: nil -*- -# name: if...else -# key: ife -# -- -{% if $1 %} - $0 -{% else %} - -{% endif %} \ No newline at end of file diff --git a/oni-twig/snippets/twig-mode/iif b/oni-twig/snippets/twig-mode/iif deleted file mode 100644 index df26b61..0000000 --- a/oni-twig/snippets/twig-mode/iif +++ /dev/null @@ -1,5 +0,0 @@ -# -*- mode: snippet; require-final-newline: nil -*- -# name: Inline if -# key: iif -# -- -{% if $1 %}$0{% endif %} \ No newline at end of file diff --git a/oni-twig/snippets/twig-mode/imp b/oni-twig/snippets/twig-mode/imp deleted file mode 100644 index 01ceb69..0000000 --- a/oni-twig/snippets/twig-mode/imp +++ /dev/null @@ -1,7 +0,0 @@ -# -*- mode: snippet; require-final-newline: nil -*- -# name: import -# key: imp -# -- -{% import "${1:module}" as ${1:$(if (string-match "/\\\\([^/]*\\\\)$" yas-text) - (match-string 1 yas-text) - yas-text)} %} \ No newline at end of file diff --git a/oni-twig/snippets/twig-mode/mac b/oni-twig/snippets/twig-mode/mac deleted file mode 100644 index d4e480a..0000000 --- a/oni-twig/snippets/twig-mode/mac +++ /dev/null @@ -1,7 +0,0 @@ -# -*- mode: snippet; require-final-newline: nil -*- -# name: macro -# key: mac -# -- -{% macro ${1:name}(${2:args}) %} - $0 -{% endmacro %} \ No newline at end of file diff --git a/oni-twig/snippets/twig-mode/set b/oni-twig/snippets/twig-mode/set deleted file mode 100644 index 715c828..0000000 --- a/oni-twig/snippets/twig-mode/set +++ /dev/null @@ -1,5 +0,0 @@ -# -*- mode: snippet; require-final-newline: nil -*- -# name: set -# key: set -# -- -{% set $1 = $2 %} \ No newline at end of file -- cgit v1.3-2-g0d8e