Skip to content

Commit ee50826

Browse files
committed
Fix tests broken by the / font-lock
1 parent c06278d commit ee50826

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

Diff for: test/clojure-mode-font-lock-test.el

+10-8
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,12 @@ POS."
117117
:tags '(fontification syntax-table)
118118
(should (equal (clojure-test-face-at 2 2 "{:alias/some 20}") '(clojure-keyword-face)))
119119
(should (equal (clojure-test-face-at 3 7 "{:alias/some 20}") '(font-lock-type-face clojure-keyword-face)))
120-
(should (equal (clojure-test-face-at 8 12 "{:alias/some 20}") '(clojure-keyword-face)))
120+
(should (equal (clojure-test-face-at 8 8 "{:alias/some 20}") '(default clojure-keyword-face)))
121+
(should (equal (clojure-test-face-at 9 12 "{:alias/some 20}") '(clojure-keyword-face)))
121122
(should (equal (clojure-test-face-at 2 2 "{:a.ias/some 20}") '(clojure-keyword-face)))
122123
(should (equal (clojure-test-face-at 3 7 "{:a.ias/some 20}") '(font-lock-type-face clojure-keyword-face)))
123-
(should (equal (clojure-test-face-at 8 12 "{:a.ias/some 20}") '(clojure-keyword-face))))
124+
(should (equal (clojure-test-face-at 8 8 "{:a.ias/some 20}") '(default clojure-keyword-face)))
125+
(should (equal (clojure-test-face-at 9 12 "{:a.ias/some 20}") '(clojure-keyword-face))))
124126

125127
(ert-deftest clojure-mode-syntax-table/type ()
126128
:tags '(fontification syntax-table)
@@ -148,23 +150,23 @@ POS."
148150
(ert-deftest clojure-mode-syntax-table/namespaced-symbol ()
149151
:tags '(fontification syntax-table)
150152
(clojure-test-with-temp-buffer "clo.core/something"
151-
(should (eq (clojure-test-face-at 9 9) nil))
153+
(should (eq (clojure-test-face-at 9 9) 'default))
152154
(should (eq (clojure-test-face-at 1 8) 'font-lock-type-face))
153155
(should (eq (clojure-test-face-at 10 18) nil))))
154156

155157
(ert-deftest clojure-mode-syntax-table/static-method ()
156158
:tags '(fontification syntax-table)
157159
(clojure-test-with-temp-buffer "Class/methodName"
158160
(should (eq (clojure-test-face-at 1 5) 'font-lock-type-face))
159-
(should (eq (clojure-test-face-at 6 6) nil))
161+
(should (eq (clojure-test-face-at 6 6) 'default))
160162
(should (eq (clojure-test-face-at 7 16) 'clojure-interop-method-face)))
161163
(clojure-test-with-temp-buffer "SomeClass/methodName"
162164
(should (eq (clojure-test-face-at 1 9) 'font-lock-type-face))
163-
(should (eq (clojure-test-face-at 10 10) nil))
165+
(should (eq (clojure-test-face-at 10 10) 'default))
164166
(should (eq (clojure-test-face-at 11 20) 'clojure-interop-method-face)))
165167
(clojure-test-with-temp-buffer "clojure.lang.Var/someMethod"
166168
(should (eq (clojure-test-face-at 1 16) 'font-lock-type-face))
167-
(should (eq (clojure-test-face-at 17 17) nil))
169+
(should (eq (clojure-test-face-at 17 17) 'default))
168170
(should (eq (clojure-test-face-at 18 27) 'clojure-interop-method-face))))
169171

170172
(ert-deftest clojure-mode-syntax-table/interop-method ()
@@ -182,15 +184,15 @@ POS."
182184
(ert-deftest clojure-mode-syntax-table/class-constant ()
183185
:tags '(fontification syntax-table)
184186
(clojure-test-with-temp-buffer "Class/CONST_NAME"
185-
(should (eq (clojure-test-face-at 6 6) nil))
187+
(should (eq (clojure-test-face-at 6 6) 'default))
186188
(should (eq (clojure-test-face-at 1 5) 'font-lock-type-face))
187189
(should (eq (clojure-test-face-at 7 16) 'font-lock-constant-face))))
188190

189191
(ert-deftest clojure-mode-syntax-table/namespaced-def ()
190192
:tags '(fontification syntax-table)
191193
(clojure-test-with-temp-buffer "(clo/defbar foo nil)"
192194
(should (eq (clojure-test-face-at 2 4) 'font-lock-type-face))
193-
(should (eq (clojure-test-face-at 5 5) nil))
195+
(should (eq (clojure-test-face-at 5 5) 'default))
194196
(should (eq (clojure-test-face-at 6 11) 'font-lock-keyword-face))
195197
(should (eq (clojure-test-face-at 13 15) 'font-lock-function-name-face))))
196198

0 commit comments

Comments
 (0)