Skip to content

Commit 2975b20

Browse files
committed
Move SourceLocation.describe() to util/Utils.kt
SchemaParser uses it, and so do the error messages and the directive code that move out of SchemaParser next. Edits to compile: private becomes internal, and SchemaParser imports it.
1 parent 661fb59 commit 2975b20

2 files changed

Lines changed: 4 additions & 3 deletions

File tree

‎src/main/kotlin/graphql/kickstart/tools/SchemaParser.kt‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import graphql.introspection.Introspection.DirectiveLocation.SCHEMA
1616
import graphql.introspection.Introspection.DirectiveLocation.UNION
1717
import graphql.kickstart.tools.directive.DirectiveWiringHelper
1818
import graphql.kickstart.tools.resolver.MethodFieldResolver
19+
import graphql.kickstart.tools.util.describe
1920
import graphql.kickstart.tools.util.extensionsOf
2021
import graphql.kickstart.tools.util.getDocumentation
2122
import graphql.kickstart.tools.util.unwrap
@@ -734,6 +735,3 @@ private val BUILT_IN_DIRECTIVES = listOf(
734735
).associateBy { it.name }
735736

736737
const val DEFAULT_DEPRECATION_MESSAGE = "No longer supported"
737-
738-
private fun SourceLocation?.describe(): String =
739-
this?.let { " at line $line, column $column" + sourceName?.let { name -> " in $name" }.orEmpty() }.orEmpty()

‎src/main/kotlin/graphql/kickstart/tools/util/Utils.kt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,3 +116,6 @@ internal fun getDocumentation(node: AbstractNode<*>, options: SchemaParserOption
116116
}
117117

118118
internal fun String.snakeToCamelCase(): String = split("_").joinToString(separator = "") { it.replaceFirstChar(Char::titlecase) }
119+
120+
internal fun SourceLocation?.describe(): String =
121+
this?.let { " at line $line, column $column" + sourceName?.let { name -> " in $name" }.orEmpty() }.orEmpty()

0 commit comments

Comments
 (0)