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

Replace assert with Normalized #428

Merged
merged 1 commit into from Sep 12, 2016
Merged

Replace assert with Normalized #428

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
20 changes: 13 additions & 7 deletions src/org/elixir_lang/psi/impl/ElixirPsiImplUtil.java
View file
Open in desktop
Expand Up @@ -34,8 +34,8 @@
import org.elixir_lang.psi.call.arguments.star.Parentheses;
import org.elixir_lang.psi.call.name.Function;
import org.elixir_lang.psi.operation.*;
import org.elixir_lang.psi.operation.infix.Position;
import org.elixir_lang.psi.operation.infix.Triple;
import org.elixir_lang.psi.operation.Normalized;
import org.elixir_lang.psi.operation.infix.*;
import org.elixir_lang.psi.qualification.Qualified;
import org.elixir_lang.psi.qualification.Unqualified;
import org.elixir_lang.psi.stub.call.Stub;
Expand Down Expand Up @@ -2128,10 +2128,9 @@ public static String fullyQualifiedName(@NotNull final ElixirAlias alias) {
public static String fullyQualifiedName(@NotNull final QualifiableAlias qualifiableAlias) {
String fullyQualifiedName = null;
PsiElement[] children = qualifiableAlias.getChildren();
int operatorIndex = Normalized.operatorIndex(children);
Quotable qualifier = org.elixir_lang.psi.operation.infix.Normalized.leftOperand(children, operatorIndex);

assert children.length == 3;

PsiElement qualifier = children[0];
String qualifierName = null;

if (qualifier instanceof Call) {
Expand Down Expand Up @@ -2164,9 +2163,16 @@ public static String fullyQualifiedName(@NotNull final QualifiableAlias qualifia
}

if (qualifierName != null) {
ElixirAlias alias = (ElixirAlias) children[2];
Quotable rightOperand = org.elixir_lang.psi.operation.infix.Normalized.rightOperand(
children,
operatorIndex
);

if (rightOperand instanceof ElixirAlias) {
ElixirAlias relativeAlias = (ElixirAlias) rightOperand;

fullyQualifiedName = qualifierName + "." + alias.getName();
fullyQualifiedName = qualifierName + "." + relativeAlias.getName();
}
}

return fullyQualifiedName;
Expand Down