Revert "Cherry-pick PR microsoft#38653 into release-3.9 (microsoft#38687

)" This reverts commit 9ec5fc5.
amcasey · Jul 7, 2020 · 731a20a · 731a20a
1 parent c6f9343
commit 731a20a
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 158 deletions.
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -22402,10 +22402,6 @@ namespace ts {
             }
         }
 
-        function isCircularMappedProperty(symbol: Symbol) {
-            return !!(getCheckFlags(symbol) & CheckFlags.Mapped && !(<MappedSymbol>symbol).type && findResolutionCycleStartIndex(symbol, TypeSystemPropertyName.Type) >= 0);
-        }
-
         function getTypeOfPropertyOfContextualType(type: Type, name: __String) {
             return mapType(type, t => {
                 if (isGenericMappedType(t)) {
@@ -22419,7 +22415,7 @@ namespace ts {
                 else if (t.flags & TypeFlags.StructuredType) {
                     const prop = getPropertyOfType(t, name);
                     if (prop) {
-                        return isCircularMappedProperty(prop) ? undefined : getTypeOfSymbol(prop);
+                        return getTypeOfSymbol(prop);
                     }
                     if (isTupleType(t)) {
                         const restType = getRestTypeOfTupleType(t);

diff --git a/tests/baselines/reference/circularContextualMappedType.js b/tests/baselines/reference/circularContextualMappedType.js
diff --git a/tests/baselines/reference/circularContextualMappedType.symbols b/tests/baselines/reference/circularContextualMappedType.symbols
diff --git a/tests/baselines/reference/circularContextualMappedType.types b/tests/baselines/reference/circularContextualMappedType.types
diff --git a/tests/cases/compiler/circularContextualMappedType.ts b/tests/cases/compiler/circularContextualMappedType.ts