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.

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

Add better number matching #1435

Merged
merged 3 commits into from
Dec 13, 2021
Merged

Add better number matching #1435

merged 3 commits into from
Dec 13, 2021

Conversation

MrEbbinghaus
Copy link
Contributor

@MrEbbinghaus MrEbbinghaus commented Dec 13, 2021

What has Changed?

Currently, there are some numbers that are highlighted wrong by calva:
image

  1. Add symbolic values for +/- infinity and "Not a Number"
  2. The decimal separator . is optional when followed by e, E, M
  3. "Arbitrary" radix is constraint to 2-36 (digit 0-9 & a-z). Also, \w also matches _ which is incorrect.
    • One could argue, that mismatching radix/value (e.g. 2rABZ) shouldn't be matched either, but I considered it overkill.
  • I merged constant.numeric.bigint.clojure into constant.numeric.long.clojure as it doesn't make sense any more to have it separate.
  • I also merged constant.numeric.bigdecimal.clojure into constant.numeric.double.clojure for consistency.

After:
image

Fixes #1378

My Calva PR Checklist

I have:

  • Read How to Contribute.
  • Directed this pull request at the dev branch. (Or have specific reasons to target some other branch.)
  • Made sure I have changed the PR base branch, so that it is not published. (Sorry for the nagging.)
  • Updated the [Unreleased] entry in CHANGELOG.md, linking the issue(s) that the PR is addressing.
  • Figured if anything about the fix warrants tests on Mac/Linux/Windows/Remote/Whatever, and either tested it there if so, or mentioned it in the PR.
  • Added to or updated docs in this branch, if appropriate
  • Added tests for the changes
  • Tested the VSIX built from the PR (so, after you've submitted the PR). You'll find the artifacts by clicking Show all checks in the CI section of the PR page, and then Details on the ci/circleci: build test.
    • Tested the particular change
    • Figured if the change might have some side effects and tested those as well.
    • Smoke tested the extension as such.
  • Referenced the issue I am fixing/addressing in a commit message for the pull request.
    • If I am fixing the issue, I have used GitHub's fixes/closes syntax
    • If I am fixing just part of the issue, I have just referenced it w/o any of the "fixes” keywords.
  • Created the issue I am fixing/addressing, if it was not present.

Ping @PEZ, @bpringe

@MrEbbinghaus MrEbbinghaus marked this pull request as ready for review December 13, 2021 17:14
@PEZ
Copy link
Collaborator

PEZ commented Dec 13, 2021

Thanks!

@PEZ PEZ merged commit dd442a8 into BetterThanTomorrow:dev Dec 13, 2021
@MrEbbinghaus MrEbbinghaus deleted the issue-1378 branch December 13, 2021 17:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants