fix(main): 修复单词字典错误；暴露索引异常，方便提交BUG

Author: isettle

README.md

@@ -18,7 +18,8 @@ IntelliJ IDEA / PhpStorm Hyperf Plugin
 
 # Feature
 ## 基础适配
-* 重复类声明：当AOP类产生代理文件，编辑器异常报错屏蔽。如`App_User.proxy.php 处存在类 'User' 的其他声明`错误将不再显示
+* 重复类声明：当AOP类产生代理文件，屏蔽重复类声明的异常报错。如`App_User.proxy.php 处存在类 'User' 的其他声明`错误将不再显示
+* 拼写检查：屏蔽框架常用词如`hyperf`、`swoole`、`jsonrpc`等等单词的拼写错误警告。如有遗漏或补充，请提交Issue给我。
 
 ## debug
 本插件会定位`模板文件`或`代理文件`的断点所在行第一个`ast节点`，计算出该节点的树路径相对偏移量，得出对应文件的断点位置，尽可能让`hyperf`得以在`模板文件`内调试

src/main/java/io/maliboot/www/hyperf/extension/dic/HyperfDictionaryProvider.kt

@@ -4,6 +4,6 @@ import com.intellij.spellchecker.BundledDictionaryProvider
 
 class HyperfDictionaryProvider: BundledDictionaryProvider {
     override fun getBundledDictionaries(): Array<String> {
-        return arrayOf("magento.dic")
+        return arrayOf("hyperf.dic")
     }
 }

src/main/java/io/maliboot/www/hyperf/lombok/codeInsight/MethodDocInlayActionHandler.kt

@@ -12,6 +12,6 @@ class MethodDocInlayActionHandler: InlayActionHandler {
     override fun handleClick(editor: Editor, payload: InlayActionPayload) {
         payload as PsiPointerInlayActionPayload
         val fakePsiMember = payload.pointer.element as? FakePsiPhpClassMember ?: return
-        HintManagerImpl.getInstanceImpl().showInformationHint(editor, fakePsiMember.getDocumentation(), HintManager.RIGHT_UNDER)
+        HintManagerImpl.getInstanceImpl().showInformationHint(editor, fakePsiMember.getDocumentation())
     }
 }

src/main/java/io/maliboot/www/hyperf/lombok/index/CustomMemberPsiGist.kt

@@ -242,15 +242,7 @@ class CustomMemberPsiGist {
         }
 
         fun getCustomMembers(psiFile: PsiFile): Map<String, MyCustomMember> {
-            try {
-                return resolveFromIndexValue(psiFile)
-            } catch (processCancel: ProcessCanceledException) {
-                throw processCancel
-            } catch (e: Exception) {
-                logger.warn("索引异常，请报告给开发者")
-                logger.warn(e.message)
-            }
-            return emptyMap()
+            return resolveFromIndexValue(psiFile)
         }
 
         fun getCustomMembers(file: VirtualFile, project: Project): Map<String, MyCustomMember> {

src/main/java/io/maliboot/www/hyperf/lombok/typeProvider/CustomMemberTypeProvider.kt

@@ -1,6 +1,8 @@
 package io.maliboot.www.hyperf.lombok.typeProvider
 
 import com.intellij.openapi.application.ReadAction
+import com.intellij.openapi.diagnostic.Logger
+import com.intellij.openapi.project.DumbService
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.text.Strings
 import com.intellij.psi.PsiElement
@@ -18,17 +20,23 @@ class CustomMemberTypeProvider : PhpTypeProvider4 {
 
     companion object {
         const val ID = '马'
+
+        private val logger: Logger = Logger.getInstance(CustomMemberTypeProvider::class.java)
     }
 
     override fun getKey(): Char {
         return ID
     }
 
     override fun getType(p0: PsiElement?): PhpType? {
-        if (p0 == null || !p0.containingFile.isExcludeDir()) {
+        if (p0 == null || DumbService.getInstance(p0.project).isDumb || !p0.containingFile.isExcludeDir()) {
             return null
         }
 
+        return tryType(p0)
+    }
+
+    private fun tryType(p0: PsiElement): PhpType? {
         var isFieldReference = false
         val reference: MemberReference = when (p0) {
             is FieldReference -> {
@@ -44,14 +52,20 @@ class CustomMemberTypeProvider : PhpTypeProvider4 {
         } ?: return null
 
         val classReference = reference.classReference ?: return null
-        var classRefFQN = classReference.type.toString()
+        val classRefType = classReference.type.toString()
+        var classRefFQN = classRefType
             .removeSuffix("|?")
             .split("|")
             .last()
             .substringAfter("\\")
             .replace(")", "")
         if (classRefFQN.contains("(")) {
-            classRefFQN = classRefFQN.substring(classRefFQN.lastIndexOf("(") + 2)
+            classRefFQN = classRefFQN.substring(classRefFQN.lastIndexOf("(") + 1)
+            if (!classRefFQN.startsWith("\\")) {
+                logger.warn("类型解析异常：$classRefType")
+                return null
+            }
+            classRefFQN = classRefFQN.substring(1)
         }
         when (classReference) {
             is Variable, is MemberReference, is FunctionReference -> {

src/main/resources/META-INF/plugin.xml

@@ -26,7 +26,7 @@
                 implementationClass="io.maliboot.www.hyperf.lombok.codeInsight.MethodInlayProvider"
                 language="PHP"
                 bundle="messages.HyperfBundle"
-                group="lombok.method.inlay.group"
+                group="TYPES_GROUP"
                 isEnabledByDefault="true"
                 nameKey="lombok.method.inlay.name"
                 providerId="lombok.method.inlay.provider.id"/>

…boot/www/hyperf/extension/dic/hyperf.dic …boot/www/hyperf/extension/dic/hyperf.dicsrc/main/java/io/maliboot/www/hyperf/extension/dic/hyperf.dic renamed to src/main/resources/io/maliboot/www/hyperf/extension/dic/hyperf.dic src/main/java/io/maliboot/www/hyperf/extension/dic/hyperf.dic renamed to src/main/resources/io/maliboot/www/hyperf/extension/dic/hyperf.dic

@@ -1,4 +1,5 @@
 hyperf
+jsonrpc
 jsonrpc-http
 swoole
 maliboot