simplify code — it can be not only fileName, avoid extra param to handler — better to make clear that it is the same passed file path/name

This commit is contained in:
Vladimir Krivosheev
2018-12-08 09:51:35 +01:00
parent 42ddce4f7a
commit ab8f8688db
3 changed files with 6 additions and 6 deletions
@@ -107,7 +107,6 @@ internal class SchemeFileTracker(private val schemeManager: SchemeManagerImpl<An
val fileName = file.name
val changedScheme = findExternalizableSchemeByFileName(fileName)
if (callSchemeContentChangedIfSupported(changedScheme, fileName, file)) {
continue
}
@@ -198,8 +198,9 @@ class SchemeManagerImpl<T : Any, MUTABLE_SCHEME : T>(val fileSpec: String,
continue
}
catchAndLog(file.fileName.toString()) { filename ->
file.inputStream().use { schemeLoader.loadScheme(filename, it) }
val fileName = file.fileName.toString()
catchAndLog(fileName) {
file.inputStream().use { schemeLoader.loadScheme(fileName, it) }
}
}
}
@@ -12,14 +12,14 @@ internal fun ExternalizableScheme.renameScheme(newName: String) {
}
}
internal inline fun catchAndLog(fileName: String, runnable: (fileName: String) -> Unit) {
internal inline fun catchAndLog(file: String, runnable: () -> Unit) {
try {
runnable(fileName)
runnable()
}
catch (e: ProcessCanceledException) {
throw e
}
catch (e: Throwable) {
LOG.error("Cannot read scheme $fileName", e)
LOG.error("Cannot read scheme $file", e)
}
}