fix: actually run prettier

gulpfile.js

@@ -31,19 +31,26 @@ function runPrettier(command, cb) {
   var exec = require('child_process').exec;
   exec(command, function(err, stdout, stderr) {
     if (err) {
-      cb(err);
-      return;
+      return cb(err);
     }
 
-    const files = stdout.split('\n');
-    for (const file of files) {
-      if (file.endsWith('.ts') || file.endsWith('.js')) {
-        exec(
-          `node ./node_modules/.bin/prettier --write --print-width 100 --single-quote --trailing-comma es5 ${file}`,
-          cb
-        );
-      }
+    if (!stdout) {
+      return cb();
     }
+
+    var files = stdout
+      .split('\n')
+      .filter(f => {
+        return f.endsWith('.ts') || f.endsWith('.js');
+      })
+      .join(' ');
+
+    exec(
+      `node ./node_modules/.bin/prettier --write --print-width 100 --single-quote --trailing-comma es5 ${files}`,
+      function(err, stdout, stderr) {
+        cb(err);
+      }
+    );
   });
 }
 

src/cmd_line/commands/setoptions.ts

@@ -77,13 +77,13 @@ export class SetOptionsCommand extends node.CommandBase {
         configuration[this._arguments.name] = false;
         break;
       case SetOptionOperator.Equal:
-      configuration[this._arguments.name] = this._arguments.value!;
+        configuration[this._arguments.name] = this._arguments.value!;
         break;
       case SetOptionOperator.Invert:
-      configuration[this._arguments.name] = !configuration[this._arguments.name];
+        configuration[this._arguments.name] = !configuration[this._arguments.name];
         break;
       case SetOptionOperator.Append:
-      configuration[this._arguments.name] += this._arguments.value!;
+        configuration[this._arguments.name] += this._arguments.value!;
         break;
       case SetOptionOperator.Subtract:
         if (typeof this._arguments.value! === 'number') {

src/configuration/configuration.ts

@@ -69,7 +69,9 @@ class Configuration implements IConfiguration {
   }
 
   reload() {
-    let vimConfigs: any = Globals.isTesting ? Globals.mockConfiguration : this.getConfiguration('vim');
+    let vimConfigs: any = Globals.isTesting
+      ? Globals.mockConfiguration
+      : this.getConfiguration('vim');
 
     /* tslint:disable:forin */
     // Disable forin rule here as we make accessors enumerable.`
@@ -295,7 +297,7 @@ class Configuration implements IConfiguration {
     replace: undefined,
   };
 
-  get modeToCursorStyleMap() : IModeSpecificStrings<vscode.TextEditorCursorStyle> {
+  get modeToCursorStyleMap(): IModeSpecificStrings<vscode.TextEditorCursorStyle> {
     let map = <IModeSpecificStrings<vscode.TextEditorCursorStyle>>{};
 
     Object.keys(this.cursorStylePerMode).forEach(k => {

src/configuration/iconfiguration.ts

@@ -73,18 +73,18 @@ export interface IConfiguration {
   easymotionMarkerBackgroundColor: string;
   easymotionMarkerForegroundColorOneChar: string;
   easymotionMarkerForegroundColorTwoChar: string;
-  easymotionMarkerWidthPerChar : number;
-  easymotionMarkerHeight : number;
+  easymotionMarkerWidthPerChar: number;
+  easymotionMarkerHeight: number;
   easymotionMarkerFontFamily: string;
   easymotionMarkerFontSize: string;
   easymotionMarkerFontWeight: string;
-  easymotionMarkerYOffset : number;
+  easymotionMarkerYOffset: number;
   easymotionKeys: string;
 
   /**
    * Timeout in milliseconds for remapped commands.
    */
-  timeout : number;
+  timeout: number;
 
   /**
    * Display partial commands on status bar?
@@ -99,12 +99,12 @@ export interface IConfiguration {
   /**
    * What key should <leader> map to in key remappings?
    */
-  leader : string;
+  leader: string;
 
   /**
    * How much search or command history should be remembered
    */
-  history : number;
+  history: number;
 
   /**
    * Show results of / or ? search as user is typing?
@@ -200,4 +200,4 @@ export interface IConfiguration {
   insertModeKeyBindingsNonRecursive: IKeyRemapping[];
   otherModesKeyBindings: IKeyRemapping[];
   otherModesKeyBindingsNonRecursive: IKeyRemapping[];
-}
+}

src/mode/modeHandler.ts

@@ -1266,7 +1266,9 @@ export class ModeHandler implements vscode.Disposable {
       cursorStyle = configuration.userCursor;
     }
 
-    cursorStyle = configuration.modeToCursorStyleMap[this.currentMode.friendlyName.toLowerCase()] || cursorStyle;
+    cursorStyle =
+      configuration.modeToCursorStyleMap[this.currentMode.friendlyName.toLowerCase()] ||
+      cursorStyle;
 
     let options = this.vimState.editor.options;
     options.cursorStyle = cursorStyle;

test/cmd_line/substitute.test.ts

@@ -2,7 +2,12 @@ import { getAndUpdateModeHandler } from '../../extension';
 import { CommandLine } from '../../src/cmd_line/commandLine';
 import { Globals } from '../../src/globals';
 import { ModeHandler } from '../../src/mode/modeHandler';
-import { assertEqualLines, cleanUpWorkspace, reloadConfiguration, setupWorkspace } from './../testUtils';
+import {
+  assertEqualLines,
+  cleanUpWorkspace,
+  reloadConfiguration,
+  setupWorkspace,
+} from './../testUtils';
 
 suite('Basic substitute', () => {
   let modeHandler: ModeHandler;

test/cmd_line/vsplit.test.ts

@@ -3,7 +3,12 @@ import * as vscode from 'vscode';
 import { getAndUpdateModeHandler } from '../../extension';
 import { CommandLine } from '../../src/cmd_line/commandLine';
 import { ModeHandler } from '../../src/mode/modeHandler';
-import { assertEqual, cleanUpWorkspace, setupWorkspace, WaitForEditorsToClose } from './../testUtils';
+import {
+  assertEqual,
+  cleanUpWorkspace,
+  setupWorkspace,
+  WaitForEditorsToClose,
+} from './../testUtils';
 
 suite('Vertical split', () => {
   let modeHandler: ModeHandler;

test/cmd_line/writequit.test.ts

@@ -3,7 +3,12 @@ import * as vscode from 'vscode';
 import { getAndUpdateModeHandler } from '../../extension';
 import { CommandLine } from '../../src/cmd_line/commandLine';
 import { ModeHandler } from '../../src/mode/modeHandler';
-import { assertEqual, cleanUpWorkspace, setupWorkspace, WaitForEditorsToClose } from './../testUtils';
+import {
+  assertEqual,
+  cleanUpWorkspace,
+  setupWorkspace,
+  WaitForEditorsToClose,
+} from './../testUtils';
 
 suite('Basic write-quit', () => {
   let modeHandler: ModeHandler;

test/configuration/configuration.test.ts

@@ -8,12 +8,13 @@ import { reloadConfiguration } from '../testUtils';
 suite('Configuration', () => {
   suiteSetup(() => {
     let configuration = new testConfiguration.Configuration();
-    configuration.leader = "<space>";
+    configuration.leader = '<space>';
     configuration.otherModesKeyBindingsNonRecursive = [
       {
-        "before": ["leader", "o"],
-        "after": ["o", "eSc", "k"]
-      }];
+        before: ['leader', 'o'],
+        after: ['o', 'eSc', 'k'],
+      },
+    ];
 
     Globals.mockConfiguration = configuration;
     reloadConfiguration();
@@ -24,7 +25,7 @@ suite('Configuration', () => {
     let keybindings = configuration.otherModesKeyBindingsNonRecursive;
 
     assert.equal(keybindings.length, 1);
-    assert.deepEqual(keybindings[0].before, [" ", "o"]);
-    assert.deepEqual(keybindings[0].after, ["o", "<Esc>", "k"]);
+    assert.deepEqual(keybindings[0].before, [' ', 'o']);
+    assert.deepEqual(keybindings[0].after, ['o', '<Esc>', 'k']);
   });
 });

test/configuration/remapper.test.ts

@@ -11,20 +11,24 @@ import { assertEqual, setupWorkspace, cleanUpWorkspace } from '../testUtils';
 suite('Remapper', () => {
   let modeHandler: ModeHandler;
   const leaderKey = '\\';
-  const insertModeKeyBindings = [{
-    "before": ["j", "j"],
-    "after": ["<Esc>"]
-  }];
-  const otherModeKeysRebindings = [{
-    "before": ["leader", "w"],
-    "after": [],
-    "commands": [
-      {
-          "command": "workbench.action.closeActiveEditor",
-          "args": []
-      },
-    ]
-   }];
+  const insertModeKeyBindings = [
+    {
+      before: ['j', 'j'],
+      after: ['<Esc>'],
+    },
+  ];
+  const otherModeKeysRebindings = [
+    {
+      before: ['leader', 'w'],
+      after: [],
+      commands: [
+        {
+          command: 'workbench.action.closeActiveEditor',
+          args: [],
+        },
+      ],
+    },
+  ];
 
   setup(async () => {
     let configuration = new Configuration();
@@ -47,7 +51,7 @@ suite('Remapper', () => {
     // act
     let actual = false;
     try {
-      actual = await remapper.sendKey(["j", "j"], modeHandler, modeHandler.vimState);
+      actual = await remapper.sendKey(['j', 'j'], modeHandler, modeHandler.vimState);
     } catch (e) {
       assert.fail(e);
     }
@@ -65,7 +69,7 @@ suite('Remapper', () => {
     // act
     let actual = false;
     try {
-      actual = await remapper.sendKey([leaderKey, "w"], modeHandler, modeHandler.vimState);
+      actual = await remapper.sendKey([leaderKey, 'w'], modeHandler, modeHandler.vimState);
     } catch (e) {
       assert.fail(e);
     }

test/extension.test.ts

@@ -38,12 +38,16 @@ suite('package.json', () => {
 
     // configuration
     let handlers = Object.keys(srcConfiguration.configuration);
-    let unhandled = _.filter(keys, k => { return handlers.indexOf(k) >= 0; });
-    assert.equal(unhandled, 0, 'Missing src handlers for ' + unhandled.join(","));
+    let unhandled = _.filter(keys, k => {
+      return handlers.indexOf(k) >= 0;
+    });
+    assert.equal(unhandled, 0, 'Missing src handlers for ' + unhandled.join(','));
 
     // test configuration
     handlers = Object.keys(new testConfiguration.Configuration());
-    unhandled = _.filter(keys, k => { return handlers.indexOf(k) >= 0; });
-    assert.equal(unhandled, 0, 'Missing test handlers for ' + unhandled.join(","));
+    unhandled = _.filter(keys, k => {
+      return handlers.indexOf(k) >= 0;
+    });
+    assert.equal(unhandled, 0, 'Missing test handlers for ' + unhandled.join(','));
   });
 });

test/mode/modeVisual.test.ts

@@ -6,7 +6,13 @@ import { ModeName } from '../../src/mode/mode';
 import { ModeHandler } from '../../src/mode/modeHandler';
 import { TextEditor } from '../../src/textEditor';
 import { getTestingFunctions } from '../testSimplifier';
-import { assertEqual, assertEqualLines, cleanUpWorkspace, reloadConfiguration, setupWorkspace } from './../testUtils';
+import {
+  assertEqual,
+  assertEqualLines,
+  cleanUpWorkspace,
+  reloadConfiguration,
+  setupWorkspace,
+} from './../testUtils';
 
 suite('Mode Visual', () => {
   let modeHandler: ModeHandler;

test/plugins/easymotion.test.ts

@@ -1,5 +1,8 @@
 import { getAndUpdateModeHandler } from '../../extension';
-import { buildTriggerKeys, EasymotionTrigger } from '../../src/actions/plugins/easymotion/easymotion.cmd';
+import {
+  buildTriggerKeys,
+  EasymotionTrigger,
+} from '../../src/actions/plugins/easymotion/easymotion.cmd';
 import { ModeHandler } from '../../src/mode/modeHandler';
 import { Configuration } from '../testConfiguration';
 import { getTestingFunctions } from '../testSimplifier';

test/testConfiguration.ts

@@ -32,12 +32,12 @@ export class Configuration implements IConfiguration {
   startInInsertMode = false;
   statusBarColorControl = false;
   statusBarColors: {
-    normal: '#005f5f',
-    insert: '#5f0000',
-    visual: '#5f00af',
-    visualline: '#005f87',
-    visualblock: '#86592d',
-    replace: '#000000',
+    normal: '#005f5f';
+    insert: '#5f0000';
+    visual: '#5f00af';
+    visualline: '#005f87';
+    visualblock: '#86592d';
+    replace: '#000000';
   };
   searchHighlightColor = 'rgba(150, 150, 255, 0.3)';
   tabstop = 2;
@@ -67,4 +67,3 @@ export class Configuration implements IConfiguration {
   otherModesKeyBindings: IKeyRemapping[] = [];
   otherModesKeyBindingsNonRecursive: IKeyRemapping[] = [];
 }
-

test/testUtils.ts

@@ -72,7 +72,10 @@ export function assertEqual<T>(one: T, two: T, message: string = ''): void {
   assert.equal(one, two, message);
 }
 
-export async function setupWorkspace(config: IConfiguration = new Configuration(), fileExtension: string = ''): Promise<any> {
+export async function setupWorkspace(
+  config: IConfiguration = new Configuration(),
+  fileExtension: string = ''
+): Promise<any> {
   const file = await createRandomFile('', fileExtension);
   const doc = await vscode.workspace.openTextDocument(file);
 
@@ -114,8 +117,8 @@ export async function cleanUpWorkspace(): Promise<any> {
       }
     );
   }).then(() => {
-    assert.equal(vscode.window.visibleTextEditors.length, 0, "Expected all editors closed.");
-    assert(!vscode.window.activeTextEditor, "Expected no active text editor.");
+    assert.equal(vscode.window.visibleTextEditors.length, 0, 'Expected all editors closed.');
+    assert(!vscode.window.activeTextEditor, 'Expected no active text editor.');
   });
 }