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

(scala) Add do and then keywords #3323

Merged

Conversation

nicolasstucki
Copy link
Contributor

Changes

Add then and do as keywords. These keywords are also keywords in Scala 2. then was reserved but not used as a keyword. do was part of do .. while keyword combination.

See https://github.com/scala/vscode-scala-syntax/blob/57e0829cd46980699570101a68c320a20330d36c/src/typescript/Scala.tmLanguage.ts#L595

Checklist

  • Added markup tests, or they don't apply here because...
  • Updated the changelog at CHANGES.md

Add `then` and `do` as keywords. These keywords are also keywords in Scala 2. `then` was reserved but not used as a keyword. `do` was part of `do .. while` keyword combination.

See https://github.com/scala/vscode-scala-syntax/blob/57e0829cd46980699570101a68c320a20330d36c/src/typescript/Scala.tmLanguage.ts#L595
@nicolasstucki nicolasstucki marked this pull request as ready for review September 3, 2021 16:01
@joshgoebel joshgoebel changed the title Add missing Scala 3 keywords (scala) Add do and then keywords Sep 3, 2021
@joshgoebel joshgoebel merged commit 29afe48 into highlightjs:main Sep 3, 2021
@joshgoebel
Copy link
Member

@nicolasstucki Thanks so very much!

@nicolasstucki nicolasstucki deleted the add-missing-scala3-keywords branch September 3, 2021 18:27
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.

None yet

2 participants