## [1.2.5] - 2023-10-16

- 修复继承占位符语法解析误报问题
0xlau · Oct 16, 2023 · 6c7c344 · 6c7c344
1 parent 0787c9b
commit 6c7c344
Show file tree

Hide file tree

Showing 14 changed files with 128 additions and 43 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## [Unreleased]
 
+## [1.2.5] - 2023-10-16
+- 修复 继承占位符语法解析误报 问题
+
 ## [1.2.4] - 2023-10-12
 - 新增 支持.must() 关键词
 - 新增 支持实验性版本的继承特性

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.2.4
+pluginVersion = 1.2.5
 
 # 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/gen/top/xystudio/plugin/idea/liteflowx/system/language/parse/LiteFlowParser.java b/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/parse/LiteFlowParser.java
diff --git a/...en/top/xystudio/plugin/idea/liteflowx/system/language/psi/LiteFlowLiteFlowAllExpress.java b/...en/top/xystudio/plugin/idea/liteflowx/system/language/psi/LiteFlowLiteFlowAllExpress.java
diff --git a/...i/LiteFlowLiteFlowPlaceholderExpress.java → ...e/psi/LiteFlowLiteFlowPlaceHolderRef.java b/...i/LiteFlowLiteFlowPlaceholderExpress.java → ...e/psi/LiteFlowLiteFlowPlaceHolderRef.java
diff --git a/...tudio/plugin/idea/liteflowx/system/language/psi/LiteFlowLiteFlowPlaceHolderStatement.java b/...tudio/plugin/idea/liteflowx/system/language/psi/LiteFlowLiteFlowPlaceHolderStatement.java
diff --git a/...o/plugin/idea/liteflowx/system/language/psi/LiteFlowLiteFlowPlaceholderAssignExpress.java b/...o/plugin/idea/liteflowx/system/language/psi/LiteFlowLiteFlowPlaceholderAssignExpress.java
diff --git a/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/LiteFlowTypes.java b/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/LiteFlowTypes.java
diff --git a/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/LiteFlowVisitor.java b/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/LiteFlowVisitor.java
diff --git a/...studio/plugin/idea/liteflowx/system/language/psi/impl/LiteFlowLiteFlowAllExpressImpl.java b/...studio/plugin/idea/liteflowx/system/language/psi/impl/LiteFlowLiteFlowAllExpressImpl.java
diff --git a/...teFlowLiteFlowPlaceholderExpressImpl.java → ...l/LiteFlowLiteFlowPlaceHolderRefImpl.java b/...teFlowLiteFlowPlaceholderExpressImpl.java → ...l/LiteFlowLiteFlowPlaceHolderRefImpl.java
diff --git a/...gin/idea/liteflowx/system/language/psi/impl/LiteFlowLiteFlowPlaceHolderStatementImpl.java b/...gin/idea/liteflowx/system/language/psi/impl/LiteFlowLiteFlowPlaceHolderStatementImpl.java
diff --git a/...idea/liteflowx/system/language/psi/impl/LiteFlowLiteFlowPlaceholderAssignExpressImpl.java b/...idea/liteflowx/system/language/psi/impl/LiteFlowLiteFlowPlaceholderAssignExpressImpl.java
diff --git a/src/main/java/top/xystudio/plugin/idea/liteflowx/system/language/LiteFlow.bnf b/src/main/java/top/xystudio/plugin/idea/liteflowx/system/language/LiteFlow.bnf
@@ -190,7 +190,7 @@ breakStatement ::= break SEMICOLON
 continueStatement ::= continue SEMICOLON
 opSelfStatement ::= opSelfExpress SEMICOLON
 liteFlowStatement ::= liteFlowConditionExpress SEMICOLON {pin=1 recoverWhile=recover_liteFlowStatement}
-liteFlowPlaceHolderStatement ::= liteFlowPlaceholderExpress SEMICOLON {pin=1 recoverWhile=recover_liteFlowStatement}
+liteFlowPlaceHolderStatement ::= liteFlowPlaceholderAssignExpress SEMICOLON {pin=1 recoverWhile=recover_liteFlowStatement}
 private recover_liteFlowStatement ::= !(SEMICOLON | liteFlowStatement | assignStatement | liteFlowPlaceHolderStatement | line_comment | block_comment | fnInvokeStatement)
 
 /** Statement Start **/
@@ -238,10 +238,10 @@ fnInvokeExpress ::= refExpress fnParamExpress
 fnParamExpress ::= {PAREN_LEFT [allExpress {COMMA (allExpress|op)}*] PAREN_RIGHT}+
 
 // LiteFlow 占位符表达式
-liteFlowPlaceholderExpress ::= BRACE_LEFT (refExpress|number) BRACE_RIGHT ASSIGN liteFlowConditionExpress
+liteFlowPlaceholderAssignExpress ::= liteFlowPlaceHolderRef ASSIGN liteFlowConditionExpress
 
 // LiteFlow 通用表达式
-liteFlowAllExpress ::= liteFlowConditionExpress | liteFlowNodeRefExpress
+liteFlowAllExpress ::= liteFlowConditionExpress | liteFlowNodeRefExpress | liteFlowPlaceHolderRef
 
 // LiteFlow 全部逻辑表达式
 liteFlowAllLogicExpress ::= liteFlowAndExpress | liteFlowOrExpress | liteFlowNotExpress
@@ -356,6 +356,8 @@ liteFlowParallelExpress ::= parallel PAREN_LEFT boolean PAREN_RIGHT {pin=1}
 
 // Ref
 
+liteFlowPlaceHolderRef ::= BRACE_LEFT (refExpress|number) BRACE_RIGHT
+
 liteFlowNodeStringRef ::= string
 
 liteFlowNodeRef ::= identifier