Revert "🤖 Pick PR #59285 (Fix captured shorthand properties i...) into release-5.5 (#59288)" (#59305)

jakebailey · web-flow · commit afe1c321cd76 · 2024-07-16T12:11:10.000-07:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -49242,7 +49242,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
             const nodeLinks = getNodeLinks(node);
             nodeLinks.calculatedFlags |= NodeCheckFlags.ConstructorReference | NodeCheckFlags.CapturedBlockScopedBinding | NodeCheckFlags.BlockScopedBindingInLoop;
             if (isIdentifier(node) && isExpressionNode(node) && !(isPropertyAccessExpression(node.parent) && node.parent.name === node)) {
-                const s = getResolvedSymbol(node);
+                const s = getSymbolAtLocation(node, /*ignoreErrors*/ true);
                 if (s && s !== unknownSymbol) {
                     checkIdentifierCalculateNodeCheckFlags(node, s);
                 }
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
@@ -3493,7 +3493,7 @@ export function isInExpressionContext(node: Node): boolean {
         case SyntaxKind.ExpressionWithTypeArguments:
             return (parent as ExpressionWithTypeArguments).expression === node && !isPartOfTypeNode(parent);
         case SyntaxKind.ShorthandPropertyAssignment:
-            return ((parent as ShorthandPropertyAssignment).objectAssignmentInitializer ?? (parent as ShorthandPropertyAssignment).name) === node;
+            return (parent as ShorthandPropertyAssignment).objectAssignmentInitializer === node;
         case SyntaxKind.SatisfiesExpression:
             return node === (parent as SatisfiesExpression).expression;
         default:
diff --git a/tests/baselines/reference/capturedShorthandPropertyAssignmentNoCheck.js b/tests/baselines/reference/capturedShorthandPropertyAssignmentNoCheck.js
diff --git a/tests/baselines/reference/capturedShorthandPropertyAssignmentNoCheck.symbols b/tests/baselines/reference/capturedShorthandPropertyAssignmentNoCheck.symbols
diff --git a/tests/baselines/reference/capturedShorthandPropertyAssignmentNoCheck.types b/tests/baselines/reference/capturedShorthandPropertyAssignmentNoCheck.types
diff --git a/tests/baselines/reference/checkJsdocTypeTagOnObjectProperty2.types b/tests/baselines/reference/checkJsdocTypeTagOnObjectProperty2.types
@@ -61,8 +61,8 @@ const obj = {
 
   /** @type {string} */
   lol
->lol : undefined
->    : ^^^^^^^^^
+>lol : string
+>    : ^^^^^^
 }
 lol = "string"
 >lol = "string" : "string"
diff --git a/tests/baselines/reference/complicatedIndexedAccessKeyofReliesOnKeyofNeverUpperBound.types b/tests/baselines/reference/complicatedIndexedAccessKeyofReliesOnKeyofNeverUpperBound.types
@@ -86,8 +86,8 @@ export function makeNewChannel<T extends ChannelType>(type: T): NewChannel<Chann
 >                         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >type : T
 >     : ^
->localChannelId : "blahblahblah"
->               : ^^^^^^^^^^^^^^
+>localChannelId : string
+>               : ^^^^^^
 }
 
 const newTextChannel = makeNewChannel('text');
diff --git a/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern.types b/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern.types
@@ -178,8 +178,8 @@ function f15() {
 >   : ^^^^^^
 >b4 : number
 >   : ^^^^^^
->c4 : true
->   : ^^^^
+>c4 : boolean
+>   : ^^^^^^^
 }
 var { a4, b4, c4 } = f15();
 >a4 : string
diff --git a/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern2.types b/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern2.types
@@ -70,8 +70,8 @@ function f15() {
 >   : ^^^^^^
 >b4 : number
 >   : ^^^^^^
->c4 : true
->   : ^^^^
+>c4 : boolean
+>   : ^^^^^^^
 }
 var { a4, b4, c4 } = f15();
 >a4 : string
diff --git a/tests/baselines/reference/declarationsAndAssignments.types b/tests/baselines/reference/declarationsAndAssignments.types
@@ -823,8 +823,8 @@ function f15() {
 >  : ^^^^^^
 >b : number
 >  : ^^^^^^
->c : true
->  : ^^^^
+>c : boolean
+>  : ^^^^^^^
 }
 
 function f16() {
diff --git a/tests/baselines/reference/inferenceOptionalPropertiesToIndexSignatures.types b/tests/baselines/reference/inferenceOptionalPropertiesToIndexSignatures.types
@@ -124,8 +124,8 @@ const obj = {
 >       : ^^^^^^^^^^^^^^^
 >{param2} : { param2: string; }
 >         : ^^^^^^^^^^^^^^^^^^^
->param2 : "value2"
->       : ^^^^^^^^
+>param2 : string
+>       : ^^^^^^
 >{} : {}
 >   : ^^
 
diff --git a/tests/baselines/reference/jsExportAssignmentNonMutableLocation.types b/tests/baselines/reference/jsExportAssignmentNonMutableLocation.types
@@ -25,8 +25,8 @@ module.exports = {
 >                    : ^^^^^^^^^^^^^^^^^^^^^^^^^
 
     customSymbol,
->customSymbol : unique symbol
->             : ^^^^^^^^^^^^^
+>customSymbol : symbol
+>             : ^^^^^^
 
 };
 
diff --git a/tests/baselines/reference/literalFreshnessPropagationOnNarrowing.types b/tests/baselines/reference/literalFreshnessPropagationOnNarrowing.types
@@ -16,8 +16,8 @@ function f1() {
 >    : ^^^^^^^^^^^^^^^
 >{ b } : { b: boolean; }
 >      : ^^^^^^^^^^^^^^^
->b : true
->  : ^^^^
+>b : boolean
+>  : ^^^^^^^
 
     // Desired: OK
     // 3.0: OK
diff --git a/tests/baselines/reference/shorthand-property-es5-es6.types b/tests/baselines/reference/shorthand-property-es5-es6.types
@@ -18,6 +18,6 @@ const bar = { foo, baz };
 >             : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >foo : any
 >    : ^^^
->baz : 42
->    : ^^
+>baz : number
+>    : ^^^^^^
 
diff --git a/tests/baselines/reference/shorthand-property-es6-amd.types b/tests/baselines/reference/shorthand-property-es6-amd.types
@@ -18,6 +18,6 @@ const bar = { foo, baz };
 >             : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >foo : any
 >    : ^^^
->baz : 42
->    : ^^
+>baz : number
+>    : ^^^^^^
 
diff --git a/tests/baselines/reference/shorthand-property-es6-es6.types b/tests/baselines/reference/shorthand-property-es6-es6.types
@@ -18,6 +18,6 @@ const bar = { foo, baz };
 >             : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >foo : any
 >    : ^^^
->baz : 42
->    : ^^
+>baz : number
+>    : ^^^^^^
 
diff --git a/tests/baselines/reference/shorthandOfExportedEntity01_targetES2015_CommonJS.types b/tests/baselines/reference/shorthandOfExportedEntity01_targetES2015_CommonJS.types
@@ -16,7 +16,7 @@ export function foo () {
 >  : ^^^^^^^^^^^^^^^^^
 >{ test } : { test: string; }
 >         : ^^^^^^^^^^^^^^^^^
->test : "test"
+>test : string
 >     : ^^^^^^
 }
 
diff --git a/tests/baselines/reference/shorthandOfExportedEntity02_targetES5_CommonJS.types b/tests/baselines/reference/shorthandOfExportedEntity02_targetES5_CommonJS.types
@@ -16,7 +16,7 @@ export function foo () {
 >  : ^^^^^^^^^^^^^^^^^
 >{ test } : { test: string; }
 >         : ^^^^^^^^^^^^^^^^^
->test : "test"
+>test : string
 >     : ^^^^^^
 }
 
diff --git a/tests/baselines/reference/systemObjectShorthandRename.types b/tests/baselines/reference/systemObjectShorthandRename.types
@@ -17,8 +17,8 @@ const x2 = {x}
 >   : ^^^^^^^^^^^^^^
 >{x} : { x: string; }
 >    : ^^^^^^^^^^^^^^
->x : "X"
->  : ^^^
+>x : string
+>  : ^^^^^^
 
 const a = {x2}
 >a : { x2: { x: string; }; }
@@ -39,6 +39,6 @@ const b = {x3}
 >  : ^^^^^^^^^^^^^^^
 >{x3} : { x3: string; }
 >     : ^^^^^^^^^^^^^^^
->x3 : "X"
->   : ^^^
+>x3 : string
+>   : ^^^^^^
 
diff --git a/tests/cases/compiler/capturedShorthandPropertyAssignmentNoCheck.ts b/tests/cases/compiler/capturedShorthandPropertyAssignmentNoCheck.ts

Original file line number	Diff line number	Diff line change
`@@ -49242,7 +49242,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {`
`49242`	`49242`	`const nodeLinks = getNodeLinks(node);`
`49243`	`49243`	`nodeLinks.calculatedFlags \|= NodeCheckFlags.ConstructorReference \| NodeCheckFlags.CapturedBlockScopedBinding \| NodeCheckFlags.BlockScopedBindingInLoop;`
`49244`	`49244`	`if (isIdentifier(node) && isExpressionNode(node) && !(isPropertyAccessExpression(node.parent) && node.parent.name === node)) {`
`49245`		`- const s = getResolvedSymbol(node);`
	`49245`	`+ const s = getSymbolAtLocation(node, /ignoreErrors/ true);`
`49246`	`49246`	`if (s && s !== unknownSymbol) {`
`49247`	`49247`	`checkIdentifierCalculateNodeCheckFlags(node, s);`
`49248`	`49248`	`}`