Better Scroll From Source

Don't just override `#getSuitableClasses`, but also `#isSuitable`, so
that the class can be checked with `#is` static functions, which ensures
that clicking in the body of Call scrolls to the clause, which was not
the case previously because the inner most Call would be used.

src/org/elixir_lang/structure_view/Model.java

@@ -6,11 +6,18 @@
 import com.intellij.ide.util.treeView.smartTree.NodeProvider;
 import com.intellij.ide.util.treeView.smartTree.Sorter;
 import com.intellij.openapi.editor.Editor;
+import com.intellij.psi.PsiElement;
 import org.elixir_lang.psi.ElixirAtom;
 import org.elixir_lang.psi.ElixirFile;
 import org.elixir_lang.psi.QuotableKeywordPair;
 import org.elixir_lang.psi.call.Call;
-import org.elixir_lang.structure_view.element.File;
+import org.elixir_lang.structure_view.element.*;
+import org.elixir_lang.structure_view.element.Exception;
+import org.elixir_lang.structure_view.element.modular.Module;
+import org.elixir_lang.structure_view.element.modular.Protocol;
+import org.elixir_lang.structure_view.element.structure.Field;
+import org.elixir_lang.structure_view.element.structure.FieldWithDefaultValue;
+import org.elixir_lang.structure_view.element.structure.Structure;
 import org.elixir_lang.structure_view.node_provider.Used;
 import org.elixir_lang.structure_view.sorter.Time;
 import org.elixir_lang.structure_view.sorter.Visibility;
@@ -87,6 +94,42 @@ public boolean isAlwaysLeaf(StructureViewTreeElement element) {
         return element instanceof ElixirFile;
     }
 
+    @Override
+    protected boolean isSuitable(PsiElement element) {
+        boolean suitable = false;
+
+        // checks if the class is good
+        if (super.isSuitable(element)) {
+            // calls can be nested in calls, so need to check for sure
+            if (element instanceof Call) {
+                Call call = (Call) element;
+                // everything in {@link Module#childCallTreeElements}
+                suitable = CallDefinitionClause.isFunction(call) ||
+                        CallDefinitionClause.isMacro(call) ||
+                        CallDefinitionSpecification.is(call) ||
+                        Callback.is(call) ||
+                        Delegation.is(call) ||
+                        Exception.is(call) ||
+                        Implementation.is(call) ||
+                        Module.is(call) ||
+                        Overridable.is(call) ||
+                        Protocol.is(call) ||
+                        Quote.is(call) ||
+                        Structure.is(call) ||
+                        Type.is(call) ||
+                        Use.is(call);
+            } else if (element instanceof ElixirAtom) {
+                ElixirAtom atom = (ElixirAtom) element;
+                suitable = Field.is(atom);
+            } else if (element instanceof QuotableKeywordPair) {
+                QuotableKeywordPair quotableKeywordPair = (QuotableKeywordPair) element;
+                suitable = FieldWithDefaultValue.is(quotableKeywordPair);
+            }
+        }
+
+        return suitable;
+    }
+
     /**
      * Returns the root element of the structure view tree.
      *

src/org/elixir_lang/structure_view/element/structure/Field.java

@@ -2,8 +2,13 @@
 
 import com.intellij.ide.util.treeView.smartTree.TreeElement;
 import com.intellij.navigation.ItemPresentation;
+import com.intellij.psi.PsiElement;
 import org.elixir_lang.navigation.item_presentation.Parent;
+import org.elixir_lang.psi.ElixirAccessExpression;
 import org.elixir_lang.psi.ElixirAtom;
+import org.elixir_lang.psi.ElixirList;
+import org.elixir_lang.psi.ElixirNoParenthesesOneArgument;
+import org.elixir_lang.psi.call.Call;
 import org.elixir_lang.structure_view.element.Element;
 import org.jetbrains.annotations.NotNull;
 
@@ -18,6 +23,39 @@ public class Field extends Element<ElixirAtom> {
     @NotNull
     private final Structure structure;
 
+    /*
+     * Static Methods
+     */
+
+    public static boolean is(ElixirAtom atom) {
+        boolean field = false;
+        PsiElement parent = atom.getParent();
+
+        if (parent instanceof ElixirAccessExpression && parent.getChildren().length == 1) {
+            PsiElement grandParent = parent.getParent();
+
+            if (grandParent instanceof ElixirList) {
+                PsiElement greatGrandParent = grandParent.getParent();
+
+                if (greatGrandParent instanceof ElixirAccessExpression && greatGrandParent.getChildren().length == 1) {
+                    PsiElement greatGreatGrandParent = greatGrandParent.getParent();
+
+                    if (greatGreatGrandParent instanceof ElixirNoParenthesesOneArgument) {
+                        PsiElement greatGreatGreatGrandParent = greatGreatGrandParent.getParent();
+
+                        if (greatGreatGreatGrandParent instanceof Call) {
+                            Call greatGreatGreatGrandParentCall = (Call) greatGreatGreatGrandParent;
+
+                            field = Structure.is(greatGreatGreatGrandParentCall);
+                        }
+                    }
+                }
+            }
+        }
+
+        return field;
+    }
+
     /*
      * Constructors
      */

src/org/elixir_lang/structure_view/element/structure/FieldWithDefaultValue.java

@@ -4,7 +4,12 @@
 import com.intellij.navigation.ItemPresentation;
 import com.intellij.psi.PsiElement;
 import org.elixir_lang.navigation.item_presentation.Parent;
+import org.elixir_lang.psi.ElixirNoParenthesesKeywords;
+import org.elixir_lang.psi.ElixirNoParenthesesOneArgument;
+import org.elixir_lang.psi.QuotableKeywordList;
 import org.elixir_lang.psi.QuotableKeywordPair;
+import org.elixir_lang.psi.call.Call;
+import org.elixir_lang.psi.call.arguments.NoParenthesesOneArgument;
 import org.elixir_lang.structure_view.element.Element;
 import org.jetbrains.annotations.NotNull;
 
@@ -19,6 +24,31 @@ public class FieldWithDefaultValue extends Element<QuotableKeywordPair> {
     @NotNull
     private final Structure structure;
 
+    /*
+     * Static Methods
+     */
+
+    public static boolean is(QuotableKeywordPair quotableKeywordPair) {
+        boolean fieldWithDefaultValue = false;
+
+        PsiElement parent = quotableKeywordPair.getParent();
+
+        if (parent instanceof QuotableKeywordList) {
+            PsiElement grandParent = parent.getParent();
+
+            if (grandParent instanceof ElixirNoParenthesesOneArgument) {
+                PsiElement greatGrandParent = grandParent.getParent();
+
+                if (greatGrandParent instanceof Call) {
+                    Call greatGrandParentCall = (Call) greatGrandParent;
+                    fieldWithDefaultValue = Structure.is(greatGrandParentCall);
+                }
+            }
+        }
+
+        return fieldWithDefaultValue;
+    }
+
     /*
      * Constructors
      */