Update dependency prettier to v2.3.0 (#6604)

Co-authored-by: Renovate Bot <bot@renovateapp.com>

Author: renovate[bot]

extensionBase.ts

@@ -162,9 +162,8 @@ export async function activate(context: vscode.ExtensionContext, handleLocal: bo
           modeHandler.vimState.historyTracker.currentContentChanges = [];
         }
 
-        modeHandler.vimState.historyTracker.currentContentChanges = modeHandler.vimState.historyTracker.currentContentChanges.concat(
-          event.contentChanges
-        );
+        modeHandler.vimState.historyTracker.currentContentChanges =
+          modeHandler.vimState.historyTracker.currentContentChanges.concat(event.contentChanges);
       }
     };
 

package.json

@@ -1151,7 +1151,7 @@
     "minimist": "1.2.5",
     "mocha": "8.4.0",
     "plugin-error": "1.0.1",
-    "prettier": "2.2.1",
+    "prettier": "2.3.0",
     "sinon": "10.0.0",
     "ts-loader": "9.1.2",
     "tslint": "6.1.3",

src/actions/commands/commandLine.ts

@@ -94,11 +94,12 @@ class CommandTabInCommandline extends BaseCommand {
       const currentUri = vimState.document.uri;
       const isRemote = !!vscode.env.remoteName;
 
-      const { fullDirPath, baseName, partialPath, path: p } = getPathDetails(
-        filePathInCmd,
-        currentUri,
-        isRemote
-      );
+      const {
+        fullDirPath,
+        baseName,
+        partialPath,
+        path: p,
+      } = getPathDetails(filePathInCmd, currentUri, isRemote);
       // Update the evalCmd in case of windows, where we change / to \
       evalCmd = evalCmd.slice(0, fileRegex.lastIndex) + partialPath;
 

src/actions/plugins/surround.ts

@@ -352,9 +352,10 @@ class CommandSurroundAddToReplacement extends BaseCommand {
     });
   }
 
