Merge pull request #615 from xuwei-k/interpolation

use string interpolation. fix warnings
eed3si9n · Oct 4, 2023 · 346e4e7 · 346e4e7
2 parents a5895bb + 155cda6
commit 346e4e7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/cli/src/main/scala/scalaxb/compiler/xsd/ContextProcessor.scala b/cli/src/main/scala/scalaxb/compiler/xsd/ContextProcessor.scala
@@ -225,7 +225,7 @@ trait ContextProcessor extends ScalaNames with PackageName {
       .split("[:/]")                                           // Split the namespace URI into fragments
       .map {_.filter(allowedChars)}                            // Package name must be valid
       .filter(!_.isEmpty)                                      // Drop empty fragments
-      .map {str => if (numbers(str.head)) 'n' + str else str}  // Package name can't start with a number
+      .map {str => if (numbers(str.head)) s"n${str}" else str} // Package name can't start with a number
       .tail                                                    // Drop the first fragment, which is usually "http"
       .mkString(".")                                           // Concat the fragments
     )}

diff --git a/cli/src/main/scala/scalaxb/compiler/xsd/Lookup.scala b/cli/src/main/scala/scalaxb/compiler/xsd/Lookup.scala
@@ -161,7 +161,7 @@ trait Lookup extends ContextProcessor {
     buildTypeName(packageName(decl, context), decl, shortLocal)
 
   def buildTypeName(pkg: Option[String], decl: Decl, shortLocal: Boolean): String = {
-    if (!context.typeNames.contains(decl)) sys.error(pkg + ": Type name not found: " + decl.toString)
+    if (!context.typeNames.contains(decl)) sys.error(s"${pkg}: Type name not found: " + decl.toString)
 
     if (shortLocal && pkg == packageName(schema, context)) context.typeNames(decl)
     else buildFullyQualifiedNameFromPackage(pkg, context.typeNames(decl))
@@ -183,7 +183,7 @@ trait Lookup extends ContextProcessor {
     val pkg = packageName(schema, context)
     val typeNames = context.enumValueNames(pkg)
     if (!typeNames.contains(enumTypeName, enum))
-      sys.error(pkg + ": Type name not found: " + enum.toString)
+      sys.error(s"${pkg}: Type name not found: " + enum.toString)
 
     if (shortLocal && pkg == packageName(schema, context)) typeNames(enumTypeName, enum)
     else buildFullyQualifiedNameFromPackage(pkg, typeNames(enumTypeName, enum))