Remove NavSource Proxy

As an intermediate step, we had IntelliJNavSourceProxy to act as a
wrapper until we could reclaim the IbtelliJNavSource name. Now that we
have split the original IntelliJNavSource into smaller NavSources, we
can now use the IntelliJNavSource name as a union of the three sources.

Bug: 197112399
Test: Manually checked Java and native code navigation using native code
Android Studio project.

Change-Id: I8c2ac82f332f67ed97f67832d0285dd36f995f5a

5 files changed, 14 insertions, 12 deletions

diff --git a/app-inspection/inspectors/backgroundtask/ide/src/com/android/tools/idea/appinspection/inspectors/backgroundtask/ide/IntellijUiComponentsProvider.kt b/app-inspection/inspectors/backgroundtask/ide/src/com/android/tools/idea/appinspection/inspectors/backgroundtask/ide/IntellijUiComponentsProvider.kt
index bddc572476f..d9aeee83a1d 100644
--- a/app-inspection/inspectors/backgroundtask/ide/src/com/android/tools/idea/appinspection/inspectors/backgroundtask/ide/IntellijUiComponentsProvider.kt
+++ b/app-inspection/inspectors/backgroundtask/ide/src/com/android/tools/idea/appinspection/inspectors/backgroundtask/ide/IntellijUiComponentsProvider.kt
@@ -17,7 +17,7 @@ package com.android.tools.idea.appinspection.inspectors.backgroundtask.ide
 
 import com.android.tools.idea.appinspection.inspectors.backgroundtask.view.UiComponentsProvider
 import com.android.tools.idea.codenavigation.CodeNavigator
-import com.android.tools.idea.codenavigation.IntellijNavSourceProxy
+import com.android.tools.idea.codenavigation.IntelliJNavSource
 import com.android.tools.inspectors.common.api.ide.stacktrace.IntelliJStackTraceGroup
 import com.android.tools.inspectors.common.api.stacktrace.StackTraceModel
 import com.android.tools.inspectors.common.ui.stacktrace.StackTraceView
