colonelpanic/dotfiles
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

actually use sub checkers in column number checker

Browse Source
This commit is contained in:
Ivan Malison 2015-11-21 04:58:26 -08:00
parent cc483ad8bd
commit 9367f2522d
1 changed files with 13 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
dotfiles/emacs.d/load.d/multi-line.el
View File

@ -92,19 +92,21 @@
((spacer :initarg :spacer :initform " "))) ((spacer :initarg :spacer :initform " ")))
(defmethod multi-line-respace ((respacer multi-line-never-newline) index markers) (defmethod multi-line-respace ((respacer multi-line-never-newline) index markers)
(when (equal index (- (length markers) 1))
(multi-line-clear-whitespace-at-point))
(when (not (or (equal 0 index) (when (not (or (equal 0 index)
(equal index (- (length markers) 1)))) (equal index (- (length markers) 1))))
(insert (oref respacer :spacer)))) (insert (oref respacer :spacer))))
(defclass multi-line-always-newline () (defclass multi-line-always-newline ()
((always-first :initarg :always-first :initform t) ((always-first :initarg :skip-first :initform nil)
(always-last :initarg :always-last :initform t))) (always-last :initarg :skip-last :initform nil)))
(defmethod multi-line-should-newline ((respacer multi-line-always-newline) (defmethod multi-line-should-newline ((respacer multi-line-always-newline)
index markers) index markers)
(let ((marker-length (length markers))) (let ((marker-length (length markers)))
(or (and (equal 0 index) (oref respacer :always-first)) (not (or (and (equal 0 index) (oref respacer :skip-first))
(and (equal index (- marker-length 1)) (oref respacer :always-last))))) (and (equal index (- marker-length 1)) (oref respacer :skip-last))))))
(defmethod multi-line-respace ((respacer multi-line-always-newline) index markers) (defmethod multi-line-respace ((respacer multi-line-always-newline) index markers)
(when (multi-line-should-newline respacer index markers) (when (multi-line-should-newline respacer index markers)
@ -128,8 +130,10 @@
(> (current-column) (oref respacer :newline-at))))))) (> (current-column) (oref respacer :newline-at)))))))
(defmethod multi-line-respace ((respacer multi-line-column-number) index markers) (defmethod multi-line-respace ((respacer multi-line-column-number) index markers)
(multi-line-respace
(if (multi-line-should-newline respacer index markers) (if (multi-line-should-newline respacer index markers)
(newline-and-indent) (insert " "))) (oref respacer :newline-respacer)
(oref respacer :default-respacer)) index markers))
(defun multi-line-get-markers (enter-strategy find-strategy) (defun multi-line-get-markers (enter-strategy find-strategy)
(multi-line-enter enter-strategy) (multi-line-enter enter-strategy)
@ -146,23 +150,6 @@
(backward-char) (backward-char)
(kill-region start (point)))) (kill-region start (point))))
(defun multi-line-clear-whitespace ()
(interactive)
(let ((markers (multi-line-get-markers multi-line-enter-strategy
multi-line-find-strategy)))
(cl-loop for marker in markers do
(goto-char (marker-position marker))
(multi-line-clear-whitespace-at-point))))
(defun multi-line-always-newline-and-indent ()
(interactive)
(let ((markers (multi-line-get-markers multi-line-enter-strategy
multi-line-find-strategy)))
(cl-loop for marker in markers do
(goto-char (marker-position marker))
(multi-line-clear-whitespace-at-point)
(newline-and-indent))))
(defun multi-line-adjust-whitespace (respacer) (defun multi-line-adjust-whitespace (respacer)
(let ((markers (multi-line-get-markers multi-line-enter-strategy (let ((markers (multi-line-get-markers multi-line-enter-strategy
multi-line-find-strategy))) multi-line-find-strategy)))
@ -171,6 +158,7 @@
(multi-line-clear-whitespace-at-point) (multi-line-clear-whitespace-at-point)
(multi-line-respace respacer i markers)))) (multi-line-respace respacer i markers))))
;;;###autoload
(defun multi-line-set-default-strategies () (defun multi-line-set-default-strategies ()
(interactive) (interactive)
(setq multi-line-find-strategy (setq multi-line-find-strategy
@ -182,15 +170,16 @@
multi-line-single-line-strategy multi-line-single-line-strategy
(make-instance multi-line-never-newline))) (make-instance multi-line-never-newline)))
;;;###autoload
(defun multi-line-multiline () (defun multi-line-multiline ()
(interactive) (interactive)
(multi-line-adjust-whitespace multi-line-multi-line-strategy)) (multi-line-adjust-whitespace multi-line-multi-line-strategy))
;;;###autoload
(defun multi-line-singleline () (defun multi-line-singleline ()
(interactive) (interactive)
(multi-line-adjust-whitespace multi-line-single-line-strategy)) (multi-line-adjust-whitespace multi-line-single-line-strategy))
(provide 'multi-line) (provide 'multi-line)
;; flycheck-disabled-checkers: (emacs-lisp-checkdoc) ;; flycheck-disabled-checkers: (emacs-lisp-checkdoc)
;;; multi-line.el ends here ;;; multi-line.el ends here