From 9dcfd16e6a7a92b00ed5076786ccb2985992f34e Mon Sep 17 00:00:00 2001 From: Sosuke Suzuki Date: Mon, 9 Aug 2021 00:00:22 +0900 Subject: [PATCH] Use ts-expect-error instead of ts-ignore (#11330) --- src/common/parser-create-error.js | 2 +- src/common/resolve.js | 2 +- src/common/util.js | 2 +- src/document/doc-builders.js | 2 +- src/index.js | 2 +- src/language-html/ast.js | 10 +++++----- src/language-html/parser-html.js | 2 +- src/language-js/comments.js | 2 +- src/language-js/parse/babel.js | 2 +- src/language-js/parse/json.js | 4 ++-- src/language-markdown/printer-markdown.js | 2 +- 11 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/common/parser-create-error.js b/src/common/parser-create-error.js index a3f68defd..f7ee8e5e1 100644 --- a/src/common/parser-create-error.js +++ b/src/common/parser-create-error.js @@ -5,7 +5,7 @@ function createError(message, loc) { const error = new SyntaxError( message + " (" + loc.start.line + ":" + loc.start.column + ")" ); - // @ts-ignore - TBD (...) + // @ts-expect-error - TBD (...) error.loc = loc; return error; } diff --git a/src/common/resolve.js b/src/common/resolve.js index a22f5c1a8..8989edc97 100644 --- a/src/common/resolve.js +++ b/src/common/resolve.js @@ -4,7 +4,7 @@ let { resolve } = require; // In the VS Code and Atom extensions `require` is overridden and `require.resolve` doesn't support the 2nd argument. if (resolve.length === 1 || process.env.PRETTIER_FALLBACK_RESOLVE) { - // @ts-ignore + // @ts-expect-error resolve = (id, options) => { let basedir; if (options && options.paths && options.paths.length === 1) { diff --git a/src/common/util.js b/src/common/util.js index 4e200b418..aa0446106 100644 --- a/src/common/util.js +++ b/src/common/util.js @@ -278,7 +278,7 @@ function getNextNonSpaceNonCommentCharacterIndex(text, node, locEnd) { */ function getNextNonSpaceNonCommentCharacter(text, node, locEnd) { return text.charAt( - // @ts-ignore => TBD: can return false, should we define a fallback? + // @ts-expect-error => TBD: can return false, should we define a fallback? getNextNonSpaceNonCommentCharacterIndex(text, node, locEnd) ); } diff --git a/src/document/doc-builders.js b/src/document/doc-builders.js index 7ed559495..c119695be 100644 --- a/src/document/doc-builders.js +++ b/src/document/doc-builders.js @@ -113,7 +113,7 @@ function dedentToRoot(contents) { * @returns Doc */ function markAsRoot(contents) { - // @ts-ignore - TBD ???: + // @ts-expect-error - TBD ???: return align({ type: "root" }, contents); } diff --git a/src/index.js b/src/index.js index e091aeae2..f6fc80c53 100644 --- a/src/index.js +++ b/src/index.js @@ -27,7 +27,7 @@ function _withPlugins( function withPlugins(fn, optsArgIdx) { const resultingFn = _withPlugins(fn, optsArgIdx); if (fn.sync) { - // @ts-ignore + // @ts-expect-error resultingFn.sync = _withPlugins(fn.sync, optsArgIdx); } return resultingFn; diff --git a/src/language-html/ast.js b/src/language-html/ast.js index a11fa691f..cf67d691a 100644 --- a/src/language-html/ast.js +++ b/src/language-html/ast.js @@ -58,7 +58,7 @@ class Node { newNode[key] = this[key]; } } - // @ts-ignore + // @ts-expect-error const { index, siblings, prev, next, parent } = this; setNonEnumerableProperties(newNode, { index, @@ -99,22 +99,22 @@ class Node { } get firstChild() { - // @ts-ignore + // @ts-expect-error return isNonEmptyArray(this.children) ? this.children[0] : null; } get lastChild() { - // @ts-ignore + // @ts-expect-error return isNonEmptyArray(this.children) ? getLast(this.children) : null; } // for element and attribute get rawName() { - // @ts-ignore + // @ts-expect-error return this.hasExplicitNamespace ? this.fullName : this.name; } get fullName() { - // @ts-ignore + // @ts-expect-error return this.namespace ? this.namespace + ":" + this.name : this.name; } } diff --git a/src/language-html/parser-html.js b/src/language-html/parser-html.js index 13c2ec9a1..119eff789 100644 --- a/src/language-html/parser-html.js +++ b/src/language-html/parser-html.js @@ -312,7 +312,7 @@ function _parse(text, options, parserOptions, shouldParseFrontMatter = true) { const start = new ParseLocation(file, 0, 0, 0); const end = start.moveBy(frontMatter.raw.length); frontMatter.sourceSpan = new ParseSourceSpan(start, end); - // @ts-ignore + // @ts-expect-error rawAst.children.unshift(frontMatter); } diff --git a/src/language-js/comments.js b/src/language-js/comments.js index f76c3f3df..5bac9b1a8 100644 --- a/src/language-js/comments.js +++ b/src/language-js/comments.js @@ -119,7 +119,7 @@ function handleRemainingComment(context) { * @returns {void} */ function addBlockStatementFirstComment(node, comment) { - // @ts-ignore + // @ts-expect-error const firstNonEmptyNode = (node.body || node.properties).find( ({ type }) => type !== "EmptyStatement" ); diff --git a/src/language-js/parse/babel.js b/src/language-js/parse/babel.js index 0a90d87db..49437d9c5 100644 --- a/src/language-js/parse/babel.js +++ b/src/language-js/parse/babel.js @@ -77,7 +77,7 @@ function parseWithOptions(parseMethod, text, options) { /** @type {import("@babel/parser").parse | import("@babel/parser").parseExpression} */ const parse = require("@babel/parser")[parseMethod]; const ast = parse(text, options); - // @ts-ignore + // @ts-expect-error const error = ast.errors.find( (error) => !allowedMessageCodes.has(error.reasonCode) ); diff --git a/src/language-js/parse/json.js b/src/language-js/parse/json.js index 02885cfd2..bae06d5be 100644 --- a/src/language-js/parse/json.js +++ b/src/language-js/parse/json.js @@ -20,9 +20,9 @@ function createJsonParse(options = {}) { throw createBabelParseError(error); } - // @ts-ignore + // @ts-expect-error if (!allowComments && isNonEmptyArray(ast.comments)) { - // @ts-ignore + // @ts-expect-error throw createJsonError(ast.comments[0], "Comment"); } diff --git a/src/language-markdown/printer-markdown.js b/src/language-markdown/printer-markdown.js index ec70d0a22..6f0196dca 100644 --- a/src/language-markdown/printer-markdown.js +++ b/src/language-markdown/printer-markdown.js @@ -278,7 +278,7 @@ function genericPrint(path, options, print) { return replaceTextEndOfLine( value, - // @ts-ignore + // @ts-expect-error isHtmlComment ? hardline : markAsRoot(literalline) ); }