Skip to content

Fix formatting configuration #190

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

Merged
Gedochao merged 3 commits into from
Jun 23, 2026
Merged

Fix formatting configuration #190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0c1dfaf
Fix `.scalafmt.conf` to reflect project dialect
Gedochao Jun 23, 2026
35e1c04
Add `.scala-build` to `.gitignore`
Gedochao Jun 23, 2026
4bf0002
Fix formatting configuration to handle `*.mill` build files correctly
Gedochao Jun 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ jobs:
submodules: true
- uses: VirtusLab/scala-cli-setup@v1
- run: scala-cli fmt . --check
- run: ./mill -i mill.scalalib.scalafmt/checkFormatAll

scalafix:
timeout-minutes: 15
Expand Down
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ out/
.metals
.vscode
.bloop
.scala-build
11 changes: 10 additions & 1 deletion .scalafmt.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,16 @@ newlines.beforeMultiline = keep
newlines.afterCurlyLambdaParams = keep
newlines.alwaysBeforeElseAfterCurlyIf = true

runner.dialect = scala3
runner.dialect = scala213

fileOverride {
"glob:**/*.mill" {
runner.dialect = scala3
}
"glob:**/*.sc" {
runner.dialect = scala3
}
}

rewrite.rules = [
RedundantBraces
Expand Down
5 changes: 3 additions & 2 deletions cli/src/org/scalajs/cli/Scalajsld.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,9 @@ object Scalajsld {
opt[String]("moduleSplitStyle")
.action((x, c) => c.copy(moduleSplitStyle = x))
.text(
"Module splitting style " + ModuleSplitStyleRead.All
.mkString("(", ", ", ")")
"Module splitting style " +
ModuleSplitStyleRead.All
.mkString("(", ", ", ")")
)
opt[Seq[String]]("smallModuleForPackages")
.valueName("<package1>,<package2>...")
Expand Down
Loading