fix linting errors

Author: jannickj

src/extension.ts

@@ -21,14 +21,14 @@ import {
   ServerOptions,
 } from 'vscode-languageclient';
 
-import * as workspace_util from './workspace_util';
 import { RLSConfiguration } from './configuration';
 import { SignatureHelpProvider } from './providers/signatureHelpProvider';
 import { checkForRls, ensureToolchain, rustupUpdate } from './rustup';
 import { startSpinner, stopSpinner } from './spinner';
 import { activateTaskProvider, Execution, runRlsCommand } from './tasks';
 import { withWsl } from './utils/child_process';
 import { uriWindowsToWsl, uriWslToWindows } from './utils/wslpath';
+import * as workspace_util from './workspace_util';
 
 /**
  * Parameter type to `window/progress` request as issued by the RLS.
@@ -72,12 +72,12 @@ function whenOpeningTextDocument(
   }
 
   const inMultiProjectMode = workspace
-      .getConfiguration()
-      .get<boolean>('rust-client.enableMultiProjectSetup', false);
+    .getConfiguration()
+    .get<boolean>('rust-client.enableMultiProjectSetup', false);
 
   const inNestedOuterProjectMode = workspace
-        .getConfiguration()
-        .get<boolean>('rust-client.nestedMultiRootConfigInOutermost', true);
+    .getConfiguration()
+    .get<boolean>('rust-client.nestedMultiRootConfigInOutermost', true);
 
   if (inMultiProjectMode) {
     folder = workspace_util.nearestParentWorkspace(folder, document.uri.fsPath);
@@ -125,7 +125,6 @@ function sortedWorkspaceFolders(): string[] {
   return _sortedWorkspaceFolders || [];
 }
 
-
 function getOuterMostWorkspaceFolder(folder: WorkspaceFolder): WorkspaceFolder {
   // TODO: decouple the global state such that it can be moved to workspace_util
   const sorted = sortedWorkspaceFolders();

src/workspace_util.ts

@@ -1,48 +1,42 @@
 import * as fs from 'fs';
 import * as path from 'path';
-import { WorkspaceFolder, Uri } from 'vscode';
-
-
+import { Uri, WorkspaceFolder } from 'vscode';
 
 // searches up the folder structure until it finds a Cargo.toml
 export function nearestParentWorkspace(
-    curWorkspace: WorkspaceFolder,
-    filePath: string,
-  ): WorkspaceFolder {
-
-    // check that the workspace folder already contains the "Cargo.toml"
-    const workspaceRoot = path.parse(curWorkspace.uri.fsPath).dir;
-    const rootManifest = path.join(workspaceRoot, 'Cargo.toml');
-    if (fs.existsSync(rootManifest)) {
-      return curWorkspace;
-    }
-
-    // algorithm that will strip one folder at a time and check if that folder contains "Cargo.toml"
-    let current = filePath;
-    while (true) {
-      const old = current;
-      current = path.dirname(current);
-
-      // break in case there is a bug that could result in a busy loop
-      if (old === current) {
-        break;
-      }
+  curWorkspace: WorkspaceFolder,
+  filePath: string,
+): WorkspaceFolder {
+  // check that the workspace folder already contains the "Cargo.toml"
+  const workspaceRoot = path.parse(curWorkspace.uri.fsPath).dir;
+  const rootManifest = path.join(workspaceRoot, 'Cargo.toml');
+  if (fs.existsSync(rootManifest)) {
+    return curWorkspace;
+  }
 
-      // break in case the strip folder has not changed
-      if (workspaceRoot === path.parse(current).dir) {
-        break;
-      }
+  // algorithm that will strip one folder at a time and check if that folder contains "Cargo.toml"
+  let current = filePath;
+  while (true) {
+    const old = current;
+    current = path.dirname(current);
 
-      // check if "Cargo.toml" is present in the parent folder
-      const cargoPath = path.join(current, 'Cargo.toml');
-      if (fs.existsSync(cargoPath)) {
+    // break in case there is a bug that could result in a busy loop
+    if (old === current) {
+      break;
+    }
 
-        // ghetto change the uri on Workspace folder to make vscode think it's located elsewhere
-        return { ...curWorkspace, uri: Uri.parse(current) };
-      }
+    // break in case the strip folder has not changed
+    if (workspaceRoot === path.parse(current).dir) {
+      break;
     }
 
-    return curWorkspace;
+    // check if "Cargo.toml" is present in the parent folder
+    const cargoPath = path.join(current, 'Cargo.toml');
+    if (fs.existsSync(cargoPath)) {
+      // ghetto change the uri on Workspace folder to make vscode think it's located elsewhere
+      return { ...curWorkspace, uri: Uri.parse(current) };
+    }
   }
 
-
+  return curWorkspace;
+}