Reverted emit to original in error case.

microsoft · Sep 27, 2024 · 91da5ae · 91da5ae
1 parent adf815d
commit 91da5ae
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -6742,9 +6742,6 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
             function createAnonymousTypeNode(type: ObjectType): TypeNode {
                 const typeId = type.id;
                 const symbol = type.symbol;
-                // if (checkTruncationLength(context)) {
-                //     return createElidedInformationPlaceholder(context);
-                // }
                 if (symbol) {
                     const isInstantiationExpressionType = !!(getObjectFlags(type) & ObjectFlags.InstantiationExpressionType);
                     if (isInstantiationExpressionType) {

diff --git a/src/compiler/expressionToTypeNode.ts b/src/compiler/expressionToTypeNode.ts
@@ -8,6 +8,7 @@ import {
     ClassExpression,
     CompilerOptions,
     ConditionalTypeNode,
+    countWhere,
     Debug,
     Declaration,
     ElementAccessExpression,
@@ -99,6 +100,7 @@ import {
     isUnionTypeNode,
     isValueSignatureDeclaration,
     isVarConstLike,
+    isVariableDeclaration,
     JSDocParameterTag,
     JSDocPropertyTag,
     JSDocSignature,
@@ -772,7 +774,7 @@ export function createSyntacticTypeNodeBuilder(
         if (declaredType) {
             resultType = syntacticResult(serializeTypeAnnotationOfDeclaration(declaredType, context, node, symbol));
         }
-        else if (node.initializer) {
+        else if (node.initializer && (symbol.declarations?.length === 1 || countWhere(symbol.declarations, isVariableDeclaration) === 1)) {
             if (!resolver.isExpandoFunctionDeclaration(node) && !isContextuallyTyped(node)) {
                 resultType = typeFromExpression(node.initializer, context, /*isConstContext*/ undefined, /*requiresAddingUndefined*/ undefined, isVarConstLike(node));
             }

diff --git a/tests/baselines/reference/jsFileCompilationDuplicateVariableErrorReported.js b/tests/baselines/reference/jsFileCompilationDuplicateVariableErrorReported.js
@@ -14,4 +14,4 @@ var x = 10; // Error reported
 
 //// [out.d.ts]
 declare var x: string;
-declare var x: number;
+declare var x: string;