From 84c71d505b111141a8138150fba09f5be1f52961 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=B2=20Ribaudo?= <hello@nicr.dev>
Date: Wed, 5 Feb 2025 16:44:19 +0100
Subject: [PATCH] rbuckton review

---
 src/compiler/checker.ts   | 8 +-------
 src/compiler/utilities.ts | 4 ++--
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index b69968220e52e..ec2c336e74289 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -49756,13 +49756,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
         }
 
         if (isExpressionNode(node)) {
-            try {
-                return getRegularTypeOfExpression(node as Expression);
-            }
-            catch (e) {
-                console.error("Error while getting the type of", isExpressionNode(node), node.kind, (node as MetaProperty).keywordToken !== SyntaxKind.ImportKeyword, (node as MetaProperty).name?.escapedText);
-                throw e;
-            }
+            return getRegularTypeOfExpression(node as Expression);
         }
 
         if (classType && !classDecl.isImplements) {
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index 0dc97a07d2e61..1159a77dc2a5f 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -12074,7 +12074,7 @@ export function forEachDynamicImportOrRequireCall<IncludeTypeSpaceImports extend
     cb: (node: CallExpression | (IncludeTypeSpaceImports extends false ? never : JSDocImportTag | ImportTypeNode), argument: RequireStringLiteralLikeArgument extends true ? StringLiteralLike : Expression) => void,
 ): void {
     const isJavaScriptFile = isInJSFile(file);
-    const r = /import|defer|require/g;
+    const r = /import|require/g;
     while (r.exec(file.text) !== null) { // eslint-disable-line no-restricted-syntax
         const node = getNodeAtPosition(file, r.lastIndex, /*includeJSDoc*/ includeTypeSpaceImports);
         if (isJavaScriptFile && isRequireCall(node, requireStringLiteralLikeArgument)) {
@@ -12106,7 +12106,7 @@ function getNodeAtPosition(sourceFile: SourceFile, position: number, includeJSDo
     };
     while (true) {
         const child = isJavaScriptFile && includeJSDoc && hasJSDocNodes(current) && forEach(current.jsDoc, getContainingChild) || forEachChild(current, getContainingChild);
-        if (!child) {
+        if (!child || isMetaProperty(child)) {
             return current;
         }
         current = child;