From 3159e87c49cd43677927ba7baa8f12c1232183a1 Mon Sep 17 00:00:00 2001
From: Veetaha <gerzoh1@gmail.com>
Date: Sun, 9 Feb 2020 13:36:36 +0200
Subject: vscode: refactor levels of code nesting and string literals quotes

---
 editors/code/src/installation/language_server.ts | 56 +++++++++++++-----------
 1 file changed, 30 insertions(+), 26 deletions(-)

(limited to 'editors')

diff --git a/editors/code/src/installation/language_server.ts b/editors/code/src/installation/language_server.ts
index ea1228e46..e571cbc98 100644
--- a/editors/code/src/installation/language_server.ts
+++ b/editors/code/src/installation/language_server.ts
@@ -71,9 +71,10 @@ export async function ensureLanguageServerBinary(
             if (isBinaryAvailable(langServerSource.path)) {
                 return langServerSource.path;
             }
+
             vscode.window.showErrorMessage(
                 `Unable to run ${langServerSource.path} binary. ` +
-                "To use the pre-built language server, set `rust-analyzer.raLspServerPath` " +
+                `To use the pre-built language server, set "rust-analyzer.raLspServerPath" ` +
                 "value to `null` or remove it from the settings to use it by default."
             );
             return null;
@@ -81,34 +82,37 @@ export async function ensureLanguageServerBinary(
         case BinarySource.Type.GithubRelease: {
             const prebuiltBinaryPath = path.join(langServerSource.dir, langServerSource.file);
 
-            if (!isBinaryAvailable(prebuiltBinaryPath)) {
-                const userResponse = await vscode.window.showInformationMessage(
-                    "Language server binary for rust-analyzer was not found. " +
-                    "Do you want to download it now?",
-                    "Download now", "Cancel"
-                );
-                if (userResponse !== "Download now") return null;
-
-                try {
-                    await downloadLatestLanguageServer(langServerSource);
-                } catch (err) {
-                    await vscode.window.showErrorMessage(
-                        `Failed to download language server from ${langServerSource.repo.name} ` +
-                        `GitHub repository: ${err.message}`
-                    );
-                    return null;
-                }
-
-
-                assert(
-                    isBinaryAvailable(prebuiltBinaryPath),
-                    "Downloaded language server binary is not functional"
-                );
+            if (isBinaryAvailable(prebuiltBinaryPath)) {
+                return prebuiltBinaryPath;
+            }
 
-                vscode.window.showInformationMessage(
-                    "Rust analyzer language server was successfully installed 🦀"
+            const userResponse = await vscode.window.showInformationMessage(
+                "Language server binary for rust-analyzer was not found. " +
+                "Do you want to download it now?",
+                "Download now", "Cancel"
+            );
+            if (userResponse !== "Download now") return null;
+
+            try {
+                await downloadLatestLanguageServer(langServerSource);
+            } catch (err) {
+                await vscode.window.showErrorMessage(
+                    `Failed to download language server from ${langServerSource.repo.name} ` +
+                    `GitHub repository: ${err.message}`
                 );
+                return null;
             }
+
+
+            assert(
+                isBinaryAvailable(prebuiltBinaryPath),
+                "Downloaded language server binary is not functional"
+            );
+
+            vscode.window.showInformationMessage(
+                "Rust analyzer language server was successfully installed 🦀"
+            );
+
             return prebuiltBinaryPath;
         }
     }
-- 
cgit v1.2.3