Skip to content

Commit

Permalink
Restore lost handling of ^ after symbols
Browse files Browse the repository at this point in the history
[skip ci]
  • Loading branch information
PEZ committed Mar 7, 2020
1 parent 4a3c453 commit 8ce20b5
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,13 @@
Changes to Calva.

## [Unreleased]
- Fix so that Calva treats symbol containing the quote character correctly.

## [2.0.80] - 2020-03-07
- Fix so that Paredit treats symbols containing the quote character correctly.
- [Fix: Parameter hints popup should be off by default](https://github.com/BetterThanTomorrow/calva/issues/574)
- [Fix: `nil` followed by comma not highlighted correctly](https://github.com/BetterThanTomorrow/calva/issues/577)
- [Fix: The syntax highlightning fails with symbols named truesomething/falsesomething](https://github.com/BetterThanTomorrow/calva/issues/578)
- Fix so that Paredit does not consider `^` to be part of a symbol name.

## [2.0.79] - 2020-03-01
- Use scope `variable.other.constant` for keywords, making them highlight nicely
Expand Down
2 changes: 1 addition & 1 deletion src/cursor-doc/clojure-lexer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ toplevel.terminal(/(#[^\(\)\[\]\{\}"_@~\s,]+[\s,]*)*(['`~^]\s*)*(:[^()[\]\{\},~@
toplevel.terminal(/#[^\(\)\[\]\{\}"_@~\s,]+/, (_l, _m) => ({ type: "reader" }));

// symbols, about anything goes!
toplevel.terminal(/(['`~#^@]\s*)*([^_()[\]\{\}#,~@'`^\"\s:;][^()[\]\{\},~@`\"\s;]*)/, (l, m) => ({ type: "id" }))
toplevel.terminal(/(['`~#^@]\s*)*([^_()[\]\{\}#,~@'`^\"\s:;][^()[\]\{\},~@`^\"\s;]*)/, (l, m) => ({ type: "id" }))


toplevel.terminal(/./, (l, m) => ({ type: "junk" }))
Expand Down

0 comments on commit 8ce20b5

Please sign in to comment.