diff --git a/CHANGELOG.md b/CHANGELOG.md index 6d19fe0..6f0b9ee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## [Unreleased] +## [1.2.1] - 2023-04-11 +- 新增 支持表达式结尾键入.tag()和.id() +- 兼容 WHILE() 括号表达式内使用AND、OR、NOT逻辑表达式 + ## [1.2.0] - 2023-04-01 - 新增 支持AND()、OR()、NOT()逻辑表达式 - 兼容 IDEA-2023.* 版本 diff --git a/gradle.properties b/gradle.properties index eba704d..184e8f8 100644 --- 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.0 +pluginVersion = 1.2.1 # 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 index a3d6389..c5da447 100644 --- 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 @@ -809,7 +809,7 @@ private static boolean liteFlowCatchExpress_4_0(PsiBuilder b, int l) { } /* ********************************************************** */ - // {block_comment | line_comment}* (liteFlowThenExpress | liteFlowWhenExpress | liteFlowSwitchExpress | liteFlowPreExpress | liteFlowFinallyExpress | liteFlowIf2Express | liteFlowIf3Express | liteFlowForExpress | liteFlowIteratorExpress | liteFlowWhileExpress | liteFlowCatchExpress) {block_comment | line_comment}* + // {block_comment | line_comment}* (liteFlowThenExpress | liteFlowWhenExpress | liteFlowSwitchExpress | liteFlowPreExpress | liteFlowFinallyExpress | liteFlowIf2Express | liteFlowIf3Express | liteFlowForExpress | liteFlowIteratorExpress | liteFlowWhileExpress | liteFlowCatchExpress) {DOT (liteFlowIdExpress | liteFlowTagExpress)}* {block_comment | line_comment}* public static boolean liteFlowConditionExpress(PsiBuilder b, int l) { if (!recursion_guard_(b, l, "liteFlowConditionExpress")) return false; boolean r; @@ -817,6 +817,7 @@ public static boolean liteFlowConditionExpress(PsiBuilder b, int l) { r = liteFlowConditionExpress_0(b, l + 1); r = r && liteFlowConditionExpress_1(b, l + 1); r = r && liteFlowConditionExpress_2(b, l + 1); + r = r && liteFlowConditionExpress_3(b, l + 1); exit_section_(b, l, m, r, false, null); return r; } @@ -859,7 +860,7 @@ private static boolean liteFlowConditionExpress_1(PsiBuilder b, int l) { return r; } - // {block_comment | line_comment}* + // {DOT (liteFlowIdExpress | liteFlowTagExpress)}* private static boolean liteFlowConditionExpress_2(PsiBuilder b, int l) { if (!recursion_guard_(b, l, "liteFlowConditionExpress_2")) return false; while (true) { @@ -870,10 +871,41 @@ private static boolean liteFlowConditionExpress_2(PsiBuilder b, int l) { return true; } - // block_comment | line_comment + // DOT (liteFlowIdExpress | liteFlowTagExpress) private static boolean liteFlowConditionExpress_2_0(PsiBuilder b, int l) { if (!recursion_guard_(b, l, "liteFlowConditionExpress_2_0")) return false; boolean r; + Marker m = enter_section_(b); + r = consumeToken(b, LITEFLOW_DOT); + r = r && liteFlowConditionExpress_2_0_1(b, l + 1); + exit_section_(b, m, null, r); + return r; + } + + // liteFlowIdExpress | liteFlowTagExpress + private static boolean liteFlowConditionExpress_2_0_1(PsiBuilder b, int l) { + if (!recursion_guard_(b, l, "liteFlowConditionExpress_2_0_1")) return false; + boolean r; + r = liteFlowIdExpress(b, l + 1); + if (!r) r = liteFlowTagExpress(b, l + 1); + return r; + } + + // {block_comment | line_comment}* + private static boolean liteFlowConditionExpress_3(PsiBuilder b, int l) { + if (!recursion_guard_(b, l, "liteFlowConditionExpress_3")) return false; + while (true) { + int c = current_position_(b); + if (!liteFlowConditionExpress_3_0(b, l + 1)) break; + if (!empty_element_parsed_guard_(b, "liteFlowConditionExpress_3", c)) break; + } + return true; + } + + // block_comment | line_comment + private static boolean liteFlowConditionExpress_3_0(PsiBuilder b, int l) { + if (!recursion_guard_(b, l, "liteFlowConditionExpress_3_0")) return false; + boolean r; r = consumeToken(b, LITEFLOW_BLOCK_COMMENT); if (!r) r = consumeToken(b, LITEFLOW_LINE_COMMENT); return r; @@ -1082,7 +1114,7 @@ private static boolean liteFlowIf2ElifExpress_6(PsiBuilder b, int l) { } /* ********************************************************** */ - // DOT ( liteFlowIf2ElifExpress | liteFlowIf2ElseExpress | liteFlowIdExpress ) + // DOT ( liteFlowIf2ElifExpress | liteFlowIf2ElseExpress ) public static boolean liteFlowIf2ElifSubExpress(PsiBuilder b, int l) { if (!recursion_guard_(b, l, "liteFlowIf2ElifSubExpress")) return false; if (!nextTokenIs(b, LITEFLOW_DOT)) return false; @@ -1095,18 +1127,17 @@ public static boolean liteFlowIf2ElifSubExpress(PsiBuilder b, int l) { return r || p; } - // liteFlowIf2ElifExpress | liteFlowIf2ElseExpress | liteFlowIdExpress + // liteFlowIf2ElifExpress | liteFlowIf2ElseExpress private static boolean liteFlowIf2ElifSubExpress_1(PsiBuilder b, int l) { if (!recursion_guard_(b, l, "liteFlowIf2ElifSubExpress_1")) return false; boolean r; r = liteFlowIf2ElifExpress(b, l + 1); if (!r) r = liteFlowIf2ElseExpress(b, l + 1); - if (!r) r = liteFlowIdExpress(b, l + 1); return r; } /* ********************************************************** */ - // LELSE PAREN_LEFT liteFlowAllExpress PAREN_RIGHT [liteFlowIf2ElseSubExpress] + // LELSE PAREN_LEFT liteFlowAllExpress PAREN_RIGHT public static boolean liteFlowIf2ElseExpress(PsiBuilder b, int l) { if (!recursion_guard_(b, l, "liteFlowIf2ElseExpress")) return false; if (!nextTokenIs(b, LITEFLOW_LELSE)) return false; @@ -1115,43 +1146,11 @@ public static boolean liteFlowIf2ElseExpress(PsiBuilder b, int l) { r = consumeTokens(b, 1, LITEFLOW_LELSE, LITEFLOW_PAREN_LEFT); p = r; // pin = 1 r = r && report_error_(b, liteFlowAllExpress(b, l + 1)); - r = p && report_error_(b, consumeToken(b, LITEFLOW_PAREN_RIGHT)) && r; - r = p && liteFlowIf2ElseExpress_4(b, l + 1) && r; - exit_section_(b, l, m, r, p, null); - return r || p; - } - - // [liteFlowIf2ElseSubExpress] - private static boolean liteFlowIf2ElseExpress_4(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "liteFlowIf2ElseExpress_4")) return false; - liteFlowIf2ElseSubExpress(b, l + 1); - return true; - } - - /* ********************************************************** */ - // DOT (liteFlowIdExpress) - public static boolean liteFlowIf2ElseSubExpress(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "liteFlowIf2ElseSubExpress")) return false; - if (!nextTokenIs(b, LITEFLOW_DOT)) return false; - boolean r, p; - Marker m = enter_section_(b, l, _NONE_, LITEFLOW_LITE_FLOW_IF_2_ELSE_SUB_EXPRESS, null); - r = consumeToken(b, LITEFLOW_DOT); - p = r; // pin = 1 - r = r && liteFlowIf2ElseSubExpress_1(b, l + 1); + r = p && consumeToken(b, LITEFLOW_PAREN_RIGHT) && r; exit_section_(b, l, m, r, p, null); return r || p; } - // (liteFlowIdExpress) - private static boolean liteFlowIf2ElseSubExpress_1(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "liteFlowIf2ElseSubExpress_1")) return false; - boolean r; - Marker m = enter_section_(b); - r = liteFlowIdExpress(b, l + 1); - exit_section_(b, m, null, r); - return r; - } - /* ********************************************************** */ // LIF PAREN_LEFT (liteFlowAllLogicExpress | liteFlowNodeRefExpress) COMMA liteFlowAllExpress PAREN_RIGHT [liteFlowIf2SubExpress] public static boolean liteFlowIf2Express(PsiBuilder b, int l) { @@ -1186,7 +1185,7 @@ private static boolean liteFlowIf2Express_6(PsiBuilder b, int l) { } /* ********************************************************** */ - // DOT ( liteFlowIf2ElifExpress | liteFlowIf2ElseExpress | liteFlowIdExpress ) + // DOT ( liteFlowIf2ElifExpress | liteFlowIf2ElseExpress ) public static boolean liteFlowIf2SubExpress(PsiBuilder b, int l) { if (!recursion_guard_(b, l, "liteFlowIf2SubExpress")) return false; if (!nextTokenIs(b, LITEFLOW_DOT)) return false; @@ -1199,18 +1198,17 @@ public static boolean liteFlowIf2SubExpress(PsiBuilder b, int l) { return r || p; } - // liteFlowIf2ElifExpress | liteFlowIf2ElseExpress | liteFlowIdExpress + // liteFlowIf2ElifExpress | liteFlowIf2ElseExpress private static boolean liteFlowIf2SubExpress_1(PsiBuilder b, int l) { if (!recursion_guard_(b, l, "liteFlowIf2SubExpress_1")) return false; boolean r; r = liteFlowIf2ElifExpress(b, l + 1); if (!r) r = liteFlowIf2ElseExpress(b, l + 1); - if (!r) r = liteFlowIdExpress(b, l + 1); return r; } /* ********************************************************** */ - // LIF PAREN_LEFT (liteFlowAllLogicExpress | liteFlowNodeRefExpress) COMMA liteFlowAllExpress COMMA liteFlowAllExpress PAREN_RIGHT [liteFlowIf3SubExpress] + // LIF PAREN_LEFT (liteFlowAllLogicExpress | liteFlowNodeRefExpress) COMMA liteFlowAllExpress COMMA liteFlowAllExpress PAREN_RIGHT public static boolean liteFlowIf3Express(PsiBuilder b, int l) { if (!recursion_guard_(b, l, "liteFlowIf3Express")) return false; if (!nextTokenIs(b, LITEFLOW_LIF)) return false; @@ -1223,8 +1221,7 @@ public static boolean liteFlowIf3Express(PsiBuilder b, int l) { r = p && report_error_(b, liteFlowAllExpress(b, l + 1)) && r; r = p && report_error_(b, consumeToken(b, LITEFLOW_COMMA)) && r; r = p && report_error_(b, liteFlowAllExpress(b, l + 1)) && r; - r = p && report_error_(b, consumeToken(b, LITEFLOW_PAREN_RIGHT)) && r; - r = p && liteFlowIf3Express_8(b, l + 1) && r; + r = p && consumeToken(b, LITEFLOW_PAREN_RIGHT) && r; exit_section_(b, l, m, r, p, null); return r || p; } @@ -1238,27 +1235,6 @@ private static boolean liteFlowIf3Express_2(PsiBuilder b, int l) { return r; } - // [liteFlowIf3SubExpress] - private static boolean liteFlowIf3Express_8(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "liteFlowIf3Express_8")) return false; - liteFlowIf3SubExpress(b, l + 1); - return true; - } - - /* ********************************************************** */ - // DOT liteFlowIdExpress - public static boolean liteFlowIf3SubExpress(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "liteFlowIf3SubExpress")) return false; - if (!nextTokenIs(b, LITEFLOW_DOT)) return false; - boolean r, p; - Marker m = enter_section_(b, l, _NONE_, LITEFLOW_LITE_FLOW_IF_3_SUB_EXPRESS, null); - r = consumeToken(b, LITEFLOW_DOT); - p = r; // pin = 1 - r = r && liteFlowIdExpress(b, l + 1); - exit_section_(b, l, m, r, p, null); - return r || p; - } - /* ********************************************************** */ // ignoreError PAREN_LEFT boolean PAREN_RIGHT public static boolean liteFlowIgnoreErrorExpress(PsiBuilder b, int l) { @@ -1638,7 +1614,7 @@ public static boolean liteFlowStatement(PsiBuilder b, int l) { } /* ********************************************************** */ - // SWITCH PAREN_LEFT liteFlowNodeRefExpress PAREN_RIGHT DOT (liteFlowToExpress | liteFlowDefaultExpress) [ liteFlowSwitchSubExpress ] + // SWITCH PAREN_LEFT liteFlowNodeRefExpress PAREN_RIGHT DOT (liteFlowToExpress | liteFlowDefaultExpress) public static boolean liteFlowSwitchExpress(PsiBuilder b, int l) { if (!recursion_guard_(b, l, "liteFlowSwitchExpress")) return false; if (!nextTokenIs(b, LITEFLOW_SWITCH)) return false; @@ -1648,8 +1624,7 @@ public static boolean liteFlowSwitchExpress(PsiBuilder b, int l) { p = r; // pin = 1 r = r && report_error_(b, liteFlowNodeRefExpress(b, l + 1)); r = p && report_error_(b, consumeTokens(b, -1, LITEFLOW_PAREN_RIGHT, LITEFLOW_DOT)) && r; - r = p && report_error_(b, liteFlowSwitchExpress_5(b, l + 1)) && r; - r = p && liteFlowSwitchExpress_6(b, l + 1) && r; + r = p && liteFlowSwitchExpress_5(b, l + 1) && r; exit_section_(b, l, m, r, p, null); return r || p; } @@ -1663,27 +1638,6 @@ private static boolean liteFlowSwitchExpress_5(PsiBuilder b, int l) { return r; } - // [ liteFlowSwitchSubExpress ] - private static boolean liteFlowSwitchExpress_6(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "liteFlowSwitchExpress_6")) return false; - liteFlowSwitchSubExpress(b, l + 1); - return true; - } - - /* ********************************************************** */ - // DOT liteFlowIdExpress - public static boolean liteFlowSwitchSubExpress(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "liteFlowSwitchSubExpress")) return false; - if (!nextTokenIs(b, LITEFLOW_DOT)) return false; - boolean r, p; - Marker m = enter_section_(b, l, _NONE_, LITEFLOW_LITE_FLOW_SWITCH_SUB_EXPRESS, null); - r = consumeToken(b, LITEFLOW_DOT); - p = r; // pin = 1 - r = r && liteFlowIdExpress(b, l + 1); - exit_section_(b, l, m, r, p, null); - return r || p; - } - /* ********************************************************** */ // tag PAREN_LEFT string PAREN_RIGHT public static boolean liteFlowTagExpress(PsiBuilder b, int l) { @@ -1698,7 +1652,7 @@ public static boolean liteFlowTagExpress(PsiBuilder b, int l) { } /* ********************************************************** */ - // THEN PAREN_LEFT liteFlowAllExpress {COMMA liteFlowAllExpress}* PAREN_RIGHT [liteFlowThenSubExpress] + // THEN PAREN_LEFT liteFlowAllExpress {COMMA liteFlowAllExpress}* PAREN_RIGHT public static boolean liteFlowThenExpress(PsiBuilder b, int l) { if (!recursion_guard_(b, l, "liteFlowThenExpress")) return false; if (!nextTokenIs(b, LITEFLOW_THEN)) return false; @@ -1708,8 +1662,7 @@ public static boolean liteFlowThenExpress(PsiBuilder b, int l) { p = r; // pin = 1 r = r && report_error_(b, liteFlowAllExpress(b, l + 1)); r = p && report_error_(b, liteFlowThenExpress_3(b, l + 1)) && r; - r = p && report_error_(b, consumeToken(b, LITEFLOW_PAREN_RIGHT)) && r; - r = p && liteFlowThenExpress_5(b, l + 1) && r; + r = p && consumeToken(b, LITEFLOW_PAREN_RIGHT) && r; exit_section_(b, l, m, r, p, null); return r || p; } @@ -1736,27 +1689,6 @@ private static boolean liteFlowThenExpress_3_0(PsiBuilder b, int l) { return r; } - // [liteFlowThenSubExpress] - private static boolean liteFlowThenExpress_5(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "liteFlowThenExpress_5")) return false; - liteFlowThenSubExpress(b, l + 1); - return true; - } - - /* ********************************************************** */ - // DOT liteFlowIdExpress - public static boolean liteFlowThenSubExpress(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "liteFlowThenSubExpress")) return false; - if (!nextTokenIs(b, LITEFLOW_DOT)) return false; - boolean r, p; - Marker m = enter_section_(b, l, _NONE_, LITEFLOW_LITE_FLOW_THEN_SUB_EXPRESS, null); - r = consumeToken(b, LITEFLOW_DOT); - p = r; // pin = 1 - r = r && liteFlowIdExpress(b, l + 1); - exit_section_(b, l, m, r, p, null); - return r || p; - } - /* ********************************************************** */ // threadPool PAREN_LEFT string PAREN_RIGHT public static boolean liteFlowThreadPoolExpress(PsiBuilder b, int l) { @@ -1898,32 +1830,30 @@ private static boolean liteFlowWhenExpress_5_0(PsiBuilder b, int l) { } /* ********************************************************** */ - // DOT (liteFlowIdExpress | liteFlowIgnoreErrorExpress | liteFlowAnyExpress | liteFlowThreadPoolExpress) + // DOT (liteFlowIgnoreErrorExpress | liteFlowAnyExpress | liteFlowThreadPoolExpress) public static boolean liteFlowWhenSubExpress(PsiBuilder b, int l) { if (!recursion_guard_(b, l, "liteFlowWhenSubExpress")) return false; if (!nextTokenIs(b, LITEFLOW_DOT)) return false; - boolean r, p; - Marker m = enter_section_(b, l, _NONE_, LITEFLOW_LITE_FLOW_WHEN_SUB_EXPRESS, null); + boolean r; + Marker m = enter_section_(b); r = consumeToken(b, LITEFLOW_DOT); - p = r; // pin = 1 r = r && liteFlowWhenSubExpress_1(b, l + 1); - exit_section_(b, l, m, r, p, null); - return r || p; + exit_section_(b, m, LITEFLOW_LITE_FLOW_WHEN_SUB_EXPRESS, r); + return r; } - // liteFlowIdExpress | liteFlowIgnoreErrorExpress | liteFlowAnyExpress | liteFlowThreadPoolExpress + // liteFlowIgnoreErrorExpress | liteFlowAnyExpress | liteFlowThreadPoolExpress private static boolean liteFlowWhenSubExpress_1(PsiBuilder b, int l) { if (!recursion_guard_(b, l, "liteFlowWhenSubExpress_1")) return false; boolean r; - r = liteFlowIdExpress(b, l + 1); - if (!r) r = liteFlowIgnoreErrorExpress(b, l + 1); + r = liteFlowIgnoreErrorExpress(b, l + 1); if (!r) r = liteFlowAnyExpress(b, l + 1); if (!r) r = liteFlowThreadPoolExpress(b, l + 1); return r; } /* ********************************************************** */ - // LWHILE PAREN_LEFT liteFlowNodeRefExpress PAREN_RIGHT DOT liteFlowDoExpress [liteFlowWhileSubExpress] + // LWHILE PAREN_LEFT (liteFlowAllLogicExpress | liteFlowNodeRefExpress) PAREN_RIGHT DOT liteFlowDoExpress [liteFlowWhileSubExpress] public static boolean liteFlowWhileExpress(PsiBuilder b, int l) { if (!recursion_guard_(b, l, "liteFlowWhileExpress")) return false; if (!nextTokenIs(b, LITEFLOW_LWHILE)) return false; @@ -1931,7 +1861,7 @@ public static boolean liteFlowWhileExpress(PsiBuilder b, int l) { Marker m = enter_section_(b, l, _NONE_, LITEFLOW_LITE_FLOW_WHILE_EXPRESS, null); r = consumeTokens(b, 1, LITEFLOW_LWHILE, LITEFLOW_PAREN_LEFT); p = r; // pin = 1 - r = r && report_error_(b, liteFlowNodeRefExpress(b, l + 1)); + r = r && report_error_(b, liteFlowWhileExpress_2(b, l + 1)); r = p && report_error_(b, consumeTokens(b, -1, LITEFLOW_PAREN_RIGHT, LITEFLOW_DOT)) && r; r = p && report_error_(b, liteFlowDoExpress(b, l + 1)) && r; r = p && liteFlowWhileExpress_6(b, l + 1) && r; @@ -1939,6 +1869,15 @@ public static boolean liteFlowWhileExpress(PsiBuilder b, int l) { return r || p; } + // liteFlowAllLogicExpress | liteFlowNodeRefExpress + private static boolean liteFlowWhileExpress_2(PsiBuilder b, int l) { + if (!recursion_guard_(b, l, "liteFlowWhileExpress_2")) return false; + boolean r; + r = liteFlowAllLogicExpress(b, l + 1); + if (!r) r = liteFlowNodeRefExpress(b, l + 1); + return r; + } + // [liteFlowWhileSubExpress] private static boolean liteFlowWhileExpress_6(PsiBuilder b, int l) { if (!recursion_guard_(b, l, "liteFlowWhileExpress_6")) return false; diff --git a/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/LiteFlowLiteFlowConditionExpress.java b/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/LiteFlowLiteFlowConditionExpress.java index 9fad51a..3862198 100644 --- a/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/LiteFlowLiteFlowConditionExpress.java +++ b/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/LiteFlowLiteFlowConditionExpress.java @@ -16,6 +16,9 @@ public interface LiteFlowLiteFlowConditionExpress extends PsiElement { @Nullable LiteFlowLiteFlowForExpress getLiteFlowForExpress(); + @NotNull + List getLiteFlowIdExpressList(); + @Nullable LiteFlowLiteFlowIf2Express getLiteFlowIf2Express(); @@ -31,6 +34,9 @@ public interface LiteFlowLiteFlowConditionExpress extends PsiElement { @Nullable LiteFlowLiteFlowSwitchExpress getLiteFlowSwitchExpress(); + @NotNull + List getLiteFlowTagExpressList(); + @Nullable LiteFlowLiteFlowThenExpress getLiteFlowThenExpress(); diff --git a/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/LiteFlowLiteFlowIf2ElifSubExpress.java b/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/LiteFlowLiteFlowIf2ElifSubExpress.java index ac4f09d..132326b 100644 --- a/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/LiteFlowLiteFlowIf2ElifSubExpress.java +++ b/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/LiteFlowLiteFlowIf2ElifSubExpress.java @@ -7,9 +7,6 @@ public interface LiteFlowLiteFlowIf2ElifSubExpress extends PsiElement { - @Nullable - LiteFlowLiteFlowIdExpress getLiteFlowIdExpress(); - @Nullable LiteFlowLiteFlowIf2ElifExpress getLiteFlowIf2ElifExpress(); diff --git a/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/LiteFlowLiteFlowIf2ElseExpress.java b/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/LiteFlowLiteFlowIf2ElseExpress.java index 4401c1a..0bcdf83 100644 --- a/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/LiteFlowLiteFlowIf2ElseExpress.java +++ b/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/LiteFlowLiteFlowIf2ElseExpress.java @@ -10,7 +10,4 @@ public interface LiteFlowLiteFlowIf2ElseExpress extends PsiElement { @Nullable LiteFlowLiteFlowAllExpress getLiteFlowAllExpress(); - @Nullable - LiteFlowLiteFlowIf2ElseSubExpress getLiteFlowIf2ElseSubExpress(); - } diff --git a/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/LiteFlowLiteFlowIf2ElseSubExpress.java b/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/LiteFlowLiteFlowIf2ElseSubExpress.java deleted file mode 100644 index d6dc86a..0000000 --- a/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/LiteFlowLiteFlowIf2ElseSubExpress.java +++ /dev/null @@ -1,13 +0,0 @@ -// This is a generated file. Not intended for manual editing. -package top.xystudio.plugin.idea.liteflowx.system.language.psi; - -import java.util.List; -import org.jetbrains.annotations.*; -import com.intellij.psi.PsiElement; - -public interface LiteFlowLiteFlowIf2ElseSubExpress extends PsiElement { - - @Nullable - LiteFlowLiteFlowIdExpress getLiteFlowIdExpress(); - -} diff --git a/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/LiteFlowLiteFlowIf2SubExpress.java b/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/LiteFlowLiteFlowIf2SubExpress.java index 68e90e9..0e4ab21 100644 --- a/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/LiteFlowLiteFlowIf2SubExpress.java +++ b/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/LiteFlowLiteFlowIf2SubExpress.java @@ -7,9 +7,6 @@ public interface LiteFlowLiteFlowIf2SubExpress extends PsiElement { - @Nullable - LiteFlowLiteFlowIdExpress getLiteFlowIdExpress(); - @Nullable LiteFlowLiteFlowIf2ElifExpress getLiteFlowIf2ElifExpress(); diff --git a/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/LiteFlowLiteFlowIf3Express.java b/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/LiteFlowLiteFlowIf3Express.java index 400709a..453de42 100644 --- a/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/LiteFlowLiteFlowIf3Express.java +++ b/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/LiteFlowLiteFlowIf3Express.java @@ -13,9 +13,6 @@ public interface LiteFlowLiteFlowIf3Express extends PsiElement { @Nullable LiteFlowLiteFlowAllLogicExpress getLiteFlowAllLogicExpress(); - @Nullable - LiteFlowLiteFlowIf3SubExpress getLiteFlowIf3SubExpress(); - @Nullable LiteFlowLiteFlowNodeRefExpress getLiteFlowNodeRefExpress(); diff --git a/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/LiteFlowLiteFlowIf3SubExpress.java b/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/LiteFlowLiteFlowIf3SubExpress.java deleted file mode 100644 index 7bd5789..0000000 --- a/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/LiteFlowLiteFlowIf3SubExpress.java +++ /dev/null @@ -1,13 +0,0 @@ -// This is a generated file. Not intended for manual editing. -package top.xystudio.plugin.idea.liteflowx.system.language.psi; - -import java.util.List; -import org.jetbrains.annotations.*; -import com.intellij.psi.PsiElement; - -public interface LiteFlowLiteFlowIf3SubExpress extends PsiElement { - - @Nullable - LiteFlowLiteFlowIdExpress getLiteFlowIdExpress(); - -} diff --git a/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/LiteFlowLiteFlowSwitchExpress.java b/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/LiteFlowLiteFlowSwitchExpress.java index 219a0da..16f3e57 100644 --- a/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/LiteFlowLiteFlowSwitchExpress.java +++ b/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/LiteFlowLiteFlowSwitchExpress.java @@ -13,9 +13,6 @@ public interface LiteFlowLiteFlowSwitchExpress extends PsiElement { @Nullable LiteFlowLiteFlowNodeRefExpress getLiteFlowNodeRefExpress(); - @Nullable - LiteFlowLiteFlowSwitchSubExpress getLiteFlowSwitchSubExpress(); - @Nullable LiteFlowLiteFlowToExpress getLiteFlowToExpress(); diff --git a/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/LiteFlowLiteFlowSwitchSubExpress.java b/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/LiteFlowLiteFlowSwitchSubExpress.java deleted file mode 100644 index 670956c..0000000 --- a/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/LiteFlowLiteFlowSwitchSubExpress.java +++ /dev/null @@ -1,13 +0,0 @@ -// This is a generated file. Not intended for manual editing. -package top.xystudio.plugin.idea.liteflowx.system.language.psi; - -import java.util.List; -import org.jetbrains.annotations.*; -import com.intellij.psi.PsiElement; - -public interface LiteFlowLiteFlowSwitchSubExpress extends PsiElement { - - @Nullable - LiteFlowLiteFlowIdExpress getLiteFlowIdExpress(); - -} diff --git a/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/LiteFlowLiteFlowThenExpress.java b/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/LiteFlowLiteFlowThenExpress.java index 27d77ea..c335ec2 100644 --- a/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/LiteFlowLiteFlowThenExpress.java +++ b/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/LiteFlowLiteFlowThenExpress.java @@ -10,7 +10,4 @@ public interface LiteFlowLiteFlowThenExpress extends PsiElement { @NotNull List getLiteFlowAllExpressList(); - @Nullable - LiteFlowLiteFlowThenSubExpress getLiteFlowThenSubExpress(); - } diff --git a/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/LiteFlowLiteFlowThenSubExpress.java b/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/LiteFlowLiteFlowThenSubExpress.java deleted file mode 100644 index 9748432..0000000 --- a/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/LiteFlowLiteFlowThenSubExpress.java +++ /dev/null @@ -1,13 +0,0 @@ -// This is a generated file. Not intended for manual editing. -package top.xystudio.plugin.idea.liteflowx.system.language.psi; - -import java.util.List; -import org.jetbrains.annotations.*; -import com.intellij.psi.PsiElement; - -public interface LiteFlowLiteFlowThenSubExpress extends PsiElement { - - @Nullable - LiteFlowLiteFlowIdExpress getLiteFlowIdExpress(); - -} diff --git a/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/LiteFlowLiteFlowWhenSubExpress.java b/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/LiteFlowLiteFlowWhenSubExpress.java index 70a46b0..150376d 100644 --- a/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/LiteFlowLiteFlowWhenSubExpress.java +++ b/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/LiteFlowLiteFlowWhenSubExpress.java @@ -10,9 +10,6 @@ public interface LiteFlowLiteFlowWhenSubExpress extends PsiElement { @Nullable LiteFlowLiteFlowAnyExpress getLiteFlowAnyExpress(); - @Nullable - LiteFlowLiteFlowIdExpress getLiteFlowIdExpress(); - @Nullable LiteFlowLiteFlowIgnoreErrorExpress getLiteFlowIgnoreErrorExpress(); diff --git a/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/LiteFlowLiteFlowWhileExpress.java b/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/LiteFlowLiteFlowWhileExpress.java index 191849b..e6a12da 100644 --- a/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/LiteFlowLiteFlowWhileExpress.java +++ b/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/LiteFlowLiteFlowWhileExpress.java @@ -7,6 +7,9 @@ public interface LiteFlowLiteFlowWhileExpress extends PsiElement { + @Nullable + LiteFlowLiteFlowAllLogicExpress getLiteFlowAllLogicExpress(); + @Nullable LiteFlowLiteFlowDoExpress getLiteFlowDoExpress(); 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 index 359c66a..f1ee8fb 100644 --- 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 @@ -40,11 +40,9 @@ public interface LiteFlowTypes { IElementType LITEFLOW_LITE_FLOW_IF_2_ELIF_EXPRESS = new LiteFlowElementType("LITEFLOW_LITE_FLOW_IF_2_ELIF_EXPRESS"); IElementType LITEFLOW_LITE_FLOW_IF_2_ELIF_SUB_EXPRESS = new LiteFlowElementType("LITEFLOW_LITE_FLOW_IF_2_ELIF_SUB_EXPRESS"); IElementType LITEFLOW_LITE_FLOW_IF_2_ELSE_EXPRESS = new LiteFlowElementType("LITEFLOW_LITE_FLOW_IF_2_ELSE_EXPRESS"); - IElementType LITEFLOW_LITE_FLOW_IF_2_ELSE_SUB_EXPRESS = new LiteFlowElementType("LITEFLOW_LITE_FLOW_IF_2_ELSE_SUB_EXPRESS"); IElementType LITEFLOW_LITE_FLOW_IF_2_EXPRESS = new LiteFlowElementType("LITEFLOW_LITE_FLOW_IF_2_EXPRESS"); IElementType LITEFLOW_LITE_FLOW_IF_2_SUB_EXPRESS = new LiteFlowElementType("LITEFLOW_LITE_FLOW_IF_2_SUB_EXPRESS"); IElementType LITEFLOW_LITE_FLOW_IF_3_EXPRESS = new LiteFlowElementType("LITEFLOW_LITE_FLOW_IF_3_EXPRESS"); - IElementType LITEFLOW_LITE_FLOW_IF_3_SUB_EXPRESS = new LiteFlowElementType("LITEFLOW_LITE_FLOW_IF_3_SUB_EXPRESS"); IElementType LITEFLOW_LITE_FLOW_IGNORE_ERROR_EXPRESS = new LiteFlowElementType("LITEFLOW_LITE_FLOW_IGNORE_ERROR_EXPRESS"); IElementType LITEFLOW_LITE_FLOW_ITERATOR_EXPRESS = new LiteFlowElementType("LITEFLOW_LITE_FLOW_ITERATOR_EXPRESS"); IElementType LITEFLOW_LITE_FLOW_ITERATOR_SUB_EXPRESS = new LiteFlowElementType("LITEFLOW_LITE_FLOW_ITERATOR_SUB_EXPRESS"); @@ -59,10 +57,8 @@ public interface LiteFlowTypes { IElementType LITEFLOW_LITE_FLOW_PRE_EXPRESS = new LiteFlowElementType("LITEFLOW_LITE_FLOW_PRE_EXPRESS"); IElementType LITEFLOW_LITE_FLOW_STATEMENT = new LiteFlowElementType("LITEFLOW_LITE_FLOW_STATEMENT"); IElementType LITEFLOW_LITE_FLOW_SWITCH_EXPRESS = new LiteFlowElementType("LITEFLOW_LITE_FLOW_SWITCH_EXPRESS"); - IElementType LITEFLOW_LITE_FLOW_SWITCH_SUB_EXPRESS = new LiteFlowElementType("LITEFLOW_LITE_FLOW_SWITCH_SUB_EXPRESS"); IElementType LITEFLOW_LITE_FLOW_TAG_EXPRESS = new LiteFlowElementType("LITEFLOW_LITE_FLOW_TAG_EXPRESS"); IElementType LITEFLOW_LITE_FLOW_THEN_EXPRESS = new LiteFlowElementType("LITEFLOW_LITE_FLOW_THEN_EXPRESS"); - IElementType LITEFLOW_LITE_FLOW_THEN_SUB_EXPRESS = new LiteFlowElementType("LITEFLOW_LITE_FLOW_THEN_SUB_EXPRESS"); IElementType LITEFLOW_LITE_FLOW_THREAD_POOL_EXPRESS = new LiteFlowElementType("LITEFLOW_LITE_FLOW_THREAD_POOL_EXPRESS"); IElementType LITEFLOW_LITE_FLOW_TO_EXPRESS = new LiteFlowElementType("LITEFLOW_LITE_FLOW_TO_EXPRESS"); IElementType LITEFLOW_LITE_FLOW_WHEN_EXPRESS = new LiteFlowElementType("LITEFLOW_LITE_FLOW_WHEN_EXPRESS"); @@ -278,9 +274,6 @@ else if (type == LITEFLOW_LITE_FLOW_IF_2_ELIF_SUB_EXPRESS) { else if (type == LITEFLOW_LITE_FLOW_IF_2_ELSE_EXPRESS) { return new LiteFlowLiteFlowIf2ElseExpressImpl(node); } - else if (type == LITEFLOW_LITE_FLOW_IF_2_ELSE_SUB_EXPRESS) { - return new LiteFlowLiteFlowIf2ElseSubExpressImpl(node); - } else if (type == LITEFLOW_LITE_FLOW_IF_2_EXPRESS) { return new LiteFlowLiteFlowIf2ExpressImpl(node); } @@ -290,9 +283,6 @@ else if (type == LITEFLOW_LITE_FLOW_IF_2_SUB_EXPRESS) { else if (type == LITEFLOW_LITE_FLOW_IF_3_EXPRESS) { return new LiteFlowLiteFlowIf3ExpressImpl(node); } - else if (type == LITEFLOW_LITE_FLOW_IF_3_SUB_EXPRESS) { - return new LiteFlowLiteFlowIf3SubExpressImpl(node); - } else if (type == LITEFLOW_LITE_FLOW_IGNORE_ERROR_EXPRESS) { return new LiteFlowLiteFlowIgnoreErrorExpressImpl(node); } @@ -335,18 +325,12 @@ else if (type == LITEFLOW_LITE_FLOW_STATEMENT) { else if (type == LITEFLOW_LITE_FLOW_SWITCH_EXPRESS) { return new LiteFlowLiteFlowSwitchExpressImpl(node); } - else if (type == LITEFLOW_LITE_FLOW_SWITCH_SUB_EXPRESS) { - return new LiteFlowLiteFlowSwitchSubExpressImpl(node); - } else if (type == LITEFLOW_LITE_FLOW_TAG_EXPRESS) { return new LiteFlowLiteFlowTagExpressImpl(node); } else if (type == LITEFLOW_LITE_FLOW_THEN_EXPRESS) { return new LiteFlowLiteFlowThenExpressImpl(node); } - else if (type == LITEFLOW_LITE_FLOW_THEN_SUB_EXPRESS) { - return new LiteFlowLiteFlowThenSubExpressImpl(node); - } else if (type == LITEFLOW_LITE_FLOW_THREAD_POOL_EXPRESS) { return new LiteFlowLiteFlowThreadPoolExpressImpl(node); } 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 index 68b8293..687c962 100644 --- 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 @@ -135,10 +135,6 @@ public void visitLiteFlowIf2ElseExpress(@NotNull LiteFlowLiteFlowIf2ElseExpress visitPsiElement(o); } - public void visitLiteFlowIf2ElseSubExpress(@NotNull LiteFlowLiteFlowIf2ElseSubExpress o) { - visitPsiElement(o); - } - public void visitLiteFlowIf2Express(@NotNull LiteFlowLiteFlowIf2Express o) { visitPsiElement(o); } @@ -151,10 +147,6 @@ public void visitLiteFlowIf3Express(@NotNull LiteFlowLiteFlowIf3Express o) { visitPsiElement(o); } - public void visitLiteFlowIf3SubExpress(@NotNull LiteFlowLiteFlowIf3SubExpress o) { - visitPsiElement(o); - } - public void visitLiteFlowIgnoreErrorExpress(@NotNull LiteFlowLiteFlowIgnoreErrorExpress o) { visitPsiElement(o); } @@ -211,10 +203,6 @@ public void visitLiteFlowSwitchExpress(@NotNull LiteFlowLiteFlowSwitchExpress o) visitPsiElement(o); } - public void visitLiteFlowSwitchSubExpress(@NotNull LiteFlowLiteFlowSwitchSubExpress o) { - visitPsiElement(o); - } - public void visitLiteFlowTagExpress(@NotNull LiteFlowLiteFlowTagExpress o) { visitPsiElement(o); } @@ -223,10 +211,6 @@ public void visitLiteFlowThenExpress(@NotNull LiteFlowLiteFlowThenExpress o) { visitPsiElement(o); } - public void visitLiteFlowThenSubExpress(@NotNull LiteFlowLiteFlowThenSubExpress o) { - visitPsiElement(o); - } - public void visitLiteFlowThreadPoolExpress(@NotNull LiteFlowLiteFlowThreadPoolExpress o) { visitPsiElement(o); } diff --git a/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/impl/LiteFlowLiteFlowConditionExpressImpl.java b/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/impl/LiteFlowLiteFlowConditionExpressImpl.java index 6907a77..0004068 100644 --- a/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/impl/LiteFlowLiteFlowConditionExpressImpl.java +++ b/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/impl/LiteFlowLiteFlowConditionExpressImpl.java @@ -45,6 +45,12 @@ public LiteFlowLiteFlowForExpress getLiteFlowForExpress() { return findChildByClass(LiteFlowLiteFlowForExpress.class); } + @Override + @NotNull + public List getLiteFlowIdExpressList() { + return PsiTreeUtil.getChildrenOfTypeAsList(this, LiteFlowLiteFlowIdExpress.class); + } + @Override @Nullable public LiteFlowLiteFlowIf2Express getLiteFlowIf2Express() { @@ -75,6 +81,12 @@ public LiteFlowLiteFlowSwitchExpress getLiteFlowSwitchExpress() { return findChildByClass(LiteFlowLiteFlowSwitchExpress.class); } + @Override + @NotNull + public List getLiteFlowTagExpressList() { + return PsiTreeUtil.getChildrenOfTypeAsList(this, LiteFlowLiteFlowTagExpress.class); + } + @Override @Nullable public LiteFlowLiteFlowThenExpress getLiteFlowThenExpress() { diff --git a/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/impl/LiteFlowLiteFlowIf2ElifSubExpressImpl.java b/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/impl/LiteFlowLiteFlowIf2ElifSubExpressImpl.java index d630503..d1fead9 100644 --- a/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/impl/LiteFlowLiteFlowIf2ElifSubExpressImpl.java +++ b/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/impl/LiteFlowLiteFlowIf2ElifSubExpressImpl.java @@ -27,12 +27,6 @@ public void accept(@NotNull PsiElementVisitor visitor) { else super.accept(visitor); } - @Override - @Nullable - public LiteFlowLiteFlowIdExpress getLiteFlowIdExpress() { - return findChildByClass(LiteFlowLiteFlowIdExpress.class); - } - @Override @Nullable public LiteFlowLiteFlowIf2ElifExpress getLiteFlowIf2ElifExpress() { diff --git a/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/impl/LiteFlowLiteFlowIf2ElseExpressImpl.java b/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/impl/LiteFlowLiteFlowIf2ElseExpressImpl.java index 9371d4a..0be50bc 100644 --- a/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/impl/LiteFlowLiteFlowIf2ElseExpressImpl.java +++ b/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/impl/LiteFlowLiteFlowIf2ElseExpressImpl.java @@ -33,10 +33,4 @@ public LiteFlowLiteFlowAllExpress getLiteFlowAllExpress() { return findChildByClass(LiteFlowLiteFlowAllExpress.class); } - @Override - @Nullable - public LiteFlowLiteFlowIf2ElseSubExpress getLiteFlowIf2ElseSubExpress() { - return findChildByClass(LiteFlowLiteFlowIf2ElseSubExpress.class); - } - } diff --git a/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/impl/LiteFlowLiteFlowIf2ElseSubExpressImpl.java b/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/impl/LiteFlowLiteFlowIf2ElseSubExpressImpl.java deleted file mode 100644 index 160d82b..0000000 --- a/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/impl/LiteFlowLiteFlowIf2ElseSubExpressImpl.java +++ /dev/null @@ -1,36 +0,0 @@ -// This is a generated file. Not intended for manual editing. -package top.xystudio.plugin.idea.liteflowx.system.language.psi.impl; - -import java.util.List; -import org.jetbrains.annotations.*; -import com.intellij.lang.ASTNode; -import com.intellij.psi.PsiElement; -import com.intellij.psi.PsiElementVisitor; -import com.intellij.psi.util.PsiTreeUtil; -import static top.xystudio.plugin.idea.liteflowx.system.language.psi.LiteFlowTypes.*; -import com.intellij.extapi.psi.ASTWrapperPsiElement; -import top.xystudio.plugin.idea.liteflowx.system.language.psi.*; - -public class LiteFlowLiteFlowIf2ElseSubExpressImpl extends ASTWrapperPsiElement implements LiteFlowLiteFlowIf2ElseSubExpress { - - public LiteFlowLiteFlowIf2ElseSubExpressImpl(@NotNull ASTNode node) { - super(node); - } - - public void accept(@NotNull LiteFlowVisitor visitor) { - visitor.visitLiteFlowIf2ElseSubExpress(this); - } - - @Override - public void accept(@NotNull PsiElementVisitor visitor) { - if (visitor instanceof LiteFlowVisitor) accept((LiteFlowVisitor)visitor); - else super.accept(visitor); - } - - @Override - @Nullable - public LiteFlowLiteFlowIdExpress getLiteFlowIdExpress() { - return findChildByClass(LiteFlowLiteFlowIdExpress.class); - } - -} diff --git a/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/impl/LiteFlowLiteFlowIf2SubExpressImpl.java b/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/impl/LiteFlowLiteFlowIf2SubExpressImpl.java index 8372de7..3fffd36 100644 --- a/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/impl/LiteFlowLiteFlowIf2SubExpressImpl.java +++ b/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/impl/LiteFlowLiteFlowIf2SubExpressImpl.java @@ -27,12 +27,6 @@ public void accept(@NotNull PsiElementVisitor visitor) { else super.accept(visitor); } - @Override - @Nullable - public LiteFlowLiteFlowIdExpress getLiteFlowIdExpress() { - return findChildByClass(LiteFlowLiteFlowIdExpress.class); - } - @Override @Nullable public LiteFlowLiteFlowIf2ElifExpress getLiteFlowIf2ElifExpress() { diff --git a/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/impl/LiteFlowLiteFlowIf3ExpressImpl.java b/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/impl/LiteFlowLiteFlowIf3ExpressImpl.java index 13ee374..5d85e83 100644 --- a/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/impl/LiteFlowLiteFlowIf3ExpressImpl.java +++ b/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/impl/LiteFlowLiteFlowIf3ExpressImpl.java @@ -39,12 +39,6 @@ public LiteFlowLiteFlowAllLogicExpress getLiteFlowAllLogicExpress() { return findChildByClass(LiteFlowLiteFlowAllLogicExpress.class); } - @Override - @Nullable - public LiteFlowLiteFlowIf3SubExpress getLiteFlowIf3SubExpress() { - return findChildByClass(LiteFlowLiteFlowIf3SubExpress.class); - } - @Override @Nullable public LiteFlowLiteFlowNodeRefExpress getLiteFlowNodeRefExpress() { diff --git a/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/impl/LiteFlowLiteFlowIf3SubExpressImpl.java b/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/impl/LiteFlowLiteFlowIf3SubExpressImpl.java deleted file mode 100644 index cf90556..0000000 --- a/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/impl/LiteFlowLiteFlowIf3SubExpressImpl.java +++ /dev/null @@ -1,36 +0,0 @@ -// This is a generated file. Not intended for manual editing. -package top.xystudio.plugin.idea.liteflowx.system.language.psi.impl; - -import java.util.List; -import org.jetbrains.annotations.*; -import com.intellij.lang.ASTNode; -import com.intellij.psi.PsiElement; -import com.intellij.psi.PsiElementVisitor; -import com.intellij.psi.util.PsiTreeUtil; -import static top.xystudio.plugin.idea.liteflowx.system.language.psi.LiteFlowTypes.*; -import com.intellij.extapi.psi.ASTWrapperPsiElement; -import top.xystudio.plugin.idea.liteflowx.system.language.psi.*; - -public class LiteFlowLiteFlowIf3SubExpressImpl extends ASTWrapperPsiElement implements LiteFlowLiteFlowIf3SubExpress { - - public LiteFlowLiteFlowIf3SubExpressImpl(@NotNull ASTNode node) { - super(node); - } - - public void accept(@NotNull LiteFlowVisitor visitor) { - visitor.visitLiteFlowIf3SubExpress(this); - } - - @Override - public void accept(@NotNull PsiElementVisitor visitor) { - if (visitor instanceof LiteFlowVisitor) accept((LiteFlowVisitor)visitor); - else super.accept(visitor); - } - - @Override - @Nullable - public LiteFlowLiteFlowIdExpress getLiteFlowIdExpress() { - return findChildByClass(LiteFlowLiteFlowIdExpress.class); - } - -} diff --git a/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/impl/LiteFlowLiteFlowSwitchExpressImpl.java b/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/impl/LiteFlowLiteFlowSwitchExpressImpl.java index 72844e3..47a4bda 100644 --- a/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/impl/LiteFlowLiteFlowSwitchExpressImpl.java +++ b/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/impl/LiteFlowLiteFlowSwitchExpressImpl.java @@ -39,12 +39,6 @@ public LiteFlowLiteFlowNodeRefExpress getLiteFlowNodeRefExpress() { return findChildByClass(LiteFlowLiteFlowNodeRefExpress.class); } - @Override - @Nullable - public LiteFlowLiteFlowSwitchSubExpress getLiteFlowSwitchSubExpress() { - return findChildByClass(LiteFlowLiteFlowSwitchSubExpress.class); - } - @Override @Nullable public LiteFlowLiteFlowToExpress getLiteFlowToExpress() { diff --git a/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/impl/LiteFlowLiteFlowSwitchSubExpressImpl.java b/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/impl/LiteFlowLiteFlowSwitchSubExpressImpl.java deleted file mode 100644 index 08bedf0..0000000 --- a/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/impl/LiteFlowLiteFlowSwitchSubExpressImpl.java +++ /dev/null @@ -1,36 +0,0 @@ -// This is a generated file. Not intended for manual editing. -package top.xystudio.plugin.idea.liteflowx.system.language.psi.impl; - -import java.util.List; -import org.jetbrains.annotations.*; -import com.intellij.lang.ASTNode; -import com.intellij.psi.PsiElement; -import com.intellij.psi.PsiElementVisitor; -import com.intellij.psi.util.PsiTreeUtil; -import static top.xystudio.plugin.idea.liteflowx.system.language.psi.LiteFlowTypes.*; -import com.intellij.extapi.psi.ASTWrapperPsiElement; -import top.xystudio.plugin.idea.liteflowx.system.language.psi.*; - -public class LiteFlowLiteFlowSwitchSubExpressImpl extends ASTWrapperPsiElement implements LiteFlowLiteFlowSwitchSubExpress { - - public LiteFlowLiteFlowSwitchSubExpressImpl(@NotNull ASTNode node) { - super(node); - } - - public void accept(@NotNull LiteFlowVisitor visitor) { - visitor.visitLiteFlowSwitchSubExpress(this); - } - - @Override - public void accept(@NotNull PsiElementVisitor visitor) { - if (visitor instanceof LiteFlowVisitor) accept((LiteFlowVisitor)visitor); - else super.accept(visitor); - } - - @Override - @Nullable - public LiteFlowLiteFlowIdExpress getLiteFlowIdExpress() { - return findChildByClass(LiteFlowLiteFlowIdExpress.class); - } - -} diff --git a/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/impl/LiteFlowLiteFlowThenExpressImpl.java b/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/impl/LiteFlowLiteFlowThenExpressImpl.java index 06b2ffa..6b1f496 100644 --- a/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/impl/LiteFlowLiteFlowThenExpressImpl.java +++ b/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/impl/LiteFlowLiteFlowThenExpressImpl.java @@ -33,10 +33,4 @@ public List getLiteFlowAllExpressList() { return PsiTreeUtil.getChildrenOfTypeAsList(this, LiteFlowLiteFlowAllExpress.class); } - @Override - @Nullable - public LiteFlowLiteFlowThenSubExpress getLiteFlowThenSubExpress() { - return findChildByClass(LiteFlowLiteFlowThenSubExpress.class); - } - } diff --git a/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/impl/LiteFlowLiteFlowThenSubExpressImpl.java b/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/impl/LiteFlowLiteFlowThenSubExpressImpl.java deleted file mode 100644 index 86a8562..0000000 --- a/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/impl/LiteFlowLiteFlowThenSubExpressImpl.java +++ /dev/null @@ -1,36 +0,0 @@ -// This is a generated file. Not intended for manual editing. -package top.xystudio.plugin.idea.liteflowx.system.language.psi.impl; - -import java.util.List; -import org.jetbrains.annotations.*; -import com.intellij.lang.ASTNode; -import com.intellij.psi.PsiElement; -import com.intellij.psi.PsiElementVisitor; -import com.intellij.psi.util.PsiTreeUtil; -import static top.xystudio.plugin.idea.liteflowx.system.language.psi.LiteFlowTypes.*; -import com.intellij.extapi.psi.ASTWrapperPsiElement; -import top.xystudio.plugin.idea.liteflowx.system.language.psi.*; - -public class LiteFlowLiteFlowThenSubExpressImpl extends ASTWrapperPsiElement implements LiteFlowLiteFlowThenSubExpress { - - public LiteFlowLiteFlowThenSubExpressImpl(@NotNull ASTNode node) { - super(node); - } - - public void accept(@NotNull LiteFlowVisitor visitor) { - visitor.visitLiteFlowThenSubExpress(this); - } - - @Override - public void accept(@NotNull PsiElementVisitor visitor) { - if (visitor instanceof LiteFlowVisitor) accept((LiteFlowVisitor)visitor); - else super.accept(visitor); - } - - @Override - @Nullable - public LiteFlowLiteFlowIdExpress getLiteFlowIdExpress() { - return findChildByClass(LiteFlowLiteFlowIdExpress.class); - } - -} diff --git a/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/impl/LiteFlowLiteFlowWhenSubExpressImpl.java b/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/impl/LiteFlowLiteFlowWhenSubExpressImpl.java index 166973a..a14cbb4 100644 --- a/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/impl/LiteFlowLiteFlowWhenSubExpressImpl.java +++ b/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/impl/LiteFlowLiteFlowWhenSubExpressImpl.java @@ -33,12 +33,6 @@ public LiteFlowLiteFlowAnyExpress getLiteFlowAnyExpress() { return findChildByClass(LiteFlowLiteFlowAnyExpress.class); } - @Override - @Nullable - public LiteFlowLiteFlowIdExpress getLiteFlowIdExpress() { - return findChildByClass(LiteFlowLiteFlowIdExpress.class); - } - @Override @Nullable public LiteFlowLiteFlowIgnoreErrorExpress getLiteFlowIgnoreErrorExpress() { diff --git a/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/impl/LiteFlowLiteFlowWhileExpressImpl.java b/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/impl/LiteFlowLiteFlowWhileExpressImpl.java index 0e5d882..044a623 100644 --- a/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/impl/LiteFlowLiteFlowWhileExpressImpl.java +++ b/src/main/gen/top/xystudio/plugin/idea/liteflowx/system/language/psi/impl/LiteFlowLiteFlowWhileExpressImpl.java @@ -27,6 +27,12 @@ public void accept(@NotNull PsiElementVisitor visitor) { else super.accept(visitor); } + @Override + @Nullable + public LiteFlowLiteFlowAllLogicExpress getLiteFlowAllLogicExpress() { + return findChildByClass(LiteFlowLiteFlowAllLogicExpress.class); + } + @Override @Nullable public LiteFlowLiteFlowDoExpress getLiteFlowDoExpress() { 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 index f4dca61..404f8e0 100644 --- 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 @@ -250,21 +250,19 @@ liteFlowNodeRefSubExpress ::= liteFlowNodeRef {DOT (liteFlowTagExpress | liteFlo liteFlowNodeRefExpress ::= {block_comment | line_comment}* (liteFlowNodeRefSubExpress | liteFlowNodeStringSubExpress) {block_comment | line_comment}* // LiteFlow Condition 表达式 -liteFlowConditionExpress ::= {block_comment | line_comment}* (liteFlowThenExpress | liteFlowWhenExpress | liteFlowSwitchExpress | liteFlowPreExpress | liteFlowFinallyExpress | liteFlowIf2Express | liteFlowIf3Express | liteFlowForExpress | liteFlowIteratorExpress | liteFlowWhileExpress | liteFlowCatchExpress) {block_comment | line_comment}* +liteFlowConditionExpress ::= {block_comment | line_comment}* (liteFlowThenExpress | liteFlowWhenExpress | liteFlowSwitchExpress | liteFlowPreExpress | liteFlowFinallyExpress | liteFlowIf2Express | liteFlowIf3Express | liteFlowForExpress | liteFlowIteratorExpress | liteFlowWhileExpress | liteFlowCatchExpress) {DOT (liteFlowIdExpress | liteFlowTagExpress)}* {block_comment | line_comment}* // LiteFlow IF(_1, _2).ELIF(_3, _4).ELSE() 表达式 liteFlowIf2Express ::= LIF PAREN_LEFT (liteFlowAllLogicExpress | liteFlowNodeRefExpress) COMMA liteFlowAllExpress PAREN_RIGHT [liteFlowIf2SubExpress] {pin=7} -liteFlowIf2SubExpress ::= DOT ( liteFlowIf2ElifExpress | liteFlowIf2ElseExpress | liteFlowIdExpress ) {pin=1} +liteFlowIf2SubExpress ::= DOT ( liteFlowIf2ElifExpress | liteFlowIf2ElseExpress ) {pin=1} liteFlowIf2ElifExpress ::= LELIF PAREN_LEFT (liteFlowAllLogicExpress | liteFlowNodeRefExpress) COMMA liteFlowAllExpress PAREN_RIGHT [liteFlowIf2ElifSubExpress] {pin=1} -liteFlowIf2ElifSubExpress ::= DOT ( liteFlowIf2ElifExpress | liteFlowIf2ElseExpress | liteFlowIdExpress ) {pin=1} +liteFlowIf2ElifSubExpress ::= DOT ( liteFlowIf2ElifExpress | liteFlowIf2ElseExpress ) {pin=1} -liteFlowIf2ElseExpress ::= LELSE PAREN_LEFT liteFlowAllExpress PAREN_RIGHT [liteFlowIf2ElseSubExpress] {pin=1} -liteFlowIf2ElseSubExpress ::= DOT (liteFlowIdExpress) {pin=1} +liteFlowIf2ElseExpress ::= LELSE PAREN_LEFT liteFlowAllExpress PAREN_RIGHT {pin=1} // LiteFlow IF(_1, _2, _3) 表达式 -liteFlowIf3Express ::= LIF PAREN_LEFT (liteFlowAllLogicExpress | liteFlowNodeRefExpress) COMMA liteFlowAllExpress COMMA liteFlowAllExpress PAREN_RIGHT [liteFlowIf3SubExpress] {pin=1} -liteFlowIf3SubExpress ::= DOT liteFlowIdExpress {pin=1} +liteFlowIf3Express ::= LIF PAREN_LEFT (liteFlowAllLogicExpress | liteFlowNodeRefExpress) COMMA liteFlowAllExpress COMMA liteFlowAllExpress PAREN_RIGHT {pin=1} // LiteFlow AND() 表达式 liteFlowAndExpress ::= LAND PAREN_LEFT liteFlowLogicExpress COMMA liteFlowLogicExpress {COMMA liteFlowLogicExpress}* PAREN_RIGHT {pin=1} @@ -276,16 +274,14 @@ liteFlowOrExpress ::= LOR PAREN_LEFT liteFlowLogicExpress COMMA liteFlowLogicExp liteFlowNotExpress ::= LNOT PAREN_LEFT liteFlowLogicExpress PAREN_RIGHT {pin=1} // LiteFlow THEN() 表达式 -liteFlowThenExpress ::= THEN PAREN_LEFT liteFlowAllExpress {COMMA liteFlowAllExpress}* PAREN_RIGHT [liteFlowThenSubExpress] {pin=1} -liteFlowThenSubExpress ::= DOT liteFlowIdExpress {pin=1} +liteFlowThenExpress ::= THEN PAREN_LEFT liteFlowAllExpress {COMMA liteFlowAllExpress}* PAREN_RIGHT {pin=1} // LiteFlow WHEN() 表达式 liteFlowWhenExpress ::= WHEN PAREN_LEFT liteFlowAllExpress {COMMA liteFlowAllExpress}* PAREN_RIGHT { liteFlowWhenSubExpress }* {pin=1} -liteFlowWhenSubExpress ::= DOT (liteFlowIdExpress | liteFlowIgnoreErrorExpress | liteFlowAnyExpress | liteFlowThreadPoolExpress) {pin=1} +liteFlowWhenSubExpress ::= DOT (liteFlowIgnoreErrorExpress | liteFlowAnyExpress | liteFlowThreadPoolExpress) // LiteFlow SWITCH() 表达式 -liteFlowSwitchExpress ::= SWITCH PAREN_LEFT liteFlowNodeRefExpress PAREN_RIGHT DOT (liteFlowToExpress | liteFlowDefaultExpress) [ liteFlowSwitchSubExpress ] {pin=1} -liteFlowSwitchSubExpress ::= DOT liteFlowIdExpress {pin=1} +liteFlowSwitchExpress ::= SWITCH PAREN_LEFT liteFlowNodeRefExpress PAREN_RIGHT DOT (liteFlowToExpress | liteFlowDefaultExpress) {pin=1} // LiteFlow CATCH() 表达式 liteFlowCatchExpress ::= LCATCH PAREN_LEFT liteFlowAllExpress PAREN_RIGHT [DOT liteFlowDoExpress] {pin = 1} @@ -299,7 +295,7 @@ liteFlowIteratorExpress ::= LITERATOR PAREN_LEFT (liteFlowNodeRefExpress) PAREN_ liteFlowIteratorSubExpress ::= DOT (liteFlowBreakExpress) {pin=1} // liteFlow WHILE() 表达式 -liteFlowWhileExpress ::= LWHILE PAREN_LEFT liteFlowNodeRefExpress PAREN_RIGHT DOT liteFlowDoExpress [liteFlowWhileSubExpress] {pin = 1} +liteFlowWhileExpress ::= LWHILE PAREN_LEFT (liteFlowAllLogicExpress | liteFlowNodeRefExpress) PAREN_RIGHT DOT liteFlowDoExpress [liteFlowWhileSubExpress] {pin = 1} liteFlowWhileSubExpress ::= DOT (liteFlowBreakExpress) {pin=1} // LiteFlow PRE() 表达式