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

Fix: Lexing regex literal tokenisation #464

Merged
merged 2 commits into from
Nov 12, 2019
Merged

Fix: Lexing regex literal tokenisation #464

merged 2 commits into from
Nov 12, 2019

Conversation

PEZ
Copy link
Collaborator

@PEZ PEZ commented Nov 11, 2019

What has Changed?

This fixes issue #463 by including an optional # in front of a string literal which gets regex literals tokenised as strings.

I think that regex literals should probably be tokenised to regex literals instead, but that is a bigger change, and this tiny change seems to fix the actual issue for the user. I propose we put the proper fix on the todo-list.

Please look at the tiny code change and help think about potential side effects, and help test that the change doesn't break things.

My Calva PR Checklist

I have:

  • Read How to Contribute.
  • Made sure I am directing this pull request at the dev branch. (Or have specific reasons to target some other branch.)
  • Made sure I am changed the default PR base branch, so that it is not master. (Sorry for the nagging.)
  • Tested the VSIX built from the PR (well, if this is a PR that changes the source code.) 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. (For now you'll need to opt in to the CircleCI New Experience UI to see the Artifacts tab, because bug.)
    • 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.
  • Created the issue I am fixing/addressing, if it was not present.
  • Updated the [Unreleased] entry in CHANGELOG.md, linking the issue(s) that the PR is addressing.

The Calva Team PR Checklist:

Before merging we (at least one of us) have:

  • Made sure the PR is directed at the dev branch (unless reasons).
  • Read the source changes.
  • Given feedback and guidance on source changes, if needed. (Please consider noting extra nice stuff as well.)
  • Tested the VSIX built from the PR (well, if this is a PR that changes the source code.)
    • Tested the particular change
    • Figured if the change might have some side effects and tested those as well.
    • Smoke tested the extension as such.
  • If need be, had a chat within the team about particular changes.

Ping @PEZ, @kstehn, @cfehse

@cfehse
Copy link
Contributor

cfehse commented Nov 12, 2019

@PEZ

I don't see problems with the changed regex.

@PEZ PEZ merged commit 0d1784d into dev Nov 12, 2019
@PEZ PEZ deleted the fix/lexing-regex branch November 12, 2019 19:45
@PEZ PEZ mentioned this pull request Nov 12, 2019
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