Skip to content

Commit

Permalink
Merge branch 'develop' into update/fastparse-3.0.2
Browse files Browse the repository at this point in the history
  • Loading branch information
Caparow authored Aug 7, 2023
2 parents 9a892db + cbdd978 commit 5eb40c6
Show file tree
Hide file tree
Showing 30 changed files with 844 additions and 941 deletions.
71 changes: 71 additions & 0 deletions .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
version = "3.7.11"
runner.dialect = scala3Future
project.git = true
project.excludePaths = ["glob:**.sbt", "glob:**sbtgen.sc"]

maxColumn = 170

importSelectors = singleLine
spaces.inImportCurlyBraces = false

literals.hexDigits = "Upper"

align.tokens."+" = ["<-", "->", {code: "=", owner: ".*"}, {code: "=>", owner: "Case"}]
align.tokenCategory {
Equals = Assign
LeftArrow = Assign
RightArrow = Assign
}

align.arrowEnumeratorGenerator = false
align.ifWhileOpenParen = false
align.openParenCallSite = false
align.openParenDefnSite = false
align.stripMargin = true
align.inInterpolation = false

newlines.beforeCurlyLambdaParams = multiline
newlines.afterCurlyLambdaParams = never
newlines.implicitParamListModifierPrefer = after
newlines.avoidAfterYield = true
newlines.alwaysBeforeMultilineDef = false
newlines.inInterpolation = allow

indent.defnSite = 2
indent.callSite = 2
indent.extendSite = 2

assumeStandardLibraryStripMargin = true
docstrings = ScalaDoc
docstrings.wrap = false
docstrings.blankFirstLine = keep
docstrings.forceBlankLineBefore = false
lineEndings = unix

danglingParentheses.callSite = true
danglingParentheses.defnSite = true
danglingParentheses.ctrlSite = false
danglingParentheses.exclude = []
verticalAlignMultilineOperators = true

includeCurlyBraceInSelectChains = false
includeNoParensInSelectChains = false

verticalMultiline.atDefnSite = true
verticalMultiline.arityThreshold = 100
verticalMultiline.newlineAfterOpenParen = false

optIn.configStyleArguments = true
optIn.breaksInsideChains = true
optIn.breakChainOnFirstMethodDot = true
optIn.selfAnnotationNewline = true
optIn.annotationNewlines = true

