From e516ffff934e441b79d14085a7452bd18e66f19a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Ebbinghaus?= Date: Mon, 8 Nov 2021 18:51:33 +0100 Subject: [PATCH 1/2] Remove faulty highlighting for clojure --- src/languages/clojure.js | 1 - test/markup/clojure/comment-macro.expect.txt | 2 ++ test/markup/clojure/comment-macro.txt | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 test/markup/clojure/comment-macro.expect.txt create mode 100644 test/markup/clojure/comment-macro.txt diff --git a/src/languages/clojure.js b/src/languages/clojure.js index c34d0527a6..34c9ff18af 100644 --- a/src/languages/clojure.js +++ b/src/languages/clojure.js @@ -132,7 +132,6 @@ export default function(hljs) { }; LIST.contains = [ - hljs.COMMENT('comment', ''), GLOBAL, NAME, BODY diff --git a/test/markup/clojure/comment-macro.expect.txt b/test/markup/clojure/comment-macro.expect.txt new file mode 100644 index 0000000000..55260ddbb3 --- /dev/null +++ b/test/markup/clojure/comment-macro.expect.txt @@ -0,0 +1,2 @@ +(comment "comment is a macro that emits no code. It can contain clojure code in itself.") +(comment-and-something "This is a valid function name") \ No newline at end of file diff --git a/test/markup/clojure/comment-macro.txt b/test/markup/clojure/comment-macro.txt new file mode 100644 index 0000000000..8ebcefc043 --- /dev/null +++ b/test/markup/clojure/comment-macro.txt @@ -0,0 +1,2 @@ +(comment "comment is a macro that emits no code. It can contain clojure code in itself.") +(comment-and-something "This is a valid function name") \ No newline at end of file From 31a9843d262ff1566c7a9a2ced121b5c33e23c2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Ebbinghaus?= Date: Mon, 8 Nov 2021 21:35:05 +0100 Subject: [PATCH 2/2] Add clojure comment fix to CHANGES.md --- CHANGES.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index 5f77890137..b43a548aee 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -5,9 +5,11 @@ Grammars: - fix(python) Fix recognition of numeric literals followed by keywords without whitespace (#2985) [Richard Gibson][] - enh(swift) add SE-0290 unavailability condition (#3382) [Bradley Mackey][] - enh(java) add `sealed` and `non-sealed` keywords (#3386) [Bradley Mackey][] +- fix(clojure) `comment` macro catches more than it should [Björn Ebbinghaus][] [Richard Gibson]: https://github.com/gibson042 [Bradley Mackey]: https://github.com/bradleymackey +[Björn Ebbinghaus]: https://github.com/MrEbbinghaus ## Version 11.3.1