fix(TypeNameScope): order of processing LexicalScope elements of Type (…

…#3085)
INRIA · Aug 31, 2019 · 780092d · 780092d
1 parent f4226b3
commit 780092d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/main/java/spoon/reflect/visitor/NameScopeImpl.java b/src/main/java/spoon/reflect/visitor/NameScopeImpl.java
@@ -68,6 +68,9 @@ public final Optional<LexicalScope> getParent() {
  @Override
  public <T> T forEachElementByName(String name, Function<? super CtNamedElement, T> consumer) {
  T r = forEachByName(elementsByName, name, consumer);
+ if (r != null) {
+ return r;
+ }
  if (scopeElement instanceof CtNamedElement) {
  CtNamedElement named = (CtNamedElement) scopeElement;
  if (name.equals(named.getSimpleName())) {

diff --git a/src/main/java/spoon/reflect/visitor/TypeNameScope.java b/src/main/java/spoon/reflect/visitor/TypeNameScope.java
@@ -41,9 +41,11 @@ class TypeNameScope extends NameScopeImpl {
 
  @Override
  public <T> T forEachElementByName(String name, Function<? super CtNamedElement, T> consumer) {
- super.forEachElementByName(name, consumer);
+ //1st check scope of type members
+ //2nd check scope of type name itself
+ T r;
  assureCacheInitialized();
- T r = forEachByName(fieldsByName, name, consumer);
+ r = forEachByName(fieldsByName, name, consumer);
  if (r != null) {
  return r;
  }
@@ -55,6 +57,10 @@ public <T> T forEachElementByName(String name, Function<? super CtNamedElement,
  if (r != null) {
  return r;
  }
+ r = super.forEachElementByName(name, consumer);
+ if (r != null) {
+ return r;
+ }
  return null;
  }