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

Jump to bottom

Scala 3 optional braces and smaller related features #2104

Merged

kpbochenek merged 30 commits into scalameta:master from kpbochenek:significant-indent

Oct 1, 2020

Collaborator

kpbochenek commented Jul 28, 2020 •

edited

Changes:

significant indentation
new control syntax
fix open soft kw being treated too much as Keyword
question placeholder instead of underscore
~~derives soft keyword~~
adaptation to the new extension methods syntax

EDIT: Reverted derives implementation as @tgodzik requested to avoid breaking compatibility in this PR.

In dotty there is an ongoing migration x: List[_ <: Factory] into x: List[? <: Factory]. Right now both are supported but first one is deprecated and will be removed in future releases. Parsing this is okay, but for now printing it always generates recommended version. Not sure if this is important to print old version if it was parsed?

kpbochenek and others added 5 commits

July 15, 2020 18:57


          Merge pull request scalameta#2090 from kpbochenek/dotty-v2

165180b

Dotty partial support V2


          Significant indentation and new control syntax

5efb517


          Significant indentation v2

5f2b956


          Significant indentation v2

a394ec5


          Merge remote-tracking branch 'upstream/master' into significant-indent

0a32052

kpbochenek requested a review from tgodzik

July 28, 2020 07:31


          Prepare for review

a6aea13

kpbochenek force-pushed the significant-indent branch 4 times, most recently from 5480a6d to 66253d5 Compare

July 28, 2020 09:44


          scalafix

32e40ca

kpbochenek force-pushed the significant-indent branch from 66253d5 to 32e40ca Compare

July 28, 2020 10:03

kitbellew reviewed

View reviewed changes

Contributor

kitbellew left a comment

nb: not a complete review, just some random observations.

scalameta/parsers/shared/src/main/scala/scala/meta/internal/parsers/ScalametaParser.scala Outdated Show resolved Hide resolved

scalameta/parsers/shared/src/main/scala/scala/meta/internal/parsers/ScalametaParser.scala Outdated Show resolved Hide resolved

scalameta/parsers/shared/src/main/scala/scala/meta/internal/parsers/ScalametaParser.scala Outdated Show resolved Hide resolved

scalameta/parsers/shared/src/main/scala/scala/meta/internal/parsers/ScalametaParser.scala Outdated Show resolved Hide resolved

scalameta/parsers/shared/src/main/scala/scala/meta/internal/parsers/ScalametaParser.scala Outdated Show resolved Hide resolved

scalameta/parsers/shared/src/main/scala/scala/meta/internal/parsers/ScalametaParser.scala Outdated Show resolved Hide resolved

kpbochenek force-pushed the significant-indent branch from 582bbe6 to 3212dce Compare

July 29, 2020 13:09

tgodzik reviewed

View reviewed changes

scalameta/trees/shared/src/main/scala/scala/meta/Trees.scala Outdated Show resolved Hide resolved

kpbochenek force-pushed the significant-indent branch from 3212dce to 6b12cda Compare

July 30, 2020 17:54


          Review changes

eb83c96

kpbochenek force-pushed the significant-indent branch from 6b12cda to eb83c96 Compare

July 31, 2020 07:30


          Revert derives implementation

391936e

kpbochenek force-pushed the significant-indent branch from 50f86a0 to 391936e Compare

August 3, 2020 08:26

tgodzik requested changes

View reviewed changes

Collaborator

tgodzik left a comment

Thanks for the great work! I do have some questions, which we can go over together.

tests/shared/src/test/scala/scala/meta/tests/parsers/dotty/EndMarkerSuite.scala Show resolved Hide resolved

tests/shared/src/test/scala/scala/meta/tests/parsers/dotty/ControlSyntaxSuite.scala Show resolved Hide resolved

scalameta/parsers/shared/src/main/scala/scala/meta/internal/parsers/ScalametaParser.scala Outdated Show resolved Hide resolved

scalameta/parsers/shared/src/main/scala/scala/meta/internal/parsers/ScalametaParser.scala Outdated Show resolved Hide resolved

