MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Javafx: Renaming of CSS selectors related to fx:id attributes (IDEA-154197)

Browse Source
This commit is contained in:
Pavel Dolgov
2016-06-02 18:00:38 +03:00
parent 46be4805f9
commit 0d886be2e0
4 changed files with 71 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxFieldIdReferenceProvider.java
+2 -36
View File
@@ -19,7 +19,6 @@ import com.intellij.psi.*;
import com.intellij.psi.impl.source.resolve.reference.impl.providers.AttributeValueSelfReference;
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.psi.util.InheritanceUtil;
import com.intellij.psi.util.PropertyUtil;
import com.intellij.psi.xml.*;
import com.intellij.util.ArrayUtil;
import com.intellij.util.IncorrectOperationException;
@@ -58,13 +57,13 @@ public class JavaFxFieldIdReferenceProvider extends JavaFxControllerBasedReferen
new AttributeValueSelfReference(xmlAttributeValue)};
}
public static class JavaFxControllerFieldRef extends JavaFxPropertyReference<XmlAttributeValue> {
public static class JavaFxControllerFieldRef extends PsiReferenceBase<XmlAttributeValue> {
private final XmlAttributeValue myXmlAttributeValue;
private final PsiMember myFieldOrMethod;
private final PsiClass myAClass;
public JavaFxControllerFieldRef(XmlAttributeValue xmlAttributeValue, PsiMember fieldOrMethod, PsiClass aClass) {
super(xmlAttributeValue, aClass, true);
super(xmlAttributeValue, true);
myXmlAttributeValue = xmlAttributeValue;
myFieldOrMethod = fieldOrMethod;
myAClass = aClass;
@@ -124,39 +123,6 @@ public class JavaFxFieldIdReferenceProvider extends JavaFxControllerBasedReferen
return ArrayUtil.toObjectArray(fieldsToSuggest);
}
@Nullable
@Override
public PsiMethod getGetter() {
if (myFieldOrMethod instanceof PsiMethod && PropertyUtil.isSimplePropertyGetter((PsiMethod)myFieldOrMethod)) {
return (PsiMethod)myFieldOrMethod;
}
return super.getGetter();
}
@Nullable
@Override
public PsiMethod getSetter() {
if (myFieldOrMethod instanceof PsiMethod && PropertyUtil.isSimplePropertySetter((PsiMethod)myFieldOrMethod)) {
return (PsiMethod)myFieldOrMethod;
}
return super.getSetter();
}
@Nullable
@Override
public PsiField getField() {
if (myFieldOrMethod instanceof PsiField) {
return (PsiField)myFieldOrMethod;
}
return super.getField();
}
@Nullable
@Override
public String getPropertyName() {
return PropertyUtil.getPropertyName(myFieldOrMethod);
}
@Override
public PsiElement handleElementRename(String newElementName) throws IncorrectOperationException {
final String newPropertyName = JavaFxPsiUtil.getPropertyName(newElementName, myFieldOrMethod instanceof PsiMethod);
plugins/javaFX/src/org/jetbrains/plugins/javaFX/refactoring/JavaFxPropertyRenameHandler.java
+46 -17
View File
@@ -12,6 +12,7 @@ import com.intellij.psi.PsiFile;
import com.intellij.psi.PsiReference;
import com.intellij.psi.impl.source.resolve.reference.impl.PsiMultiReference;
import com.intellij.psi.util.PropertyUtil;
import com.intellij.psi.xml.XmlAttributeValue;
import com.intellij.psi.xml.XmlFile;
import com.intellij.refactoring.RenameRefactoring;
import com.intellij.refactoring.openapi.impl.JavaRenameRefactoringImpl;
@@ -19,16 +20,20 @@ import com.intellij.refactoring.rename.PsiElementRenameHandler;
import com.intellij.refactoring.rename.RenameDialog;
import com.intellij.refactoring.rename.RenameHandler;
import com.intellij.refactoring.util.CommonRefactoringUtil;
import com.intellij.util.NotNullProducer;
import com.intellij.util.containers.ContainerUtil;
import gnu.trove.THashMap;
import gnu.trove.THashSet;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.plugins.javaFX.fxml.JavaFxCommonNames;
import org.jetbrains.plugins.javaFX.fxml.JavaFxFileTypeFactory;
import org.jetbrains.plugins.javaFX.fxml.refs.JavaFxComponentIdReferenceProvider;
import org.jetbrains.plugins.javaFX.fxml.refs.JavaFxFieldIdReferenceProvider;
import org.jetbrains.plugins.javaFX.fxml.refs.JavaFxPropertyReference;
import java.util.Collection;
import java.util.Map;
import java.util.Set;
/**
* @author Pavel.Dolgov
@@ -36,7 +41,7 @@ import java.util.Map;
public class JavaFxPropertyRenameHandler implements RenameHandler {
@Override
public boolean isAvailableOnDataContext(DataContext dataContext) {
final PsiReference reference = getReference(dataContext);
final PsiReference reference = getKnownReference(getReferences(dataContext));
return reference != null;
}
@@ -56,7 +61,8 @@ public class JavaFxPropertyRenameHandler implements RenameHandler {
}
private static void performInvoke(@NotNull Project project, @Nullable Editor editor, DataContext dataContext) {
PsiReference reference = getReference(dataContext);
final PsiReference[] references = getReferences(dataContext);
final PsiReference reference = getKnownReference(references);
if (reference == null) return;
if (reference instanceof JavaFxComponentIdReferenceProvider.JavaFxIdReferenceBase &&
((JavaFxComponentIdReferenceProvider.JavaFxIdReferenceBase)reference).isBuiltIn()) {
@@ -66,10 +72,7 @@ public class JavaFxPropertyRenameHandler implements RenameHandler {
if (reference instanceof JavaFxPropertyReference && reference.resolve() != null) {
final JavaFxPropertyReference propertyReference = (JavaFxPropertyReference)reference;
final Map<PsiElement, String> elementsToRename = getElementsToRename(propertyReference, "a");
final boolean cannotRename = !elementsToRename.isEmpty() &&
elementsToRename.keySet().stream()
.anyMatch(element -> !PsiElementRenameHandler.canRename(project, editor, element));
if (cannotRename) {
if (!canRename(project, editor, elementsToRename.keySet())) {
return;
}
if (ApplicationManager.getApplication().isUnitTestMode()) {
@@ -83,6 +86,30 @@ public class JavaFxPropertyRenameHandler implements RenameHandler {
new PropertyRenameDialog(propertyReference, psiElement, project, editor).show();
}
}
if (reference instanceof JavaFxFieldIdReferenceProvider.JavaFxControllerFieldRef) {
final Set<PsiElement> elementsToRename = new THashSet<>();
JavaFxRenameAttributeProcessor.visitReferencedElements(references, psiElement -> {
if (psiElement != null) {
elementsToRename.add(psiElement);
}
});
if (!canRename(project, editor, elementsToRename)) {
return;
}
final XmlAttributeValue fxIdElement = ((JavaFxFieldIdReferenceProvider.JavaFxControllerFieldRef)reference).getXmlAttributeValue();
if (ApplicationManager.getApplication().isUnitTestMode()) {
final String newName = PsiElementRenameHandler.DEFAULT_NAME.getData(dataContext);
assert newName != null : "Rename property";
new RenameDialog(project, fxIdElement, null, editor).performRename(newName);
}
else {
new RenameDialog(project, fxIdElement, null, editor).show();
}
}
}
private static boolean canRename(@NotNull Project project, @Nullable Editor editor, @NotNull Collection<PsiElement> elements) {
return elements.stream().allMatch(element -> PsiElementRenameHandler.canRename(project, editor, element));
}
private static void doRename(JavaFxPropertyReference reference, String newName, final boolean searchInComments, boolean isPreview) {
@@ -98,7 +125,12 @@ public class JavaFxPropertyRenameHandler implements RenameHandler {
@Nullable
private static PsiReference getReference(DataContext dataContext) {
private static PsiReference getKnownReference(PsiReference[] references) {
return ContainerUtil.find(references, JavaFxPropertyRenameHandler::isKnown);
}
@NotNull
private static PsiReference[] getReferences(DataContext dataContext) {
final Editor editor = CommonDataKeys.EDITOR.getData(dataContext);
PsiFile file = CommonDataKeys.PSI_FILE.getData(dataContext);
@@ -114,21 +146,18 @@ public class JavaFxPropertyRenameHandler implements RenameHandler {
final PsiReference reference = file.findReferenceAt(offset);
if (reference instanceof PsiMultiReference) {
final PsiReference[] references = ((PsiMultiReference)reference).getReferences();
for (PsiReference ref : references) {
if (isKnown(ref)) {
return ref;
}
}
return ((PsiMultiReference)reference).getReferences();
}
if (isKnown(reference)) return reference;
if (isKnown(reference)) return new PsiReference[]{reference};
}
return null;
return PsiReference.EMPTY_ARRAY;
}
private static boolean isKnown(PsiReference reference) {
if (reference instanceof JavaFxPropertyReference) return true;
if (reference instanceof JavaFxPropertyReference || reference instanceof JavaFxFieldIdReferenceProvider.JavaFxControllerFieldRef) {
return true;
}
if (reference instanceof JavaFxComponentIdReferenceProvider.JavaFxIdReferenceBase) {
return ((JavaFxComponentIdReferenceProvider.JavaFxIdReferenceBase)reference).isBuiltIn();
}
plugins/javaFX/src/org/jetbrains/plugins/javaFX/refactoring/JavaFxRenameAttributeProcessor.java
+18 -10
View File
@@ -15,13 +15,12 @@
*/
package org.jetbrains.plugins.javaFX.refactoring;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiField;
import com.intellij.psi.PsiReference;
import com.intellij.psi.*;
import com.intellij.psi.search.SearchScope;
import com.intellij.psi.xml.XmlAttribute;
import com.intellij.psi.xml.XmlAttributeValue;
import com.intellij.refactoring.rename.RenameXmlAttributeProcessor;
import com.intellij.util.NullableConsumer;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.plugins.javaFX.fxml.FxmlConstants;
import org.jetbrains.plugins.javaFX.fxml.JavaFxFileTypeFactory;
@@ -44,15 +43,24 @@ public class JavaFxRenameAttributeProcessor extends RenameXmlAttributeProcessor
@Override
public void prepareRenaming(PsiElement element, String newName, Map<PsiElement, String> allRenames, SearchScope scope) {
if (element instanceof XmlAttributeValue) {
final XmlAttributeValue refId = (XmlAttributeValue)element;
final PsiReference refIdReference = refId.getReference();
if (refIdReference != null) {
final PsiElement resolveRefId = refIdReference.resolve();
if (resolveRefId instanceof PsiField) {
allRenames.put(resolveRefId, newName);
visitReferencedElements(element.getReferences(), psiElement -> {
if (psiElement instanceof PsiNamedElement && psiElement != element) {
allRenames.put(psiElement, newName);
}
});
}
static void visitReferencedElements(PsiReference[] references, NullableConsumer<PsiElement> consumer) {
for (PsiReference reference : references) {
if (reference instanceof PsiPolyVariantReference) {
final ResolveResult[] resolveResults = ((PsiPolyVariantReference)reference).multiResolve(false);
for (ResolveResult resolveResult : resolveResults) {
consumer.consume(resolveResult.getElement());
}
}
else {
consumer.consume(reference.resolve());
}
}
}
}
plugins/javaFX/testSrc/org/jetbrains/plugins/javaFX/fxml/AbstractJavaFXRenameTest.java
+5 -1
View File
@@ -11,7 +11,11 @@ import com.intellij.refactoring.rename.naming.AutomaticRenamerFactory;
public abstract class AbstractJavaFXRenameTest extends AbstractJavaFXTestCase {
protected void doRenameWithAutomaticRenamers(final String newName) {
final PsiElement element = myFixture.getElementAtCaret();
final RenameProcessor processor = new RenameProcessor(getProject(), element, newName, false, false);
doRenameWithAutomaticRenamers(element, newName);
}
protected void doRenameWithAutomaticRenamers(PsiElement elementAtCaret, String newName) {
final RenameProcessor processor = new RenameProcessor(getProject(), elementAtCaret, newName, false, false);
for (AutomaticRenamerFactory factory : Extensions.getExtensions(AutomaticRenamerFactory.EP_NAME)) {
processor.addRenamerFactory(factory);
}