Update Strings.kt

Co-authored-by: Islon Scherer <[email protected]>
apple · Oct 25, 2024 · 9972d3d · 9972d3d
1 parent 5cfefb7
commit 9972d3d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/pkl-cli/src/main/kotlin/org/pkl/cli/CliImportAnalyzer.kt b/pkl-cli/src/main/kotlin/org/pkl/cli/CliImportAnalyzer.kt
@@ -20,7 +20,7 @@ import org.pkl.commons.cli.CliCommand
 import org.pkl.commons.createParentDirectories
 import org.pkl.commons.writeString
 import org.pkl.core.ModuleSource
-import org.pkl.core.module.ModuleKeyFactories
+import org.pkl.core.util.Readers
 
 class CliImportAnalyzer
 @JvmOverloads
@@ -73,7 +73,8 @@ constructor(
         .build()
         .use { it.evaluateOutputText(sourceModule) }
     } finally {
-      ModuleKeyFactories.closeQuietly(builder.moduleKeyFactories)
+      Readers.closeQuietly(builder.moduleKeyFactories)
+      Readers.closeQuietly(builder.resourceReaders)
     }
   }
 }
diff --git a/pkl-commons/src/main/kotlin/org/pkl/commons/Strings.kt b/pkl-commons/src/main/kotlin/org/pkl/commons/Strings.kt
@@ -20,7 +20,6 @@ import java.net.URI
 import java.nio.file.Path
 import java.util.*
 import java.util.regex.Pattern
-import kotlin.collections.ArrayList
 
 fun String.toPath(): Path = Path.of(this)
 
@@ -41,7 +40,7 @@ fun String.toUri(): URI {
 
 /** Lex a string into tokens similar to how a shell would */
 fun shlex(input: String): List<String> {
-  val result = ArrayList<String>()
+  val result = mutableListOf<String>()
   var inEscape = false
   var quote: Char? = null
   var lastCloseQuoteIndex = Int.MIN_VALUE