scalameta/parsers/shared/src/main/scala/scala/meta/internal/parsers/ScalametaParser.scala Outdated Show resolved Hide resolved

scalameta/parsers/shared/src/main/scala/scala/meta/internal/parsers/ScalametaParser.scala Outdated Show resolved Hide resolved

scalameta/parsers/shared/src/main/scala/scala/meta/internal/parsers/ScalametaParser.scala Outdated Show resolved Hide resolved

scalameta/parsers/shared/src/main/scala/scala/meta/internal/parsers/ScalametaParser.scala Outdated Show resolved Hide resolved

scalameta/parsers/shared/src/main/scala/scala/meta/internal/parsers/ScalametaParser.scala Outdated Show resolved Hide resolved

scalameta/parsers/shared/src/main/scala/scala/meta/internal/parsers/ScalametaParser.scala Outdated Show resolved Hide resolved

kpbochenek force-pushed the significant-indent branch from b5fbeb0 to 5a0b398 Compare

August 21, 2020 09:25

kpbochenek requested a review from tgodzik

August 21, 2020 09:52


          Fixes after review

701ec27

kpbochenek force-pushed the significant-indent branch 5 times, most recently from 4262ffd to 0cfd0ae Compare

August 24, 2020 08:40

kpbochenek added 2 commits

September 22, 2020 19:44


          Final version of parsing indentation

2f2df94


          Additional work

44a6977

tgodzik requested changes

View reviewed changes

Collaborator

tgodzik left a comment

Went over the changes once again and I think we can almost merge, but I still have some comments and questions.

dottytest/src/test/scala/ParseDottySuite.scala Outdated Show resolved Hide resolved

dottytest/src/test/scala/ParseDottySuite.scala Outdated Show resolved Hide resolved

scalameta/parsers/shared/src/main/scala/scala/meta/internal/parsers/ScalametaParser.scala Outdated Show resolved Hide resolved

scalameta/parsers/shared/src/main/scala/scala/meta/internal/parsers/ScalametaParser.scala Outdated Show resolved Hide resolved

scalameta/parsers/shared/src/main/scala/scala/meta/internal/parsers/ScalametaParser.scala Outdated Show resolved Hide resolved

scalameta/parsers/shared/src/main/scala/scala/meta/internal/parsers/ScalametaParser.scala Show resolved Hide resolved

scalameta/parsers/shared/src/main/scala/scala/meta/internal/parsers/ScalametaParser.scala Outdated Show resolved Hide resolved

scalameta/parsers/shared/src/main/scala/scala/meta/internal/parsers/ScalametaParser.scala Outdated Show resolved Hide resolved

tests/shared/src/test/scala/scala/meta/tests/parsers/dotty/ControlSyntaxSuite.scala Show resolved Hide resolved

tests/shared/src/test/scala/scala/meta/tests/parsers/dotty/SignificantIndentationSuite.scala Outdated Show resolved Hide resolved

tgodzik reviewed

View reviewed changes

dottytest/src/test/scala/ParseDottySuite.scala Outdated Show resolved Hide resolved

tgodzik reviewed

View reviewed changes

dottytest/src/test/scala/ParseDottySuite.scala Outdated Show resolved Hide resolved

scalameta/parsers/shared/src/main/scala/scala/meta/internal/parsers/ScalametaParser.scala Outdated Show resolved Hide resolved

scalameta/parsers/shared/src/main/scala/scala/meta/internal/parsers/ScalametaParser.scala Outdated Show resolved Hide resolved

kpbochenek force-pushed the significant-indent branch from 75275b7 to 8ff9b74 Compare

September 24, 2020 12:40

kpbochenek commented

View reviewed changes

prep-dotty.sh Outdated Show resolved Hide resolved

kpbochenek force-pushed the significant-indent branch from 8ff9b74 to 6908fc2 Compare

September 24, 2020 13:03

kpbochenek added 2 commits

September 24, 2020 15:42


          Cleanup

27baa1c


          Cleanup v2

f89d1b4

kpbochenek force-pushed the significant-indent branch from 6908fc2 to f89d1b4 Compare

September 24, 2020 14:08


          Fix tests

75607ab

