Support Scala 3 #226

lolgab · 2021-11-10T20:38:33Z

This PR is built on top of the commits by @edwardcwang.

Changes:

Add Mima to check how much we break binary compatibility.
Update Mill to version 0.9.10 and fix build deprecations
Add scalaMajorVersion in buildInfoMembers since Scala 3 represents types wrapped inside () in error messages.
Explicitly apply implicit function ev: A => Frag in various implicit classes (like SeqFrag) since Scala 3 doesn't apply implicitly.
Remove protected[this] val RawFrag: Companion[RawFrag] and protected[this] val StringFrag: Companion[StringFrag] since they break variance and Scala 3 is much less permissive with variance. Overriding them with strictier types in subclasses result in compiler errors. Since this was the only use case of Companion I removed it as well. Also I failed to represent Companion in Scala 3 since it uses different signatures for unapply
Add explicit types to all implicit fields as required by Scala 3.
Replace def +(other: Any): String in class String with String interpolator since it is not supported in Scala 3
Make all abstract members in Tags.scala, Tags2.scala and SvgTags.scala defs instead of vals since Scala 3 doesn't support overriding an abstract val member with a lazy val as Scalatags does.
Move the SourceClasses class and its companion object to the version specific code. Since it is the only code using macros.
Updated tests to not use the * - utest syntax. Also not supported in Scala 3.
Move objects used in tests to be stable and not defined in the utest macro. Without this change the Scala 3 version doesn't compile.

There is a bug in the dotty compiler? scala/scala3#13518 scalatags.js[3.0.1,1.7.0].compile java.lang.AssertionError: assertion failed scala.runtime.Scala3RunTime$.assertFailed(Scala3RunTime.scala:11) dotty.tools.backend.sjs.JSCodeGen.genStringConcat(JSCodeGen.scala:2487) dotty.tools.backend.sjs.JSCodeGen.genPrimitiveOp(JSCodeGen.scala:2098)

nightscape · 2021-11-11T16:15:37Z

scalatags/src/scalatags/DataTypes.scala

@@ -32,58 +32,58 @@ trait DataConverters{
     *
     * MDN
     */
-    def px = x + "px"
+    def px = x.toString + "px"


Imo this would look a little nicer as

def px = s"${x}px"

Just personal opinion though.

Yes, agree!

nightscape · 2021-11-11T16:16:35Z

scalatags/src-3/scalatags/stylesheet/StyleSheet.scala

+  inline def apply[T <: StyleSheet]: SourceClasses[T] = $ { manglerImpl[T] }
+
+  def manglerImpl[T <: StyleSheet: Type](using Quotes): Expr[SourceClasses[T]] = {
+    ' { new SourceClasses[T]((t: T) => ${ Expr.ofSeq(terms('t)) }) }


Github's code highlighting doesn't seem to be aware of the new quotes syntax 😉

that would be a good bug report over at https://github.com/scala/vscode-scala-syntax/issues (repo name says "vscode", but it also powers highlighting on GitHub)

Thank you for the suggestion @SethTisue 🙂
I opened an issue as you suggested and opened also a PR with a fix.
Issue: scala/vscode-scala-syntax#226, PR: scala/vscode-scala-syntax#227

oh wow even better!

sake92 · 2021-11-29T18:39:03Z

scalatags/src/scalatags/Text.scala

+  // Scala 3 behaviour prevents us from using the same name as the case
+  // class for some reason, thus also preventing us from using the
+  // auto-generated companion object.


It works fine in 3.0.2, not sure what was the problem here.

sake92 · 2021-12-01T10:03:46Z

Seems like trait Companion[V] extends (String => V) is redundant if we have the def apply already.
It could be just trait Companion[V] I guess.

Then we need to new RawFrag(target) etc in VirtualDom, because scala3 has creator-applications

lolgab · 2021-12-01T19:13:45Z

scalatags/src/scalatags/generic/Bundle.scala

  /**
   * A [[Modifier]] which contains a String which will not be escaped.
   */
  protected[this] type RawFrag <: Modifier
-  protected[this] val RawFrag: Companion[RawFrag]


I removed this and all the tests pass.
The way unapply works in Scala 3 is different from Scala 2 and it's hard to write it generically.
Does this have an usage @lihaoyi ?

I don't think this is generally used. People construct raw frags via raw(...), and generally we do not support or encourage de-constructing frags: they are to be constructed and rendered, with no other operations in between.

Thus we can probably do without this if it's too difficult. If removing it doesn't break the test suite, then we it probably won't be missed

lolgab · 2021-12-01T19:22:11Z

Seems like trait Companion[V] extends (String => V) is redundant if we have the def apply already. It could be just trait Companion[V] I guess.

Then we need to new RawFrag(target) etc in VirtualDom, because scala3 has creator-applications

I tried removing Companion altogether and tests pass just fine. Maybe we can get rid of it.
The failure was because Scala 3 handles unapplies differently from Scala 2.

lolgab · 2021-12-01T19:25:52Z

Tests pass now 🎉

lihaoyi · 2021-12-02T07:51:15Z

@lolgab could you provide a verbose PR description of what the major changes are and why they are necessary? That would be a lot easier to review than trying to reverse engineer your intent from the raw code diff

