Skip to content

Commit

Permalink
revert experimental commits a40d991 f07b8ff
Browse files Browse the repository at this point in the history
  • Loading branch information
mor-n4 committed Oct 20, 2021
1 parent 9b2d42b commit bdbd9ea
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 25 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -425,16 +425,6 @@ private List<Type> getPolyfillTypesFromScope(QualifiedName fqn) {
throw new IllegalStateException("unexpected proxy");
}
}

// ensure we do not use types from resources that are only partially resolved
Resource polyfillResource = polyfillType.eResource();
if (polyfillResource instanceof N4JSResource) {
// Note: the following call will be a no-op if
// 1) the resource was already post-processed, or
// 2) the resource was loaded from the index.
((N4JSResource) polyfillResource).performPostProcessing();
}

types.add(polyfillType);
}
// }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@
import java.util.Map.Entry;
import java.util.Set;

import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.n4js.resource.N4JSResource;
import org.eclipse.n4js.ts.types.TClass;
import org.eclipse.n4js.ts.types.TClassifier;
import org.eclipse.n4js.ts.types.TMember;
Expand Down Expand Up @@ -52,7 +49,6 @@ public MemberCube(TClassifier tClassifier, MemberCollector memberCollector) {

private void addMembers(int source, List<TMember> members) {
for (TMember member : members) {
ensureResolution(member);
NameStaticPair nsp = NameStaticPair.of(member);
MemberMatrix memberMatrix = memberMatrixesByName.get(nsp);
if (memberMatrix == null) {
Expand All @@ -63,17 +59,6 @@ private void addMembers(int source, List<TMember> members) {
}
}

private void ensureResolution(EObject obj) {
// ensure we do not use types from resources that are only partially resolved
Resource polyfillResource = obj.eResource();
if (polyfillResource instanceof N4JSResource) {
// Note: the following call will be a no-op if
// 1) the resource was already post-processed, or
// 2) the resource was loaded from the index.
((N4JSResource) polyfillResource).performPostProcessing();
}
}

/**
* @see java.util.Map#entrySet()
*/
Expand Down

0 comments on commit bdbd9ea

Please sign in to comment.