kpbochenek force-pushed the significant-indent branch from 5089b8f to 75607ab Compare

September 24, 2020 15:12

kpbochenek requested a review from tgodzik

September 24, 2020 23:57

tgodzik reviewed

View reviewed changes

dottytest/src/test/scala/ParseDottySuite.scala Outdated Show resolved Hide resolved

dottytest/src/test/scala/ParseDottySuite.scala Outdated Show resolved Hide resolved

dottytest/src/test/scala/ParseDottySuite.scala Outdated Show resolved Hide resolved

build.sbt Outdated Show resolved Hide resolved

prep-dotty.sh Outdated Show resolved Hide resolved

scalameta/parsers/shared/src/main/scala/scala/meta/internal/parsers/ScalametaParser.scala Outdated Show resolved Hide resolved

scalameta/parsers/shared/src/main/scala/scala/meta/internal/parsers/ScalametaParser.scala Outdated Show resolved Hide resolved

scalameta/parsers/shared/src/main/scala/scala/meta/internal/parsers/ScalametaParser.scala Outdated Show resolved Hide resolved

scalameta/parsers/shared/src/main/scala/scala/meta/internal/parsers/ScalametaParser.scala Outdated Show resolved Hide resolved

scalameta/parsers/shared/src/main/scala/scala/meta/internal/parsers/ScalametaParser.scala Outdated Show resolved Hide resolved

tgodzik requested changes

View reviewed changes

scalameta/parsers/shared/src/main/scala/scala/meta/internal/parsers/ScalametaParser.scala Outdated Show resolved Hide resolved

scalameta/parsers/shared/src/main/scala/scala/meta/internal/parsers/ScalametaParser.scala Show resolved Hide resolved

scalameta/parsers/shared/src/main/scala/scala/meta/internal/parsers/ScalametaParser.scala Outdated Show resolved Hide resolved

scalameta/parsers/shared/src/main/scala/scala/meta/internal/parsers/ScalametaParser.scala Show resolved Hide resolved

scalameta/parsers/shared/src/main/scala/scala/meta/internal/parsers/ScalametaParser.scala Show resolved Hide resolved

scalameta/parsers/shared/src/main/scala/scala/meta/internal/parsers/ScalametaParser.scala Show resolved Hide resolved

kpbochenek force-pushed the significant-indent branch from f72e9e4 to c8d8883 Compare

September 27, 2020 15:08


          Changes after review

4be296b

kpbochenek force-pushed the significant-indent branch from c8d8883 to 4be296b Compare

September 28, 2020 07:30


          scalafmt

83b7c42

tgodzik reviewed

View reviewed changes

Collaborator

tgodzik left a comment

Some last comments. We can discuss the leftover ones offline.

community-test/src/test/scala/CommunityDottySuite.scala Outdated Show resolved Hide resolved

scalameta/parsers/shared/src/main/scala/scala/meta/internal/parsers/ScalametaParser.scala Show resolved Hide resolved

scalameta/parsers/shared/src/main/scala/scala/meta/internal/parsers/ScalametaParser.scala Show resolved Hide resolved


          Document community-test and add current performance statistics

959061c

kpbochenek force-pushed the significant-indent branch from 0930740 to 959061c Compare

September 28, 2020 17:42

tgodzik approved these changes

View reviewed changes

Collaborator

tgodzik left a comment

I think we should be good to merge, it's a hell of a work and it would be awesome to finally support optional braces!

tgodzik changed the title ~~Dotty V3~~ Scala 3 optional braces and smaller related features

Collaborator

tgodzik commented Sep 29, 2020 •

edited

mima failure is expected as we changed the extension methods, which was recently updated in Scala 3.

Contributor

kitbellew commented Sep 29, 2020

I think we should be good to merge, it's a hell of a work and it would be awesome to finally support optional braces!

you guys built a massive new feature, 29 commits and several months! let's hope it works :)


          Last polishing changes

abda614

kpbochenek merged commit 5d92598 into scalameta:master

tgodzik mentioned this pull request

Support Scala 3 scalameta/scalafmt#2216

Closed

47 tasks

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment