file cleanup and renaming of artefact

.gitlab-ci.yml

@@ -17,4 +17,4 @@ jar:
         - ./gradlew --continue --console=plain --info buildPlugin
     artifacts:
         paths:
-            - "/builds/jastadd/*/build/libs/JastAddGrammar-*.jar"
+            - "/builds/jastadd/*/build/libs/JastAddIntelliJPlugin-*.jar"

settings.gradle.kts

 
-rootProject.name = "JastAddGrammar"
+rootProject.name = "JastAddIntelliJPlugin"

src/main/grammar/Aspect.bnf

@@ -26,24 +26,6 @@
       ]
 }
 
-
-
-
-//attribute_equation ::= EQ java_block
-//
-//java_block ::= JAVABLOCK
-//{
-//  implements="org.jastadd.tooling.aspect.psi.JastAddAspectJavaExtension"
-//  extends="org.jastadd.tooling.aspect.psi.impl.JastAddAspectJavaImplExtension"
-//}
-
-// aspect_body_declarations_eof ::= aspect_body_declaration* EOF
-
-
-//jastaddAspectFile ::= ( aspect_declaration | comment )*
-//
-//comment ::= (MULTI_LINE_COMMENT | DOC_COMMENT | SINGLE_LINE_COMMENT)
-
 compilation_unit ::= import_declaration* type_declaration*
 
 import_declaration ::= IMPORT STATIC? name_name (DOT STAR)? SEMICOLON
@@ -404,17 +386,5 @@ java_identifier ::= IDENTIFIER | INH | SYN | LAZY | REWRITE | TO | WHEN | ASPECT
 
 attribute_name ::= IDENTIFIER
 
-// EOF
-
-// unused keywords
-
+// unused keywords must still appear somewhere
 unused_keywords ::= GOTO | CONST ELLIPSIS | PACKAGE
-
-// island things
-
-//// should be parsed after circular and in collection attributes
-//expression_in_brackets ::= LBRACKET_ANYTHING_RBRACKET // LBRACKET expression RBRACKET
-//{
-//  implements="org.jastadd.tooling.aspect.psi.JastAddAspectJavaExtension"
-//  extends="org.jastadd.tooling.aspect.psi.impl.JastAddAspectJavaImplExtension"
-//}

src/main/grammar/Aspect.flex

@@ -12,7 +12,7 @@ import com.intellij.psi.TokenType;
 %unicode
 %function advance
 %type IElementType
-%eof{  return;
+%eof{
 %eof}
 
 %{

src/main/grammar/Grammar.flex

@@ -13,7 +13,7 @@ import com.intellij.psi.TokenType;
 %unicode
 %function advance
 %type IElementType
-%eof{  return;
+%eof{
 %eof}
 
 

src/main/java/org/jastadd/tooling/aspect/AspectSyntaxHighlighter.java

@@ -103,22 +103,8 @@ public class AspectSyntaxHighlighter extends SyntaxHighlighterBase {
   // unclear
   // TODO unclear IO
   // TODO missing AT_NAME
-  // TODO unused NOTPARENTHESIS
   // TODO combined DOT_CLASS
 
-  // islands
-  // public static final TextAttributesKey CLASS_BODY_UNSUPPORTED = createTextAttributesKey("ASPECT_CLASS_BODY_UNSUPPORTED", DefaultLanguageHighlighterColors.);
-  // public static final TextAttributesKey CLASS_ANYTHING_LBRACE_ANYTHING_RBRACE = createTextAttributesKey("ASPECT_CLASS_ANYTHING_LBRACE_ANYTHING_RBRACE", DefaultLanguageHighlighterColors.);
-  // public static final TextAttributesKey INTERFACE_ANYTHING_LBRACE_ANYTHING_RBRACE = createTextAttributesKey("ASPECT_INTERFACE_ANYTHING_LBRACE_ANYTHING_RBRACE", DefaultLanguageHighlighterColors.);
-  // public static final TextAttributesKey AT_NAME_LPAREN_ANYTHING_RPAREN = createTextAttributesKey("ASPECT_AT_NAME_LPAREN_ANYTHING_RPAREN", DefaultLanguageHighlighterColors.);
-  // public static final TextAttributesKey AT_INTERFACE_ANYTHING_LBRACE_ANYTHING_RBRACE = createTextAttributesKey("ASPECT_AT_INTERFACE_ANYTHING_LBRACE_ANYTHING_RBRACE", DefaultLanguageHighlighterColors.);
-  // public static final TextAttributesKey ENUM_ANYTHING_LBRACE_ANYTHING_RBRACE = createTextAttributesKey("ASPECT_ENUM_ANYTHING_LBRACE_ANYTHING_RBRACE", DefaultLanguageHighlighterColors.);
-  // public static final TextAttributesKey STATEMENT = createTextAttributesKey("ASPECT_STATEMENT", DefaultLanguageHighlighterColors.);
-  // public static final TextAttributesKey LBRACE_ANYTHING_RBRACE = createTextAttributesKey("ASPECT_LBRACE_ANYTHING_RBRACE", DefaultLanguageHighlighterColors.);
-  // public static final TextAttributesKey LBRACKET_ANYTHING_RBRACKET = createTextAttributesKey("ASPECT_LBRACKET_ANYTHING_RBRACKET", DefaultLanguageHighlighterColors.);
-  // public static final TextAttributesKey JAVA_EXPLICIT_CONSTRUCTUR_BLOCK = createTextAttributesKey("ASPECT_JAVA_EXPLICIT_CONSTRUCTUR_BLOCK", DefaultLanguageHighlighterColors.);
-
-
   public static final TextAttributesKey BAD_CHARACTER =
     createTextAttributesKey("JASTADD_BAD_CHARACTER", HighlighterColors.BAD_CHARACTER);
 

src/main/java/org/jastadd/tooling/aspect/JavaLanguageInjector.java

@@ -6,7 +6,9 @@ import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.InjectedLanguagePlaces;
 import com.intellij.psi.LanguageInjector;
 import com.intellij.psi.PsiLanguageInjectionHost;
-import org.jastadd.tooling.aspect.psi.*;
+import org.jastadd.tooling.aspect.psi.JastAddAspectAspectClassDeclaration;
+import org.jastadd.tooling.aspect.psi.JastAddAspectBlock;
+import org.jastadd.tooling.aspect.psi.JastAddAspectExpression;
 import org.jetbrains.annotations.NotNull;
 
 public class JavaLanguageInjector implements LanguageInjector {

src/main/java/org/jastadd/tooling/java/JavaColorSettingsPage.java

@@ -17,12 +17,12 @@ import java.util.Map;
 public class JavaColorSettingsPage implements ColorSettingsPage {
 
   private static final AttributesDescriptor[] DESCRIPTORS = new AttributesDescriptor[]{
-    new AttributesDescriptor("Nonterminal Use", JavaSyntaxHighlighter.NT_USE),
-    new AttributesDescriptor("High-Level API Use", JavaSyntaxHighlighter.HIGHLEVEL_API_USE),
-    new AttributesDescriptor("Low-Level API Use", JavaSyntaxHighlighter.LOWLEVEL_API_USE),
-    new AttributesDescriptor("Internal API Use", JavaSyntaxHighlighter.INTERNAL_API_USE),
-    new AttributesDescriptor("Attribute Call", JavaSyntaxHighlighter.ATTRIBUTE_CALL),
-    new AttributesDescriptor("Inter-Type Declaration Use", JavaSyntaxHighlighter.INTERTYPE_DECL_USE)
+    new AttributesDescriptor("Nonterminal use", JavaSyntaxHighlighter.NT_USE),
+    new AttributesDescriptor("High-Level API use", JavaSyntaxHighlighter.HIGHLEVEL_API_USE),
+    new AttributesDescriptor("Low-Level API use", JavaSyntaxHighlighter.LOWLEVEL_API_USE),
+    new AttributesDescriptor("Internal API use", JavaSyntaxHighlighter.INTERNAL_API_USE),
+    new AttributesDescriptor("Attribute call", JavaSyntaxHighlighter.ATTRIBUTE_CALL),
+    new AttributesDescriptor("Inter-Type declaration use", JavaSyntaxHighlighter.INTERTYPE_DECL_USE)
   };
 
   @Nullable
@@ -63,13 +63,13 @@ public class JavaColorSettingsPage implements ColorSettingsPage {
 
   @NotNull
   @Override
-  public AttributesDescriptor[] getAttributeDescriptors() {
+  public AttributesDescriptor @NotNull [] getAttributeDescriptors() {
     return DESCRIPTORS;
   }
 
   @NotNull
   @Override
-  public ColorDescriptor[] getColorDescriptors() {
+  public ColorDescriptor @NotNull [] getColorDescriptors() {
     return ColorDescriptor.EMPTY_ARRAY;
   }