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

Don't highlight vars with colons as keywords #670

Merged
merged 4 commits into from
Nov 24, 2023
Merged

Don't highlight vars with colons as keywords #670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
88f75d0
Don't highlight vars with colons as keywords
daveliepmann Nov 21, 2023
fc987b4
tests: colons in the middle of a var name
daveliepmann Nov 21, 2023
cc955fa
test: font-lock on namespaced var w/middle colons
daveliepmann Nov 21, 2023
bb1c624
test: font-lock on keywords w/middle colons
daveliepmann Nov 22, 2023
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
5 changes: 3 additions & 2 deletions clojure-mode.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1072,12 +1072,13 @@ any number of matches of `clojure--sym-forbidden-rest-chars'."))
;; keywords: {:oneword/ve/yCom|pLex.stu-ff 0}
(,(concat "\\(:\\{1,2\\}\\)\\(" clojure--keyword-sym-regexp "?\\)\\(/\\)"
"\\(" clojure--keyword-sym-regexp "\\)")
;; with ns
(1 'clojure-keyword-face)
(2 font-lock-type-face)
;; (2 'clojure-keyword-face)
(3 'default)
(4 'clojure-keyword-face))
(,(concat "\\(:\\{1,2\\}\\)\\(" clojure--keyword-sym-regexp "\\)")
(,(concat "\\<\\(:\\{1,2\\}\\)\\(" clojure--keyword-sym-regexp "\\)")
;; without ns
(1 'clojure-keyword-face)
(2 'clojure-keyword-face))

Expand Down
25 changes: 24 additions & 1 deletion test/clojure-mode-font-lock-test.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,13 @@ DESCRIPTION is the description of the spec."
(9 10 nil)
(11 16 nil))

("(colons:are:okay)"
(2 16 nil))

("(some-ns/colons:are:okay)"
(2 8 font-lock-type-face)
(9 24 nil))

("(oneword/ve/yCom|pLex.stu-ff)"
(2 8 font-lock-type-face)
(9 10 nil)
Expand Down Expand Up @@ -715,6 +722,19 @@ DESCRIPTION is the description of the spec."
(10 10 default)
(11 30 clojure-keyword-face)))

(when-fontifying-it "should handle keywords with colons"
(":a:a"
(1 4 clojure-keyword-face))

(":a:a/:a"
(1 7 clojure-keyword-face))

("::a:a"
(1 5 clojure-keyword-face))

("::a.a:a"
(1 7 clojure-keyword-face)))

(when-fontifying-it "should handle very complex keywords"
(" :ve/yCom|pLex.stu-ff"
(3 4 font-lock-type-face)
Expand Down Expand Up @@ -824,7 +844,10 @@ DESCRIPTION is the description of the spec."
(when-fontifying-it "should handle variables defined with def"
("(def foo 10)"
(2 4 font-lock-keyword-face)
(6 8 font-lock-variable-name-face)))
(6 8 font-lock-variable-name-face))
("(def foo:bar 10)"
(2 4 font-lock-keyword-face)
(6 12 font-lock-variable-name-face)))

(when-fontifying-it "should handle variables definitions of type string"
("(def foo \"hello\")"
Expand Down