@@ -32,7 +32,7 @@ class IntellijUiComponentsProvider(private val project: Project) : UiComponentsP
   init {
     val locator = SymbolFilesLocator(ProjectSymbolSource(project))
     val symbolizer = createNativeSymbolizer(locator)
-    codeNavigator = CodeNavigator(IntellijNavSourceProxy(project, symbolizer),
+    codeNavigator = CodeNavigator(IntelliJNavSource(project, symbolizer),
                                   CodeNavigator.applicationExecutor)
   }
 
diff --git a/app-inspection/inspectors/network/ide/src/com/android/tools/idea/appinspection/inspectors/network/ide/DefaultCodeNavigationProvider.kt b/app-inspection/inspectors/network/ide/src/com/android/tools/idea/appinspection/inspectors/network/ide/DefaultCodeNavigationProvider.kt
index ee8d697db69..b82ecc76969 100644
--- a/app-inspection/inspectors/network/ide/src/com/android/tools/idea/appinspection/inspectors/network/ide/DefaultCodeNavigationProvider.kt
+++ b/app-inspection/inspectors/network/ide/src/com/android/tools/idea/appinspection/inspectors/network/ide/DefaultCodeNavigationProvider.kt
@@ -17,7 +17,7 @@ package com.android.tools.idea.appinspection.inspectors.network.ide
 
 import com.android.tools.idea.appinspection.inspectors.network.model.CodeNavigationProvider
 import com.android.tools.idea.codenavigation.CodeNavigator
-import com.android.tools.idea.codenavigation.IntellijNavSourceProxy
+import com.android.tools.idea.codenavigation.IntelliJNavSource
 import com.android.tools.nativeSymbolizer.ProjectSymbolSource
 import com.android.tools.nativeSymbolizer.SymbolFilesLocator
 import com.android.tools.nativeSymbolizer.createNativeSymbolizer
@@ -31,7 +31,6 @@ class DefaultCodeNavigationProvider(project: Project) : CodeNavigationProvider {
   private val locator = SymbolFilesLocator(ProjectSymbolSource(project))
   private val symbolizer = createNativeSymbolizer(locator)
 
-  override val codeNavigator: CodeNavigator = CodeNavigator(
-      IntellijNavSourceProxy(project, symbolizer),
-      CodeNavigator.applicationExecutor)
+  override val codeNavigator: CodeNavigator = CodeNavigator(IntelliJNavSource(project, symbolizer),
+                                                            CodeNavigator.applicationExecutor)
 }
\ No newline at end of file
diff --git a/app-inspection/inspectors/network/ide/testSrc/com/android/tools/idea/appinspection/inspectors/network/ide/CodeNavigationProviderTest.kt b/app-inspection/inspectors/network/ide/testSrc/com/android/tools/idea/appinspection/inspectors/network/ide/CodeNavigationProviderTest.kt
index aa2ef0a35aa..15b841910c5 100644
--- a/app-inspection/inspectors/network/ide/testSrc/com/android/tools/idea/appinspection/inspectors/network/ide/CodeNavigationProviderTest.kt
+++ b/app-inspection/inspectors/network/ide/testSrc/com/android/tools/idea/appinspection/inspectors/network/ide/CodeNavigationProviderTest.kt
@@ -15,7 +15,7 @@
  */
 package com.android.tools.idea.appinspection.inspectors.network.ide
 
-import com.android.tools.idea.codenavigation.IntellijNavSourceProxy
+import com.android.tools.idea.codenavigation.IntelliJNavSource
 import com.android.tools.idea.testing.AndroidProjectRule
 import com.google.common.truth.Truth.assertThat
 import org.junit.Rule
@@ -29,6 +29,6 @@ class CodeNavigationProviderTest {
   @Test
   fun getCodeNavigator() {
     val navigator = DefaultCodeNavigationProvider(projectRule.project).codeNavigator
-    assertThat(navigator.mySource).isInstanceOf(IntellijNavSourceProxy::class.java)
+    assertThat(navigator.mySource).isInstanceOf(IntelliJNavSource::class.java)
   }
 }
\ No newline at end of file
diff --git a/codenavigation/src/com/android/tools/idea/codenavigation/IntellijNavSourceProxy.kt b/codenavigation/src/com/android/tools/idea/codenavigation/IntelliJNavSource.kt
index 5aeac025c66..5066d06e8f0 100644
--- a/codenavigation/src/com/android/tools/idea/codenavigation/IntellijNavSourceProxy.kt
+++ b/codenavigation/src/com/android/tools/idea/codenavigation/IntelliJNavSource.kt
@@ -19,8 +19,11 @@ import com.android.tools.nativeSymbolizer.NativeSymbolizer
 import com.intellij.openapi.project.Project
 import com.intellij.pom.Navigatable
 
-// TODO(vaage): Rename this [NavSource] to [IntellijNavSource].
-class IntellijNavSourceProxy(project:Project, symbolizer: NativeSymbolizer): NavSource {
+/**
+ * Combines all the individual [NavSource]s needed navigate to [CodeLocation]s in an IntelliJ
+ * project.
+ */
+class IntelliJNavSource(project: Project, symbolizer: NativeSymbolizer): NavSource {
   private val sources = listOf(ApkNavSource(project),
                                NativeNavSource(project, symbolizer),
                                PsiNavSource(project))
diff --git a/profilers-android/src/com/android/tools/idea/profilers/IntellijProfilerServices.java b/profilers-android/src/com/android/tools/idea/profilers/IntellijProfilerServices.java
index b3cf60ad995..e32cf14809d 100644
--- a/profilers-android/src/com/android/tools/idea/profilers/IntellijProfilerServices.java
+++ b/profilers-android/src/com/android/tools/idea/profilers/IntellijProfilerServices.java
@@ -16,7 +16,7 @@
 package com.android.tools.idea.profilers;
 
 import com.android.tools.idea.codenavigation.CodeNavigator;
-import com.android.tools.idea.codenavigation.IntellijNavSourceProxy;
+import com.android.tools.idea.codenavigation.IntelliJNavSource;
 import com.android.tools.idea.flags.StudioFlags;
 import com.android.tools.idea.gradle.project.sync.hyperlink.OpenUrlHyperlink;
 import com.android.tools.idea.profilers.analytics.StudioFeatureTracker;
@@ -112,7 +112,7 @@ public class IntellijProfilerServices implements IdeProfilerServices, Disposable
     myTemporaryPreferences = new TemporaryProfilerPreferences();
     myMigrationServices = new AppInspectionIntellijMigrationServices(myPersistentPreferences, project);
 
-    myCodeNavigator = new CodeNavigator(new IntellijNavSourceProxy(project, nativeSymbolizer),
+    myCodeNavigator = new CodeNavigator(new IntelliJNavSource(project, nativeSymbolizer),
                                         CodeNavigator.Companion.getApplicationExecutor());
     myCodeNavigator.addListener(location -> myFeatureTracker.trackNavigateToCode());
   }