From ab8f8688dba6724952065bc6535517bd5bd3ac2c Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Fri, 7 Dec 2018 19:59:45 +0100
Subject: [PATCH] =?UTF-8?q?simplify=20code=20=E2=80=94=20it=20can=20be=20n?=
 =?UTF-8?q?ot=20only=20fileName,=20avoid=20extra=20param=20to=20handler=20?=
 =?UTF-8?q?=E2=80=94=20better=20to=20make=20clear=20that=20it=20is=20the?=
 =?UTF-8?q?=20same=20passed=20file=20path/name?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/schemeManager/SchemeFileTracker.kt                  | 1 -
 .../src/schemeManager/SchemeManagerImpl.kt                  | 5 +++--
 .../src/schemeManager/schemeManagerUtil.kt                  | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/platform/configuration-store-impl/src/schemeManager/SchemeFileTracker.kt b/platform/configuration-store-impl/src/schemeManager/SchemeFileTracker.kt
index 2e01d55ab052..a1c4fa721bfe 100644
--- a/platform/configuration-store-impl/src/schemeManager/SchemeFileTracker.kt
+++ b/platform/configuration-store-impl/src/schemeManager/SchemeFileTracker.kt
@@ -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
       }
diff --git a/platform/configuration-store-impl/src/schemeManager/SchemeManagerImpl.kt b/platform/configuration-store-impl/src/schemeManager/SchemeManagerImpl.kt
index fef027a4aee7..33366c44e85c 100644
--- a/platform/configuration-store-impl/src/schemeManager/SchemeManagerImpl.kt
+++ b/platform/configuration-store-impl/src/schemeManager/SchemeManagerImpl.kt
@@ -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) }
             }
           }
         }
diff --git a/platform/configuration-store-impl/src/schemeManager/schemeManagerUtil.kt b/platform/configuration-store-impl/src/schemeManager/schemeManagerUtil.kt
index 5871c2dfd4ed..6b7122f41788 100644
--- a/platform/configuration-store-impl/src/schemeManager/schemeManagerUtil.kt
+++ b/platform/configuration-store-impl/src/schemeManager/schemeManagerUtil.kt
@@ -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)
   }
 }
\ No newline at end of file