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.0.0 #75

Merged
merged 2 commits into from
Aug 20, 2021
Merged
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
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = 2.7.5
version = 3.0.0

style = default

Expand Down
3 changes: 2 additions & 1 deletion src/main/scala/sangria/marshalling/ArrayMapBuilder.scala
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ import scala.annotation.tailrec
import scala.collection.immutable.{ListMap, VectorBuilder}
import scala.collection.mutable.{Set => MutableSet}

/** GraphQL `Map` builder that knows keys in advance and able to preserve an original fields sort order
/** GraphQL `Map` builder that knows keys in advance and able to preserve an original fields sort
* order
*/
class ArrayMapBuilder[T](keys: Seq[String]) extends Iterable[(String, T)] {
private val elements = new Array[(String, T)](keys.size)
Expand Down
11 changes: 7 additions & 4 deletions src/main/scala/sangria/marshalling/InputUnmarshaller.scala
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,12 @@ trait InputUnmarshaller[Node] {
def isEnumNode(node: Node): Boolean
def isVariableNode(node: Node): Boolean

/** @return Scalar values are Scala String, Int, Double, Boolean and Enum values defined in the schema
* as well as ast nodes if appropriate.
/** @return
* Scalar values are Scala String, Int, Double, Boolean and Enum values defined in the schema
* as well as ast nodes if appropriate.
*
* TODO: find better approach. Ideally the should be only one `getScalarValue` method witch returns normal scala values
* TODO: find better approach. Ideally the should be only one `getScalarValue` method witch
* returns normal scala values
*/
def getScalarValue(node: Node): Any

Expand All @@ -40,7 +42,8 @@ trait InputUnmarshaller[Node] {
* - scala.BigInt
* - scala.BigDecimal
*
* @return Only normal scala scalar values
* @return
* Only normal scala scalar values
*/
def getScalaScalarValue(node: Node): Any

Expand Down
12 changes: 8 additions & 4 deletions src/main/scala/sangria/marshalling/ResultMarshaller.scala
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,13 @@ trait ResultMarshaller {
* - scala.BigInt
* - scala.BigDecimal
*
* Implementation may also support additional scala types if underlying data format supports them (like Dates, or BLOBs).
* Implementation may also support additional scala types if underlying data format supports them
* (like Dates, or BLOBs).
*
* @param value coerced scalar value
* @return marshaled node
* @param value
* coerced scalar value
* @return
* marshaled node
*/
def scalarNode(value: Any, typeName: String, info: Set[ScalarValueInfo]): Node

Expand Down Expand Up @@ -60,7 +63,8 @@ object ResultMarshaller {
scalaMarshalling.scalaResultMarshaller
}

/** Alters the behaviour of the executor and marshals raw (in-scala coerced representation) or scalar values and enums.
/** Alters the behaviour of the executor and marshals raw (in-scala coerced representation) or
* scalar values and enums.
*/
trait RawResultMarshaller extends ResultMarshaller {
def rawScalarNode(rawValue: Any): Node
Expand Down