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

Update scalafmt-core to 3.8.4 #416

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,6 @@

# Scala Steward: Reformat with scalafmt 3.8.2
f5a756f05939939b4a30a4109f1a3b2cf472d85a

# Scala Steward: Reformat with scalafmt 3.8.4
7674b8eb48dc8e33debb1acad4365364b8c12d5a
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Test upgrades: $ scripts/scalafmt --test 2> diff.txt
version = 3.8.3
version = 3.8.4
runner.dialect = scala213source3
preset = default

Expand Down
8 changes: 4 additions & 4 deletions sconfig/shared/src/main/scala/org/ekrich/config/Config.scala
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ import scala.annotation.varargs
* path expressions and individual path elements (keys).
*
* <p> Another difference between `Config` and `ConfigObject` is that
* conceptually, `ConfigValue`s with a [[ConfigValue#valueType valueType]] of
* conceptually, `ConfigValue` s with a [[ConfigValue#valueType valueType]] of
* [[ConfigValueType#NULL NULL]] exist in a `ConfigObject`, while a `Config`
* treats null values as if they were missing. (With the exception of two
* methods: [[Config#hasPathOrNull]] and [[Config#getIsNull]] let you detect
Expand Down Expand Up @@ -137,7 +137,7 @@ import scala.annotation.varargs
*
* <p> <strong>This is an interface but don't implement it yourself</strong>
*
* <p> <em>Do not implement `Config`</em>; it should only be implemented by the
* <p> <em>Do not implement `Config` </em>; it should only be implemented by the
* config library. Arbitrary implementations will not work because the library
* internals assume a specific concrete implementation. Also, this interface is
* likely to grow new methods over time, so third-party implementations will
Expand Down Expand Up @@ -303,7 +303,7 @@ trait Config extends ConfigMergeable {
* validate them. Also, if every module validates only its own stuff, there
* isn't as much redundant work being done.
*
* <p> If no paths are specified in `checkValid`'s parameter list, validation
* <p> If no paths are specified in `checkValid` 's parameter list, validation
* is for the entire config.
*
* <p> If you specify paths that are not in the reference config, those paths
Expand Down Expand Up @@ -420,7 +420,7 @@ trait Config extends ConfigMergeable {
def hasPathOrNull(path: String): Boolean

/**
* Returns true if the `Config`'s root object contains no key-value pairs.
* Returns true if the `Config` 's root object contains no key-value pairs.
*
* @return
* true if the configuration is empty
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -750,7 +750,7 @@ object ConfigFactory extends PlatformConfigFactory {
* `klass.getClassLoader()` will be used to load resources, and non-absolute
* resource names will have this class's package added
* @param resource
* resource to look up, relative to `klass`'s package or absolute starting
* resource to look up, relative to `klass` 's package or absolute starting
* with a "/"
* @param options
* parse options
Expand All @@ -773,7 +773,7 @@ object ConfigFactory extends PlatformConfigFactory {
* `klass.getClassLoader()` will be used to load resources, and non-absolute
* resource names will have this class's package added
* @param resource
* resource to look up, relative to `klass`'s package or absolute starting
* resource to look up, relative to `klass` 's package or absolute starting
* with a "/"
* @return
* the parsed configuration
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import java.{util => ju}
* <p> The [[ConfigValue#valueType]] method on a list returns
* [[ConfigValueType#LIST]].
*
* <p> <em>Do not implement `ConfigList`</em>; it should only be implemented by
* <p> <em>Do not implement `ConfigList` </em>; it should only be implemented by
* the config library. Arbitrary implementations will not work because the
* library internals assume a specific concrete implementation. Also, this
* interface is likely to grow new methods over time, so third-party
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ import java.{util => ju}
* a [[ConfigValue]] with type `ConfigValueType#NULL` then the key was set to
* null explicitly in the config file.
*
* <p> <em>Do not implement interface `ConfigObject`</em>; it should only be
* <p> <em>Do not implement interface `ConfigObject` </em>; it should only be
* implemented by the config library. Arbitrary implementations will not work
* because the library internals assume a specific concrete implementation.
* Also, this interface is likely to grow new methods over time, so third-party
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,9 @@ trait ConfigOrigin {

/**
* Returns a `ConfigOrigin` based on this one, but with the given comments.
* Does not modify this instance or any `ConfigValue`s with this origin (since
* they are immutable). To set the returned origin to a `ConfigValue`, use
* [[ConfigValue#withOrigin]].
* Does not modify this instance or any `ConfigValue` s with this origin
* (since they are immutable). To set the returned origin to a `ConfigValue`,
* use [[ConfigValue#withOrigin]].
*
* <p> Note that when the given comments are equal to the comments on this
* object, a new instance may not be created and `this` is returned directly.
Expand All @@ -103,7 +103,7 @@ trait ConfigOrigin {
/**
* Returns a `ConfigOrigin` based on this one, but with the given line number.
* This origin must be a FILE, URL or RESOURCE. Does not modify this instance
* or any `ConfigValue`s with this origin (since they are immutable). To set
* or any `ConfigValue` s with this origin (since they are immutable). To set
* the returned origin to a `ConfigValue`, use [[ConfigValue#withOrigin]].
*
* <p> Note that when the given lineNumber are equal to the lineNumber on this
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ package org.ekrich.config
* <p> Because this object is immutable, it is safe to use from multiple threads
* and there's no need for "defensive copies."
*
* <p> <em>Do not implement interface `ConfigValue`</em>; it should only be
* <p> <em>Do not implement interface `ConfigValue` </em>; it should only be
* implemented by the config library. Arbitrary implementations will not work
* because the library internals assume a specific concrete implementation.
* Also, this interface is likely to grow new methods over time, so third-party
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import org.ekrich.config.ConfigValue
* <p> Because this object is immutable, it is safe to use from multiple threads
* and there's no need for "defensive copies."
*
* <p> <em>Do not implement interface `ConfigDocument`</em>; it should only be
* <p> <em>Do not implement interface `ConfigDocument` </em>; it should only be
* implemented by the config library. Arbitrary implementations will not work
* because the library internals assume a specific concrete implementation.
* Also, this interface is likely to grow new methods over time, so third-party
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ package org.ekrich.config.parser
* <p> Because this object is immutable, it is safe to use from multiple threads
* and there's no need for "defensive copies."
*
* <p> <em>Do not implement interface `ConfigNode`</em>; it should only be
* <p> <em>Do not implement interface `ConfigNode` </em>; it should only be
* implemented by the config library. Arbitrary implementations will not work
* because the library internals assume a specific concrete implementation.
* Also, this interface is likely to grow new methods over time, so third-party
Expand Down