Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Log when scope is not last parent's parent #669

Merged
merged 1 commit into from
Apr 18, 2017
Merged

Log when scope is not last parent's parent #669

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
33 changes: 20 additions & 13 deletions src/org/elixir_lang/psi/impl/ElixirPsiImplUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1691,25 +1691,32 @@ public static boolean processDeclarationsInPreviousSibling(@NotNull final PsiEle
@NotNull ResolveState state,
PsiElement lastParent,
@NotNull @SuppressWarnings("unused") PsiElement entrance) {
assert scope.isEquivalentTo(lastParent.getParent());

boolean keepProcessing = true;
PsiElement previousSibling = lastParent.getPrevSibling();

while (previousSibling != null) {
if (!(previousSibling instanceof ElixirEndOfExpression ||
previousSibling instanceof PsiComment ||
previousSibling instanceof PsiWhiteSpace)) {
if (!createsNewScope(previousSibling)) {
keepProcessing = processor.execute(previousSibling, state);
if (scope.isEquivalentTo(lastParent.getParent())) {
PsiElement previousSibling = lastParent.getPrevSibling();

if (!keepProcessing) {
break;
while (previousSibling != null) {
if (!(previousSibling instanceof ElixirEndOfExpression ||
previousSibling instanceof PsiComment ||
previousSibling instanceof PsiWhiteSpace)) {
if (!createsNewScope(previousSibling)) {
keepProcessing = processor.execute(previousSibling, state);

if (!keepProcessing) {
break;
}
}
}
}

previousSibling = previousSibling.getPrevSibling();
previousSibling = previousSibling.getPrevSibling();
}
} else {
error(
PsiElement.class,
"Scope is not lastParent's parent\nlastParent:\n" + lastParent.getText(),
scope
);
}

return keepProcessing;
Expand Down