Merge branch 'release/1.1.2'

0xlau · Nov 23, 2022 · d95d0d4 · d95d0d4
2 parents f021784 + 2bc2495
commit d95d0d4
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 ## [Unreleased]
 
+## [1.1.2] - 2022-11-23
+- 修复 #I5X8XV com/intellij/psi/impl/source/PsiClassImpl.isInheritor must not be null 的问题
+  - https://gitee.com/liupeiqiang/LiteFlowX/issues/I5X8XV
+- 修复 com.intellij.psi.impl.source.xml.XmlElementContentGroupImpl cannot be cast to class com.intellij.psi.xml.XmlTag 的问题
+
 ## [1.1.1] - 2022-10-24
 - 新增 #I5VMP4 在xml中新增对groovy以及javascript语法的支持
   - https://gitee.com/liupeiqiang/LiteFlowX/issues/I5VMP4

diff --git a/README.md b/README.md
@@ -74,8 +74,5 @@ For full details of install plugins, <a href="https://www.jetbrains.com/help/ide
 ### Local variables
 ![支持局部变量](https://liteflow.yomahub.com/img/liteflowx/localvar.gif)
 
-### Language injection
-![支持.el.xml的chain标签自动注入elf语法](https://liteflow.yomahub.com/img/liteflowx/newelxml.gif)
-
 ### LiteFlow ToolBox
 ![LiteFlow 工具箱](https://liteflow.yomahub.com/img/liteflowx/toolbox.gif)
diff --git a/README.zh-CN.md b/README.zh-CN.md
@@ -74,9 +74,6 @@
 ### 支持局部变量
 ![支持局部变量](https://liteflow.yomahub.com/img/liteflowx/localvar.gif)
 
-### 支持.el.xml的chain标签自动注入elf语法
-![支持.el.xml的chain标签自动注入elf语法](https://liteflow.yomahub.com/img/liteflowx/newelxml.gif)
-
 ### LiteFlow 工具箱
 ![LiteFlow 工具箱](https://liteflow.yomahub.com/img/liteflowx/toolbox.gif)
 

diff --git a/gradle.properties b/gradle.properties
@@ -4,7 +4,7 @@
 pluginGroup = top.xystudio.plugin.idea
 pluginName = LiteFlowX
 # SemVer format -> https://semver.org
-pluginVersion = 1.1.1
+pluginVersion = 1.1.2
 
 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 # for insight into build numbers and IntelliJ Platform versions.

diff --git a/src/main/java/top/xystudio/plugin/idea/liteflowx/service/LiteFlowService.java b/src/main/java/top/xystudio/plugin/idea/liteflowx/service/LiteFlowService.java
@@ -234,7 +234,8 @@ private boolean _isLiteFlow(PsiElement psiElement, String clazz, String nodeType
             if (psiMethod.getContainingClass().hasAnnotation(Annotation.LiteflowCmpDefine)){
                 return false;
             }
-            if (psiMethod.getContainingClass().isInheritor(javaService.getClassByQualifiedName(Clazz.NodeComponent), true)){
+            PsiClass nodeComponent = javaService.getClassByQualifiedName(Clazz.NodeComponent);
+            if (nodeComponent != null && psiMethod.getContainingClass().isInheritor(nodeComponent, true)){
                 return false;
             }
             String liteFlowMethod = javaService.getAnnotationAttributeValue(psiMethod, Annotation.LiteflowMethod, "value");

diff --git a/.../java/top/xystudio/plugin/idea/liteflowx/system/language/annotator/XmlChainAnnotator.java b/.../java/top/xystudio/plugin/idea/liteflowx/system/language/annotator/XmlChainAnnotator.java
@@ -32,6 +32,9 @@ public void annotate(@NotNull PsiElement element, @NotNull AnnotationHolder hold
         if (!element.getText().equalsIgnoreCase("chain")){
             return;
         }
+        if (!(element.getParent() instanceof XmlTag)){
+            return;
+        }
         String name = ((XmlTag) element.getParent()).getAttributeValue("name");
         if (StringUtil.isEmpty(name)){
             holder.newAnnotation(HighlightSeverity.ERROR, "缺少 'name' 属性值")