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

Scala3 increase/decrease indentation and keyword completion #572

Merged
merged 2 commits into from
Jun 17, 2021

Conversation

Giggiux
Copy link
Contributor

@Giggiux Giggiux commented May 24, 2021

This PR merges smarter/vscode-dotty-syntax's changes into metals, allowing for scala3's optional braces syntax support with auto increase and decrease in indentation and new keywords completion.

This is still a WIP, but it's fairly stable.

src/extension.ts Outdated Show resolved Hide resolved
src/extension.ts Outdated Show resolved Hide resolved
src/extension.ts Outdated Show resolved Hide resolved
src/extension.ts Outdated Show resolved Hide resolved
@Giggiux
Copy link
Contributor Author

Giggiux commented Jun 9, 2021

With the latest commits I've implemented the suggested changes, test are implemented, and Tests' CI integration was added.

@Giggiux Giggiux marked this pull request as ready for review June 9, 2021 15:44
src/indentPattern.ts Outdated Show resolved Hide resolved
src/test/suite/index.ts Outdated Show resolved Hide resolved
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.

Some minor comments, but great work! I would remove some test cases that are not a parseable Scala code.

src/indentPattern.ts Outdated Show resolved Hide resolved
src/test/indentPattern.test.ts Show resolved Hide resolved
src/test/indentPattern.test.ts Outdated Show resolved Hide resolved
src/test/indentPattern.test.ts Outdated Show resolved Hide resolved
src/test/indentPattern.test.ts Show resolved Hide resolved
src/test/indentPattern.test.ts Outdated Show resolved Hide resolved
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 from my side! @gabro anything typescript wise that we could be doing better here?

Copy link
Member

@gabro gabro left a comment

Choose a reason for hiding this comment

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

Nice work, just a couple of minor things

package.json Outdated Show resolved Hide resolved
package.json Outdated Show resolved Hide resolved
Copy link
Member

@gabro gabro left a comment

Choose a reason for hiding this comment

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

👍 LGTM, but @Giggiux I think you need to rebase to resolve the conflicts

Copy link
Member

@gabro gabro left a comment

Choose a reason for hiding this comment

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

👍 LGTM, but @Giggiux I think you need to rebase to resolve the conflicts

@gabro gabro merged commit 6e12afe into scalameta:main Jun 17, 2021
@Giggiux Giggiux deleted the scala3-indentation branch June 17, 2021 09:57
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

3 participants