[IDEA] added missing @CLOBBERBUILTINS annotation + corrected regex for numbers

Author: lord41ph4

IDEA/build.gradle.kts

@@ -76,11 +76,10 @@ intellijPlatform {
 }
 
 project(":") {
-    val generateLexer = //        targetClass.set("KerboScriptLexer")
+    val generateLexer =
         tasks.register<GenerateLexerTask>("generateMyLexer", fun GenerateLexerTask.() {
             sourceFile.set(file("src/main/grammar/KerboScript.flex"))
             targetOutputDir.set(file("src/gen/ksp/kos/ideaplugin/parser"))
-//        targetClass.set("KerboScriptLexer")
             purgeOldFiles.set(true)
         })
 

IDEA/src/main/grammar/KerboScript.bnf

@@ -25,7 +25,7 @@
     tokenTypeClass="ksp.kos.ideaplugin.psi.KerboScriptTokenType"
 
     extends(".*_stmt|directive|instruction_block")=instruction
-    extends("lazyglobal_directive")=directive
+    extends("lazyglobal_directive|clobberbuiltins_directive")=directive
     extends("function_trailer|array_trailer")=suffixterm_trailer
     extends("[a-z]*_expr|factor|suffix|suffixterm|atom|.*number")=expr
 
@@ -109,13 +109,14 @@
         ALL          = 'regexp:(?i)all'
         IDENTIFIER   = 'regexp:[a-zA-Z_][a-zA-Z0-9_]*'
         FILEIDENT    = 'regexp:[a-zA-Z_][a-zA-Z0-9_]*(\.[a-zA-Z0-9_][a-zA-Z0-9_]*)*'
-        INTEGER      = 'regexp:[0-9]+'
-        DOUBLE       = 'regexp:[0-9]*\.[0-9]+'
+        INTEGER      = 'regexp:[0-9][0-9_]*'
+        DOUBLE       = 'regexp:([0-9]+(_[0-9]*)*)?\.[0-9]+(_[0-9]*)*'
         STRING       = 'regexp:@?"(""|[^"])*"'
         EOI          = '.'
         //Compiler Directives
         ATSIGN       = '@'
         LAZYGLOBAL   = 'regexp:(?i)lazyglobal'
+        CLOBBERBUILTINS = 'regexp:(?i)clobberbuiltins'
         //Special
         //EOF          = '$'
         //[Skip]
@@ -127,7 +128,7 @@
 
 // Rules
 // ===================================================
-Start ::= (instruction)* 
+Start ::= (directive|instruction)*
 instruction_block ::= CURLYOPEN instruction* CURLYCLOSE
 instruction ::= !(CURLYCLOSE | <<eof>>) instruction_inner {
   pin = 1
@@ -174,7 +175,6 @@ private instruction_inner ::= empty_stmt |
                unset_stmt |
                instruction_block |
                identifier_led_stmt | // any statement that starts with an identifier.
-               directive // allow directives anywhere for now, let the compiler decide if it's in the wrong place, not the parser.
 
 // ------------ directives --------------------
 lazyglobal_directive      ::= LAZYGLOBAL onoff_trailer EOI

IDEA/src/main/grammar/KerboScript.flex

@@ -98,8 +98,8 @@ ARRAYINDEX   = #
 ALL          = all
 IDENTIFIER   = [a-zA-Z_][a-zA-Z0-9_]*
 FILEIDENT    = [a-zA-Z_][a-zA-Z0-9_]*(\.[a-zA-Z0-9_][a-zA-Z0-9_]*)*
-INTEGER      = [0-9]+
-DOUBLE       = [0-9]*\.[0-9]+
+INTEGER      = [0-9][0-9_]*
+DOUBLE       = ([0-9]+(_[0-9]*)*)?\.[0-9]+(_[0-9]*)*
 STRING       = @?\"(\"\"|[^\"])*\"
 EOI          = \.
 //Compiler Directives

IDEA/src/main/java/ksp/kos/ideaplugin/Magic.kt

@@ -58,6 +58,7 @@ object Magic {
             KerboScriptTypes.UNSET,
             KerboScriptTypes.CHOOSE,
             KerboScriptTypes.ATSIGN,
-            KerboScriptTypes.LAZYGLOBAL
+            KerboScriptTypes.LAZYGLOBAL,
+            KerboScriptTypes.CLOBBERBUILTINS
     )
 }

IDEA/src/main/java/ksp/kos/ideaplugin/dataflow/ContextBuilder.java

@@ -31,12 +31,14 @@ public void visit(ExpressionVisitor visitor) {
     }
 
     public String getText() {
-        String text = "";
+        StringBuilder text = new StringBuilder();
         for (Flow<?> flow : getList()) {
-            if (!text.isEmpty()) text += "\n";
-            text += flow.getText();
+            if (!text.isEmpty()) {
+				text.append("\n");
+			}
+            text.append(flow.getText());
         }
-        return text;
+        return text.toString();
     }
 
     public void differentiate(LocalContext context, ContextBuilder contextBuilder) {

IDEA/src/main/java/ksp/kos/ideaplugin/highlighting/KerboScriptSyntaxHighlighter.java

@@ -81,7 +81,8 @@ public class KerboScriptSyntaxHighlighter extends SyntaxHighlighterBase {
                     KerboScriptTypes.UNSET,
                     KerboScriptTypes.CHOOSE,
                     KerboScriptTypes.ATSIGN,
-                    KerboScriptTypes.LAZYGLOBAL
+                    KerboScriptTypes.LAZYGLOBAL,
+                    KerboScriptTypes.CLOBBERBUILTINS
             )
     );
 
@@ -93,7 +94,7 @@ public Lexer getHighlightingLexer() {
 
     @NotNull
     @Override
-    public TextAttributesKey[] getTokenHighlights(IElementType tokenType) {
+    public TextAttributesKey @NotNull [] getTokenHighlights(IElementType tokenType) {
         // TODO - Ideally syntax highlight based off of parser, not lexer, to handle keywords used as variables.
         if (tokenType.equals(KerboScriptTypes.IDENTIFIER)) {
             return createKeys(IDENTIFIER);

IDEA/src/test/kotlin/ksp/kos/ideaplugin/parsing/KerboScriptParsingTest.kt

@@ -10,4 +10,5 @@ class KerboScriptParsingTest : ParsingTestCase("", "ks", KerboScriptParserDefini
 
     fun testBasic() = doTest(true)
     fun testErrorRecovery() = doTest(true)
+    fun testAnnotations() = doTest(true)
 }

IDEA/src/test/testData/parsing/Annotations.ks

@@ -0,0 +1,5 @@
+@LAZYGLOBAL OFF.
+@CLOBBERBUILTINS ON.
+
+local decimalsWith_ is 10_000.00.
+local integerWith_ is 10_000.

IDEA/src/test/testData/parsing/Annotations.txt

@@ -0,0 +1,48 @@
+FILE(0,102)
+  KerboScriptDirectiveImpl(DIRECTIVE)(0,16)
+    PsiElement(@)('@')(0,1)
+    KerboScriptLazyglobalDirectiveImpl(LAZYGLOBAL_DIRECTIVE)(1,16)
+      PsiElement(LAZYGLOBAL)('LAZYGLOBAL')(1,11)
+      PsiWhiteSpace(' ')(11,12)
+      KerboScriptOnoffTrailerImpl(ONOFF_TRAILER)(12,15)
+        PsiElement(OFF)('OFF')(12,15)
+      PsiElement(.)('.')(15,16)
+  PsiWhiteSpace('\n')(16,17)
+  KerboScriptDirectiveImpl(DIRECTIVE)(17,37)
+    PsiElement(@)('@')(17,18)
+    KerboScriptClobberbuiltinsDirectiveImpl(CLOBBERBUILTINS_DIRECTIVE)(18,37)
+      PsiElement(CLOBBERBUILTINS)('CLOBBERBUILTINS')(18,33)
+      PsiWhiteSpace(' ')(33,34)
+      KerboScriptOnoffTrailerImpl(ONOFF_TRAILER)(34,36)
+        PsiElement(ON)('ON')(34,36)
+      PsiElement(.)('.')(36,37)
+  PsiWhiteSpace('\n\n')(37,39)
+  KerboScriptDeclareStmtImpl(DECLARE_STMT)(39,72)
+    PsiElement(LOCAL)('local')(39,44)
+    PsiWhiteSpace(' ')(44,45)
+    KerboScriptDeclareIdentifierClauseImpl(DECLARE_IDENTIFIER_CLAUSE)(45,72)
+      KerboScriptIdentImpl(IDENT)(45,58)
+        PsiElement(IDENTIFIER)('decimalsWith_')(45,58)
+      PsiWhiteSpace(' ')(58,59)
+      PsiElement(IS)('is')(59,61)
+      PsiWhiteSpace(' ')(61,62)
+      KerboScriptSuffixtermImpl(SUFFIXTERM)(62,71)
+        KerboScriptAtomImpl(ATOM)(62,71)
+          KerboScriptNumberImpl(NUMBER)(62,71)
+            PsiElement(DOUBLE)('10_000.00')(62,71)
+      PsiElement(.)('.')(71,72)
+  PsiWhiteSpace('\n')(72,73)
+  KerboScriptDeclareStmtImpl(DECLARE_STMT)(73,102)
+    PsiElement(LOCAL)('local')(73,78)
+    PsiWhiteSpace(' ')(78,79)
+    KerboScriptDeclareIdentifierClauseImpl(DECLARE_IDENTIFIER_CLAUSE)(79,102)
+      KerboScriptIdentImpl(IDENT)(79,91)
+        PsiElement(IDENTIFIER)('integerWith_')(79,91)
+      PsiWhiteSpace(' ')(91,92)
+      PsiElement(IS)('is')(92,94)
+      PsiWhiteSpace(' ')(94,95)
+      KerboScriptSuffixtermImpl(SUFFIXTERM)(95,101)
+        KerboScriptAtomImpl(ATOM)(95,101)
+          KerboScriptNumberImpl(NUMBER)(95,101)
+            PsiElement(INTEGER)('10_000')(95,101)
+      PsiElement(.)('.')(101,102)