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 other available injectors (IDEA-109366, IDEA-CR-33537)

Browse Source
This commit is contained in:
Nicolay Mitropolsky
2018-06-21 09:21:18 +03:00
parent 26e1c19777
commit c134328bc3
3 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/IntelliLang/src/org/intellij/plugins/intelliLang/Configuration.java
+5
View File
@@ -555,6 +555,11 @@ public class Configuration extends SimpleModificationTracker implements Persiste
DocumentReference[] documentReferences = ContainerUtil
.map2Array(psiFiles, DocumentReference.class, file -> DocumentReferenceManager.getInstance().create(file.getVirtualFile()));
if (documentReferences.length == 0) {
LOG.error("documentReferences array is empty, undo-redo for language injection will not be registered for any document/file," +
" please pass a proper `hostFile`, current hostFile = '" + hostFile + "'"); //refer IDEA-109366
}
final UndoableAction action = new GlobalUndoableAction(documentReferences) {
@Override
public void undo() {
plugins/IntelliLang/xml-support/org/intellij/plugins/intelliLang/inject/xml/XmlLanguageInjectionSupport.java
+9 -8
View File
@@ -27,6 +27,7 @@ import com.intellij.openapi.util.Ref;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.patterns.*;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import com.intellij.psi.PsiLanguageInjectionHost;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.xml.*;
@@ -125,7 +126,7 @@ public class XmlLanguageInjectionSupport extends AbstractLanguageInjectionSuppor
newInjections.add(newInjection);
}
configuration.replaceInjectionsWithUndo(
project, newInjections, injections, Collections.emptyList());
project, host.getContainingFile(), newInjections, injections, Collections.emptyList());
return true;
}
@@ -141,7 +142,7 @@ public class XmlLanguageInjectionSupport extends AbstractLanguageInjectionSuppor
xmlInjection == null? showDefaultInjectionUI(project, originalInjection.copy()) : showInjectionUI(project, xmlInjection);
if (newInjection != null) {
configuration.replaceInjectionsWithUndo(
project, Collections.singletonList(newInjection),
project, host.getContainingFile(), Collections.singletonList(newInjection),
Collections.singletonList(originalInjection),
Collections.emptyList());
}
@@ -284,19 +285,19 @@ public class XmlLanguageInjectionSupport extends AbstractLanguageInjectionSuppor
injection.setTagName(tag.getLocalName());
injection.setTagNamespace(tag.getNamespace());
injection.generatePlaces();
doEditInjection(host.getProject(), injection);
doEditInjection(host.getProject(), host.getContainingFile(), injection);
return true;
}
return false;
}
private static void doEditInjection(final Project project, final XmlTagInjection template) {
private static void doEditInjection(final Project project, PsiFile psiFile, final XmlTagInjection template) {
final Configuration configuration = InjectorUtils.getEditableInstance(project);
final AbstractTagInjection originalInjection = (AbstractTagInjection)configuration.findExistingInjection(template);
final XmlTagInjection newInjection = originalInjection == null? template : new XmlTagInjection().copyFrom(originalInjection);
configuration.replaceInjectionsWithUndo(
project, Collections.singletonList(newInjection),
project, psiFile, Collections.singletonList(newInjection),
ContainerUtil.createMaybeSingletonList(originalInjection),
Collections.emptyList());
}
@@ -312,18 +313,18 @@ public class XmlLanguageInjectionSupport extends AbstractLanguageInjectionSuppor
injection.setTagName(tag.getLocalName());
injection.setTagNamespace(tag.getNamespace());
injection.generatePlaces();
doEditInjection(host.getProject(), injection);
doEditInjection(host.getProject(), host.getContainingFile(), injection);
return true;
}
return false;
}
private static void doEditInjection(final Project project, final XmlAttributeInjection template) {
private static void doEditInjection(final Project project, PsiFile file, final XmlAttributeInjection template) {
final Configuration configuration = InjectorUtils.getEditableInstance(project);
final BaseInjection originalInjection = configuration.findExistingInjection(template);
final BaseInjection newInjection = originalInjection == null ? template : originalInjection.copy();
configuration.replaceInjectionsWithUndo(
project, Collections.singletonList(newInjection),
project, file, Collections.singletonList(newInjection),
ContainerUtil.createMaybeSingletonList(originalInjection),
Collections.emptyList());
}
plugins/groovy/src/org/intellij/plugins/intelliLang/inject/groovy/GroovyLanguageInjectionSupport.java
+1 -1
View File
@@ -130,7 +130,7 @@ public class GroovyLanguageInjectionSupport extends AbstractLanguageInjectionSup
newInjection.setPlaceEnabled(placeText, false);
return InjectorUtils.canBeRemoved(newInjection) ? null : newInjection;
});
configuration.replaceInjectionsWithUndo(project, newInjections, originalInjections, annotations);
configuration.replaceInjectionsWithUndo(project, psiElement.getContainingFile(), newInjections, originalInjections, annotations);
return true;
}