Skip to content

Perf #5

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

Merged
Deraen merged 11 commits into from
Feb 24, 2021
Merged

Perf #5

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
262a75c
Merge nine clojureCharacter patterns into one
guns Feb 9, 2017
7a2abd5
Remove correct radix literal matching for better performance
guns Feb 9, 2017
4d05e76
Add %, &, and | to iskeyword
guns Feb 9, 2017
bb34f72
Fix error in clojureRegexpBackRef match
guns Feb 9, 2017
3b5db3f
Use a limit in the negative lookbehind clojureSymbol pattern
guns Feb 10, 2017
4d155eb
Fix file creation problem in defsyntaxtest
guns Feb 10, 2017
4ed031c
Limit negative lookbehind in clojureKeyword
guns Feb 12, 2017
78ef023
Merge four clojureNumber patterns into one
guns Feb 12, 2017
5824456
Merge more syntax matches
guns Feb 12, 2017
d46626d
Fix regression in clojureCharacter match
guns Feb 12, 2017
d5f1eee
Merge remote-tracking branch 'guns/issue-77' into perf
Deraen Dec 29, 2020
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
Prev Previous commit
Next Next commit
Limit negative lookbehind in clojureKeyword
  • Loading branch information
@guns
guns committed Feb 12, 2017
commit 4ed031c038712cb70c6d9f11ccad438000854623
40 changes: 19 additions & 21 deletions clj/test/vim_clojure_static/syntax_test.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,27 +104,25 @@

(comment (test #'test-character-literals))

;; TODO: Finish me! (this was in an old git stash)
;; (defsyntaxtest keywords-test
;; (with-format "%s"
;; ":1" kw
;; ":A" kw
;; ":a" kw
;; ":αβγ" kw
;; "::a" kw
;; ":a/b" kw
;; ":a:b" kw
;; ":a:b/:c:b" kw
;; ":a/b/c/d" kw
;; "::a/b" !kw
;; "::" !kw
;; ":a:" !kw
;; ":a/" !kw
;; ":/" !kw
;; ":" !kw
;; ))
;;
;; (comment (test #'keywords-test))
(defsyntaxtest keywords-test
["%s"
[":1" kw
":A" kw
":a" kw
":αβγ" kw
"::a" kw
":a/b" kw
":a:b" kw
":a:b/:c:b" kw
":a/b/c/d" kw
"::a/b" kw
"::" !kw
":a:" !kw
":a/" !kw
; ":/" !kw ; This is legal, but for simplicity we do not match it
":" !kw]])

(comment (test #'keywords-test))

(defsyntaxtest test-java-regexp-literals
["#\"%s\""
Expand Down
2 changes: 1 addition & 1 deletion syntax/clojure.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ delfunction s:syntax_keyword
" * Must not end in a : or /
" * Must not have two adjacent colons except at the beginning
" * Must not contain any reader metacharacters except for ' and #
syntax match clojureKeyword "\v<:{1,2}%([^ \n\r\t()\[\]{}";@^`~\\%/]+/)*[^ \n\r\t()\[\]{}";@^`~\\%/]+:@<!>"
syntax match clojureKeyword "\v<:{1,2}%([^ \n\r\t()\[\]{}";@^`~\\%/]+/)*[^ \n\r\t()\[\]{}";@^`~\\%/]+:@1<!>"

syntax match clojureStringEscape "\v\\%([\\btnfr"]|u\x{4}|[0-3]\o{2}|\o{1,2})" contained

Expand Down