build: release version v1.1.4

jetplugins · Sep 27, 2023 · 2ec3f43 · 2ec3f43
1 parent b17cfef
commit 2ec3f43
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 4 deletions.
diff --git a/build.gradle b/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 group 'com.github.jetplugins'
-version '1.1.3'
+version '1.1.4'
 
 java.sourceCompatibility = 1.8
 java.targetCompatibility = 1.8

diff --git a/src/main/java/io/apidocx/config/ApidocxSettingsForm.form b/src/main/java/io/apidocx/config/ApidocxSettingsForm.form
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="io.apidocx.config.ApidocxSettingsForm">
-  <grid id="27dc6" binding="panel" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+  <grid id="27dc6" binding="panel" layout-manager="GridLayoutManager" row-count="3" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
-      <xy x="20" y="20" width="508" height="91"/>
+      <xy x="20" y="20" width="508" height="111"/>
     </constraints>
     <properties/>
     <border type="none"/>
@@ -109,6 +109,11 @@
           </component>
         </children>
       </grid>
+      <vspacer id="9c46d">
+        <constraints>
+          <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
+        </constraints>
+      </vspacer>
     </children>
   </grid>
   <buttonGroups>

diff --git a/src/main/java/io/apidocx/parse/ApiParser.java b/src/main/java/io/apidocx/parse/ApiParser.java
@@ -10,6 +10,8 @@
 import com.intellij.psi.PsiMethod;
 import com.intellij.psi.PsiModifier;
 import com.intellij.psi.PsiModifierList;
+import com.intellij.psi.search.searches.SuperMethodsSearch;
+import com.intellij.psi.util.MethodSignatureBackedByPsiMethod;
 import io.apidocx.config.ApidocxConfig;
 import io.apidocx.model.Api;
 import io.apidocx.parse.constant.SpringConstants;
@@ -81,7 +83,16 @@ public ClassApiData parse(PsiClass psiClass) {
      */
     public MethodApiData parse(PsiMethod method) {
         PsiClass psiClass = method.getContainingClass();
-        return doParseMethod(method, doParseClassLevelApiInfo(psiClass));
+        MethodApiData methodApiData = doParseMethod(method, doParseClassLevelApiInfo(psiClass));
+        if (!methodApiData.isValid()) {
+            // 处理父类方法：接口方法和实现分离情况
+            MethodSignatureBackedByPsiMethod superMethodSignature = SuperMethodsSearch.search(method, psiClass, true, false).findFirst();
+            if (superMethodSignature != null) {
+                method = superMethodSignature.getMethod();
+            }
+            methodApiData = doParseMethod(method, doParseClassLevelApiInfo(psiClass));
+        }
+        return methodApiData;
     }
 
     /**

diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -73,6 +73,10 @@
     </actions>
 
     <change-notes><![CDATA[
+        1.1.4: <br>
+        - feat: 支持配置复制cURL的主机路径<br>
+        - fix: 修复配置文件类型检测可能导致索引过程卡死<br>
+        <br>
         1.1.3: <br>
         - fix: 修复解析getter方法导致大量解析提示<br>
         - feat: 支持swagger3.0部分功能<br>