-  private static getStartAndEndReplacements(
-    replacement: string | undefined
-  ): { startReplace: string; endReplace: string } {
+  private static getStartAndEndReplacements(replacement: string | undefined): {
+    startReplace: string;
+    endReplace: string;
+  } {
     if (!replacement) {
       return { startReplace: '', endReplace: '' };
     }

src/cmd_line/subparsers/tab.ts

@@ -28,9 +28,10 @@ function parseCount(args: string): number | undefined {
   }
 }
 
-function parseCountOrOffset(
-  args: string
-): { count: number | undefined; direction?: 'left' | 'right' } {
+function parseCountOrOffset(args: string): {
+  count: number | undefined;
+  direction?: 'left' | 'right';
+} {
   if (!args) {
     return { count: undefined };
   }

src/configuration/remapper.ts

@@ -223,8 +223,8 @@ export class Remapper implements IRemapper {
 
         if (remapState.wasPerformingRemapThatFinishedWaitingForTimeout) {
           // Some keys that broke the possible remap were typed by the user so handle them seperatly
-          const lastRemapLength = remapState.wasPerformingRemapThatFinishedWaitingForTimeout.after!
-            .length;
+          const lastRemapLength =
+            remapState.wasPerformingRemapThatFinishedWaitingForTimeout.after!.length;
           const keysPressedByUser = keys.slice(lastRemapLength);
           keys = keys.slice(0, lastRemapLength);
 

src/configuration/vimrcKeyRemappingBuilder.ts

@@ -57,7 +57,8 @@ class VimrcKeyRemappingBuilderImpl {
    * * `(?!.*<Plug>|.*<SID>)` -> don't allow mappings with <Plug> or <SID>
    * * `([\S ]+)$` -> match the {rhs} (we call it 'after') allowing spaces for commands like `:edit {file}<CR>`
    */
-  private static readonly KEY_REMAPPING_REG_EX = /^(map!?|smap|[nvxoilc]m(?:a(?:p)?)?|(?:[nvxl]no?r?|[oic]nor?|snor)(?:e(?:m(?:a(?:p)?)?)?)?|no(?:r(?:e(?:m(?:a(?:p)?)?)?)?)?!?)\s+(?!.*(?:<expr>|<script>))(?:(?:<buffer>|<silent>|<nowait>|<special>)\s?)*([\S]+)\s+(?!.*<Plug>|.*<SID>)([\S ]+)$/i;
+  private static readonly KEY_REMAPPING_REG_EX =
+    /^(map!?|smap|[nvxoilc]m(?:a(?:p)?)?|(?:[nvxl]no?r?|[oic]nor?|snor)(?:e(?:m(?:a(?:p)?)?)?)?|no(?:r(?:e(?:m(?:a(?:p)?)?)?)?)?!?)\s+(?!.*(?:<expr>|<script>))(?:(?:<buffer>|<silent>|<nowait>|<special>)\s?)*([\S]+)\s+(?!.*<Plug>|.*<SID>)([\S ]+)$/i;
 
   /**
    * Regex for unmapping lines
@@ -86,7 +87,8 @@ class VimrcKeyRemappingBuilderImpl {
    * * `(?:(?:<buffer>|<silent>|<nowait>|<special>)\s?)*` -> allow any of these arguments without capture
    * * `([\S]+)$` -> match the {lhs} (we call it 'before')
    */
-  private static readonly KEY_UNREMAPPING_REG_EX = /^(unm(?:a(?:p)?)?!?|[nvxoilc]u(?:n(?:m(?:a(?:p)?)?)?)?|sunm(?:a(?:p)?)?)\s+(?:(?:<buffer>|<silent>|<nowait>|<special>)\s?)*([\S]+)$/i;
+  private static readonly KEY_UNREMAPPING_REG_EX =
+    /^(unm(?:a(?:p)?)?!?|[nvxoilc]u(?:n(?:m(?:a(?:p)?)?)?)?|sunm(?:a(?:p)?)?)\s+(?:(?:<buffer>|<silent>|<nowait>|<special>)\s?)*([\S]+)$/i;
 
   /**
    * Regex for clear mapping lines
@@ -111,7 +113,8 @@ class VimrcKeyRemappingBuilderImpl {
    *
    * * `([\S]+)$` -> match the {lhs} (we call it 'before')
    */
-  private static readonly KEY_CLEAR_REMAPPING_REG_EX = /^(mapc(?:l(?:e(?:a(?:r)?)?)?)?!?|[nvxsoilc]mapc(?:l(?:e(?:a(?:r)?)?)?)?)$/i;
+  private static readonly KEY_CLEAR_REMAPPING_REG_EX =
+    /^(mapc(?:l(?:e(?:a(?:r)?)?)?)?!?|[nvxsoilc]mapc(?:l(?:e(?:a(?:r)?)?)?)?)$/i;
 
   /**
    * Regex for each key of {lhs} and {rhs}

src/mode/modeHandler.ts

@@ -463,9 +463,10 @@ export class ModeHandler implements vscode.Disposable, IModeHandler {
           // Remove the <TimeoutFinished> key and get the key before that. If the <TimeoutFinished>
           // key was the last key, then 'key' will be undefined and won't be sent to handle action.
           this.vimState.recordedState.commandList.pop();
-          key = this.vimState.recordedState.commandList[
-            this.vimState.recordedState.commandList.length - 1
-          ];
+          key =
+            this.vimState.recordedState.commandList[
+              this.vimState.recordedState.commandList.length - 1
+            ];
         }
         if (key !== undefined) {
           handledAsAction = await this.handleKeyAsAnAction(key);
@@ -1448,13 +1449,13 @@ export class ModeHandler implements vscode.Disposable, IModeHandler {
     if (this.vimState.currentMode === Mode.Insert || this.vimState.currentMode === Mode.Replace) {
       let virtualKey: string | undefined;
       if (this.vimState.recordedState.bufferedKeys.length > 0) {
-        virtualKey = this.vimState.recordedState.bufferedKeys[
-          this.vimState.recordedState.bufferedKeys.length - 1
-        ];
+        virtualKey =
+          this.vimState.recordedState.bufferedKeys[
+            this.vimState.recordedState.bufferedKeys.length - 1
+          ];
       } else if (this.vimState.recordedState.waitingForAnotherActionKey) {
-        virtualKey = this.vimState.recordedState.actionKeys[
-          this.vimState.recordedState.actionKeys.length - 1
-        ];
+        virtualKey =
+          this.vimState.recordedState.actionKeys[this.vimState.recordedState.actionKeys.length - 1];
         if (virtualKey === '<C-r>') {
           virtualKey = '"';
         } else if (virtualKey === '<C-k>') {
@@ -1609,9 +1610,8 @@ export class ModeHandler implements vscode.Disposable, IModeHandler {
   // Return true if a new undo point should be created based on brackets and parentheses
   private createUndoPointForBrackets(): boolean {
     // }])> keys all start a new undo state when directly next to an {[(< opening character
-    const key = this.vimState.recordedState.actionKeys[
-      this.vimState.recordedState.actionKeys.length - 1
-    ];
+    const key =
+      this.vimState.recordedState.actionKeys[this.vimState.recordedState.actionKeys.length - 1];
 
     if (key === undefined) {
       return false;

test/historyTracker.test.ts

@@ -19,7 +19,7 @@ suite('historyTracker unit tests', () => {
   const retrieveFileMark = (markName: string): IMark | undefined =>
     historyTracker.getGlobalMarks().find((mark) => mark.name === markName);
 
-  const setupVimState = () => (sandbox.createStubInstance(VimState) as unknown) as VimState;
+  const setupVimState = () => sandbox.createStubInstance(VimState) as unknown as VimState;
 
   const setupHistoryTracker = (vimState = setupVimState()) => new HistoryTracker(vimState);
 

test/testUtils.ts

@@ -179,7 +179,8 @@ export async function cleanUpWorkspace(): Promise<void> {
 }
 
 export async function reloadConfiguration() {
-  const validatorResults = (await require('../src/configuration/configuration').configuration.load()) as ValidatorResults;
+  const validatorResults =
+    (await require('../src/configuration/configuration').configuration.load()) as ValidatorResults;
   for (const validatorResult of validatorResults.get()) {
     console.log(validatorResult);
   }