Skip to content

Commit 4f869f5

Browse files
authored
Merge pull request #80 from scala-steward/update/scalafmt-core-3.10.4
Update scalafmt-core to 3.10.4
2 parents de793ec + 50c6e37 commit 4f869f5

File tree

5 files changed

+37
-31
lines changed

5 files changed

+37
-31
lines changed

.git-blame-ignore-revs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,6 @@
33

44
# Reformat with -Xsource:3
55
408b75336e95324ada240998b91ecc16c5fece9a
6+
7+
# Scala Steward: Reformat with scalafmt 3.10.4
8+
309956dcedc3ffc47ad850acd21d1e3f21b1f188

.scalafmt.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//description of properties: https://scalameta.org/scalafmt/docs/configuration.html
2-
version = "3.10.3"
2+
version = "3.10.4"
33
runner.dialect = scala213source3
44
maxColumn = 120
55

build.sbt

Lines changed: 30 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -11,30 +11,33 @@ val junitVersion = "4.13.2"
1111
val commonsTextVersion = "1.15.0"
1212
val opentest4jVersion = "1.3.0"
1313

14-
lazy val hocon = project.in(file(".")).enablePlugins(SbtIdeaPlugin).settings(
15-
version := "2026.1.2-SNAPSHOT",
16-
Compile / scalaSource := baseDirectory.value / "src",
17-
Test / scalaSource := baseDirectory.value / "test",
18-
Compile / resourceDirectory := baseDirectory.value / "resources",
19-
Global / javacOptions ++= Seq("--release", "21"),
20-
Global / scalacOptions ++= Seq(
21-
"-deprecation",
22-
"-feature",
23-
"-unchecked",
24-
"-Xfatal-warnings",
25-
"-Xsource:3"
26-
),
27-
ideBasePackages := Seq("org.jetbrains.plugins.hocon"),
28-
intellijPlugins := Seq("com.intellij.java-i18n", "com.intellij.modules.json").map(_.toPlugin),
29-
intellijExtraRuntimePluginsInTests := Seq("org.jetbrains.kotlin").map(_.toPlugin),
30-
libraryDependencies ++= Seq(
31-
"org.apache.commons" % "commons-text" % commonsTextVersion,
32-
"com.github.sbt" % "junit-interface" % junitInterfaceVersion % Test,
33-
"junit" % "junit" % junitVersion % Test,
34-
"org.opentest4j" % "opentest4j" % opentest4jVersion % Test,
35-
),
36-
packageLibraryMappings := Seq.empty, // allow scala-library
37-
patchPluginXml := pluginXmlOptions { xml =>
38-
xml.version = version.value
39-
}
40-
)
14+
lazy val hocon = project
15+
.in(file("."))
16+
.enablePlugins(SbtIdeaPlugin)
17+
.settings(
18+
version := "2026.1.2-SNAPSHOT",
19+
Compile / scalaSource := baseDirectory.value / "src",
20+
Test / scalaSource := baseDirectory.value / "test",
21+
Compile / resourceDirectory := baseDirectory.value / "resources",
22+
Global / javacOptions ++= Seq("--release", "21"),
23+
Global / scalacOptions ++= Seq(
24+
"-deprecation",
25+
"-feature",
26+
"-unchecked",
27+
"-Xfatal-warnings",
28+
"-Xsource:3",
29+
),
30+
ideBasePackages := Seq("org.jetbrains.plugins.hocon"),
31+
intellijPlugins := Seq("com.intellij.java-i18n", "com.intellij.modules.json").map(_.toPlugin),
32+
intellijExtraRuntimePluginsInTests := Seq("org.jetbrains.kotlin").map(_.toPlugin),
33+
libraryDependencies ++= Seq(
34+
"org.apache.commons" % "commons-text" % commonsTextVersion,
35+
"com.github.sbt" % "junit-interface" % junitInterfaceVersion % Test,
36+
"junit" % "junit" % junitVersion % Test,
37+
"org.opentest4j" % "opentest4j" % opentest4jVersion % Test,
38+
),
39+
packageLibraryMappings := Seq.empty, // allow scala-library
40+
patchPluginXml := pluginXmlOptions { xml =>
41+
xml.version = version.value
42+
},
43+
)

src/org/jetbrains/plugins/hocon/editor/HoconObjectEntryMover.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import org.jetbrains.plugins.hocon.psi.*
1111

1212
import scala.annotation.tailrec
1313

14-
/** An implementation of com.intellij.codeInsight.editorActions.moveUpDown.StatementUpDownMover which can move
15-
* entire HOCON object entries (object fields or include statements).
14+
/** An implementation of com.intellij.codeInsight.editorActions.moveUpDown.StatementUpDownMover which can move entire
15+
* HOCON object entries (object fields or include statements).
1616
*
1717
* The entry being moved is being required to be the only entry in its own lines, i.e. there may not be any other entry
1818
* (or left/right object brace) in the first or last line occupied by the entry being moved. If this requirement is not

src/org/jetbrains/plugins/hocon/package.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import scala.annotation.tailrec
1616
import scala.collection.AbstractIterator
1717
import scala.collection.convert.{AsJavaExtensions, AsScalaExtensions}
1818
import scala.language.implicitConversions
19-
import scala.reflect.{ClassTag, classTag}
19+
import scala.reflect.{classTag, ClassTag}
2020

2121
package object hocon extends AsJavaExtensions with AsScalaExtensions {
2222
type JList[T] = java.util.List[T]

0 commit comments

Comments
 (0)