support primitive type

Author: Krosxx

EventBus-Navigator.jar

@@ -5,7 +5,8 @@
 [中文介绍](ReadMe_zh.md)
 
 - **Kotlin** language support
-- support encapsulated `post` function
+- Support encapsulated `post` function
+- Support primitive type
 - based on [likfe/eventbus3-intellij-plugin](https://github.com/likfe/eventbus3-intellij-plugin)
 
 ## Preview
@@ -50,24 +51,6 @@ IDEA or Android Studio `Settings/Plugins/Marketplace` search `EventBus-Navigator
 `Settings/Plugins/` Install Plugin from Disk.
 
 
-## Warning
-
-Not support navigate from that java or kotlin post primitive type to kotlin receiver function, but java receiver is ok.
-  
-primitive type :
-
-```
-"kotlin.Int" to "java.lang.Integer",
-"kotlin.Boolean" to "java.lang.Boolean",
-"kotlin.Char" to "java.lang.Character",
-"kotlin.Double" to "java.lang.Double",
-"kotlin.Float" to "java.lang.Float",
-"kotlin.Long" to "java.lang.Long",
-"kotlin.Any" to "java.lang.Object",
-"kotlin.String" to "java.lang.String"
-```
-  
-
 ## Thanks
 
 - [likfe/eventbus3-intellij-plugin](https://github.com/likfe/eventbus3-intellij-plugin)

ReadMe.md

@@ -4,6 +4,7 @@
 
 - 支持Kotlin语言
 - 支持封装的YourBus.post函数
+- 支持基础类型
 - 修改于 [likfe/eventbus3-intellij-plugin](https://github.com/likfe/eventbus3-intellij-plugin)
 
 ![](/pic/s1.png)
@@ -49,23 +50,6 @@ IDEA or Android Studio `Settings/Plugins/Marketplace` search `EventBus-Navigator
 `Settings/Plugins/` Install Plugin from Disk.
 
 
-## Warning
-
-  目前（可能以后也）不支持java/kotlin post 基础类型 函数导航到kotlin接收函数，但Java可以。
-  
-基础类型包括:
-
-```
-"kotlin.Int" to "java.lang.Integer",
-"kotlin.Boolean" to "java.lang.Boolean",
-"kotlin.Char" to "java.lang.Character",
-"kotlin.Double" to "java.lang.Double",
-"kotlin.Float" to "java.lang.Float",
-"kotlin.Long" to "java.lang.Long",
-"kotlin.Any" to "java.lang.Object",
-"kotlin.String" to "java.lang.String"
-```
-
 ## Thanks
 
 - [likfe/eventbus3-intellij-plugin](https://github.com/likfe/eventbus3-intellij-plugin)

ReadMe_zh.md

@@ -3,7 +3,7 @@
     <id>cn.vove7.ide.plugin.eventbus_navigator</id>
     <name>EventBus-Navigator</name>
     <vendor email="[email protected]" url="http://www.github.com/Vove7/EventBus-Navigator">Vove7</vendor>
-    <version>1.1.0</version>
+    <version>1.2</version>
 
     <description><![CDATA[
     <article class="markdown-body entry-content p-5" itemprop="text"><h1><a id="user-content-eventbus-navigator" class="anchor" aria-hidden="true" href="#eventbus-navigator"><svg class="octicon octicon-link" viewBox="0 0 16 16" version="1.1" width="16" height="16" aria-hidden="true"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2.09V6.25c-1.09.53-2 1.84-2 3.25C6 11.31 7.55 13 9 13h4c1.45 0 3-1.69 3-3.5S14.5 6 13 6z"></path></svg></a>EventBus-Navigator</h1>

resources/META-INF/plugin.xml

@@ -67,6 +67,8 @@
 import com.intellij.openapi.wm.IdeFocusManager;
 import com.intellij.psi.PsiDocumentManager;
 import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiJavaCodeReferenceElement;
+import com.intellij.psi.PsiMethod;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.search.ProjectScope;
 import com.intellij.psi.search.PsiElementProcessor;
@@ -80,6 +82,7 @@
 import com.intellij.ui.TableUtil;
 import com.intellij.ui.awt.RelativePoint;
 import com.intellij.ui.popup.AbstractPopup;
+import com.intellij.usageView.UsageInfo;
 import com.intellij.usageView.UsageViewBundle;
 import com.intellij.usages.PsiElementUsageTarget;
 import com.intellij.usages.Usage;
@@ -110,6 +113,8 @@
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.kotlin.psi.KtNameReferenceExpression;
+import org.jetbrains.kotlin.psi.KtNamedFunction;
 
 import java.awt.BorderLayout;
 import java.awt.Component;
@@ -148,6 +153,11 @@ public class ShowUsagesAction extends AnAction implements PopupAction {
     private static final int USAGES_PAGE_SIZE = 100;
 
     private Filter filter;
+    //0 search receiver; 1 search post
+    private int type;
+
+    public static final int TYPE_RECEIVER = 0;
+    public static final int TYPE_POST = 1;
 
     public final static NullUsage MORE_USAGES_SEPARATOR = NullUsage.INSTANCE;
     private static final UsageNode MORE_USAGES_SEPARATOR_NODE = UsageViewImpl.NULL_NODE;
@@ -193,8 +203,9 @@ public ShowUsagesAction() {
         myUsageViewSettings.GROUP_BY_SCOPE = false;
     }
 
-    public ShowUsagesAction(Filter filter) {
+    public ShowUsagesAction(Filter filter, int type) {
         this.filter = filter;
+        this.type = type;
         setInjectedContext(true);
 
         final UsageViewSettings usageViewSettings = UsageViewSettings.getInstance();
@@ -465,8 +476,22 @@ private void useHandler(@NotNull final FindUsagesHandler handler,
         Disposer.register(popup, indicator::cancel);
     }
 
-    protected @Nullable
-    Usage transform(@NotNull Usage usage) {
+    /**
+     * 转换usage 显示行
+     * 当使用@Subscribe 进行搜索时，显示列不是函数所在行，需要转换至函数Usage
+     */
+    @SuppressWarnings("ConstantConditions")
+    private Usage transform(@NotNull Usage usage) {
+        if (type == TYPE_RECEIVER) {
+            PsiElement ele = ((UsageInfo2UsageAdapter) usage).getElement();
+            if (ele instanceof PsiJavaCodeReferenceElement) {
+                PsiElement method = ((PsiMethod) ele.getContext().getContext().getContext()).getIdentifyingElement();
+                return new UsageInfo2UsageAdapter(new UsageInfo(method));
+            } else if (ele instanceof KtNameReferenceExpression) {
+                PsiElement method = ((KtNamedFunction) ele.getParent().getParent().getParent().getParent().getParent().getParent()).getNameIdentifier();
+                return new UsageInfo2UsageAdapter(new UsageInfo(method));
+            }
+        }
         return usage;
     }
 

src/cn/vove7/eventbus_nav/action/ShowUsagesAction.java

@@ -1,21 +1,34 @@
 package cn.vove7.eventbus_nav.filter
 
-import cn.vove7.eventbus_nav.util.PsiUtils
+import cn.vove7.eventbus_nav.util.firstParamTypeName
+import cn.vove7.eventbus_nav.util.toPsiMethod
 import com.intellij.psi.PsiJavaCodeReferenceElement
+import com.intellij.psi.PsiMethod
 import com.intellij.usages.Usage
 import com.intellij.usages.UsageInfo2UsageAdapter
 import org.jetbrains.kotlin.psi.KtNameReferenceExpression
+import org.jetbrains.kotlin.psi.KtNamedFunction
 
+//import org.jetbrains.kotlin.psi.KtNameReferenceExpression
 
-class ReceiverFilter : Filter {
+
+class ReceiverFilter(
+        private val paramType: String
+) : Filter {
     override fun shouldShow(usage: Usage): Boolean {
         val element = (usage as UsageInfo2UsageAdapter).element
+
         if (element is PsiJavaCodeReferenceElement) {
-            val method = element.context?.context?.context?.context ?: return false
-            return PsiUtils.isEventBusReceiver(method)
+            val me = element.context?.context?.context ?: return false
+            if (me is PsiMethod) {
+                return me.firstParamTypeName() == paramType
+            }
         }
         if (element is KtNameReferenceExpression) {
-            return PsiUtils.isEventBusReceiver(element.parent.parent.parent.parent.parent)
+            val me = element.parent.parent.parent.parent.parent.parent
+            if (me is KtNamedFunction) {
+                return me.toPsiMethod()?.firstParamTypeName() == paramType
+            }
         }
         return false
     }

src/cn/vove7/eventbus_nav/filter/ReceiverFilter.kt

@@ -93,48 +93,42 @@ class EventBus3LineMarkerProvider : LineMarkerProvider {
                 ?: return@forEach
             findEleUsageList.add(myPostMethod)
         }
-        ShowUsagesAction(PosterFilter(paramType)).startFindUsages(findEleUsageList.toTypedArray(), RelativePoint(e), PsiUtilBase.findEditor(psiElement), MAX_USAGES)
+        ShowUsagesAction(PosterFilter(paramType), ShowUsagesAction.TYPE_POST).startFindUsages(findEleUsageList.toTypedArray(), RelativePoint(e), PsiUtilBase.findEditor(psiElement), MAX_USAGES)
     }
 
     /**
      * 解析post 数据类型
      * 根据类型 搜索引用，过滤函数
      */
     private fun showReceivers(e: MouseEvent, psiElement: PsiElement) {
+        val global = GlobalSearchScope.allScope(psiElement.project)
+        val javaPsiFacade = JavaPsiFacade.getInstance(psiElement.project)
+        val subscribeCls = javaPsiFacade.findClass("org.greenrobot.eventbus.Subscribe", global)
+            ?: return
         //Java 函数调用
         if (psiElement is PsiMethodCallExpression) {
             val expressionTypes = psiElement.argumentList.expressionTypes
             if (expressionTypes.isNotEmpty()) {
-                val eventClass = PsiUtils.getClass(expressionTypes[0], psiElement)
-                if (eventClass != null) {
-                    ShowUsagesAction(ReceiverFilter()).startFindUsages(eventClass, RelativePoint(e), PsiUtilBase.findEditor(psiElement), MAX_USAGES)
+                val eventClass = PsiUtils.getClass(expressionTypes[0], psiElement) ?: return
+                eventClass.qualifiedName?.also {
+                    ShowUsagesAction(ReceiverFilter(it), ShowUsagesAction.TYPE_RECEIVER).startFindUsages(subscribeCls, RelativePoint(e), PsiUtilBase.findEditor(psiElement), MAX_USAGES)
                     return
                 }
             }
         }
         //Kotlin 函数调用
         if (psiElement is KtReferenceExpression) {
             val argList = psiElement.nextSibling as KtValueArgumentList
-
             val type = argList.arguments[0].getArgumentExpression()?.resolveType() as KotlinType
-
-            val global = GlobalSearchScope.allScope(psiElement.project)
             val ktType = KotlinPsiUtil.getTypeWithoutTypeParameters(type)
-
-            val javaPsiFacade = JavaPsiFacade.getInstance(psiElement.project)
-
-            //todo kt 基础 类型引用
             val clsType = ktType.toJavaType()
-            val javaTypeCls = javaPsiFacade.findClass(clsType, global)
-            if (javaTypeCls != null) {
-                ShowUsagesAction(ReceiverFilter()).startFindUsages(javaTypeCls,
-                        RelativePoint(e), PsiUtilBase.findEditor(psiElement), MAX_USAGES)
-            }
+            ShowUsagesAction(ReceiverFilter(clsType), ShowUsagesAction.TYPE_RECEIVER).startFindUsages(subscribeCls,
+                    RelativePoint(e), PsiUtilBase.findEditor(psiElement), MAX_USAGES)
         }
     }
 
     private fun showReferences(e: MouseEvent, psiElement: PsiElement) {
-        ShowUsagesAction(Filter { true }).startFindUsages(psiElement,
+        ShowUsagesAction(Filter { true }, -1).startFindUsages(psiElement,
                 RelativePoint(e), PsiUtilBase.findEditor(psiElement), MAX_USAGES)
         AllIcons.General.Remove