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

intelliLang: fixes for "undo" action for JavaLanguageInjectionSupport (IDEA-109366, IDEA-CR-33537)

Browse Source
This commit is contained in:
Nicolay Mitropolsky
2018-06-21 09:21:18 +03:00
parent e4b54d097c
commit 26e1c19777
2 changed files with 39 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/inject/java/JavaLanguageInjectionSupport.java
+7 -4
View File
@@ -129,7 +129,7 @@ public class JavaLanguageInjectionSupport extends AbstractLanguageInjectionSuppo
newInjection.setPlaceEnabled(placeText, false);
return InjectorUtils.canBeRemoved(newInjection)? null : newInjection;
});
configuration.replaceInjectionsWithUndo(project, newInjections, originalInjections, annotations);
configuration.replaceInjectionsWithUndo(project, host.getContainingFile(), newInjections, originalInjections, annotations);
return true;
}
@@ -152,7 +152,8 @@ public class JavaLanguageInjectionSupport extends AbstractLanguageInjectionSuppo
newInjection.mergeOriginalPlacesFrom(copy, false);
newInjection.mergeOriginalPlacesFrom(originalInjection, true);
configuration.replaceInjectionsWithUndo(
project, Collections.singletonList(newInjection), Collections.singletonList(originalInjection), Collections.<PsiAnnotation>emptyList());
project, psiElement.getContainingFile(), Collections.singletonList(newInjection), Collections.singletonList(originalInjection),
Collections.<PsiAnnotation>emptyList());
}
return true;
@@ -378,10 +379,12 @@ public class JavaLanguageInjectionSupport extends AbstractLanguageInjectionSuppo
originalCopy.setPlaceEnabled(currentPlace.getText(), true);
methodParameterInjection = createFrom(project, originalCopy, contextMethod, false);
}
mergePlacesAndAddToConfiguration(project, configuration, methodParameterInjection, originalInjection);
mergePlacesAndAddToConfiguration(project, contextMethod.getContainingFile(), configuration, methodParameterInjection,
originalInjection);
}
private static void mergePlacesAndAddToConfiguration(@NotNull Project project,
@Nullable PsiFile psiFile,
@NotNull Configuration configuration,
@NotNull MethodParameterInjection injection,
@Nullable BaseInjection originalInjection) {
@@ -390,7 +393,7 @@ public class JavaLanguageInjectionSupport extends AbstractLanguageInjectionSuppo
newInjection.mergeOriginalPlacesFrom(originalInjection, true);
}
configuration.replaceInjectionsWithUndo(
project, Collections.singletonList(newInjection),
project, psiFile, Collections.singletonList(newInjection),
ContainerUtil.createMaybeSingletonList(originalInjection),
Collections.emptyList());
}
plugins/IntelliLang/src/org/intellij/plugins/intelliLang/Configuration.java
+32 -7
View File
@@ -468,7 +468,7 @@ public class Configuration extends SimpleModificationTracker implements Persiste
}
}
if (!originalInjections.isEmpty()) {
replaceInjectionsWithUndo(host.getProject(), newInjections, originalInjections, Collections.emptyList());
replaceInjectionsWithUndo(host.getProject(), host.getContainingFile(), newInjections, originalInjections, Collections.emptyList());
return true;
}
return false;
@@ -488,15 +488,33 @@ public class Configuration extends SimpleModificationTracker implements Persiste
return Collections.unmodifiableList(myInjections.get(injectorId));
}
/**
* @deprecated use {@link #replaceInjectionsWithUndo(Project, PsiFile, List, List, List)},
* and consider passing non-null {@code hostFile} to make undo-redo registered for this file,
* especially when {@code psiElementsToRemove} is null (IDEA-109366)
* To be removed in IDEA 2019.2
*/
@Deprecated
public void replaceInjectionsWithUndo(final Project project,
final List<? extends BaseInjection> newInjections,
final List<? extends BaseInjection> originalInjections,
final List<? extends PsiElement> psiElementsToRemove) {
replaceInjectionsWithUndo(project, newInjections, originalInjections, psiElementsToRemove,
final List<? extends BaseInjection> newInjections,
final List<? extends BaseInjection> originalInjections,
final List<? extends PsiElement> psiElementsToRemove) {
replaceInjectionsWithUndo(project, null, newInjections, originalInjections, psiElementsToRemove);
}
/**
* @since 2018.3
*/
public void replaceInjectionsWithUndo(Project project,
@Nullable PsiFile hostFile,
List<? extends BaseInjection> newInjections,
List<? extends BaseInjection> originalInjections,
List<? extends PsiElement> psiElementsToRemove) {
replaceInjectionsWithUndo(project, hostFile, newInjections, originalInjections, psiElementsToRemove,
(add, remove) -> {
replaceInjectionsWithUndoInner(add, remove);
if (ContainerUtil.find(add, LANGUAGE_INJECTION_CONDITION) != null || ContainerUtil.find(remove,
LANGUAGE_INJECTION_CONDITION) != null) {
if (ContainerUtil.find(add, LANGUAGE_INJECTION_CONDITION) != null ||
ContainerUtil.find(remove, LANGUAGE_INJECTION_CONDITION) != null) {
FileContentUtil.reparseOpenedFiles();
}
return true;
@@ -507,6 +525,13 @@ public class Configuration extends SimpleModificationTracker implements Persiste
replaceInjections(add, remove, false);
}
/**
* @deprecated use {@link #replaceInjectionsWithUndo(Project, PsiFile, Object, Object, List, PairProcessor)},
* and consider passing non-null {@code hostFile} to make undo-redo registered for this file,
* especially when {@code psiElementsToRemove} is null (IDEA-109366)
* To be removed in IDEA 2019.2
*/
@Deprecated
public static <T> void replaceInjectionsWithUndo(final Project project, final T add, final T remove,
final List<? extends PsiElement> psiElementsToRemove,
final PairProcessor<T, T> actualProcessor) {