starred/pkl
1
0
Fork 0
mirror of https://github.com/apple/pkl.git synced 2026-03-21 00:29:07 +01:00
Code Issues 198 Packages Projects Releases 10 Wiki Activity

More external reader refinements (#766)

Browse Source 
* org.pkl.core.Readers -> org.pkl.core.Closeables
* Remove coupling between pkl.core.module/resource and pkl.core.messaging
This commit is contained in:
Josh B
2024-11-01 14:05:45 -07:00
committed by GitHub
parent 3f38173ed5
commit fa25fb46fd
16 changed files with 70 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkl-cli/src/main/kotlin/org/pkl/cli/CliEvaluator.kt
View File

@@ -28,10 +28,10 @@ import org.pkl.commons.cli.CliException
import org.pkl.commons.createParentDirectories
import org.pkl.commons.currentWorkingDir
import org.pkl.commons.writeString
import org.pkl.core.Closeables
import org.pkl.core.EvaluatorBuilder
import org.pkl.core.ModuleSource
import org.pkl.core.PklException
import org.pkl.core.Readers
import org.pkl.core.module.ModulePathResolver
import org.pkl.core.runtime.ModuleResolver
import org.pkl.core.runtime.VmException
@@ -100,8 +100,8 @@ constructor(
writeOutput(builder)
}
} finally {
Readers.closeQuietly(builder.moduleKeyFactories)
Readers.closeQuietly(builder.resourceReaders)
Closeables.closeQuietly(builder.moduleKeyFactories)
Closeables.closeQuietly(builder.resourceReaders)
}
}

6
pkl-cli/src/main/kotlin/org/pkl/cli/CliImportAnalyzer.kt
View File

@@ -19,8 +19,8 @@ import java.io.Writer
import org.pkl.commons.cli.CliCommand
import org.pkl.commons.createParentDirectories
import org.pkl.commons.writeString
import org.pkl.core.Closeables
import org.pkl.core.ModuleSource
import org.pkl.core.Readers
class CliImportAnalyzer
@JvmOverloads
@@ -73,8 +73,8 @@ constructor(
.build()
.use { it.evaluateOutputText(sourceModule) }
} finally {
Readers.closeQuietly(builder.moduleKeyFactories)
Readers.closeQuietly(builder.resourceReaders)
Closeables.closeQuietly(builder.moduleKeyFactories)
Closeables.closeQuietly(builder.resourceReaders)
}
}
}

6
pkl-cli/src/main/kotlin/org/pkl/cli/CliTestRunner.kt
View File

@@ -17,9 +17,9 @@ package org.pkl.cli
import java.io.Writer
import org.pkl.commons.cli.*
import org.pkl.core.Closeables
import org.pkl.core.EvaluatorBuilder
import org.pkl.core.ModuleSource.uri
import org.pkl.core.Readers
import org.pkl.core.stdlib.test.report.JUnitReport
import org.pkl.core.stdlib.test.report.SimpleReport
import org.pkl.core.util.ErrorMessages
@@ -38,8 +38,8 @@ constructor(
try {
evalTest(builder)
} finally {
Readers.closeQuietly(builder.moduleKeyFactories)
Readers.closeQuietly(builder.resourceReaders)
Closeables.closeQuietly(builder.moduleKeyFactories)
Closeables.closeQuietly(builder.resourceReaders)
}
}