From ad37fbb5c217e6c0d3c76550dcc9bba91a95fb9e Mon Sep 17 00:00:00 2001
From: liuzhihang <liuzhihangs@vip.qq.com>
Date: Fri, 31 Jul 2020 22:08:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20Mapper=20=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA=20=E4=B8=8D=E8=83=BD=E8=B7=B3=E8=BD=AC=20Xml=20?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     |  4 +-
 build.gradle                                  |  5 +-
 doc/ChangeNotes.md                            |  4 ++
 parts/changeNotes.html                        | 10 ++--
 .../com/liuzhihang/toolkit/model/Delete.java  | 13 +++--
 .../com/liuzhihang/toolkit/model/Include.java | 18 ------
 .../com/liuzhihang/toolkit/model/Insert.java  | 13 +++--
 .../com/liuzhihang/toolkit/model/Mapper.java  | 32 ++++++-----
 .../liuzhihang/toolkit/model/ResultMap.java   | 23 --------
 .../com/liuzhihang/toolkit/model/Select.java  | 13 +++--
 ...ntifiableStatement.java => Statement.java} | 16 ++++--
 .../com/liuzhihang/toolkit/model/Update.java  | 12 ++--
 .../toolkit/model/WithIncludes.java           | 19 -------
 .../toolkit/model/WithParameterMap.java       | 13 -----
 .../toolkit/model/WithParameterType.java      | 13 -----
 .../toolkit/model/WithResultMap.java          | 18 ------
 .../toolkit/model/WithResultType.java         | 13 -----
 .../Java2MapperLineMarkerProvider.java        | 57 ++++++++-----------
 .../Mapper2JavaLineMarkerProvider.java        |  2 +-
 .../search/MapperDefinitionSearch.java        |  6 +-
 20 files changed, 102 insertions(+), 202 deletions(-)
 delete mode 100644 src/main/java/com/liuzhihang/toolkit/model/Include.java
 delete mode 100644 src/main/java/com/liuzhihang/toolkit/model/ResultMap.java
 rename src/main/java/com/liuzhihang/toolkit/model/{MapperIdentifiableStatement.java => Statement.java} (62%)
 delete mode 100644 src/main/java/com/liuzhihang/toolkit/model/WithIncludes.java
 delete mode 100644 src/main/java/com/liuzhihang/toolkit/model/WithParameterMap.java
 delete mode 100644 src/main/java/com/liuzhihang/toolkit/model/WithParameterType.java
 delete mode 100644 src/main/java/com/liuzhihang/toolkit/model/WithResultMap.java
 delete mode 100644 src/main/java/com/liuzhihang/toolkit/model/WithResultType.java

diff --git a/README.md b/README.md
index b8dd702..02d0d7e 100644
--- a/README.md
+++ b/README.md
@@ -39,9 +39,9 @@ Toolkit
             
 更新
 ----
-## [v1.0.8](https://github.com/liuzhihangs/toolkit/releases/tag/v1.0.8) (2020-07-29)
+## [v1.0.9](https://github.com/liuzhihangs/toolkit/releases/tag/v1.0.9) (2020-07-31)
 
-- 修改使用包装类型
+- 修复 Mapper 为空 不能跳转 Xml 的问题
 
 [查看更多历史更新记录](./doc/ChangeNotes.md)
 
diff --git a/build.gradle b/build.gradle
index 173c797..14d6226 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 group 'com.liuzhihang.toolkit'
-version '1.0.8'
+version '1.0.9'
 
 sourceCompatibility = 1.8
 
