User: joe
Date: 13 Apr 26 19:33
Revision: 090a8f15f893813cfca9b0e91d1baa884935d93b
Summary:
Generalize incomplete word token to also apply to access type


TeamCity URL: http://ci.mcdev.io:80/viewModification.html?tab=vcsModificationFiles&modId=10512&personal=false

Index: src/main/grammars/CtLexer.flex
===================================================================
--- src/main/grammars/CtLexer.flex	(revision d3067241bcded304433a427a78ac6491eae8efeb)
+++ src/main/grammars/CtLexer.flex	(revision 090a8f15f893813cfca9b0e91d1baa884935d93b)
@@ -62,7 +62,7 @@
 ACCESS_ELEMENT=accessible|transitive-accessible|extendable|transitive-extendable|mutable|transitive-mutable
 INJECT_INTERFACE_ELEMENT=inject-interface|transitive-inject-interface
 EXTEND_ENUM_ELEMENT=extend-enum|transitive-extend-enum
-INCOMPLETE_ENTRY_START=[a-zA-Z-]+
+INCOMPLETE_WORD=[a-zA-Z-]+
 CLASS_ELEMENT=class
 METHOD_ELEMENT=method
 FIELD_ELEMENT=field
@@ -81,7 +81,7 @@
     {EXTEND_ENUM_ELEMENT}                       { yybegin(ENUM_NAME); return EXTEND_ENUM_ELEMENT; }
     // Create tokens for incomplete or invalid inputs too if they look like real inputs (same characters)
     // to prevent a bug where the entire file is erroring until reopened.
-    {INCOMPLETE_ENTRY_START}                    { return INCOMPLETE_ENTRY_START; }
+    {INCOMPLETE_WORD}                           { return INCOMPLETE_WORD; }
 }
 
 <HEADER> {
@@ -93,6 +93,7 @@
     {CLASS_ELEMENT}                             { yybegin(AW_CLASS_NAME); return CLASS_ELEMENT; }
     {METHOD_ELEMENT}                            { yybegin(AW_CLASS_NAME); return METHOD_ELEMENT; }
     {FIELD_ELEMENT}                             { yybegin(AW_CLASS_NAME); return FIELD_ELEMENT; }
+    {INCOMPLETE_WORD}                           { return INCOMPLETE_WORD; }
 }
 
 <AW_CLASS_NAME> {
Index: src/main/grammars/CtParser.bnf
===================================================================
--- src/main/grammars/CtParser.bnf	(revision d3067241bcded304433a427a78ac6491eae8efeb)
+++ src/main/grammars/CtParser.bnf	(revision 090a8f15f893813cfca9b0e91d1baa884935d93b)
@@ -50,6 +50,7 @@
 }
 
 private entry ::= aw_entry | itf_entry | extend_enum_entry {
+    name="ClassTweaker Entry"
     mixin="com.demonwav.mcdev.platform.mcp.ct.psi.mixins.impl.CtEntryImplMixin"
     implements="com.demonwav.mcdev.platform.mcp.ct.psi.mixins.impl.CtEntryMixin"
     recoverWhile = line_recover
@@ -137,5 +138,6 @@
 signature_element ::= OPEN_BRACKET* (PRIMITIVE | TYPE_VARIABLE | signature_class_element)
 signature_class_element ::= ASTERISK | ( (PLUS | MINUS)? SIGNATURE_CLASS_VALUE_START (LESS_THAN signature_element GREATER_THAN)? SIGNATURE_CLASS_VALUE_END )
 
-// Unused rule to generate the INCOMPLETE_ENTRY_START token type used in the lexer.
-private incomplete_entry_start_holder ::= INCOMPLETE_ENTRY_START
+// Unused rule to generate the INCOMPLETE_WORD token type used in the lexer.
+//noinspection BnfUnusedRule
+private incomplete_word_holder ::= INCOMPLETE_WORD