From 4315ccdb6fbb9ce052e692063f64d6ff680dae67 Mon Sep 17 00:00:00 2001 From: JT Knabenschuh Date: Tue, 8 Nov 2016 12:47:04 +0100 Subject: [PATCH] Rename package --- README.md | 28 ++-- html-element-edit-utils.el | 28 ---- ....el => web-mode-edit-element-attributes.el | 10 +- ...ts.el => web-mode-edit-element-elements.el | 140 +++++++++--------- web-mode-edit-element-utils.el | 28 ++++ ...lement-edit.el => web-mode-edit-element.el | 52 +++---- 6 files changed, 143 insertions(+), 143 deletions(-) delete mode 100644 html-element-edit-utils.el rename html-element-edit-attributes.el => web-mode-edit-element-attributes.el (63%) rename html-element-edit-elements.el => web-mode-edit-element-elements.el (52%) create mode 100644 web-mode-edit-element-utils.el rename html-element-edit.el => web-mode-edit-element.el (54%) diff --git a/README.md b/README.md index 85df320..364f9e1 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -# HTML-Element Edit [![License: GPL v2](https://img.shields.io/badge/License-GPL%20v2-blue.svg)](https://img.shields.io/badge/License-GPL%20v2-blue.svg) -HTML-Element Edit is a smart enhancement for the Emacs-Package [web-mode](https://github.com/fxbois/web-mode) inspired by the packages [ParEdit](https://www.emacswiki.org/emacs/ParEdit) and [Paxedit](https://github.com/promethial/paxedit). +# "web-mode-edit-element" [![License: GPL v2](https://img.shields.io/badge/License-GPL%20v2-blue.svg)](https://img.shields.io/badge/License-GPL%20v2-blue.svg) +"web-mode-edit-element" is a smart enhancement for the Emacs-Package [web-mode](https://github.com/fxbois/web-mode) inspired by the packages [ParEdit](https://www.emacswiki.org/emacs/ParEdit) and [Paxedit](https://github.com/promethial/paxedit). It provides a few helper-functions for attribute- and element-handling based on the functions given by [web-mode](https://github.com/fxbois/web-mode). Further more it provides functions for slurping, barfing, dissolving, raising ... elements inspired by [ParEdit](https://www.emacswiki.org/emacs/ParEdit) and [Paxedit](https://github.com/promethial/paxedit). Last but not least this package includes a minor mode to provide a keymap with default bindings using commands of [web-mode](https://github.com/fxbois/web-mode) and this package. @@ -9,8 +9,8 @@ It provides a few helper-functions for attribute- and element-handling based on ### Usage ```clojure -(require 'html-element-edit) -(add-hook 'web-mode-hook 'html-element-edit-minor-mode) +(require 'web-mode-edit-element) +(add-hook 'web-mode-hook 'web-mode-edit-element-minor-mode) ``` ### Keymap @@ -22,29 +22,29 @@ Shortcut | Command **Elements** | `C-` | web-mode-element-previous `C-` | web-mode-element-next -`M-` | html-element-edit-elements-contract-over-border -`M-` | html-element-edit-elements-expand-over-border -`C-M-` | html-element-edit-elements-transpose-backward +`M-` | web-mode-edit-element-elements-contract-over-border +`M-` | web-mode-edit-element-elements-expand-over-border +`C-M-` | web-mode-edit-element-elements-transpose-backward `C-M-` | web-mode-element-transpose `C-` | web-mode-element-beginning `C-` | web-mode-tag-match `C-S-` | web-mode-element-parent `C-S-` | web-mode-element-next -`M-` | html-element-edit-elements-dissolve -`M-` | html-element-edit-elements-raise +`M-` | web-mode-edit-element-elements-dissolve +`M-` | web-mode-edit-element-elements-raise `C-M-` | web-mode-element-content-select `C-M-` | web-mode-element-vanish `C-k` | web-mode-element-kill -`C-S-k` | html-element-edit-elements-kill-siblings -`M-k` | html-element-edit-elements-kill-siblings-previous -`M-S-k` | html-element-edit-elements-kill-siblings-next +`C-S-k` | web-mode-edit-element-elements-kill-siblings +`M-k` | web-mode-edit-element-elements-kill-siblings-previous +`M-S-k` | web-mode-edit-element-elements-kill-siblings-next **Attributes** | `C-S-` | web-mode-attribute-previous `C-S-` | web-mode-attribute-next -`C-M-S-` | html-element-edit-attributes-transpose-backward +`C-M-S-` | web-mode-edit-element-attributes-transpose-backward `C-M-S-` | web-mode-attribute-transpose `C-M-S-` | web-mode-attribute-beginning -`C-M-S-` | html-element-edit-attributes-end-inside +`C-M-S-` | web-mode-edit-element-attributes-end-inside `C-M-S-k` | web-mode-attribute-kill ## Appendix diff --git a/html-element-edit-utils.el b/html-element-edit-utils.el deleted file mode 100644 index a3af700..0000000 --- a/html-element-edit-utils.el +++ /dev/null @@ -1,28 +0,0 @@ -;;; html-element-edit-utils.el - -;; Copyright 2016 Julian T. Knabenschuh - -;; Author: Julian T. Knabenschuh -;; License: GNU General Public License >= 2 -;; Distribution: This file is not part of Emacs - -;;; Code: - -(defun html-element-edit-utils-x-position (fx) - (save-excursion - (funcall fx) - (point))) - -(defun html-element-edit-utils-fnil (val f) - (if val val - (funcall f))) - -(defun html-element-edit-utils-kill-region (&optional begin end) - (let ((begin (html-element-edit-utils-fnil begin 'region-beginning)) - (end (html-element-edit-utils-fnil end 'region-end))) - (let ((content (buffer-substring begin end))) - (delete-region begin end) - content))) - -(provide 'html-element-edit-utils) -;;; html-element-edit-utils.el ends here diff --git a/html-element-edit-attributes.el b/web-mode-edit-element-attributes.el similarity index 63% rename from html-element-edit-attributes.el rename to web-mode-edit-element-attributes.el index 355b39b..e84bbd4 100644 --- a/html-element-edit-attributes.el +++ b/web-mode-edit-element-attributes.el @@ -1,4 +1,4 @@ -;;; html-element-edit-attributes.el +;;; web-mode-edit-element-attributes.el ;; Copyright 2016 Julian T. Knabenschuh @@ -10,17 +10,17 @@ (require 'web-mode) -(defun html-element-edit-attributes-end-inside () +(defun web-mode-edit-element-attributes-end-inside () (interactive) (web-mode-attribute-end) (backward-char)) -(defun html-element-edit-attributes-transpose-backward () +(defun web-mode-edit-element-attributes-transpose-backward () (interactive) (save-excursion (web-mode-attribute-beginning) (web-mode-attribute-previous) (web-mode-attribute-transpose))) -(provide 'html-element-edit-attributes) -;;; html-element-edit-attributes.el ends here +(provide 'web-mode-edit-element-attributes) +;;; web-mode-edit-element-attributes.el ends here diff --git a/html-element-edit-elements.el b/web-mode-edit-element-elements.el similarity index 52% rename from html-element-edit-elements.el rename to web-mode-edit-element-elements.el index 799bb67..a3e3011 100644 --- a/html-element-edit-elements.el +++ b/web-mode-edit-element-elements.el @@ -1,4 +1,4 @@ -;;; html-element-edit-elements.el +;;; web-mode-edit-element-elements.el ;; Copyright 2016 Julian T. Knabenschuh @@ -9,56 +9,56 @@ ;;; Code: (require 'web-mode) -(require 'html-element-edit-utils) +(require 'web-mode-edit-element-utils) ;; General -(defun html-element-edit-elements-end-inside () +(defun web-mode-edit-element-elements-end-inside () (interactive) (web-mode-element-end) (backward-char)) ;; Insert -(defun html-element-edit-elements-insert-direct-before (content) +(defun web-mode-edit-element-elements-insert-direct-before (content) (interactive "sContent: ") (save-excursion (web-mode-tag-beginning) (insert content))) -(defun html-element-edit-elements-insert-before (content) +(defun web-mode-edit-element-elements-insert-before (content) (interactive "sContent: ") (save-excursion (web-mode-element-beginning) (web-mode-tag-previous) - (html-element-edit-elements-insert-direct-after content))) + (web-mode-edit-element-elements-insert-direct-after content))) -(defun html-element-edit-elements-insert-direct-after (content) +(defun web-mode-edit-element-elements-insert-direct-after (content) (interactive "sContent: ") (save-excursion (web-mode-tag-end) (insert content))) -(defun html-element-edit-elements-insert-after (content) +(defun web-mode-edit-element-elements-insert-after (content) (interactive "sContent: ") (save-excursion - (html-element-edit-elements-end-inside) + (web-mode-edit-element-elements-end-inside) (web-mode-tag-next) - (html-element-edit-elements-insert-direct-before))) + (web-mode-edit-element-elements-insert-direct-before))) ;; Sibling -(defun html-element-edit-elements-sibling-previous-position () - (html-element-edit-utils-x-position +(defun web-mode-edit-element-elements-sibling-previous-position () + (web-mode-edit-element-utils-x-position 'web-mode-element-sibling-previous)) -(defun html-element-edit-elements-sibling-previous-p () +(defun web-mode-edit-element-elements-sibling-previous-p () (let ((parent-position - (html-element-edit-utils-fnil + (web-mode-edit-element-utils-fnil (save-excursion (web-mode-element-beginning) (web-mode-element-parent-position)) 'point)) (tag-prev-position - (html-element-edit-utils-x-position + (web-mode-edit-element-utils-x-position (lambda () (web-mode-element-beginning) (web-mode-tag-previous) @@ -66,44 +66,44 @@ (not (= parent-position tag-prev-position)))) -(defun html-element-edit-elements-sibling-next-position () - (html-element-edit-utils-x-position +(defun web-mode-edit-element-elements-sibling-next-position () + (web-mode-edit-element-utils-x-position 'web-mode-element-sibling-next)) -(defun html-element-edit-elements-sibling-next-p () +(defun web-mode-edit-element-elements-sibling-next-p () (let ((parent-position - (html-element-edit-utils-fnil + (web-mode-edit-element-utils-fnil (save-excursion (web-mode-element-beginning) (web-mode-element-parent-position)) 'point)) (tag-next-position - (html-element-edit-utils-x-position + (web-mode-edit-element-utils-x-position (lambda () - (html-element-edit-elements-end-inside) + (web-mode-edit-element-elements-end-inside) (web-mode-tag-next) (web-mode-element-beginning))))) (not (= parent-position tag-next-position)))) ;; Parent -(defun html-element-edit-elements-parent-p () +(defun web-mode-edit-element-elements-parent-p () (save-excursion (web-mode-element-beginning) (and (web-mode-element-parent-position) (not (= (web-mode-element-parent-position) (web-mode-element-beginning-position)))))) -(defun html-element-edit-elements-root-p () - (not (html-element-edit-elements-parent-p))) +(defun web-mode-edit-element-elements-root-p () + (not (web-mode-edit-element-elements-parent-p))) ;; Child -(defun html-element-edit-elements-child-p () +(defun web-mode-edit-element-elements-child-p () (let ((end-tag-position - (html-element-edit-utils-x-position + (web-mode-edit-element-utils-x-position (lambda () - (html-element-edit-elements-end-inside) + (web-mode-edit-element-elements-end-inside) (web-mode-tag-beginning)))) (child-position @@ -113,20 +113,20 @@ (not (= end-tag-position child-position)))) -(defun html-element-edit-elements-child-last () +(defun web-mode-edit-element-elements-child-last () (interactive) - (if (html-element-edit-elements-child-p) + (if (web-mode-edit-element-elements-child-p) (progn - (html-element-edit-elements-end-inside) + (web-mode-edit-element-elements-end-inside) (web-mode-tag-beginning) (web-mode-tag-previous)) (progn (web-mode-element-beginning) (web-mode-tag-end)))) -(defun html-element-edit-elements-child-first () +(defun web-mode-edit-element-elements-child-first () (interactive) - (if (html-element-edit-elements-child-p) + (if (web-mode-edit-element-elements-child-p) (progn (web-mode-element-beginning) (web-mode-tag-next)) @@ -135,12 +135,12 @@ (web-mode-tag-end)))) ;; Kill -(defun html-element-edit-elements-kill-siblings-previous () +(defun web-mode-edit-element-elements-kill-siblings-previous () (interactive) (save-excursion (web-mode-element-beginning) (set-mark (point)) - (if (html-element-edit-elements-parent-p) + (if (web-mode-edit-element-elements-parent-p) (progn (web-mode-element-parent) (web-mode-tag-end)) @@ -150,15 +150,15 @@ (region-end)) (insert "\n"))) -(defun html-element-edit-elements-kill-siblings-next () +(defun web-mode-edit-element-elements-kill-siblings-next () (interactive) (save-excursion (set-mark (+ 1 (web-mode-element-end-position))) - (if (html-element-edit-elements-parent-p) + (if (web-mode-edit-element-elements-parent-p) (progn (web-mode-element-beginning) (web-mode-element-parent) - (html-element-edit-elements-end-inside) + (web-mode-edit-element-elements-end-inside) (web-mode-tag-beginning)) (end-of-buffer)) (kill-region @@ -166,25 +166,25 @@ (region-end)) (insert "\n"))) -(defun html-element-edit-elements-kill-siblings () +(defun web-mode-edit-element-elements-kill-siblings () (interactive) - (html-element-edit-elements-kill-siblings-previous) - (html-element-edit-elements-kill-siblings-next)) + (web-mode-edit-element-elements-kill-siblings-previous) + (web-mode-edit-element-elements-kill-siblings-next)) ;; Edit -(defun html-element-edit-elements-transpose-backward () +(defun web-mode-edit-element-elements-transpose-backward () (interactive) - (when (html-element-edit-elements-sibling-previous-p) + (when (web-mode-edit-element-elements-sibling-previous-p) (save-excursion (web-mode-element-sibling-previous) (web-mode-element-transpose)))) -(defun html-element-edit-elements-expand-p () - (html-element-edit-elements-sibling-next-p)) +(defun web-mode-edit-element-elements-expand-p () + (web-mode-edit-element-elements-sibling-next-p)) -(defun html-element-edit-elements-expand () +(defun web-mode-edit-element-elements-expand () (interactive) - (when (html-element-edit-elements-expand-p) + (when (web-mode-edit-element-elements-expand-p) (let ((content (concat (string-trim-left @@ -193,62 +193,62 @@ (set-mark (point)) (web-mode-tag-next) (web-mode-element-end) - (html-element-edit-utils-kill-region))) + (web-mode-edit-element-utils-kill-region))) "\n"))) (save-excursion - (html-element-edit-elements-end-inside) + (web-mode-edit-element-elements-end-inside) (web-mode-tag-beginning) (insert content))))) -(defun html-element-edit-elements-expand-over-border () +(defun web-mode-edit-element-elements-expand-over-border () (interactive) (save-excursion - (while (and (html-element-edit-elements-parent-p) - (not (html-element-edit-elements-expand-p))) + (while (and (web-mode-edit-element-elements-parent-p) + (not (web-mode-edit-element-elements-expand-p))) (web-mode-element-parent)) - (html-element-edit-elements-expand))) + (web-mode-edit-element-elements-expand))) -(defun html-element-edit-elements-contract-p () - (html-element-edit-elements-child-p)) +(defun web-mode-edit-element-elements-contract-p () + (web-mode-edit-element-elements-child-p)) -(defun html-element-edit-elements-contract () +(defun web-mode-edit-element-elements-contract () (interactive) - (when (html-element-edit-elements-contract-p) + (when (web-mode-edit-element-elements-contract-p) (let ((content (save-excursion - (html-element-edit-elements-child-last) + (web-mode-edit-element-elements-child-last) (web-mode-element-beginning) (web-mode-tag-previous) (web-mode-tag-end) (set-mark (point)) (web-mode-tag-next) (web-mode-element-end) - (html-element-edit-utils-kill-region)))) + (web-mode-edit-element-utils-kill-region)))) (save-excursion (web-mode-element-end) - (html-element-edit-elements-insert-direct-after content))))) + (web-mode-edit-element-elements-insert-direct-after content))))) -(defun html-element-edit-elements-contract-over-border () +(defun web-mode-edit-element-elements-contract-over-border () (interactive) (save-excursion - (while (and (html-element-edit-elements-parent-p) - (not (html-element-edit-elements-contract-p))) + (while (and (web-mode-edit-element-elements-parent-p) + (not (web-mode-edit-element-elements-contract-p))) (web-mode-element-parent)) - (html-element-edit-elements-contract))) + (web-mode-edit-element-elements-contract))) -(defun html-element-edit-elements-dissolve (&optional ARGS) +(defun web-mode-edit-element-elements-dissolve (&optional ARGS) (interactive "p") - (when (html-element-edit-elements-parent-p) + (when (web-mode-edit-element-elements-parent-p) (save-excursion (web-mode-element-beginning) (web-mode-element-parent) (web-mode-element-vanish ARGS)))) -(defun html-element-edit-elements-raise (&optional ARGS) +(defun web-mode-edit-element-elements-raise (&optional ARGS) (interactive "p") - (html-element-edit-elements-kill-siblings) - (html-element-edit-elements-dissolve ARGS)) + (web-mode-edit-element-elements-kill-siblings) + (web-mode-edit-element-elements-dissolve ARGS)) -(provide 'html-element-edit-elements) -;;; html-element-edit-elements.el ends here +(provide 'web-mode-edit-element-elements) +;;; web-mode-edit-element-elements.el ends here diff --git a/web-mode-edit-element-utils.el b/web-mode-edit-element-utils.el new file mode 100644 index 0000000..3b2147d --- /dev/null +++ b/web-mode-edit-element-utils.el @@ -0,0 +1,28 @@ +;;; web-mode-edit-element-utils.el + +;; Copyright 2016 Julian T. Knabenschuh + +;; Author: Julian T. Knabenschuh +;; License: GNU General Public License >= 2 +;; Distribution: This file is not part of Emacs + +;;; Code: + +(defun web-mode-edit-element-utils-x-position (fx) + (save-excursion + (funcall fx) + (point))) + +(defun web-mode-edit-element-utils-fnil (val f) + (if val val + (funcall f))) + +(defun web-mode-edit-element-utils-kill-region (&optional begin end) + (let ((begin (web-mode-edit-element-utils-fnil begin 'region-beginning)) + (end (web-mode-edit-element-utils-fnil end 'region-end))) + (let ((content (buffer-substring begin end))) + (delete-region begin end) + content))) + +(provide 'web-mode-edit-element-utils) +;;; web-mode-edit-element-utils.el ends here diff --git a/html-element-edit.el b/web-mode-edit-element.el similarity index 54% rename from html-element-edit.el rename to web-mode-edit-element.el index 59d5921..c327bad 100644 --- a/html-element-edit.el +++ b/web-mode-edit-element.el @@ -1,10 +1,10 @@ -;;; html-element-edit.el --- Helper-functions for attribute- and element-handling +;;; web-mode-edit-element.el --- Helper-functions for attribute- and element-handling ;; Copyright 2016 Julian T. Knabenschuh ;; Version: 0.0 ;; Author: Julian T. Knabenschuh -;; Homepage: https://github.com/jtkDvlp/html-element-edit +;; Homepage: https://github.com/jtkDvlp/web-mode-edit-element ;; License: GNU General Public License >= 2 ;; Distribution: This file is not part of Emacs ;; Keywords: languages convenience @@ -12,29 +12,29 @@ ;;; Commentary: -;; HTML-Element Edit is a smart enhancement for the package web-mode inspired by the packages ParEdit and Paxedit. +;; "web-mode-edit-element" is a smart enhancement for the package web-mode inspired by the packages ParEdit and Paxedit. ;; It provides a few helper-functions for attribute- and element-handling based on the functions given by web-mode. Further more it provides functions for slurping, barfing, dissolving, raising ... elements inspired by ParEdit and Paxedit. Last but not least this package includes a minor mode to provide a keymap with default bindings using commands of web-mode and this package. ;; To use this package, add the following lines somewhere in you init file: -;; (require 'html-element-edit) -;; (add-hook 'web-mode-hook 'html-element-edit-minor-mode) +;; (require 'web-mode-edit-element) +;; (add-hook 'web-mode-hook 'web-mode-edit-element-minor-mode) -;; See keymap in the main file or online https://github.com/jtkDvlp/html-element-edit +;; See keymap in the main file or online https://github.com/jtkDvlp/web-mode-edit-element ;;; Code: (require 'web-mode) -(require 'html-element-edit-attributes) -(require 'html-element-edit-elements) +(require 'web-mode-edit-element-attributes) +(require 'web-mode-edit-element-elements) -(defvar html-element-edit-minor-mode-map +(defvar web-mode-edit-element-minor-mode-map (make-keymap) - "html-element-edit-minor-mode keymap") + "web-mode-edit-element-minor-mode keymap") -(define-minor-mode html-element-edit-minor-mode - "Minor mode to provide key-bindings for html-element-edit functions" - nil " html-elemenet-edit" 'html-element-edit-minor-mode-map) +(define-minor-mode web-mode-edit-element-minor-mode + "Minor mode to provide key-bindings for web-mode-edit-element functions" + nil " html-elemenet-edit" 'web-mode-edit-element-minor-mode-map) (let ((bindings '(;; General @@ -45,10 +45,10 @@ ("C-" web-mode-element-previous) ("C-" web-mode-element-next) - ("M-" html-element-edit-elements-contract-over-border) - ("M-" html-element-edit-elements-expand-over-border) + ("M-" web-mode-edit-element-elements-contract-over-border) + ("M-" web-mode-edit-element-elements-expand-over-border) - ("C-M-" html-element-edit-elements-transpose-backward) + ("C-M-" web-mode-edit-element-elements-transpose-backward) ("C-M-" web-mode-element-transpose) ("C-" web-mode-element-beginning) @@ -57,32 +57,32 @@ ("C-S-" web-mode-element-parent) ("C-S-" web-mode-element-next) - ("M-" html-element-edit-elements-dissolve) - ("M-" html-element-edit-elements-raise) + ("M-" web-mode-edit-element-elements-dissolve) + ("M-" web-mode-edit-element-elements-raise) ("C-M-" web-mode-element-content-select) ("C-M-" web-mode-element-vanish) ("C-k" web-mode-element-kill) - ("C-S-k" html-element-edit-elements-kill-siblings) - ("M-k" html-element-edit-elements-kill-siblings-previous) - ("M-S-k" html-element-edit-elements-kill-siblings-next) + ("C-S-k" web-mode-edit-element-elements-kill-siblings) + ("M-k" web-mode-edit-element-elements-kill-siblings-previous) + ("M-S-k" web-mode-edit-element-elements-kill-siblings-next) ;; Attributes ("C-S-" web-mode-attribute-previous) ("C-S-" web-mode-attribute-next) - ("C-M-S-" html-element-edit-attributes-transpose-backward) + ("C-M-S-" web-mode-edit-element-attributes-transpose-backward) ("C-M-S-" web-mode-attribute-transpose) ("C-M-S-" web-mode-attribute-beginning) - ("C-M-S-" html-element-edit-attributes-end-inside) + ("C-M-S-" web-mode-edit-element-attributes-end-inside) ("C-M-S-k" web-mode-attribute-kill)))) (dolist (binding bindings) - (define-key html-element-edit-minor-mode-map + (define-key web-mode-edit-element-minor-mode-map (kbd (car binding)) (car (cdr binding)))) - (provide 'html-element-edit)) -;;; html-element-edit.el ends here + (provide 'web-mode-edit-element)) +;;; web-mode-edit-element.el ends here