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

Add Scala 3 support via dotty compatibility #1150

Merged

Conversation

alexarchambault
Copy link
Collaborator

@alexarchambault alexarchambault commented Feb 3, 2021

So this PR adds Scala 3 support, as a follow up of #1144.

Its changes successively consist in:

  • minor refactorings, easing subsequent developments (from 0dd150b up to 6208f80, 12 commits as of now),
  • actually adding Scala 3 support (8c22bfa up to 6a815b0, 10 commits)
  • updating the tests, so that they run fine for Scala 3 (a4e2db9 up to the end, 28 commits).

All commits but one don't touch more than approx. 100 lines each, which should make it easy to review those. The only sizable commit is the one adding the Scala 3 implementation of the compiler module, under amm/compiler/src/main/scala-3 (8c22bfa). This commit mainly:

  • adds new sources under amm/compiler/src/main/scala-3,
  • updates build.sc so that using just 3 as cross version builds and runs Ammonite as a mix of Scala 2.13 / 3 modules (that run fine together thanks to dotty compatibility)

Many of the sources this commit adds under amm/compiler/src/main/scala-3 are adapted either from dotty sources, or from Ammonite Scala 2 things.

Some features don't work yet in Scala 3, or don't work as fine as in Scala 2 yet. The commits updating the tests should make clear what has been disabled for Scala 3. Most notably:

  • entrypoints: this would require mainargs to be ported over to Scala 3, its use of Scala 2 macros complicates that,
  • line numbers in diagnostics and stack traces: an equivalent of the LineNumberModifier plugin for Scala 3 would fix both at the same time, else ammonite.interp.script.PositionOffsetConversion could be used to fix at least the former
  • deep completions: there's currently a candidate implementation for these (in amm/compiler/src/main/scala-3/dotty/ammonite/compiler/Completion.scala), but it's awfully slow, so it's disabled by default (look for the commented out line calling addDeepCompletions)
  • import $ivy completion: there's a candidate implementation too (in Completion.scala), but it has issues with backticks. This required tinkering in Scala 2, which seemed less straightforward to do in Scala 3 (IIRC, dotty doesn't easily hand us over backticks around what's being completed)
  • source and desugar macros: they need to be ported over to Scala 3 (using Tasty reflection-based macros I guess)

