Use default space-before-function-paren from eslint-config-standard

TypeFox · Jun 21, 2022 · df05905 · df05905
1 parent 204f7d1
commit df05905
Show file tree

Hide file tree

Showing 9 changed files with 215 additions and 160 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -21,11 +21,6 @@ module.exports = {
         indent: ['error', 4, {
             SwitchCase: 1
         }],
-        'space-before-function-paren': ['error', {
-            anonymous: 'always',
-            named: 'never',
-            asyncArrow: 'always'
-        }],
         semi: ['error', 'always'],
         'no-extra-semi': 'off',
         '@typescript-eslint/no-extra-semi': ['error'],

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -4,10 +4,12 @@
   "editor.formatOnSave": false,
   "workbench.editor.revealIfOpen": true,
   "[javascript]": {
-    "editor.formatOnSave": true
+    "editor.formatOnSave": true,
+    "editor.defaultFormatter": "dbaeumer.vscode-eslint"
   },
   "[typescript]": {
-    "editor.formatOnSave": true
+    "editor.formatOnSave": true,
+    "editor.defaultFormatter": "dbaeumer.vscode-eslint"
   },
   "eslint.validate": [
     "javascript",

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/client/src/console-window.ts b/packages/client/src/console-window.ts
@@ -7,7 +7,7 @@ import * as vscode from 'vscode';
 
 export class ConsoleWindow implements Window {
     protected readonly channels = new Map<string, vscode.OutputChannel>();
-    showMessage<T extends vscode.MessageOptions | string | vscode.MessageItem>(severity: Severity, message: string, ...actions: T[]): Thenable<T | undefined> {
+    showMessage<T extends vscode.MessageOptions | string | vscode.MessageItem> (severity: Severity, message: string, ...actions: T[]): Thenable<T | undefined> {
         if (severity === Severity.Error) {
             console.error(message);
         }
@@ -23,23 +23,23 @@ export class ConsoleWindow implements Window {
         return Promise.resolve(undefined);
     }
 
-    createOutputChannel(name: string): vscode.OutputChannel {
+    createOutputChannel (name: string): vscode.OutputChannel {
         const existing = this.channels.get(name);
         if (existing) {
             return existing;
         }
         const channel: vscode.OutputChannel = {
             name: 'default',
-            append(value: string): void {
+            append (value: string): void {
                 console.log(name + ': ' + value);
             },
-            appendLine(line: string): void {
+            appendLine (line: string): void {
                 console.log(name + ': ' + line);
             },
-            show(): void {
+            show (): void {
                 // no-op
             },
-            dispose(): void {
+            dispose (): void {
                 // no-op
             },
             replace: function (value: string): void {

diff --git a/packages/client/src/disposable.ts b/packages/client/src/disposable.ts
@@ -8,17 +8,17 @@ import { Disposable } from 'vscode-jsonrpc';
 export class DisposableCollection implements Disposable {
     protected readonly disposables: Disposable[] = [];
 
-    dispose(): void {
+    dispose (): void {
         while (this.disposables.length !== 0) {
             this.disposables.pop()?.dispose();
         }
     }
 
-    push(disposable: Disposable): Disposable {
+    push (disposable: Disposable): Disposable {
         const disposables = this.disposables;
         disposables.push(disposable);
         return {
-            dispose(): void {
+            dispose (): void {
                 const index = disposables.indexOf(disposable);
                 if (index !== -1) {
                     disposables.splice(index, 1);