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.

Sign up for GitHub

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

scalafix-core_3 (GSoC 2022) #1629

Merged
merged 25 commits into from
Jul 22, 2022
Merged

scalafix-core_3 (GSoC 2022) #1629

merged 25 commits into from
Jul 22, 2022

Conversation

rvacaru
Copy link
Contributor

@rvacaru rvacaru commented Jul 6, 2022 •
edited by bjaglin
Loading

This PR is the first step towards adapting ExplicitResultTypes for scala3 #1583 and part of the plan for scala3 support #1680. The idea is to cross compile all scalafix modules to scala3 and then introduce a new ExplicitResultTypes implementation for scala3.

Screenshot 2022-07-22 at 12 03 53

In this first step we're cross compiling scalafix-core to scala3

@rvacaru

This comment was marked as resolved.

Sign in to view
@rvacaru rvacaru force-pushed the scala-3 branch 2 times, most recently from 4a5490b to dd956df Compare July 14, 2022 08:54
bjaglin
bjaglin reviewed Jul 14, 2022
View reviewed changes
build.sbt Outdated Show resolved Hide resolved
build.sbt Outdated Show resolved Hide resolved
build.sbt Outdated Show resolved Hide resolved
project/Dependencies.scala Outdated Show resolved Hide resolved
scalafix-core/src/main/scala-2/scalafix/internal/util/MetaconfigCompatMacros.scala Outdated Show resolved Hide resolved
project/ScalafixBuild.scala Outdated Show resolved Hide resolved
scalafix-core/src/main/scala-3/scalafix/internal/util/PrettyType.scala Outdated Show resolved Hide resolved
build.sbt Outdated Show resolved Hide resolved
scalafix-core/src/main/scala/scalafix/internal/util/Pretty.scala Outdated Show resolved Hide resolved
scalafix-core/src/main/scala/scalafix/util/TokenClasses.scala Outdated Show resolved Hide resolved
@bjaglin
Copy link
Collaborator

bjaglin commented Jul 15, 2022 •
edited
Loading

Another note: since core3 is an orphan modules not used by any other, I don't think its compilation is covered by CI, so you should add an explicit unit3/compile in

scalafix/project/ScalafixBuild.scala

Lines 131 to 134 in 59ed8c0

commands += Command.command("ci-3") { s =>
"unit2_12Target3/test" ::
s
},

This will apply for all xxx3 modules until we move unit2_12Target3 to unit3.

@armanbilge armanbilge mentioned this pull request Jul 15, 2022
Closed
bjaglin
bjaglin reviewed Jul 20, 2022
View reviewed changes
Copy link
Collaborator

@bjaglin bjaglin left a comment

Choose a reason for hiding this comment

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

Last round of comments, and we'll be good to go (provided core3/compile is green!)

scalafix-core/src/main/scala-3/scalafix/util/TokenList.scala Outdated Show resolved Hide resolved
scalafix-core/src/main/scala/scalafix/internal/util/PrettyType.scala Outdated Show resolved Hide resolved
project/ScalafixBuild.scala Outdated Show resolved Hide resolved
scalafix-core/src/main/scala-2/scalafix/internal/config/ConfigRulePatches.scala Outdated Show resolved Hide resolved
build.sbt Outdated Show resolved Hide resolved
build.sbt Outdated Show resolved Hide resolved
@rvacaru rvacaru force-pushed the scala-3 branch 2 times, most recently from 1fc6675 to c88e7be Compare July 21, 2022 14:55
mlachkar and others added 16 commits July 22, 2022 10:19
@mlachkar @rvacaru
start compiler in scala 3 scalafix-core
24e0725
@rvacaru
format
7688f47
@rvacaru
(chore): fixed compilation errors via imports
3d76f4b
@rvacaru
fixed quasiquotes q"???" and t"T", fixed TreePos typing issue by casting
c8307b8
@rvacaru
introduced scala3 scalafix util w/Compat class, fix TokenList partially
a0b0aeb
@rvacaru
fixed imports after self pr review
46f4526
@rvacaru
cast trailing and leading returns to correct type
bc74315
@rvacaru
(chore): )removed comments after clarification on Compat
e9e8354
@rvacaru
removed 2.12 and 2.13 package.scala with generic objects for better e…
3f32fb4 
…rrors, run scalafmt on all project
@rvacaru
fixed compilation errors, todo only missing sourcode lib in core2_13
508ba53
@rvacaru
build.sbt libDependency changes to exclude 2_13 dependencies in core3
58dc1f3
@rvacaru
(chore): fix pr comments, readability, relative imports, unmanagedSou…
bcee1c1 
…rceDirectories
@rvacaru
pr comment fixes: refactor PrettyType a la Compat, refactor sbt commo…
3e3cb06 
…n settings for scalacOptions, add unit3/compile
@rvacaru
rename of new compaSenticType classes/files
6c4bf8f
@rvacaru @bjaglin
Apply suggestions from code review
5e9f5ba 
Co-authored-by: Brice Jaglin <bjaglin@gmail.com>
@rvacaru
reverse sbt build logic for semanticdb synthetics
b3730b2
@rvacaru rvacaru marked this pull request as ready for review July 22, 2022 08:21
@bjaglin bjaglin merged commit d6645da into scalacenter:main Jul 22, 2022
@bjaglin bjaglin mentioned this pull request Jul 22, 2022
Merged
@bjaglin bjaglin changed the title Scalafix-core compiled in Scala 3 scalafix-core_3 Oct 2, 2022
@bjaglin bjaglin mentioned this pull request Oct 2, 2022
Merged
@bjaglin bjaglin changed the title scalafix-core_3 scalafix-core_3 (GSoC 2022) Oct 2, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@armanbilge armanbilge armanbilge left review comments

@bjaglin bjaglin bjaglin approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@rvacaru @bjaglin @armanbilge @mlachkar