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

TokenClasses: don't use classifiers #3667

Merged
merged 1 commit into from
Oct 23, 2023
Merged

Conversation

kitbellew
Copy link
Collaborator

Scalameta is gradually phasing out macros, so let's stop using custom classifiers.

Also, let's switch to using standard scalameta token branches instead of custom ones defined within scalafmt:

  • Trivia -> Token.Trivia
  • Whitespace -> Token.Whitespace
  • Delim -> Token.Symbolic
  • Literal -> Token.Literal
  • rename Keyword as Reserved and represent it as Token.Keyword and false/true/null
  • remove Modifier since it's covered by Reserved and used only once, where Reserved applies already

Scalameta is gradually phasing out macros, so let's stop using custom
classifiers.

Also, let's switch to using standard scalameta token branches instead
of custom ones defined within scalafmt:
- Trivia -> Token.Trivia
- Whitespace -> Token.Whitespace
- Delim -> Token.Symbolic
- Literal -> Token.Literal
- rename Keyword as Reserved and represent it as Token.Keyword and
  false/true/null
- remove Modifier since it's covered by Reserved and used only once,
  where Reserved applies already
Copy link
Contributor

@tgodzik tgodzik left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@kitbellew kitbellew merged commit b103a89 into scalameta:master Oct 23, 2023
8 checks passed
@kitbellew kitbellew deleted the 3667 branch October 23, 2023 14: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