Hi all, The new scalafmt formatter has been merged. From now on, just using mvn spotless:apply as usual will format both Java and Scala, and Intellij will automatically pick up the scalafmt config for who has the Scala plugin installed. If it doesn't, just go in Preferences > Editor > Code Style > Scala and change the Formatter to scalafmt. If you use the actions on save plugin, make sure you have the reformat on save enabled for Scala.
For more details on integration with IDEs, please refer to https://scalameta.org/scalafmt/docs/installation.html If you have a pending PR with Scala changes, chances are you're going to have conflicts with upstream/master now. In order to fix it, here is the suggested procedure: - Do an interactive rebase on commit 3ea3fee5ac996f6ae8836c3cba252f974d20bd2e, which is the commit before the refactoring of the whole codebase, fixing as usual the conflicting changes. This will make sure you won't miss the changes between your branch and master *before* the reformatting commit. - Do a rebase on commit 91d81c427aa6312841ca868d54e8ce6ea721cd60 accepting all changes from your local branch. You can easily do that via git rebase -Xours 91d81c427aa6312841ca868d54e8ce6ea721cd60 - Run mvn spotless:apply and commit all the changes - Do an interactive rebase on upstream/master. This will make sure you won't miss the changes between your branch and master *after* the reformatting commit. - Force push your branch to update the PR Sorry for this noise! Thank you, FG -- Francesco Guardiani | Software Engineer france...@ververica.com <https://www.ververica.com/> Follow us @VervericaData -- Join Flink Forward <https://flink-forward.org/> - The Apache Flink Conference Stream Processing | Event Driven | Real Time -- Ververica GmbH | Invalidenstrasse 115, 10115 Berlin, Germany -- Ververica GmbH Registered at Amtsgericht Charlottenburg: HRB 158244 B Managing Directors: Karl Anton Wehner, Holger Temme, Yip Park Tung Jason, Jinwei (Kevin) Zhang