There are also limitations in the Scala 3 specific code, most notably:

  • the script blocks splitter (splitting around @) is regex based for now (I didn't try to have the dotty parser handle those yet)

@alexarchambault alexarchambault force-pushed the scala-3-with-dotty-compat branch 3 times, most recently from 7312742 to 9d05da9 Compare February 3, 2021 16:58
@alexarchambault alexarchambault force-pushed the scala-3-with-dotty-compat branch from 9d05da9 to a4ee402 Compare February 3, 2021 17:24
@alexarchambault alexarchambault force-pushed the scala-3-with-dotty-compat branch 3 times, most recently from fa18ef7 to 17c078e Compare February 3, 2021 21:54
@alexarchambault alexarchambault force-pushed the scala-3-with-dotty-compat branch 4 times, most recently from 87fae0c to 4839d55 Compare February 4, 2021 11:03
@alexarchambault alexarchambault marked this pull request as ready for review February 4, 2021 11:45
@alexarchambault alexarchambault force-pushed the scala-3-with-dotty-compat branch 3 times, most recently from f2c678b to f6d58ed Compare February 15, 2021 15:38
@alexarchambault
Copy link
Collaborator Author

@lihaoyi This is ready for review, if you wish. Don't fear the number of commits or the number of changed lines… All commits but one touch less than or around 100 lines. The only sizeable commit is the one adding the Scala 3 source of the compiler module - it mostly only adds code, but for its changes in build.sc.

That said, I can always split that to make it easier to review it:

  • all the commits until the one adding Scala 3 code in compiler in a first PR, then
  • adding Scala 3 code per se, then
  • adding CI jobs and adjusting the tests for Scala 3.

The tests now pass in #1151, that switches to 3.0.0-M3. Its developments could also be folded here.

Lastly, some things could be cleaned-up in the biggest commit (Scala 3 code in compiler), I could update that, but that shouldn't hamper review… (or even merging).

Copy link
Member

@lihaoyi lihaoyi left a comment

Choose a reason for hiding this comment

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

@alexarchambault I skimmed this, I think it looks good to me. I trust both that you know your way around the codebase, and also our test suite to catch any regressions in the old code paths.

Since the bulk of the code here is in Scala 3, could it be worth getting someone more familiar with Scala3 to review those sections? Even if you need to explain what the code is meant to do, a second perspective from the Scala3 side of things may be valuable to make sure what we're doing sounds reasonable to them

@alexarchambault alexarchambault force-pushed the scala-3-with-dotty-compat branch from f6d58ed to 3c252f5 Compare February 18, 2021 15:33
@alexarchambault
Copy link
Collaborator Author

(Last push force: folded #1151 here.)

@alexarchambault alexarchambault force-pushed the scala-3-with-dotty-compat branch from 3c252f5 to 88d7a83 Compare February 18, 2021 16:08
@alexarchambault
Copy link
Collaborator Author

alexarchambault commented Feb 18, 2021

Since the bulk of the code here is in Scala 3, could it be worth getting someone more familiar with Scala3 to review those sections? Even if you need to explain what the code is meant to do, a second perspective from the Scala3 side of things may be valuable to make sure what we're doing sounds reasonable to them

I agree it would be nice to have more Scala 3 expert eyes have a look, yes.

@smarter @anatoliykmetyuk Don't know if you guys would be interested in having a look at the commit named Add Scala 3 stuff, currently at ecf2928. This commit adds Scala 3 implementations for parsing and compiler related stuff.

In more detail, it adds the following classes:

  • AmmonitePhase: a Scala 3 equivalent to AmmonitePlugin, which tracks new variables, but also new imports, during compilation
  • Compiler: as the name says, going from source to byte code, but also some completion-related things
  • DottyParser and Parsers: parsing-related stuff
  • Preprocessor; generating additional code (printing the type and value of new vals, etc.) from an AST of the input code (most of it adapted from its Scala 2 counterpart)
  • SyntaxHighlighting: adapted from dotty sources
  • Completion: adapted from dotty sources too, so that we can add support for import $ivy completions, deep completion (committed but disabled for now, as my current implem is too slow), but also for a better handling of back-quoted identifiers (that could be interesting for the dotty REPL too)

(I might push force some clean-ups of that commit, as I just found some duplication or formatting related issues…)

@smarter
Copy link
Collaborator

smarter commented Feb 18, 2021

Looks like there's quite a lot of code adapted from existing code in dotty, my advice would be to instead change dotty to make the existing code reusable for your purposes when possible.

@alexarchambault
Copy link
Collaborator Author

alexarchambault commented Feb 18, 2021

Looks like there's quite a lot of code adapted from existing code in dotty, my advice would be to instead change dotty to make the existing code reusable for your purposes when possible.

I agree. That's mostly syntax-highlighting and completion-related code. I'll look into submitting a PR to dotty.

@mallman
Copy link

mallman commented Feb 22, 2021

Hi @alexarchambault. I was just working with Spark SQL in Jupyter thanks to Almond, and I'm curious how you're handling the removal of scala.Symbol and its related ' literal syntax from Scala 3 in this patch. Have you provided some kind of substitute? Unfortunately I don't understand this patch well enough to answer this question for myself. FWIW, my inquiry is partly motivated by the extensive use of the symbol literal syntax in the documentation for Ammonite at ammonite.io. However, I must admit I'm also rather partial to that syntax for use in Spark SQL, so I'm hopeful you have found a pleasant alternative.

Cheers.

@alexarchambault
Copy link
Collaborator Author

@mallman In the Ammonite codebase, most symbol literals (maybe even all of them, I think) are related to os-lib paths, in code like os.pwd / 'foo / 'something. Luckily, os-lib also accepts string literals, so I just changed such code to os.pwd / "foo" / "something".

I'm not sure how spark-sql will handle the end of symbol literals, but IIRC, it also accepts string literals in most places, right? Using string literals would be the way to go then.

(By the way, this kind of question might be more suited to the Gitter channel, although I have to admit I should check my Gitter notifications more often 😬)

Some tests are disabled, as it seems the Scala 3 typer doesn't
discriminate between `class Foo` and `object Foo`,
which prevents imports of a class and an object with the same name,
but different namespaces, to work as expected.
Without the added braces, indentation-based syntax assumes the def-s /
lazy val-s are not complete, and expects more input.
There's a candidate deep completion implementation for Scala 3 already,
but it's waaaaay too slow as of now.
Some logic for import $ivy completion is there already, but it needs a
bit more tinkering (in the way it handles backticks in particular).
Seems these are related to root packages…
`desugar` support needs to be added back in Scala 3.
Support for URL-based class path needs to be added back (this needs a
Scala 3 equivalent to CustomURLZipArchive).
No -Yrangepos option to tinker with in Scala 3 I think.
Line numbers from Scala 3 are currently wrong.
Turns out what we do from interp.configureCompiler(…) doesn't matter in
this test, so we do something that compiles with both Scala 2 and 3.
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.

4 participants