From a01fb1ef1c376babb895018507ac916211fa9bf3 Mon Sep 17 00:00:00 2001 From: Denis Bezrukov <6227442+denbezrukov@users.noreply.github.com> Date: Fri, 10 Jan 2025 12:16:41 +0200 Subject: [PATCH] fix: keep empty end line (#120) --- .../kotlin/com/github/biomejs/intellijbiome/BiomePackage.kt | 4 ++-- .../com/github/biomejs/intellijbiome/BiomeStdinRunner.kt | 4 ++-- .../intellijbiome/extensions/CapturingProcessAdapterExt.kt | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/kotlin/com/github/biomejs/intellijbiome/BiomePackage.kt b/src/main/kotlin/com/github/biomejs/intellijbiome/BiomePackage.kt index 26410d6..c6eadde 100644 --- a/src/main/kotlin/com/github/biomejs/intellijbiome/BiomePackage.kt +++ b/src/main/kotlin/com/github/biomejs/intellijbiome/BiomePackage.kt @@ -71,9 +71,9 @@ class BiomePackage(private val project: Project) { val processHandler = BiomeTargetRunBuilder(project).getBuilder(binaryPath).addParameters(listOf("--version")).build() return runCatching { - val result = processHandler.runProcessFuture().await() + val result = runProcessFuture(processHandler).await() val processOutput = result.processOutput - val stdout = processOutput.stdout.trim() + val stdout = processOutput.stdout val matchResult = versionRegex.find(stdout) return matchResult?.value }.getOrNull() diff --git a/src/main/kotlin/com/github/biomejs/intellijbiome/BiomeStdinRunner.kt b/src/main/kotlin/com/github/biomejs/intellijbiome/BiomeStdinRunner.kt index 506f05d..3950ee5 100644 --- a/src/main/kotlin/com/github/biomejs/intellijbiome/BiomeStdinRunner.kt +++ b/src/main/kotlin/com/github/biomejs/intellijbiome/BiomeStdinRunner.kt @@ -36,10 +36,10 @@ class BiomeStdinRunner(project: Project) : BiomeRunner { setInputFile(file) }.build() - val result = processHandler.runProcessFuture().await() + val result = runProcessFuture(processHandler).await() val processOutput = result.processOutput - val stdout = processOutput.stdout.trim() + val stdout = processOutput.stdout val stderr = processOutput.stderr.trim() if (result.processEvent.isSuccess) { diff --git a/src/main/kotlin/com/github/biomejs/intellijbiome/extensions/CapturingProcessAdapterExt.kt b/src/main/kotlin/com/github/biomejs/intellijbiome/extensions/CapturingProcessAdapterExt.kt index 42b49fc..73b346b 100644 --- a/src/main/kotlin/com/github/biomejs/intellijbiome/extensions/CapturingProcessAdapterExt.kt +++ b/src/main/kotlin/com/github/biomejs/intellijbiome/extensions/CapturingProcessAdapterExt.kt @@ -10,16 +10,16 @@ class ProcessResult(val processEvent: ProcessEvent, val processOutput: ProcessOu val ProcessEvent.isSuccess: Boolean get() = exitCode == 0 -fun OSProcessHandler.runProcessFuture(): CompletableFuture { +fun runProcessFuture(handler: OSProcessHandler): CompletableFuture { val future = CompletableFuture() - this.addProcessListener(object : CapturingProcessAdapter() { + handler.addProcessListener(object : CapturingProcessAdapter() { override fun processTerminated(event: ProcessEvent) { future.complete(ProcessResult(event, output)) } }) - this.startNotify() + handler.startNotify() return future }