diff --git a/plugins/android/src/org/jetbrains/android/dom/converters/PackageClassConverter.java b/plugins/android/src/org/jetbrains/android/dom/converters/PackageClassConverter.java index 8e1e41a39810..7a2d2056888e 100644 --- a/plugins/android/src/org/jetbrains/android/dom/converters/PackageClassConverter.java +++ b/plugins/android/src/org/jetbrains/android/dom/converters/PackageClassConverter.java @@ -266,7 +266,7 @@ public class PackageClassConverter extends ResolvingConverter implemen final PsiElement element = myIsPackage ? facade.findPackage(value) : facade.findClass(value, myModule != null - ? myModule.getModuleWithDependenciesScope() + ? myModule.getModuleWithDependenciesAndLibrariesScope(false) : myElement.getResolveScope()); if (element != null) { @@ -279,7 +279,7 @@ public class PackageClassConverter extends ResolvingConverter implemen return myIsPackage ? facade.findPackage(relativeName) : facade.findClass(relativeName, myModule != null - ? myModule.getModuleWithDependenciesScope() + ? myModule.getModuleWithDependenciesAndLibrariesScope(false) : myElement.getResolveScope()); } return null; diff --git a/plugins/android/testData/dom/manifest/InstrumentationRunner.xml b/plugins/android/testData/dom/manifest/InstrumentationRunner.xml new file mode 100644 index 000000000000..eaf0ae0b6561 --- /dev/null +++ b/plugins/android/testData/dom/manifest/InstrumentationRunner.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/plugins/android/testSrc/org/jetbrains/android/dom/AndroidManifestDomTest.java b/plugins/android/testSrc/org/jetbrains/android/dom/AndroidManifestDomTest.java index 762c5eeeed55..b70290f888fe 100644 --- a/plugins/android/testSrc/org/jetbrains/android/dom/AndroidManifestDomTest.java +++ b/plugins/android/testSrc/org/jetbrains/android/dom/AndroidManifestDomTest.java @@ -155,6 +155,10 @@ public class AndroidManifestDomTest extends AndroidDomTest { doTestCompletion(false); } + public void testInstrumentationRunner() throws Throwable { + doTestHighlighting(); + } + public void testIntentsCompletion1() throws Throwable { doTestCompletion(); }