rewrite.rules = [AsciiSortImports, RedundantBraces, RedundantParens]
rewrite.redundantBraces.methodBodies = false // remove braces only in interpolations
rewrite.redundantBraces.maxLines = -1 // remove braces only in interpolations
rewrite.redundantBraces.generalExpressions = false // remove braces only in interpolations
rewrite.redundantBraces.includeUnitMethods = false
rewrite.redundantBraces.stringInterpolation = true
rewrite.redundantBraces.parensForOneLineApply = true
rewrite.trailingCommas.style = multiple
38 changes: 19 additions & 19 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ lazy val `idealingua-v1-model` = crossProject(JVMPlatform, JSPlatform).crossType
"-Ycache-plugin-class-loader:always",
"-Ycache-macro-class-loader:last-modified"
)
case (_, "3.2.2") => Seq(
case (_, "3.3.1-RC4") => Seq(
"-release:8",
"-Ykind-projector:underscores",
"-no-indent",
Expand All @@ -143,15 +143,15 @@ lazy val `idealingua-v1-model` = crossProject(JVMPlatform, JSPlatform).crossType
)
.jvmSettings(
crossScalaVersions := Seq(
"3.2.2",
"3.3.1-RC4",
"2.13.11",
"2.12.18"
),
scalaVersion := crossScalaVersions.value.head
)
.jsSettings(
crossScalaVersions := Seq(
"3.2.2",
"3.3.1-RC4",
"2.13.11",
"2.12.18"
),
Expand Down Expand Up @@ -275,7 +275,7 @@ lazy val `idealingua-v1-core` = crossProject(JVMPlatform, JSPlatform).crossType(
"-Ycache-plugin-class-loader:always",
"-Ycache-macro-class-loader:last-modified"
)
case (_, "3.2.2") => Seq(
case (_, "3.3.1-RC4") => Seq(
"-release:8",
"-Ykind-projector:underscores",
"-no-indent",
Expand Down Expand Up @@ -439,7 +439,7 @@ lazy val `idealingua-v1-runtime-rpc-scala` = crossProject(JVMPlatform, JSPlatfor
"-Ycache-plugin-class-loader:always",
"-Ycache-macro-class-loader:last-modified"
)
case (_, "3.2.2") => Seq(
case (_, "3.3.1-RC4") => Seq(
"-release:8",
"-Ykind-projector:underscores",
"-no-indent",
Expand All @@ -458,15 +458,15 @@ lazy val `idealingua-v1-runtime-rpc-scala` = crossProject(JVMPlatform, JSPlatfor
)
.jvmSettings(
crossScalaVersions := Seq(
"3.2.2",
"3.3.1-RC4",
"2.13.11",
"2.12.18"
),
scalaVersion := crossScalaVersions.value.head
)
.jsSettings(
crossScalaVersions := Seq(
"3.2.2",
"3.3.1-RC4",
"2.13.11",
"2.12.18"
),
Expand Down Expand Up @@ -508,7 +508,7 @@ lazy val `idealingua-v1-runtime-rpc-http4s` = project.in(file("idealingua-v1/ide
)
.settings(
crossScalaVersions := Seq(
"3.2.2",
"3.3.1-RC4",
"2.13.11",
"2.12.18"
),
Expand Down Expand Up @@ -608,7 +608,7 @@ lazy val `idealingua-v1-runtime-rpc-http4s` = project.in(file("idealingua-v1/ide
"-Ycache-plugin-class-loader:always",
"-Ycache-macro-class-loader:last-modified"
)
case (_, "3.2.2") => Seq(
case (_, "3.3.1-RC4") => Seq(
"-release:8",
"-Ykind-projector:underscores",
"-no-indent",
Expand Down Expand Up @@ -752,7 +752,7 @@ lazy val `idealingua-v1-transpilers` = crossProject(JVMPlatform, JSPlatform).cro
"-Ycache-plugin-class-loader:always",
"-Ycache-macro-class-loader:last-modified"
)
case (_, "3.2.2") => Seq(
case (_, "3.3.1-RC4") => Seq(
"-release:8",
"-Ykind-projector:underscores",
"-no-indent",
Expand Down Expand Up @@ -820,7 +820,7 @@ lazy val `idealingua-v1-test-defs` = project.in(file("idealingua-v1/idealingua-v
)
.settings(
crossScalaVersions := Seq(
"3.2.2",
"3.3.1-RC4",
"2.13.11",
"2.12.18"
),
Expand Down Expand Up @@ -920,7 +920,7 @@ lazy val `idealingua-v1-test-defs` = project.in(file("idealingua-v1/idealingua-v
"-Ycache-plugin-class-loader:always",
"-Ycache-macro-class-loader:last-modified"
)
case (_, "3.2.2") => Seq(
case (_, "3.3.1-RC4") => Seq(
"-release:8",
"-Ykind-projector:underscores",
"-no-indent",
Expand Down Expand Up @@ -951,7 +951,7 @@ lazy val `idealingua-v1-runtime-rpc-typescript` = project.in(file("idealingua-v1
)
.settings(
crossScalaVersions := Seq(
"3.2.2",
"3.3.1-RC4",
"2.13.11",
"2.12.18"
),
Expand Down Expand Up @@ -1051,7 +1051,7 @@ lazy val `idealingua-v1-runtime-rpc-typescript` = project.in(file("idealingua-v1
"-Ycache-plugin-class-loader:always",
"-Ycache-macro-class-loader:last-modified"
)
case (_, "3.2.2") => Seq(
case (_, "3.3.1-RC4") => Seq(
"-release:8",
"-Ykind-projector:underscores",
"-no-indent",
Expand Down Expand Up @@ -1082,7 +1082,7 @@ lazy val `idealingua-v1-runtime-rpc-go` = project.in(file("idealingua-v1/idealin
)
.settings(
crossScalaVersions := Seq(
"3.2.2",
"3.3.1-RC4",
"2.13.11",
"2.12.18"
),
Expand Down Expand Up @@ -1182,7 +1182,7 @@ lazy val `idealingua-v1-runtime-rpc-go` = project.in(file("idealingua-v1/idealin
"-Ycache-plugin-class-loader:always",
"-Ycache-macro-class-loader:last-modified"
)
case (_, "3.2.2") => Seq(
case (_, "3.3.1-RC4") => Seq(
"-release:8",
"-Ykind-projector:underscores",
"-no-indent",
Expand Down Expand Up @@ -1213,7 +1213,7 @@ lazy val `idealingua-v1-runtime-rpc-csharp` = project.in(file("idealingua-v1/ide
)
.settings(
crossScalaVersions := Seq(
"3.2.2",
"3.3.1-RC4",
"2.13.11",
"2.12.18"
),
Expand Down Expand Up @@ -1313,7 +1313,7 @@ lazy val `idealingua-v1-runtime-rpc-csharp` = project.in(file("idealingua-v1/ide
"-Ycache-plugin-class-loader:always",
"-Ycache-macro-class-loader:last-modified"
)
case (_, "3.2.2") => Seq(
case (_, "3.3.1-RC4") => Seq(
"-release:8",
"-Ykind-projector:underscores",
"-no-indent",
Expand Down Expand Up @@ -1452,7 +1452,7 @@ lazy val `idealingua-v1-compiler` = project.in(file("idealingua-v1/idealingua-v1
"-Ycache-plugin-class-loader:always",
"-Ycache-macro-class-loader:last-modified"
)
case (_, "3.2.2") => Seq(
case (_, "3.3.1-RC4") => Seq(
"-release:8",
"-Ykind-projector:underscores",
"-no-indent",
Expand Down

This file was deleted.

This file was deleted.

Loading

0 comments on commit 5eb40c6

Please sign in to comment.