diff options
| author | Yuriy Solodkyy <solodkyy@google.com> | 2022-03-21 15:02:50 +0000 |
|---|---|---|
| committer | TreeHugger Robot <treehugger-gerrit@google.com> | 2022-03-21 16:03:29 +0000 |
| commit | 5418b9e8218643b2f72a6915a38f0eb181828c56 (patch) | |
| tree | 307eb606b18b07361cb767dd64cffe5ee3cff2db /android | |
| parent | 984d3c3584d6e0ffcd3ef771c22ce1058de182bd (diff) | |
| download | idea-5418b9e8218643b2f72a6915a38f0eb181828c56.tar.gz | |
Prepare GoToAndroidResourceContributor for MPSS
(1) since only items from the main resource repository are enumerated
consider `:main` source set modules only for.
(2) make the test compatible with the MPSS mode before the light sync
test framework starts setting up MPSS like projects.
Bug: 182137612
Test: n/a
Change-Id: I51b4802b4818a94361ced3965d17446f38fd6fcc
Diffstat (limited to 'android')
| -rw-r--r-- | android/src/com/android/tools/idea/res/psi/GoToAndroidResourceContributor.java | 4 | ||||
| -rw-r--r-- | android/testSrc/com/android/tools/idea/res/psi/GoToAndroidResourceContributorTest.kt | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/android/src/com/android/tools/idea/res/psi/GoToAndroidResourceContributor.java b/android/src/com/android/tools/idea/res/psi/GoToAndroidResourceContributor.java index 5cf2f2e73ac..e197d5885ad 100644 --- a/android/src/com/android/tools/idea/res/psi/GoToAndroidResourceContributor.java +++ b/android/src/com/android/tools/idea/res/psi/GoToAndroidResourceContributor.java @@ -15,6 +15,8 @@ */ package com.android.tools.idea.res.psi; +import static com.android.tools.idea.projectsystem.ModuleSystemUtil.isMainModule; + import com.android.ide.common.resources.ResourceVisitor; import com.android.ide.common.resources.SingleNamespaceResourceRepository; import com.android.tools.idea.res.LocalResourceRepository; @@ -66,6 +68,6 @@ public class GoToAndroidResourceContributor extends GoToSymbolProvider { @Override protected boolean acceptModule(@NotNull Module module) { - return AndroidFacet.getInstance(module) != null; + return AndroidFacet.getInstance(module) != null && isMainModule(module); } } diff --git a/android/testSrc/com/android/tools/idea/res/psi/GoToAndroidResourceContributorTest.kt b/android/testSrc/com/android/tools/idea/res/psi/GoToAndroidResourceContributorTest.kt index ddeb7463128..c6df0804104 100644 --- a/android/testSrc/com/android/tools/idea/res/psi/GoToAndroidResourceContributorTest.kt +++ b/android/testSrc/com/android/tools/idea/res/psi/GoToAndroidResourceContributorTest.kt @@ -15,6 +15,7 @@ */ package com.android.tools.idea.res.psi +import com.android.tools.idea.projectsystem.getMainModule import com.android.tools.idea.testing.AndroidProjectBuilder import com.android.tools.idea.testing.AndroidProjectRule import com.google.common.truth.Truth.assertThat @@ -82,7 +83,7 @@ class GoToAndroidResourceContributorTest { val result = searchResults[selectResult] assertThat(result).isInstanceOf(NavigationItem::class.java) val textWithIcon = ModuleRendererFactory.findInstance(result).getModuleTextWithIcon(result) - assertThat(textWithIcon!!.text).isEqualTo("GoToAndroidResourceContributorTest") + assertThat(textWithIcon!!.text).isEqualTo(projectRule.module.getMainModule().name) assertThat(textWithIcon.icon).isEqualTo(AllIcons.Nodes.Module) assertThat((result as NavigationItem).presentation!!.getIcon(false)).isNotNull() UIUtil.dispatchAllInvocationEvents() |