Version bump :>

Author: Ciel-MC

CHANGELOG.md

@@ -3,9 +3,10 @@
 # RedLib-Command-File Changelog
 
 ## [Unreleased]
+- Small hotfix
 ## [0.2.15]
 - Fixed a bug which `hidesub` is not properly highlighted.
-- Fixed not being able to use key words as command names
+- Fixed not being able to use keywords as command names
 - Added commenter to allow commenting via hotkey
 ## [0.2.13]
 ## [0.2.12]

README.md

@@ -7,6 +7,8 @@
 ## Description
 <!-- Plugin description -->
 Adds grammar checking and syntax highlighting for the command file use by RedLib(https://github.com/Redempt/RedLib) by Redempt to Intellij IDEA
+
+If you are having any issues or problems with this plugin, please report them on the [GitHub issues page](https://github.com/Shuaiouke/RedLib-Command-File/issues), join the [RedSupport Discord server](https://discord.gg/Frgkk99unx), or add me on [Discord](https://discord.com/users/441474795100438530)
 <!-- Plugin description end -->
 
 ## Installation

build.gradle.kts

@@ -31,7 +31,7 @@ repositories {
     mavenCentral()
 }
 dependencies {
-    detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.17.1")
+    detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.19.0")
 }
 
 // Configure gradle-intellij-plugin plugin.

gradle.properties

@@ -3,7 +3,7 @@
 
 pluginGroup = com.github.shuaiouke.redlibcommandfile
 pluginName = RedLib-Command-File
-pluginVersion = 0.2.15
+pluginVersion = 0.2.16
 
 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 # for insight into build numbers and IntelliJ Platform versions.

src/main/gen/com/github/shuaiouke/redlibcommandfile/language/parser/RedLibCommandParser.java

@@ -24,20 +24,15 @@ private CommandDef ::= CommandDefinition | CommandDefinition_Consuming | newline
 
 private CommandDef_Consumed ::= CommandDefinition_Consumed | newline
 
-private CommandDefinition ::= space* CommandName (comma Alias)* (space Args)? newline? Open_Bracket (Line | Blank_Line)* Close_Bracket {pin = CommandName}
-//private CommandDefinition ::= space* commandname (space alias)* (space Args)? newline? Open_Bracket (Line | Blank_Line)* Close_Bracket
+private CommandDefinition ::= space* CommandName (comma Alias)* (space Args)? newline? Open_Bracket (Line | Blank_Line)* Close_Bracket
 
-private CommandDefinition_Consuming ::= space* CommandName (comma Alias)* (space Args_Can_Consume)? newline? Open_Bracket (Line_Consumed | Blank_Line)* Close_Bracket {pin = CommandName}
-//private CommandDefinition_Consuming ::= space* commandname (space alias)* (space Args_Can_Consume)? newline? Open_Bracket (Line_Consumed | Blank_Line)* Close_Bracket
+private CommandDefinition_Consuming ::= space* CommandName (comma Alias)* (space Args_Can_Consume)? newline? Open_Bracket (Line_Consumed | Blank_Line)* Close_Bracket
 
-private CommandDefinition_Base ::= space* CommandName (comma Alias)* (space Args)? newline? Open_Bracket (Line_Base | Blank_Line)* Close_Bracket {pin = CommandName}
-//private CommandDefinition_Base ::= space* commandname (space alias)* (space Args)? newline? Open_Bracket (Line_Base | Blank_Line)* Close_Bracket
+private CommandDefinition_Base ::= space* CommandName (comma Alias)* (space Args)? newline? Open_Bracket (Line_Base | Blank_Line)* Close_Bracket
 
-private CommandDefinition_Consuming_Base ::= space* CommandName (comma Alias)* (space Args_Can_Consume)? newline? Open_Bracket (Line_Base_Consuming | Blank_Line)* Close_Bracket {pin = CommandName}
-//private CommandDefinition_Consuming_Base ::= space* commandname (space alias)* (space Args_Can_Consume)? newline? Open_Bracket (Line_Base_Consuming | Blank_Line)* Close_Bracket
+private CommandDefinition_Consuming_Base ::= space* CommandName (comma Alias)* (space Args_Can_Consume)? newline? Open_Bracket (Line_Base_Consuming | Blank_Line)* Close_Bracket
 
-private CommandDefinition_Consumed ::= space* CommandName (comma Alias)* (space Args_Can_Consume)? newline? Open_Bracket (Line_Consumed_Recovering | Blank_Line)* Close_Bracket {pin = CommandName}
-//private CommandDefinition_Consumed ::= space* commandname (space alias)* (space Args_Can_Consume)? newline? Open_Bracket (Line_Consumed_Recovering | Blank_Line)* Close_Bracket
+private CommandDefinition_Consumed ::= space* CommandName (comma Alias)* (space Args_Can_Consume)? newline? Open_Bracket (Line_Consumed_Recovering | Blank_Line)* Close_Bracket
 
 private CommandName ::= commandname|help|permission|user|hook|context|assert|nohelp|notab|postarg|hidesub|helpmsg
 
@@ -92,13 +87,13 @@ private Args_Can_Consume ::= ConsumingArg*
 
 private Args ::= Arg*
 
-private Arg ::= (((ARG_TYPE CONSTRAINT? COLON)? Flag) | (ARG_TYPE CONSTRAINT? COLON Argument)) (newline | space)
+private Arg ::= (((ARG_TYPE CONSTRAINT? COLON)? Flag) | (ARG_TYPE CONSTRAINT? COLON Argument)) (newline | space |)
 
-private ConsumingArg ::= ARG_TYPE CONSTRAINT? CONSUME_TOKEN? COLON Consuming_Argument (newline | space)
+private ConsumingArg ::= ARG_TYPE CONSTRAINT? CONSUME_TOKEN? COLON Consuming_Argument (newline | space |)
 
 private Flag ::= DASHES FLAG_NAME (COMMA DASHES FLAG_NAME)* FLAG_MODIFIER? (BRACKET_OPEN DEFAULT_VALUE? BRACKET_CLOSE)?
 
-private Argument ::= ARG_NAME (noshowtype | ((noshowtype) ( BRACKET_OPEN DEFAULT_VALUE? BRACKET_CLOSE)? ))?
+private Argument ::= ARG_NAME (noshowtype | ((notrequired | bothmodifiers) (BRACKET_OPEN DEFAULT_VALUE? BRACKET_CLOSE)? ))?
 
 private Consuming_Argument ::= ARG_NAME (noshowtype | ((notrequired | bothmodifiers) ( BRACKET_OPEN DEFAULT_VALUE? BRACKET_CLOSE)? ))?
 

src/main/java/com/github/shuaiouke/redlibcommandfile/language/RedLibCommand.bnf

@@ -131,9 +131,9 @@ FLAG_COLON=\:-+
 {
     "(" {yybegin(DEFAULTVALUE);return BRACKET_OPEN;}
     ")" {yybegin(ARGS);return BRACKET_CLOSE;}
+    {NOSHOWTYPENOREQ} {return BOTHMODIFIERS;}
     {NOSHOWTYPE} {return NOSHOWTYPE;}
     {NOREQ} {return NOTREQUIRED;}
-    {NOSHOWTYPENOREQ} {return BOTHMODIFIERS;}
     {NEWLINE} {yybegin(COMMAND);return NEWLINE;}
     {SPACE} {yybegin(ARGS);return SPACE;}
     {WORD} {return ARG_NAME;}