Fix style issues

Author: Tobias Bordenca

vscode-dotty/src/extension.ts

@@ -339,7 +339,7 @@ function run(serverOptions: ServerOptions, isOldServer: boolean) {
 
   const providerRegistration = Disposable.from(
     vscode.workspace.registerTextDocumentContentProvider(DecompiledDocumentProvider.scheme, provider)
-  );
+  )
 
   extensionContext.subscriptions.push(providerRegistration, provider)
 

vscode-dotty/src/features.ts

@@ -78,8 +78,8 @@ export interface TastyDecompilerClientCapabilities {
 }
 
 export class TastyDecompilerFeature extends TextDocumentFeature<TextDocumentRegistrationOptions> {
-	constructor(client: BaseLanguageClient, readonly provider: DecompiledDocumentProvider) {
-		super(client, TastyDecompileRequest.type);
+  constructor(client: BaseLanguageClient, readonly provider: DecompiledDocumentProvider) {
+    super(client, TastyDecompileRequest.type)
   }
 
   fillClientCapabilities(capabilities: ClientCapabilities & TastyDecompilerClientCapabilities): void {

vscode-dotty/src/tasty-decompiler.ts

@@ -19,33 +19,33 @@ export class TastyDecompilerProvider implements Disposable {
     readonly documentSelector: vscode.DocumentSelector,
     readonly provider: DecompiledDocumentProvider) {
       this.disposables.push(
-        vscode.workspace.onDidOpenTextDocument( textDocument => {
+        vscode.workspace.onDidOpenTextDocument(textDocument => {
           if (this.isTasty(textDocument)) {
-            this.requestDecompile(textDocument).then( decompileResult => {
-              switch(decompileResult.error) {
+            this.requestDecompile(textDocument).then(decompileResult => {
+              switch (decompileResult.error) {
                 case RESULT_OK:
                   let scalaDocument = provider.makeScalaDocument(textDocument, decompileResult.scala)
 
                   vscode.workspace.openTextDocument(scalaDocument).then(doc => {
                     vscode.window.showTextDocument(doc, 1)
-                  });
+                  })
 
                   let fileName = textDocument.fileName.substring(textDocument.fileName.lastIndexOf(path.sep) + 1)
 
                   TastyTreeView.create(fileName, decompileResult.tastyTree)
-                  break;
+                  break
                 case ERROR_TASTY_VERSION:
                   vscode.window.showErrorMessage("Tasty file has unexpected signature.")
-                  break;
+                  break
                 case ERROR_CLASS_NOT_FOUND:
                   vscode.window.showErrorMessage("The class file related to this TASTy file could not be found.")
-                  break;
+                  break
                 case ERROR_OTHER:
                   vscode.window.showErrorMessage("A decompilation error has occurred.")
-                  break;
+                  break
                 default:
                   vscode.window.showErrorMessage("Unknown Error.")
-                  break;
+                  break
               }
             })
           }
@@ -54,8 +54,8 @@ export class TastyDecompilerProvider implements Disposable {
   }
 
   dispose(): void {
-		this.disposables.forEach(d => d.dispose())
-		this.disposables = []
+    this.disposables.forEach(d => d.dispose())
+    this.disposables = []
   }
 
   /**
@@ -72,44 +72,43 @@ export class TastyDecompilerProvider implements Disposable {
         title: "Decompiling"
       }, () => this.client.sendRequest(TastyDecompileRequest.type, requestParams, token)
       ))
-    }).then( decompileResult => {
-        canceller.dispose()
-        return decompileResult
-    });
+    }).then(decompileResult => {
+      canceller.dispose()
+      return decompileResult
+    })
   }
 
-    /** Is this document a tasty file? */
-    private isTasty(document: vscode.TextDocument): boolean {
-      return vscode.languages.match(this.documentSelector, document) > 0
-    }
-
+  /** Is this document a tasty file? */
+  private isTasty(document: vscode.TextDocument): boolean {
+    return vscode.languages.match(this.documentSelector, document) > 0
+  }
 }
 
 /**
  * Provider of virtual, read-only, scala documents
  */
 export class DecompiledDocumentProvider implements vscode.TextDocumentContentProvider {
-  static scheme = 'decompiled';
+  static scheme = 'decompiled'
 
-  private _documents = new Map<string, string>();
-  private _subscriptions: vscode.Disposable;
+  private _documents = new Map<string, string>()
+  private _subscriptions: vscode.Disposable
 
   constructor() {
     // Don't keep closed documents in memory
-		this._subscriptions = vscode.workspace.onDidCloseTextDocument(doc => this._documents.delete(doc.uri.toString()));
+    this._subscriptions = vscode.workspace.onDidCloseTextDocument(doc => this._documents.delete(doc.uri.toString()))
   }
 
   dispose() {
-		this._subscriptions.dispose();
-		this._documents.clear();
+    this._subscriptions.dispose()
+    this._documents.clear()
   }
 
-	provideTextDocumentContent(uri: vscode.Uri): string {
-    let document = this._documents.get(uri.toString());
-		if (document) {
-			return document;
+  provideTextDocumentContent(uri: vscode.Uri): string {
+    let document = this._documents.get(uri.toString())
+    if (document) {
+      return document
     } else {
-      return 'Failed to load result.';
+      return 'Failed to load result.'
     }
   }
 
@@ -119,70 +118,70 @@ export class DecompiledDocumentProvider implements vscode.TextDocumentContentPro
    * @param textDocument  The document containing the TASTy that was decompiled
    * @param content       The source code provided by the language server
    */
-  makeScalaDocument(textDocument: vscode.TextDocument, content: string): vscode.Uri  {
+  makeScalaDocument(textDocument: vscode.TextDocument, content: string): vscode.Uri {
     let scalaDocument = textDocument.uri.with({
       scheme: DecompiledDocumentProvider.scheme,
-      path:  textDocument.uri.path.replace(".tasty", ".scala")
+      path: textDocument.uri.path.replace(".tasty", ".scala")
     })
-    this._documents.set(scalaDocument.toString(), content);
-    return scalaDocument;
+    this._documents.set(scalaDocument.toString(), content)
+    return scalaDocument
   }
 }
 
 /**
  * WebView used as container for preformatted TASTy trees
  */
 class TastyTreeView {
-    public static readonly viewType = 'tastyTree';
+  public static readonly viewType = 'tastyTree'
 
-    private readonly _panel: vscode.WebviewPanel;
-    private _disposables: vscode.Disposable[] = [];
+  private readonly _panel: vscode.WebviewPanel
+  private _disposables: vscode.Disposable[] = []
 
-    /**
-     * Create new panel for a TASTy tree in a new column or column 2 if none is currently open
-     *
-     * @param title     The panel's title
-     * @param content   The panel's preformatted content
-     */
-    public static create(title: string, content: string) {
-        const column = vscode.window.activeTextEditor ? vscode.window.activeTextEditor.viewColumn : undefined;
+  /**
+   * Create new panel for a TASTy tree in a new column or column 2 if none is currently open
+   *
+   * @param title     The panel's title
+   * @param content   The panel's preformatted content
+   */
+  public static create(title: string, content: string) {
+    const column = vscode.window.activeTextEditor ? vscode.window.activeTextEditor.viewColumn : undefined
 
-        const panel = vscode.window.createWebviewPanel(TastyTreeView.viewType, "Tasty Tree", (column || vscode.ViewColumn.One) + 1, {});
+    const panel = vscode.window.createWebviewPanel(TastyTreeView.viewType, "Tasty Tree", (column || vscode.ViewColumn.One) + 1, {})
 
-        new TastyTreeView(panel, title, content);
-    }
+    new TastyTreeView(panel, title, content)
+  }
 
-    private constructor(
-        panel: vscode.WebviewPanel,
-        title: string,
-        content: string
-    ) {
-        this._panel = panel;
-        this.setContent(title, content)
-
-        // Listen for when the panel is disposed
-        // This happens when the user closes the panel or when the panel is closed programmatically
-        this._panel.onDidDispose(() => this.dispose(), null, this._disposables);
-    }
+  private constructor(
+    panel: vscode.WebviewPanel,
+    title: string,
+    content: string
+  ) {
+    this._panel = panel
+    this.setContent(title, content)
+
+    // Listen for when the panel is disposed
+    // This happens when the user closes the panel or when the panel is closed programmatically
+    this._panel.onDidDispose(() => this.dispose(), null, this._disposables)
+  }
 
-    public dispose() {
-        this._panel.dispose();
+  public dispose() {
+    this._panel.dispose()
 
-        while (this._disposables.length) {
-            const x = this._disposables.pop();
-            if (x) {
-                x.dispose();
-            }
-        }
+    while (this._disposables.length) {
+      const x = this._disposables.pop()
+      if (x) {
+        x.dispose()
+      }
     }
+  }
 
-    private setContent(name: string, content: string) {
-        this._panel.title = name;
-        this._panel.webview.html = this._getHtmlForWebview(content);
-    }
+  private setContent(name: string, content: string) {
+    this._panel.title = name
+    this._panel.webview.html = this._getHtmlForWebview(content)
+  }
 
-    private _getHtmlForWebview(content: string) {
-        return `<!DOCTYPE html>
+  private _getHtmlForWebview(content: string) {
+    return `<!DOCTYPE html>
             <html lang="en">
             <head>
                 <style>
@@ -207,6 +206,6 @@ class TastyTreeView {
               <pre>
 ${content}</pre>
             </body>
-            </html>`;
-    }
+            </html>`
+  }
 }