Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ignore blacklisted delimiters altogether. #1

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Ignore blacklisted delimiters altogether. #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
042c683
Ignore blacklisted delimiters altogether.
Fanael Oct 27, 2014
4ff1107
Properly handle cleaning up the 'category' property.
Fanael Oct 28, 2014
a8d45be
Extract duplicate code into a function.
Fanael Oct 28, 2014
7da46ea
Redesign the way character eligibility is determined.
Fanael Oct 28, 2014
0ded4fb
Update the test suite to reflect the new intended behavior.
Fanael Oct 28, 2014
e2b3c02
Don't test for escaped delimiters in rainbow-delimiters--face-propert…
Fanael Oct 29, 2014
272cc8f
Remove redundant test.
Fanael Oct 29, 2014
18b9410
Add a test checking if syntax table entries as properties work.
Fanael Oct 29, 2014
53d8eb0
Test if syntax table properties are ignored when the delim is blackli…
Fanael Oct 29, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 45 additions & 18 deletions rainbow-delimiters-test.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,16 @@
(fontify-buffer)
(buffer-string)))

(defun buffer-string-without-uninteresting-properties ()
(remove-list-of-text-properties
(point-min) (point-max) '(category c-type syntax-table))
(buffer-string))

(defun should-do-nothing (mode str)
(with-temp-buffer-in-mode mode
(with-string (str str)
(should (ert-equal-including-properties
(buffer-string)
(buffer-string-without-uninteresting-properties)
(fontify-without-rainbow-delimiters mode str))))))

(ert-deftest can-enable-mode ()
Expand All @@ -95,7 +100,7 @@
(with-temp-buffer-in-mode 'text-mode
(with-string (str ,(format "%cfoo%c" opening closing))
(should (ert-equal-including-properties
(buffer-string)
(buffer-string-without-uninteresting-properties)
(progn
(add-text-properties 0 1 '(face (rainbow-delimiters-depth-1-face)) str)
(add-text-properties 4 5 '(face (rainbow-delimiters-depth-1-face)) str)
Expand All @@ -110,7 +115,7 @@
(with-temp-buffer-in-mode 'text-mode
(with-string (str ,(format "%sfoo%s" (make-string 4 opening) (make-string 4 closing)))
(should (ert-equal-including-properties
(buffer-string)
(buffer-string-without-uninteresting-properties)
(progn
(add-text-properties 0 1 '(face (rainbow-delimiters-depth-1-face)) str)
(add-text-properties 1 2 '(face (rainbow-delimiters-depth-2-face)) str)
Expand All @@ -130,7 +135,7 @@
(with-temp-buffer-in-mode 'text-mode
(with-string (str "([{(foo)}])")
(should (ert-equal-including-properties
(buffer-string)
(buffer-string-without-uninteresting-properties)
#("([{(foo)}])"
0 1 (face (rainbow-delimiters-depth-1-face))
1 2 (face (rainbow-delimiters-depth-2-face))
Expand All @@ -145,10 +150,7 @@
(with-temp-buffer-in-mode 'c++-mode
(with-string (str "foo<int> x;")
(should (ert-equal-including-properties
(progn
(remove-list-of-text-properties
(point-min) (point-max) '(category c-type syntax-table))
(buffer-string))
(buffer-string-without-uninteresting-properties)
#("foo<int> x;"
0 3 (face font-lock-type-face)
3 4 (face (rainbow-delimiters-depth-1-face))
Expand All @@ -175,15 +177,15 @@
(with-temp-buffer-in-mode 'emacs-lisp-mode
(with-string (str ")")
(should (ert-equal-including-properties
(buffer-string)
(buffer-string-without-uninteresting-properties)
#(")"
0 1 (face (rainbow-delimiters-unmatched-face))))))))

(ert-deftest highlights-mismatched ()
(with-temp-buffer-in-mode 'emacs-lisp-mode
(with-string (str "(]")
(should (ert-equal-including-properties
(buffer-string)
(buffer-string-without-uninteresting-properties)
#("(]"
0 1 (face (rainbow-delimiters-depth-1-face))
1 2 (face (rainbow-delimiters-mismatched-face))))))))
Expand All @@ -196,7 +198,7 @@
(with-temp-buffer-in-mode 'emacs-lisp-mode
(with-string (str "(bar ?\\( ?( (foo?))")
(should (ert-equal-including-properties
(buffer-string)
(buffer-string-without-uninteresting-properties)
#("(bar ?\\( ?( (foo?))"
0 1
(face (rainbow-delimiters-depth-1-face))
Expand All @@ -212,7 +214,7 @@
(with-temp-buffer-in-mode 'text-mode
(with-string (str "(((())))")
(should (ert-equal-including-properties
(buffer-string)
(buffer-string-without-uninteresting-properties)
#("(((())))"
0 1 (face (rainbow-delimiters-depth-1-face))
1 2 (face (rainbow-delimiters-depth-2-face))
Expand All @@ -229,7 +231,7 @@
(with-temp-buffer-in-mode 'text-mode
(with-string (str "(((())))")
(should (ert-equal-including-properties
(buffer-string)
(buffer-string-without-uninteresting-properties)
#("(((())))"
0 1 (face (rainbow-delimiters-depth-1-face))
1 2 (face (rainbow-delimiters-depth-2-face))
Expand All @@ -244,23 +246,48 @@
(with-temp-buffer-in-mode 'diff-mode
(with-string (str "+ foo ()\n")
(should (ert-equal-including-properties
(buffer-string)
(buffer-string-without-uninteresting-properties)
#("+ foo ()\n"
0 1 (face diff-indicator-added)
1 6 (face diff-added)
6 7 (face (rainbow-delimiters-depth-1-face diff-added))
7 8 (face (rainbow-delimiters-depth-1-face diff-added))
8 9 (face diff-added)))))))

(ert-deftest blacklisted-contribute-to-depth ()
(ert-deftest blacklisted-dont-contribute-to-depth ()
(let ((rainbow-delimiters-delimiter-blacklist '(?\( ?\))))
(with-temp-buffer-in-mode 'text-mode
(with-string (str "([])")
(should (ert-equal-including-properties
(buffer-string)
(buffer-string-without-uninteresting-properties)
#("([])"
1 2 (face (rainbow-delimiters-depth-2-face))
2 3 (face (rainbow-delimiters-depth-2-face)))))))))
1 2 (face (rainbow-delimiters-depth-1-face))
2 3 (face (rainbow-delimiters-depth-1-face)))))))))

(ert-deftest syntax-table-entries-as-properties-work ()
(with-temp-buffer-in-mode 'emacs-lisp-mode
(with-string (str #("(ab)"
1 2 (syntax-table (4 . ?b))
2 3 (syntax-table (5 . ?a)))))
(should (ert-equal-including-properties
(buffer-string-without-uninteresting-properties)
#("(ab)"
0 1 (face (rainbow-delimiters-depth-1-face))
1 2 (face (rainbow-delimiters-depth-2-face))
2 3 (face (rainbow-delimiters-depth-2-face))
3 4 (face (rainbow-delimiters-depth-1-face)))))))

(ert-deftest syntax-table-entries-dont-work-when-blacklisted ()
(let ((rainbow-delimiters-delimiter-blacklist '(?a ?b)))
(with-temp-buffer-in-mode 'emacs-lisp-mode
(with-string (str #("(ab)"
1 2 (syntax-table (4 . ?b))
2 3 (syntax-table (5 . ?a))))
(should (ert-equal-including-properties
(buffer-string-without-uninteresting-properties)
#("(ab)"
0 1 (face (rainbow-delimiters-depth-1-face))
3 4 (face (rainbow-delimiters-depth-1-face)))))))))

(provide 'rainbow-delimiters-test)
;;; rainbow-delimiters-test.el ends here
Loading