From 0b4acf523fd1506b69aa846bf1504f68c42ccaef Mon Sep 17 00:00:00 2001
From: Andreas Fehn <fehnomenal@fehn.systems>
Date: Tue, 10 Nov 2020 16:05:02 +0100
Subject: [PATCH] Make check pass

---
 .../services/DirenvProjectService.kt          | 20 +++++++++----------
 .../intellijdirenv/services/DirenvService.kt  |  1 -
 .../services/EnvironmentService.kt            |  5 ++---
 3 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/src/main/kotlin/systems/fehn/intellijdirenv/services/DirenvProjectService.kt b/src/main/kotlin/systems/fehn/intellijdirenv/services/DirenvProjectService.kt
index d6ee67e..d641373 100644
--- a/src/main/kotlin/systems/fehn/intellijdirenv/services/DirenvProjectService.kt
+++ b/src/main/kotlin/systems/fehn/intellijdirenv/services/DirenvProjectService.kt
@@ -21,7 +21,6 @@ class DirenvProjectService(private val project: Project) {
     private val direnvService = service<DirenvService>()
     private val envService = service<EnvironmentService>()
 
-
     fun importDirenv() {
         val process = executeDirenv("export", "json") ?: return
 
@@ -85,16 +84,15 @@ class DirenvProjectService(private val project: Project) {
         )
     }
 
-
     private fun executeDirenv(vararg args: String): Process? {
-        envrcFile ?: return null
-
-        val command = listOf(
-            direnvService.direnvExecutable?.toString() ?: return null,
-            *args,
-        )
-        return ProcessBuilder(command)
-            .directory(workingDir ?: return null)
-            .start()
+        return envrcFile?.let {
+            workingDir?.let { workingDir ->
+                direnvService.direnvExecutable?.toString()?.let { executable ->
+                    ProcessBuilder(executable, *args)
+                        .directory(workingDir)
+                        .start()
+                }
+            }
+        }
     }
 }
diff --git a/src/main/kotlin/systems/fehn/intellijdirenv/services/DirenvService.kt b/src/main/kotlin/systems/fehn/intellijdirenv/services/DirenvService.kt
index bfc1453..1bfb979 100644
--- a/src/main/kotlin/systems/fehn/intellijdirenv/services/DirenvService.kt
+++ b/src/main/kotlin/systems/fehn/intellijdirenv/services/DirenvService.kt
@@ -24,6 +24,5 @@ class DirenvService {
             .map { Path.of(it, "direnv") }
             .firstOrNull { Files.exists(it) && Files.isExecutable(it) }
 
-
     val notificationGroup = NotificationGroup.balloonGroup("Direnv")
 }
diff --git a/src/main/kotlin/systems/fehn/intellijdirenv/services/EnvironmentService.kt b/src/main/kotlin/systems/fehn/intellijdirenv/services/EnvironmentService.kt
index 3cb4c94..10c44d3 100644
--- a/src/main/kotlin/systems/fehn/intellijdirenv/services/EnvironmentService.kt
+++ b/src/main/kotlin/systems/fehn/intellijdirenv/services/EnvironmentService.kt
@@ -11,10 +11,8 @@ class EnvironmentService {
         modifiableEnvironment[name] = value
     }
 
-
     class ManipulateEnvironmentException(message: String) : Throwable(message)
 
-
     private val modifiableEnvironment by lazy {
         val env = System.getenv()
         val envClass = env.javaClass
@@ -43,7 +41,8 @@ class EnvironmentService {
                     "exception.multipleMapFields",
                     cls.canonicalName,
                     Map::class.java.canonicalName,
-                    mapFields.map { it.name })
+                    mapFields.map { it.name }
+                )
             )
         }