apply variables refactoring in given statement only

language/cypher/src/main/java/com/neueda/jetbrains/plugin/graphdb/language/cypher/references/impl/CypherVariableReference.java

@@ -4,9 +4,11 @@
 import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.ResolveResult;
+import com.neueda.jetbrains.plugin.graphdb.language.cypher.psi.CypherStatement;
 import com.neueda.jetbrains.plugin.graphdb.language.cypher.psi.CypherTypes;
 import com.neueda.jetbrains.plugin.graphdb.language.cypher.references.CypherReferenceBase;
 import com.neueda.jetbrains.plugin.graphdb.language.cypher.util.CypherUtil;
+import com.neueda.jetbrains.plugin.graphdb.language.cypher.util.PsiTraversalUtilities;
 import com.neueda.jetbrains.plugin.graphdb.platform.GraphIcons;
 import org.jetbrains.annotations.NotNull;
 
@@ -24,7 +26,8 @@ public CypherVariableReference(@NotNull PsiElement element, TextRange textRange)
     @NotNull
     @Override
     public ResolveResult[] multiResolve(boolean incompleteCode) {
-        return resolveResults(CypherUtil.findAllByName(myElement.getContainingFile(), CypherTypes.VARIABLE, name));
+        PsiElement statementElement = PsiTraversalUtilities.getParentOfType(myElement, CypherStatement.class);
+        return resolveResults(CypherUtil.findAllByName(statementElement, CypherTypes.VARIABLE, name));
     }
 
     @NotNull

language/cypher/src/main/java/com/neueda/jetbrains/plugin/graphdb/language/cypher/util/CypherUtil.java

@@ -2,6 +2,7 @@
 
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiManager;
 import com.intellij.psi.search.FileTypeIndex;
@@ -42,6 +43,10 @@ public static <T extends CypherNamedElement> List<T> findAllByName(PsiFile file,
         return findAllAndFilter(file, elementType, (element) -> name.equals(element.getName()));
     }
 
+    public static <T extends CypherNamedElement> List<T> findAllByName(PsiElement psiElement, IElementType elementType, String name) {
+        return findAllAndFilter(psiElement, elementType, (element) -> name.equals(element.getName()));
+    }
+
     public static <T extends CypherNamedElement> List<T> findAllAndFilter(Project project, IElementType elementType, Filter filter) {
         Collection<VirtualFile> virtualFiles = FileBasedIndex.getInstance()
                 .getContainingFiles(FileTypeIndex.NAME, CypherFileType.INSTANCE, GlobalSearchScope.allScope(project));
@@ -59,9 +64,21 @@ public static <T extends CypherNamedElement> List<T> findAllAndFilter(Project pr
     }
 
     public static <T extends CypherNamedElement> List<T> findAllAndFilter(PsiFile file, IElementType elementType, Filter filter) {
-        List<T> sameElements = null;
         List<T> candidates = TraverseUtil.collectPsiElementsByType(file, elementType);
+        return filterSameElementsFromCandidates(candidates, filter);
+    }
+
+    public static <T extends CypherNamedElement> List<T> findAllAndFilter(PsiElement psiElement, IElementType elementType, Filter filter) {
+        List<T> candidates = TraverseUtil.collectPsiElementsByType(psiElement, elementType);
+        return filterSameElementsFromCandidates(candidates, filter);
+    }
+
+    public interface Filter {
+        boolean filter(CypherNamedElement element);
+    }
 
+    private static <T extends CypherNamedElement> List<T> filterSameElementsFromCandidates(List<T> candidates, Filter filter) {
+        List<T> sameElements = null;
         for (T candidate : candidates) {
             if (filter.filter(candidate)) {
                 if (sameElements == null) {
@@ -72,10 +89,5 @@ public static <T extends CypherNamedElement> List<T> findAllAndFilter(PsiFile fi
         }
 
         return sameElements != null ? sameElements : Collections.emptyList();
-
-    }
-
-    public interface Filter {
-        boolean filter(CypherNamedElement element);
     }
 }

ui/jetbrains/src/main/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/psi/PsiTraversalUtilities.java → language/cypher/src/main/java/com/neueda/jetbrains/plugin/graphdb/language/cypher/util/PsiTraversalUtilities.java

@@ -1,4 +1,4 @@
-package com.neueda.jetbrains.plugin.graphdb.jetbrains.psi;
+package com.neueda.jetbrains.plugin.graphdb.language.cypher.util;
 
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;

testing/integration-neo4j/src/test/resources/rename/variable/MultipleQueriesAfter.cyp

@@ -1,5 +1,5 @@
-MATCH (renamed)
-RETURN (renamed);
+MATCH (renameThis)
+RETURN (renameThis);
 
 MATCH (renamed)
 RETURN (renamed);

ui/jetbrains/src/main/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/actions/execute/ExecuteQueryAction.java

@@ -17,7 +17,7 @@
 import com.neueda.jetbrains.plugin.graphdb.jetbrains.component.analytics.Analytics;
 import com.neueda.jetbrains.plugin.graphdb.jetbrains.component.datasource.DataSourcesComponent;
 import com.neueda.jetbrains.plugin.graphdb.jetbrains.component.datasource.state.DataSourceApi;
-import com.neueda.jetbrains.plugin.graphdb.jetbrains.psi.PsiTraversalUtilities;
+import com.neueda.jetbrains.plugin.graphdb.language.cypher.util.PsiTraversalUtilities;
 import com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.console.ConsoleToolWindow;
 import com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.console.event.QueryParametersRetrievalErrorEvent;
 import com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.console.params.ParametersService;

ui/jetbrains/src/main/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/component/highlighter/SyncedElementHighlighter.java

@@ -10,7 +10,7 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.ui.Colors;
-import com.neueda.jetbrains.plugin.graphdb.jetbrains.psi.PsiTraversalUtilities;
+import com.neueda.jetbrains.plugin.graphdb.language.cypher.util.PsiTraversalUtilities;
 import com.neueda.jetbrains.plugin.graphdb.platform.GraphLanguages;
 
 public class SyncedElementHighlighter {