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

IDEA-183233 Exception during offline inspections

Browse Source
This commit is contained in:
Dmitry Avdeev
2018-07-31 20:40:11 +03:00
parent 2ec6a36af6
commit 5fb10a36f1
5 changed files with 52 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/devkit/devkit-java-tests/intellij.devkit.java.tests.iml
+1
View File
@@ -8,5 +8,6 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="intellij.devkit.tests" />
<orderEntry type="module" module-name="intellij.xml.psi.impl" scope="TEST" />
</component>
</module>
plugins/devkit/devkit-java-tests/testData/pluginXmlDomStubs/XIncludeWithActions-main.xml
+11
View File
@@ -0,0 +1,11 @@
<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
<xi:include href="XIncludeWithActions.xml" xpointer="xpointer(/idea-plugin/*)"/>
<actions>
<group>
<action class="foo" id="bar"/>
</group>
</actions>
</idea-plugin>
plugins/devkit/devkit-java-tests/testData/pluginXmlDomStubs/XIncludeWithActions.xml
+6
View File
@@ -0,0 +1,6 @@
<idea-plugin>
<actions>
</actions>
</idea-plugin>
plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/codeInsight/PluginXmlDomStubsTest.java
+32
View File
@@ -15,9 +15,20 @@
*/
package org.jetbrains.idea.devkit.codeInsight;
import com.intellij.psi.xml.XmlTag;
import com.intellij.testFramework.TestDataPath;
import com.intellij.util.xml.DomFileElement;
import com.intellij.util.xml.DomTarget;
import com.intellij.util.xml.impl.DomInvocationHandler;
import com.intellij.util.xml.impl.DomManagerImpl;
import com.intellij.util.xml.stubs.DomStubTest;
import com.intellij.xml.util.IncludedXmlTag;
import org.jetbrains.idea.devkit.DevkitJavaTestsUtil;
import org.jetbrains.idea.devkit.dom.Action;
import org.jetbrains.idea.devkit.dom.Actions;
import org.jetbrains.idea.devkit.dom.IdeaPlugin;
import java.util.List;
@TestDataPath("$CONTENT_ROOT/testData/pluginXmlDomStubs")
public class PluginXmlDomStubsTest extends DomStubTest {
@@ -74,6 +85,27 @@ public class PluginXmlDomStubsTest extends DomStubTest {
myFixture.testHighlighting("pluginWithXInclude.xml");
}
public void testIncludedActions() {
prepareFile("XIncludeWithActions.xml");
DomFileElement<IdeaPlugin> element = prepare("XIncludeWithActions-main.xml", IdeaPlugin.class);
XmlTag[] tags = element.getRootTag().getSubTags();
assertEquals(2, tags.length);
XmlTag included = tags[0];
assertTrue(included instanceof IncludedXmlTag);
assertEquals("actions", included.getName());
List<Actions> actions = element.getRootElement().getActions();
assertEquals(1, actions.size());
assertNotNull(actions.get(0).getXmlTag());
Action action = actions.get(0).getGroups().get(0).getActions().get(0);
DomInvocationHandler handler = DomManagerImpl.getDomInvocationHandler(action.getId());
assertNotNull(handler.getStub());
assertNotNull(DomTarget.getTarget(action));
}
@Override
protected String getBasePath() {
return DevkitJavaTestsUtil.TESTDATA_PATH + "pluginXmlDomStubs";
xml/dom-impl/src/com/intellij/util/xml/stubs/StubParentStrategy.java
+2 -1
View File
@@ -21,6 +21,7 @@ import com.intellij.psi.xml.XmlElement;
import com.intellij.psi.xml.XmlFile;
import com.intellij.psi.xml.XmlTag;
import com.intellij.util.xml.impl.*;
import com.intellij.xml.util.IncludedXmlTag;
import com.intellij.xml.util.XmlUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -94,7 +95,7 @@ public class StubParentStrategy implements DomParentStrategy {
int i = 0;
String nameToFind = myStub.getName();
for (XmlTag xmlTag : tags) {
if (nameToFind.equals(xmlTag.getName()) && myStub.getIndex() == i++) {
if (nameToFind.equals(xmlTag.getName()) && !(xmlTag instanceof IncludedXmlTag) && myStub.getIndex() == i++) {
return xmlTag;
}
}