Update TS -> 4.6.3 Fixes #1639

Update Project TS Version to 4.6.3 + some cspell Fixes #1639
BetterThanTomorrow · Apr 2, 2022 · ab152ef · ab152ef
1 parent c38a5f0
commit ab152ef
Show file tree

Hide file tree

Showing 7 changed files with 97 additions and 97 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2767,8 +2767,8 @@
     "@types/lodash": "^4.14.167",
     "@types/mocha": "^9.1.0",
     "@types/vscode": "^1.45.0",
-    "@typescript-eslint/eslint-plugin": "^5.11.0",
-    "@typescript-eslint/parser": "^5.11.0",
+    "@typescript-eslint/eslint-plugin": "^5.17.0",
+    "@typescript-eslint/parser": "^5.17.0",
     "chai": "^4.2.0",
     "concurrently": "^6.3.0",
     "cson-parser": "^4.0.3",
@@ -2795,7 +2795,7 @@
     "tar": "^4.4.18",
     "ts-loader": "^8.0.18",
     "ts-node": "^10.3.0",
-    "typescript": "^3.9.10",
+    "typescript": "^4.6.3",
     "url-loader": "^4.1.1",
     "vsce": "^2.6.7",
     "vscode-test": "^1.3.0",

diff --git a/src/edit.ts b/src/edit.ts
@@ -19,7 +19,7 @@ export function continueCommentCommand() {
     }
     const commentOffset = cursor.rowCol[1];
     const commentText = cursor.getToken().raw;
-    const [_1, startText, bullet, num] = commentText.match(/^([;\s]+)([*-] +|(\d+)\. +)?/);
+    const [_1, startText, bullet, num] = commentText.match(/^([;\s]+)([*-] +|(\d+)\. +)?/) ?? [];
     const newNum = num ? parseInt(num) + 1 : undefined;
     const bulletText = newNum ? bullet.replace(/\d+/, '' + newNum) : bullet;
     const pad = ' '.repeat(commentOffset);

diff --git a/src/extension-test/unit/common/text-notation.ts b/src/extension-test/unit/common/text-notation.ts
@@ -14,8 +14,8 @@ import * as model from '../../../cursor-doc/model';
 
 function textNotationToTextAndSelection(s: string): [string, { anchor: number; active: number }] {
   const text = s.replace(/•/g, '\n').replace(/\|?[<>]?\|/g, '');
-  let anchor = undefined;
-  let active = undefined;
+  let anchor: undefined | number = undefined;
+  let active: undefined | number = undefined;
   anchor = s.indexOf('|>|');
   if (anchor >= 0) {
     active = s.lastIndexOf('|>|') - 3;

diff --git a/src/paredit/extension.ts b/src/paredit/extension.ts
@@ -40,7 +40,7 @@ function shouldKillAlsoCutToClipboard() {
 
 type PareditCommand = {
   command: string;
-  handler: (doc: EditableDocument) => void;
+  handler: (doc: EditableDocument) => void | Promise<void>;
 };
 const pareditCommands: PareditCommand[] = [
   // NAVIGATING
@@ -391,7 +391,7 @@ function wrapPareditCommand(command: PareditCommand) {
       if (!enabled || !languages.has(textEditor.document.languageId)) {
         return;
       }
-      command.handler(mDoc);
+      void command.handler(mDoc);
     } catch (e) {
       console.error(e.message);
     }

diff --git a/src/results-output/util.ts b/src/results-output/util.ts
@@ -1,7 +1,7 @@
 import { takeWhile } from 'lodash';
 import type { ResultsBuffer } from './results-doc';
 
-function addToHistory(history: string[], content: string): string[] {
+function addToHistory(history: string[], content?: string): string[] {
   if (content) {
     const entry = content.trim();
     if (entry !== '') {