From bb9a78979d220d7f907f348868af02c0b931906a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 20 Nov 2020 13:53:31 -0500
Subject: [PATCH] Update dependency typescript to v4.1.2 (#5703)

---
 package-lock.json            | 6 +++---
 package.json                 | 2 +-
 src/textobject/textobject.ts | 2 +-
 test/testSimplifier.ts       | 6 +++---
 test/testUtils.ts            | 4 ++--
 yarn.lock                    | 8 ++++----
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ac8c15013..47d0adeca 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8321,9 +8321,9 @@
       "dev": true
     },
     "typescript": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.0.5.tgz",
-      "integrity": "sha512-ywmr/VrTVCmNTJ6iV2LwIrfG1P+lv6luD8sUJs+2eI9NLGigaN+nUQc13iHqisq7bra9lnmUSYqbJvegraBOPQ==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.1.2.tgz",
+      "integrity": "sha512-thGloWsGH3SOxv1SoY7QojKi0tc+8FnOmiarEGMbd/lar7QOEd3hvlx3Fp5y6FlDUGl9L+pd4n2e+oToGMmhRQ==",
       "dev": true
     },
     "typical": {
diff --git a/package.json b/package.json
index 4bd1c06ef..93a7a5369 100644
--- a/package.json
+++ b/package.json
@@ -1076,7 +1076,7 @@
     "sinon": "9.2.1",
     "ts-loader": "8.0.9",
     "tslint": "6.1.3",
-    "typescript": "4.0.5",
+    "typescript": "4.1.2",
     "vscode-test": "1.4.1",
     "webpack": "5.6.0",
     "webpack-cli": "4.2.0",
diff --git a/src/textobject/textobject.ts b/src/textobject/textobject.ts
index 0f4c90e15..7cfdd0037 100644
--- a/src/textobject/textobject.ts
+++ b/src/textobject/textobject.ts
@@ -33,7 +33,7 @@ export abstract class TextObjectMovement extends BaseMovement {
     return res;
   }
 
-  public abstract async execAction(position: Position, vimState: VimState): Promise<IMovement>;
+  public abstract execAction(position: Position, vimState: VimState): Promise<IMovement>;
 }
 
 @RegisterAction
diff --git a/test/testSimplifier.ts b/test/testSimplifier.ts
index 2edf09e4e..44da45e17 100644
--- a/test/testSimplifier.ts
+++ b/test/testSimplifier.ts
@@ -577,7 +577,7 @@ async function testItWithRemaps(
     };
 
     const p2 = () => {
-      return new Promise<ResultType>((p2Resolve, p2Reject) => {
+      return new Promise<ResultType | undefined>((p2Resolve, p2Reject) => {
         if (waitsForTimeout) {
           setTimeout(async () => {
             if (modeHandler.vimState.isCurrentlyPerformingRemapping) {
@@ -604,7 +604,7 @@ async function testItWithRemaps(
             });
           }, timeout + timeoutOffset);
         } else {
-          p2Resolve();
+          p2Resolve(undefined);
         }
       });
     };
@@ -648,7 +648,7 @@ async function testItWithRemaps(
       );
     }
 
-    if (waitsForTimeout) {
+    if (result2) {
       // After the timeout finishes (plus an offset to be sure it finished)
       assert.notStrictEqual(result2, undefined);
 
diff --git a/test/testUtils.ts b/test/testUtils.ts
index 811e76f58..f08632e0e 100644
--- a/test/testUtils.ts
+++ b/test/testUtils.ts
@@ -86,7 +86,7 @@ export async function removeDir(fsPath: string) {
  * @param numExpectedEditors Expected number of editors in the window
  */
 export async function WaitForEditorsToClose(numExpectedEditors: number = 0): Promise<void> {
-  const waitForTextEditorsToClose = new Promise((c, e) => {
+  const waitForTextEditorsToClose = new Promise<void>((c, e) => {
     if (vscode.window.visibleTextEditors.length === numExpectedEditors) {
       return c();
     }
@@ -150,7 +150,7 @@ const mockAndEnable = async () => {
 };
 
 export async function cleanUpWorkspace(): Promise<void> {
-  return new Promise((c, e) => {
+  return new Promise<void>((c, e) => {
     if (vscode.window.visibleTextEditors.length === 0) {
       return c();
     }
diff --git a/yarn.lock b/yarn.lock
index bfb6f7b84..4335f6de3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5354,10 +5354,10 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-typescript@4.0.5:
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.5.tgz#ae9dddfd1069f1cb5beb3ef3b2170dd7c1332389"
-  integrity sha512-ywmr/VrTVCmNTJ6iV2LwIrfG1P+lv6luD8sUJs+2eI9NLGigaN+nUQc13iHqisq7bra9lnmUSYqbJvegraBOPQ==
+typescript@4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.2.tgz#6369ef22516fe5e10304aae5a5c4862db55380e9"
+  integrity sha512-thGloWsGH3SOxv1SoY7QojKi0tc+8FnOmiarEGMbd/lar7QOEd3hvlx3Fp5y6FlDUGl9L+pd4n2e+oToGMmhRQ==
 
 typical@^5.0.0, typical@^5.2.0:
   version "5.2.0"