From 97f2b953ea732abfb51a84073f94bc21d05343bf Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Mon, 21 Dec 2020 09:24:31 +0100
Subject: [PATCH] Cleanup (logging; formatting)

GitOrigin-RevId: f9ce235b02f6c2289d8811d028e1339e69b372e7
---
 .../execution/wsl/WSLCommandLineOptions.java  |  1 -
 .../wsl/WslDistributionDescriptor.java        | 27 +++++++++----------
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/execution/wsl/WSLCommandLineOptions.java b/platform/platform-impl/src/com/intellij/execution/wsl/WSLCommandLineOptions.java
index afc2ab8d605d..9755deca0c9f 100644
--- a/platform/platform-impl/src/com/intellij/execution/wsl/WSLCommandLineOptions.java
+++ b/platform/platform-impl/src/com/intellij/execution/wsl/WSLCommandLineOptions.java
@@ -9,7 +9,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 public final class WSLCommandLineOptions {
-
   private boolean myLaunchWithWslExe = true;
   private boolean myExecuteCommandInShell = true;
   private boolean mySudo = false;
diff --git a/platform/platform-impl/src/com/intellij/execution/wsl/WslDistributionDescriptor.java b/platform/platform-impl/src/com/intellij/execution/wsl/WslDistributionDescriptor.java
index 83a40729ebc1..63744dcd103b 100644
--- a/platform/platform-impl/src/com/intellij/execution/wsl/WslDistributionDescriptor.java
+++ b/platform/platform-impl/src/com/intellij/execution/wsl/WslDistributionDescriptor.java
@@ -44,8 +44,7 @@ final class WslDistributionDescriptor {
   /**
    * Necessary for serializer
    */
-  WslDistributionDescriptor() {
-  }
+  WslDistributionDescriptor() { }
 
   WslDistributionDescriptor(@NotNull String msId) {
     this(msId, msId, null, msId);
@@ -163,28 +162,26 @@ final class WslDistributionDescriptor {
   @Nullable
   private List<String> readWSLOutput(WSLCommandLineOptions options, List<@NonNls String> command) {
     WSLDistribution distribution = WSLUtil.getDistributionById(getId());
-    if (distribution == null) {
-      return null;
-    }
-    ProcessOutput pwdOutput;
+    if (distribution == null) return null;
+
+    ProcessOutput output;
     try {
-      pwdOutput = distribution.executeOnWsl(command, options, -1, null);
+      output = distribution.executeOnWsl(command, options, -1, null);
     }
     catch (ExecutionException e) {
-      LOG.warn("Error reading pwd output for " + getId(), e);
+      LOG.warn("Start failed on " + getId(), e);
       return null;
     }
 
-    if (pwdOutput.getExitCode() != 0) {
-      LOG.info("Non-zero exit code while fetching pwd: " +
-               "[id=" + getId() + "; " +
-               "[exitCode=" + pwdOutput.getExitCode() + "; " +
-               "[stderr=" + pwdOutput.getStderr() + "; " +
-               "[stdout=" + pwdOutput.getStdout() + "]");
+    if (output.getExitCode() != 0) {
+      LOG.info("Execution failed on " + getId() +
+               " [exitCode=" + output.getExitCode() +
+               "; stderr=" + output.getStderr() +
+               "; stdout=" + output.getStdout() + "]");
       return null;
     }
 
-    return pwdOutput.getStdoutLines();
+    return output.getStdoutLines();
   }
 
   @NonNls @Nullable