@@ -24,7 +24,8 @@ dependencies {
 
 // See https://github.com/JetBrains/gradle-intellij-plugin/
 intellij {
-    version '2018.3'
+    version '2020.2'
+    plugins = ['java']
     pluginName 'Toolkit'
     updateSinceUntilBuild false
     sameSinceUntilBuild false
diff --git a/doc/ChangeNotes.md b/doc/ChangeNotes.md
index 87f6732..4a009c8 100644
--- a/doc/ChangeNotes.md
+++ b/doc/ChangeNotes.md
@@ -1,5 +1,9 @@
 # ChangeNotes
 
+## [v1.0.8](https://github.com/liuzhihangs/toolkit/releases/tag/v1.0.9) (2020-07-31)
+
+- 修复 Mapper 为空 不能跳转 Xml 的问题
+
 ## [v1.0.8](https://github.com/liuzhihangs/toolkit/releases/tag/v1.0.8) (2020-07-29)
 
 - 修复复制为 JSON 字段丢失问题
diff --git a/parts/changeNotes.html b/parts/changeNotes.html
index 0e38bf9..f95aee2 100644
--- a/parts/changeNotes.html
+++ b/parts/changeNotes.html
@@ -3,20 +3,18 @@
 
 <h4>English introduction</h4>
 <ul>
-    <li>1.0.8
+    <li>1.0.9
         <ol>
-            <li>Fix the bug that some fields are missing</li>
-            <li>Modified support 2018.3 and above</li>
+            <li>Fix the problem that Mapper is empty and cannot jump to Xml</li>
         </ol>
     </li>
     <li><a href="https://github.com/liuzhihangs/toolkit/blob/master/doc/ChangeNotes.md">More records</a></li>
 </ul>
 <h4>中文介绍</h4>
 <ul>
-    <li>1.0.8
+    <li>1.0.9
         <ol>
-            <li>修复部分字段丢失的bug</li>
-            <li>修改支持 2018.3 及以上版本</li>
+            <li>修复 Mapper 为空 不能跳转 Xml 的问题</li>
         </ol>
     </li>
     <li><a href="https://github.com/liuzhihangs/toolkit/blob/master/doc/ChangeNotes.md">更多记录</a></li>
diff --git a/src/main/java/com/liuzhihang/toolkit/model/Delete.java b/src/main/java/com/liuzhihang/toolkit/model/Delete.java
index 5565d69..99d3d7c 100644
--- a/src/main/java/com/liuzhihang/toolkit/model/Delete.java
+++ b/src/main/java/com/liuzhihang/toolkit/model/Delete.java
@@ -1,10 +1,13 @@
 package com.liuzhihang.toolkit.model;
 
+
 /**
- * Created with IntelliJ IDEA.
- * User: mishchenko
- * Date: 26.05.12
- * Time: 15:55
+ * 只需要跳转功能
+ *
+ * @link https://jetbrains.org/intellij/sdk/docs/reference_guide/frameworks_and_external_apis/xml_dom_api.html
+ *
+ * @author liuzhihang
+ * @date 2020/7/31 19:20
  */
-public interface Delete extends MapperIdentifiableStatement {
+public interface Delete extends Statement {
 }
diff --git a/src/main/java/com/liuzhihang/toolkit/model/Include.java b/src/main/java/com/liuzhihang/toolkit/model/Include.java
deleted file mode 100644
index 35aebd4..0000000
--- a/src/main/java/com/liuzhihang/toolkit/model/Include.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.liuzhihang.toolkit.model;
-
-import com.intellij.util.xml.Attribute;
-import com.intellij.util.xml.DomElement;
-import com.intellij.util.xml.GenericAttributeValue;
-
-/**
- * Created with IntelliJ IDEA.
- * User: mishchenko
- * Date: 26.05.12
- * Time: 15:59
- */
-public interface Include extends DomElement {
-
-    @Attribute("refid")
-    GenericAttributeValue<MapperIdentifiableStatement> getRefid();
-
-}
diff --git a/src/main/java/com/liuzhihang/toolkit/model/Insert.java b/src/main/java/com/liuzhihang/toolkit/model/Insert.java
index dc5b2f1..d8b768b 100644
--- a/src/main/java/com/liuzhihang/toolkit/model/Insert.java
+++ b/src/main/java/com/liuzhihang/toolkit/model/Insert.java
@@ -1,10 +1,13 @@
 package com.liuzhihang.toolkit.model;
 
+
 /**
- * Created with IntelliJ IDEA.
- * User: mishchenko
- * Date: 26.05.12
- * Time: 15:55
+ * 只需要跳转功能
+ *
+ * @link https://jetbrains.org/intellij/sdk/docs/reference_guide/frameworks_and_external_apis/xml_dom_api.html
+ *
+ * @author liuzhihang
+ * @date 2020/7/31 19:20
  */
-public interface Insert extends MapperIdentifiableStatement {
+public interface Insert extends Statement {
 }
diff --git a/src/main/java/com/liuzhihang/toolkit/model/Mapper.java b/src/main/java/com/liuzhihang/toolkit/model/Mapper.java
index 21745a7..cfce5f6 100644
--- a/src/main/java/com/liuzhihang/toolkit/model/Mapper.java
+++ b/src/main/java/com/liuzhihang/toolkit/model/Mapper.java
@@ -5,24 +5,31 @@
 import java.util.List;
 
 /**
- * Created by IntelliJ IDEA.
- * User: Max
- * Date: 01.01.12
- * Time: 18:37
+ * 只需要跳转功能
+ *
+ * @link https://jetbrains.org/intellij/sdk/docs/reference_guide/frameworks_and_external_apis/xml_dom_api.html
+ *
+ * @author liuzhihang
+ * @date 2020/7/31 19:20
  */
 public interface Mapper extends DomElement {
 
+    /**
+     * namespace
+     *
+     * @return
+     */
     @Attribute("namespace")
     GenericAttributeValue<String> getNamespace();
 
-    @SubTagsList({"sql", "select", "insert", "update", "delete"})
-    List<MapperIdentifiableStatement> getIdentifiableStatements();
-
-    @SubTagList("resultMap")
-    List<ResultMap> getResultMaps();
-
-    @SubTagList("sql")
-    List<MapperIdentifiableStatement> getSqls();
+    /**
+     *
+     * 增删改查对应的节点
+     *
+     * @return
+     */
+    @SubTagsList({"select", "insert", "update", "delete"})
+    List<Statement> getStatements();
 
     @SubTagList("select")
     List<Select> getSelects();
@@ -36,5 +43,4 @@ public interface Mapper extends DomElement {
     @SubTagList("delete")
     List<Delete> getDeletes();
 
-
 }
diff --git a/src/main/java/com/liuzhihang/toolkit/model/ResultMap.java b/src/main/java/com/liuzhihang/toolkit/model/ResultMap.java
deleted file mode 100644
index 09385fc..0000000
--- a/src/main/java/com/liuzhihang/toolkit/model/ResultMap.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.liuzhihang.toolkit.model;
-
-import com.intellij.util.xml.Attribute;
-import com.intellij.util.xml.DomElement;
-import com.intellij.util.xml.GenericAttributeValue;
-import com.intellij.util.xml.NameValue;
-
-/**
- * Created with IntelliJ IDEA.
- * User: mishchenko
- * Date: 26.05.12
- * Time: 16:21
- */
-public interface ResultMap extends DomElement {
-
-    @NameValue
-    @Attribute("id")
-    GenericAttributeValue<String> getId();
-
-    @Attribute("extends")
-    GenericAttributeValue<ResultMap> getExtends();
-
-}
diff --git a/src/main/java/com/liuzhihang/toolkit/model/Select.java b/src/main/java/com/liuzhihang/toolkit/model/Select.java
index 35176c8..076cc77 100644
--- a/src/main/java/com/liuzhihang/toolkit/model/Select.java
+++ b/src/main/java/com/liuzhihang/toolkit/model/Select.java
@@ -1,10 +1,13 @@
 package com.liuzhihang.toolkit.model;
 
+
 /**
- * Created with IntelliJ IDEA.
- * User: mishchenko
- * Date: 26.05.12
- * Time: 15:50
+ * 只需要跳转功能
+ *
+ * @link https://jetbrains.org/intellij/sdk/docs/reference_guide/frameworks_and_external_apis/xml_dom_api.html
+ *
+ * @author liuzhihang
+ * @date 2020/7/31 19:20
  */
-public interface Select extends MapperIdentifiableStatement, WithParameterMap, WithParameterType, WithResultMap, WithResultType {
+public interface Select extends Statement {
 }
diff --git a/src/main/java/com/liuzhihang/toolkit/model/MapperIdentifiableStatement.java b/src/main/java/com/liuzhihang/toolkit/model/Statement.java
similarity index 62%
rename from src/main/java/com/liuzhihang/toolkit/model/MapperIdentifiableStatement.java
rename to src/main/java/com/liuzhihang/toolkit/model/Statement.java
index 12f3cd4..cf1f550 100644
--- a/src/main/java/com/liuzhihang/toolkit/model/MapperIdentifiableStatement.java
+++ b/src/main/java/com/liuzhihang/toolkit/model/Statement.java
@@ -6,13 +6,19 @@
 import com.intellij.util.xml.NameValue;
 
 /**
- * Created by IntelliJ IDEA.
- * User: Max
- * Date: 23.12.11
- * Time: 23:43
+ * 只需要跳转功能
+ *
+ * @author liuzhihang
+ * @date 2020/7/31 19:25
  */
-public interface MapperIdentifiableStatement extends DomElement, WithIncludes {
+public interface Statement extends DomElement {
 
+
+    /**
+     * id 属性
+     *
+     * @return
+     */
     @NameValue
     @Attribute("id")
     GenericAttributeValue<String> getId();
diff --git a/src/main/java/com/liuzhihang/toolkit/model/Update.java b/src/main/java/com/liuzhihang/toolkit/model/Update.java
index ddae1ed..a2ce88a 100644
--- a/src/main/java/com/liuzhihang/toolkit/model/Update.java
+++ b/src/main/java/com/liuzhihang/toolkit/model/Update.java
@@ -1,10 +1,12 @@
 package com.liuzhihang.toolkit.model;
 
 /**
- * Created with IntelliJ IDEA.
- * User: mishchenko
- * Date: 26.05.12
- * Time: 15:55
+ * 只需要跳转功能
+ *
+ * @link https://jetbrains.org/intellij/sdk/docs/reference_guide/frameworks_and_external_apis/xml_dom_api.html
+ *
+ * @author liuzhihang
+ * @date 2020/7/31 19:20
  */
-public interface Update extends MapperIdentifiableStatement {
+public interface Update extends Statement {
 }
diff --git a/src/main/java/com/liuzhihang/toolkit/model/WithIncludes.java b/src/main/java/com/liuzhihang/toolkit/model/WithIncludes.java
deleted file mode 100644
index e39c3ce..0000000
--- a/src/main/java/com/liuzhihang/toolkit/model/WithIncludes.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.liuzhihang.toolkit.model;
-
-import com.intellij.util.xml.DomElement;
-import com.intellij.util.xml.SubTagList;
-
-import java.util.List;
-
-/**
- * Created with IntelliJ IDEA.
- * User: mishchenko
- * Date: 26.05.12
- * Time: 15:47
- */
-public interface WithIncludes extends DomElement {
-
-    @SubTagList("include")
-    List<Include> getIncludes();
-
-}
diff --git a/src/main/java/com/liuzhihang/toolkit/model/WithParameterMap.java b/src/main/java/com/liuzhihang/toolkit/model/WithParameterMap.java
deleted file mode 100644
index e6bb17b..0000000
--- a/src/main/java/com/liuzhihang/toolkit/model/WithParameterMap.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.liuzhihang.toolkit.model;
-
-import com.intellij.util.xml.Attribute;
-import com.intellij.util.xml.DomElement;
-import com.intellij.util.xml.GenericAttributeValue;
-import com.intellij.util.xml.NameValue;
-
-public interface WithParameterMap extends DomElement {
-
-    @NameValue
-    @Attribute("parameterMap")
-    GenericAttributeValue<String> getParameterMap();
-}
diff --git a/src/main/java/com/liuzhihang/toolkit/model/WithParameterType.java b/src/main/java/com/liuzhihang/toolkit/model/WithParameterType.java
deleted file mode 100644
index 5942546..0000000
--- a/src/main/java/com/liuzhihang/toolkit/model/WithParameterType.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.liuzhihang.toolkit.model;
-
-import com.intellij.util.xml.Attribute;
-import com.intellij.util.xml.DomElement;
-import com.intellij.util.xml.GenericAttributeValue;
-import com.intellij.util.xml.NameValue;
-
-public interface WithParameterType extends DomElement {
-
-    @NameValue
-    @Attribute("parameterType")
-    GenericAttributeValue<String> getParameterType();
-}
diff --git a/src/main/java/com/liuzhihang/toolkit/model/WithResultMap.java b/src/main/java/com/liuzhihang/toolkit/model/WithResultMap.java
deleted file mode 100644
index b25dde3..0000000
--- a/src/main/java/com/liuzhihang/toolkit/model/WithResultMap.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.liuzhihang.toolkit.model;
-
-import com.intellij.util.xml.Attribute;
-import com.intellij.util.xml.DomElement;
-import com.intellij.util.xml.GenericAttributeValue;
-
-/**
- * Created with IntelliJ IDEA.
- * User: mishchenko
- * Date: 26.05.12
- * Time: 16:20
- */
-public interface WithResultMap extends DomElement {
-
-    @Attribute("resultMap")
-    GenericAttributeValue<ResultMap> getResultMap();
-
-}
diff --git a/src/main/java/com/liuzhihang/toolkit/model/WithResultType.java b/src/main/java/com/liuzhihang/toolkit/model/WithResultType.java
deleted file mode 100644
index 7b9ccd0..0000000
--- a/src/main/java/com/liuzhihang/toolkit/model/WithResultType.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.liuzhihang.toolkit.model;
-
-import com.intellij.util.xml.Attribute;
-import com.intellij.util.xml.DomElement;
-import com.intellij.util.xml.GenericAttributeValue;
-import com.intellij.util.xml.NameValue;
-
-public interface WithResultType extends DomElement {
-
-    @NameValue
-    @Attribute("resultType")
-    GenericAttributeValue<String> getResultType();
-}
diff --git a/src/main/java/com/liuzhihang/toolkit/provider/Java2MapperLineMarkerProvider.java b/src/main/java/com/liuzhihang/toolkit/provider/Java2MapperLineMarkerProvider.java
index a47ae91..43752b1 100644
--- a/src/main/java/com/liuzhihang/toolkit/provider/Java2MapperLineMarkerProvider.java
+++ b/src/main/java/com/liuzhihang/toolkit/provider/Java2MapperLineMarkerProvider.java
@@ -1,7 +1,5 @@
 package com.liuzhihang.toolkit.provider;
 
-import com.google.common.base.Function;
-import com.google.common.collect.Collections2;
 import com.intellij.codeInsight.daemon.RelatedItemLineMarkerInfo;
 import com.intellij.codeInsight.daemon.RelatedItemLineMarkerProvider;
 import com.intellij.codeInsight.navigation.NavigationGutterIconBuilder;
@@ -13,20 +11,16 @@
 import com.intellij.psi.PsiNameIdentifierOwner;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.util.PsiTreeUtil;
-import com.intellij.psi.xml.XmlTag;
-import com.intellij.util.CommonProcessors;
-import com.intellij.util.xml.DomElement;
 import com.intellij.util.xml.DomFileElement;
+import com.intellij.util.xml.DomManager;
 import com.intellij.util.xml.DomService;
+import com.intellij.util.xml.GenericAttributeValue;
 import com.liuzhihang.toolkit.model.Mapper;
-import com.liuzhihang.toolkit.model.MapperIdentifiableStatement;
+import com.liuzhihang.toolkit.model.Statement;
 import com.liuzhihang.toolkit.utils.IconUtils;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.Collection;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
+import java.util.*;
 
 /**
  * 行标记和跳转符号
@@ -36,27 +30,20 @@
  */
 public class Java2MapperLineMarkerProvider extends RelatedItemLineMarkerProvider {
 
-    private static final Function<DomElement, XmlTag> FUN = new Function<DomElement, XmlTag>() {
-        @Override
-        public XmlTag apply(DomElement domElement) {
-            return domElement.getXmlTag();
-        }
-    };
 
     @Override
-    protected void collectNavigationMarkers(@NotNull PsiElement element, @NotNull Collection<? super RelatedItemLineMarkerInfo> result) {
+    protected void collectNavigationMarkers(@NotNull PsiElement element, @NotNull Collection<? super RelatedItemLineMarkerInfo<?>> result) {
 
         //element 需要是 PsiNameIdentifierOwner 且为接口
         if (element instanceof PsiNameIdentifierOwner && isElementWithinInterface(element)) {
-            CommonProcessors.CollectProcessor<MapperIdentifiableStatement> processor = process(element);
 
-            Collection<MapperIdentifiableStatement> results = processor.getResults();
-            if (!results.isEmpty()) {
+            List<PsiElement> resultList = process(element);
+            if (!resultList.isEmpty()) {
                 //构建导航图标的builder
                 NavigationGutterIconBuilder<PsiElement> builder = NavigationGutterIconBuilder
                         .create(IconUtils.NAVIGATE_TO_XML)
                         .setAlignment(GutterIconRenderer.Alignment.CENTER)
-                        .setTargets(Collections2.transform(results, FUN))
+                        .setTargets(resultList)
                         .setTooltipTitle("Navigation to target in mapper xml");
                 result.add(builder.createLineMarkerInfo(Objects.requireNonNull(((PsiNameIdentifierOwner) element).getNameIdentifier())));
             }
@@ -66,10 +53,13 @@ protected void collectNavigationMarkers(@NotNull PsiElement element, @NotNull Co
 
     /**
      * 处理元素
+     *
+     * @return
      */
-    private CommonProcessors.CollectProcessor<MapperIdentifiableStatement> process(PsiElement element) {
+    private List<PsiElement> process(PsiElement element) {
+
+        List<PsiElement> elementList = new ArrayList<>();
 
-        CommonProcessors.CollectProcessor<MapperIdentifiableStatement> processor = new CommonProcessors.CollectProcessor<>();
         if (element instanceof PsiMethod) {
             PsiMethod psiMethod = (PsiMethod) element;
             PsiClass psiClass = psiMethod.getContainingClass();
@@ -85,13 +75,11 @@ private CommonProcessors.CollectProcessor<MapperIdentifiableStatement> process(P
                 for (DomFileElement<Mapper> mapperDomFileElement : fileElements) {
                     Mapper mapper = mapperDomFileElement.getRootElement();
 
-                    List<MapperIdentifiableStatement> daoElements = mapper.getIdentifiableStatements();
-
-                    for (MapperIdentifiableStatement statement : mapper.getIdentifiableStatements()) {
+                    for (Statement statement : mapper.getStatements()) {
                         String namespace = mapper.getNamespace().getStringValue();
                         String xmlDomElementId = statement.getId().getRawText();
                         if (Objects.equals(qualifiedName, namespace) && methodName.equals(xmlDomElementId)) {
-                            processor.process(statement);
+                            elementList.add(statement.getXmlElement());
                         }
                     }
                 }
@@ -100,22 +88,25 @@ private CommonProcessors.CollectProcessor<MapperIdentifiableStatement> process(P
             PsiClass psiClass = (PsiClass) element;
             // 当前项目
             Project project = psiClass.getProject();
+
+
+
             // 当前项目的所有元素 mapper
             List<DomFileElement<Mapper>> fileElements = DomService.getInstance().getFileElements(Mapper.class, project, GlobalSearchScope.allScope(project));
             // 只需要判断namespace
             String qualifiedName = psiClass.getQualifiedName();
 
             for (DomFileElement<Mapper> mapperDomFileElement : fileElements) {
+
                 Mapper mapper = mapperDomFileElement.getRootElement();
-                for (MapperIdentifiableStatement statement : mapper.getIdentifiableStatements()) {
-                    String namespace = mapper.getNamespace().getStringValue();
-                    if (Objects.equals(qualifiedName, namespace)) {
-                        processor.process(statement);
-                    }
+
+                String namespace = mapper.getNamespace().getStringValue();
+                if (Objects.equals(qualifiedName, namespace)) {
+                    elementList.add(mapper.getXmlElement());
                 }
             }
         }
-        return processor;
+        return elementList;
     }
 
     /**
diff --git a/src/main/java/com/liuzhihang/toolkit/provider/Mapper2JavaLineMarkerProvider.java b/src/main/java/com/liuzhihang/toolkit/provider/Mapper2JavaLineMarkerProvider.java
index e109416..a727739 100644
--- a/src/main/java/com/liuzhihang/toolkit/provider/Mapper2JavaLineMarkerProvider.java
+++ b/src/main/java/com/liuzhihang/toolkit/provider/Mapper2JavaLineMarkerProvider.java
@@ -25,7 +25,7 @@
 public class Mapper2JavaLineMarkerProvider extends RelatedItemLineMarkerProvider {
 
     @Override
-    protected void collectNavigationMarkers(@NotNull PsiElement element, @NotNull Collection<? super RelatedItemLineMarkerInfo> result) {
+    protected void collectNavigationMarkers(@NotNull PsiElement element, @NotNull Collection<? super RelatedItemLineMarkerInfo<?>> result) {
 
 
         PsiNameIdentifierOwner psiNameIdentifierOwner = process(element);
diff --git a/src/main/java/com/liuzhihang/toolkit/search/MapperDefinitionSearch.java b/src/main/java/com/liuzhihang/toolkit/search/MapperDefinitionSearch.java
index 6094ad1..ad2b22b 100644
--- a/src/main/java/com/liuzhihang/toolkit/search/MapperDefinitionSearch.java
+++ b/src/main/java/com/liuzhihang/toolkit/search/MapperDefinitionSearch.java
@@ -13,7 +13,7 @@
 import com.intellij.util.xml.DomFileElement;
 import com.intellij.util.xml.DomService;
 import com.liuzhihang.toolkit.model.Mapper;
-import com.liuzhihang.toolkit.model.MapperIdentifiableStatement;
+import com.liuzhihang.toolkit.model.Statement;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
@@ -48,7 +48,7 @@ public void processQuery(@NotNull PsiElement element, @NotNull Processor<? super
 
                     for (DomFileElement<Mapper> mapperDomFileElement : fileElements) {
                         Mapper mapper = mapperDomFileElement.getRootElement();
-                        for (MapperIdentifiableStatement statement : mapper.getIdentifiableStatements()) {
+                        for (Statement statement : mapper.getStatements()) {
                             String namespace = mapper.getNamespace().getStringValue();
                             String xmlDomElementId = statement.getId().getRawText();
                             if (Objects.equals(qualifiedName, namespace) && methodName.equals(xmlDomElementId)) {
@@ -68,7 +68,7 @@ public void processQuery(@NotNull PsiElement element, @NotNull Processor<? super
 
                 for (DomFileElement<Mapper> mapperDomFileElement : fileElements) {
                     Mapper mapper = mapperDomFileElement.getRootElement();
-                    for (MapperIdentifiableStatement statement : mapper.getIdentifiableStatements()) {
+                    for (Statement statement : mapper.getStatements()) {
                         String namespace = mapper.getNamespace().getStringValue();
                         if (Objects.equals(qualifiedName, namespace)) {
                             processor.process(statement);