lolgab · 2021-12-02T11:12:45Z

@lihaoyi Reverted some changed that are not necessary for Scala 3 tests to pass.
Also added a list of changes in the description trying to explain the whys of the various changes.

jodersky · 2021-12-02T11:35:11Z

Move objects used in tests to be stable and not defined in the utest macro. Without this change the Scala 3 version doesn't compile.

Do you know if this is an inherent limitation of the utest macro, or is it something that could be fixed in utest for scala 3? Not a blocker, but I'm just curious

lolgab · 2021-12-02T11:38:30Z

@jodersky I don't know, sorry.

build.sc

sake92 · 2021-12-02T12:06:26Z

@lolgab don't these scala specific folders have to be src-2.12 etc?
https://com-lihaoyi.github.io/mill/mill/Common_Project_Layouts.html#_cross_scala_version_modules

Co-authored-by: Sakib Hadžiavdić <sake92@users.noreply.github.com>

lolgab · 2021-12-02T13:19:56Z

@lolgab don't these scala specific folders have to be src-2.12 etc? https://com-lihaoyi.github.io/mill/mill/Common_Project_Layouts.html#_cross_scala_version_modules

Mill splits the version by . and adds all prefixes as supported versions.
src-2, src-2.13 and src-2.13.4 are supported.

lihaoyi · 2021-12-02T13:47:52Z

I think this generally looks good to me. @sake92 I know you've made some efforts around Scala3, if you could give this pR your approval then I think we're good to merge

sake92 · 2021-12-02T13:50:32Z

@lihaoyi Yep, all looks good I think.

lihaoyi · 2021-12-02T13:59:52Z

Great. @lolgab go ahead and merge whenever you're ready :)

edwardcwang and others added 5 commits November 10, 2021 21:49

Update build system for Scala 3

5401114

Initial Scala 3 (dotty) port

1ead820

Bump to Scala 3.0.0

08bfcd4

wip

d50b698

edwardcwang mentioned this pull request Nov 11, 2021

dotty port #215

Closed

nightscape reviewed Nov 11, 2021

View reviewed changes

lolgab added 4 commits November 11, 2021 18:39

Use string interpolation instead of +

df68552

Gitignore /.bsp from Mill BSP

6c8f772

Remove space in quoted start

b806539

Reduce duplicated code and fix some compilation error

c7f20fc

sake92 reviewed Nov 29, 2021

View reviewed changes

Remove some lazy vals and revert renames

6c6336b

lolgab added 5 commits December 1, 2021 18:03

Most code compiles

ed881d6

All code compiling now

4711325

Fix macro to use declaredFields

b8e26f8

Remove pprint

2b314de

Remove empty companion objects

c20c998

lolgab commented Dec 1, 2021

View reviewed changes

Remove old comment

baace05

lolgab marked this pull request as ready for review December 1, 2021 19:24

lolgab changed the title ~~Support scala 3 second attempt~~ Support Scala 3 Dec 1, 2021

lolgab requested review from lihaoyi, anatoliykmetyuk and jodersky December 1, 2021 23:45

Avoid to define lazy val Frags

d23bb1a

sake92 mentioned this pull request Dec 2, 2021

Support scala 3 3rd attempt #227

Closed

Revert some changes not necessary for Scala 3

d67457a

lolgab added 4 commits December 2, 2021 12:14

Revert formatting change

f8b973b

Remove unused import

6abb54e

Revert spurious change

7ab6e9f

Remove spurious import

4f20d8d

sake92 reviewed Dec 2, 2021

View reviewed changes

build.sc Outdated Show resolved Hide resolved

Refactor filter for ScalaJS versions

17e99f2

Co-authored-by: Sakib Hadžiavdić <sake92@users.noreply.github.com>

lolgab merged commit 0cfff0c into com-lihaoyi:master Dec 2, 2021

lolgab deleted the support-scala-3-second-attempt branch December 2, 2021 14:37

seoethereal mentioned this pull request Dec 17, 2021

Access modifiers in Scala 3 #233

Open

Uh oh!

Support Scala 3 #226

Support Scala 3 #226

Uh oh!

Conversation

lolgab commented Nov 10, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Changes:

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

sake92 commented Dec 1, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

lolgab Dec 1, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

lolgab commented Dec 1, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

lolgab commented Dec 1, 2021

Uh oh!

lihaoyi commented Dec 2, 2021

Uh oh!

lolgab commented Dec 2, 2021

Uh oh!

jodersky commented Dec 2, 2021

Uh oh!

lolgab commented Dec 2, 2021

Uh oh!

Uh oh!

sake92 commented Dec 2, 2021

Uh oh!

lolgab commented Dec 2, 2021

Uh oh!

lihaoyi commented Dec 2, 2021

Uh oh!

sake92 commented Dec 2, 2021

Uh oh!

lihaoyi commented Dec 2, 2021

Uh oh!

Uh oh!

lolgab commented Nov 10, 2021 •

edited

Loading

sake92 commented Dec 1, 2021 •

edited

Loading

lolgab Dec 1, 2021 •

edited

Loading

lolgab commented Dec 1, 2021 •

edited

Loading