align with master

src/main/java/org/jastadd/tooling/grammar/GrammarUtil.java

@@ -10,7 +10,7 @@ import com.intellij.psi.search.FileTypeIndex;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.util.PsiTreeUtil;
 import org.jastadd.tooling.grammar.psi.GrammarFile;
-import org.jastadd.tooling.grammar.psi.RelAstGrammarTypeDecl;
+import org.jastadd.tooling.grammar.psi.GrammarTypeDecl;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.*;
@@ -30,17 +30,17 @@ public class GrammarUtil {
    * @param name    to check
    * @return matching TypeDecls
    */
-  public static List<RelAstGrammarTypeDecl> findTypeDecl(Project project, String name) {
-    List<RelAstGrammarTypeDecl> result = new ArrayList<>();
+  public static List<GrammarTypeDecl> findTypeDecl(Project project, String name) {
+    List<GrammarTypeDecl> result = new ArrayList<>();
     Collection<VirtualFile> virtualFiles =
       FileTypeIndex.getFiles(GrammarFileType.INSTANCE, GlobalSearchScope.allScope(project));
     for (VirtualFile virtualFile : virtualFiles) {
       GrammarFile simpleFile = (GrammarFile) PsiManager.getInstance(project).findFile(virtualFile);
       if (simpleFile != null) {
         // TODO check if file is ignored or generated!
-        RelAstGrammarTypeDecl[] typeDecls = PsiTreeUtil.getChildrenOfType(simpleFile, RelAstGrammarTypeDecl.class);
+        GrammarTypeDecl[] typeDecls = PsiTreeUtil.getChildrenOfType(simpleFile, GrammarTypeDecl.class);
         if (typeDecls != null) {
-          for (RelAstGrammarTypeDecl typeDecl : typeDecls) {
+          for (GrammarTypeDecl typeDecl : typeDecls) {
             if (name.equals(typeDecl.getName())) {
               result.add(typeDecl);
             }
@@ -57,15 +57,15 @@ public class GrammarUtil {
    * @param project current project
    * @return all TypeDecls
    */
-  public static List<RelAstGrammarTypeDecl> findTypeDecl(Project project) {
-    List<RelAstGrammarTypeDecl> result = new ArrayList<>();
+  public static List<GrammarTypeDecl> findTypeDecl(Project project) {
+    List<GrammarTypeDecl> result = new ArrayList<>();
     Collection<VirtualFile> virtualFiles =
       FileTypeIndex.getFiles(GrammarFileType.INSTANCE, GlobalSearchScope.allScope(project));
     for (VirtualFile virtualFile : virtualFiles) {
       GrammarFile simpleFile = (GrammarFile) PsiManager.getInstance(project).findFile(virtualFile);
       if (simpleFile != null) {
         // TODO check if file is ignored or generated!
-        RelAstGrammarTypeDecl[] typeDecls = PsiTreeUtil.getChildrenOfType(simpleFile, RelAstGrammarTypeDecl.class);
+        GrammarTypeDecl[] typeDecls = PsiTreeUtil.getChildrenOfType(simpleFile, GrammarTypeDecl.class);
         if (typeDecls != null) {
           result.addAll(Arrays.asList(typeDecls));
         }

src/main/java/org/jastadd/tooling/grammar/parser/GrammarParserDefinition.java

@@ -16,6 +16,7 @@ import org.jastadd.tooling.grammar.lexer.GrammarLexerAdapter;
 import org.jastadd.tooling.grammar.psi.GrammarFile;
 import org.jetbrains.annotations.NotNull;
 
+
 public class GrammarParserDefinition implements ParserDefinition {
 
   public static final TokenSet WHITE_SPACES = TokenSet.create(TokenType.WHITE_SPACE);

src/main/java/org/jastadd/tooling/grammar/psi/GrammarElementFactory.java

@@ -13,14 +13,14 @@ public class GrammarElementFactory {
     throw new IllegalStateException("Utility class");
   }
 
-  public static RelAstGrammarDeclaredName createDeclaredName(Project project, String name) {
+  public static GrammarDeclaredName createDeclaredName(Project project, String name) {
     final GrammarFile file = createFile(project, name + ";");
-    return (RelAstGrammarDeclaredName) file.getFirstChild().getFirstChild();
+    return (GrammarDeclaredName) file.getFirstChild().getFirstChild();
   }
 
-  public static RelAstGrammarTypeReference createTypeReference(Project project, String name) {
+  public static GrammarTypeReference createTypeReference(Project project, String name) {
     final GrammarFile file = createFile(project, "X : " + name + ";");
-    return (RelAstGrammarTypeReference) (Objects.requireNonNull(file.getFirstChild().getNode().findChildByType(GrammarTypes.TYPE_REFERENCE)).getPsi());
+    return (GrammarTypeReference) (Objects.requireNonNull(file.getFirstChild().getNode().findChildByType(GrammarTypes.TYPE_REFERENCE)).getPsi());
   }
 
   public static GrammarFile createFile(Project project, String text) {

src/main/java/org/jastadd/tooling/grammar/psi/GrammarFile.java

 package org.jastadd.tooling.grammar.psi;
 
 import com.intellij.extapi.psi.PsiFileBase;
+import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.psi.FileViewProvider;
 import org.jastadd.tooling.grammar.Grammar;
 import org.jastadd.tooling.grammar.GrammarFileType;
@@ -14,7 +15,7 @@ public class GrammarFile extends PsiFileBase {
 
   @NotNull
   @Override
-  public com.intellij.openapi.fileTypes.FileType getFileType() {
+  public FileType getFileType() {
     return GrammarFileType.INSTANCE;
   }
 

src/main/java/org/jastadd/tooling/grammar/psi/GrammarTokenType.java

@@ -13,7 +13,7 @@ public class GrammarTokenType extends IElementType {
 
   @Override
   public String toString() {
-    return "RelAstGrammarTokenType." + super.toString();
+    return "GrammarTokenType." + super.toString();
   }
 
 }

src/main/java/org/jastadd/tooling/grammar/psi/GrammarTypeReferenceManipulator.java

@@ -7,7 +7,7 @@ import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-public class GrammarTypeReferenceManipulator extends AbstractElementManipulator<RelAstGrammarTypeReference> implements ElementManipulator<RelAstGrammarTypeReference> {
+public class GrammarTypeReferenceManipulator extends AbstractElementManipulator<GrammarTypeReference> implements ElementManipulator<GrammarTypeReference> {
   /**
    * Changes the element's text to the given new text.
    *
@@ -19,9 +19,9 @@ public class GrammarTypeReferenceManipulator extends AbstractElementManipulator<
    */
   @Nullable
   @Override
-  public RelAstGrammarTypeReference handleContentChange(@NotNull RelAstGrammarTypeReference element, @NotNull TextRange range, String newContent) {
+  public GrammarTypeReference handleContentChange(@NotNull GrammarTypeReference element, @NotNull TextRange range, String newContent) {
     try {
-      return (RelAstGrammarTypeReference) element.setName(range.replace(element.getText(), newContent));
+      return (GrammarTypeReference) element.setName(range.replace(element.getText(), newContent));
     } catch (Exception e) { // e.g., in case the range is wrong
       throw new IncorrectOperationException(e);
     }

src/main/java/org/jastadd/tooling/grammar/psi/impl/GrammarNamedElementImpl.java

@@ -5,8 +5,8 @@ import com.intellij.lang.ASTNode;
 import com.intellij.navigation.ItemPresentation;
 import com.intellij.psi.PsiReference;
 import com.intellij.psi.impl.source.resolve.reference.ReferenceProvidersRegistry;
-import org.jastadd.tooling.util.JastAddIcons;
 import org.jastadd.tooling.grammar.psi.GrammarNamedElement;
+import org.jastadd.tooling.util.JastAddIcons;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

src/main/java/org/jastadd/tooling/grammar/psi/impl/GrammarTypeDeclImplExtension.java

@@ -3,9 +3,9 @@ package org.jastadd.tooling.grammar.psi.impl;
 import com.intellij.lang.ASTNode;
 import com.intellij.psi.PsiElement;
 import org.jastadd.tooling.grammar.parser.GrammarTypes;
-import org.jastadd.tooling.grammar.psi.GrammarTypeDeclExtension;
-import org.jastadd.tooling.grammar.psi.RelAstGrammarDeclaredName;
+import org.jastadd.tooling.grammar.psi.GrammarDeclaredName;
 import org.jastadd.tooling.grammar.psi.GrammarElementFactory;
+import org.jastadd.tooling.grammar.psi.GrammarTypeDeclExtension;
 import org.jetbrains.annotations.NotNull;
 
 public class GrammarTypeDeclImplExtension extends GrammarNamedElementImpl implements GrammarTypeDeclExtension {
@@ -27,7 +27,7 @@ public class GrammarTypeDeclImplExtension extends GrammarNamedElementImpl implem
   public PsiElement setName(@NotNull String newName) {
     ASTNode keyNode = getNode().findChildByType(GrammarTypes.DECLARED_NAME);
     if (keyNode != null) {
-      RelAstGrammarDeclaredName name = GrammarElementFactory.createDeclaredName(getProject(), newName);
+      GrammarDeclaredName name = GrammarElementFactory.createDeclaredName(getProject(), newName);
       ASTNode newKeyNode = name.getNode();
       getNode().replaceChild(keyNode, newKeyNode);
     }

src/main/java/org/jastadd/tooling/grammar/psi/impl/GrammarTypeReferenceImplExtension.java

@@ -3,8 +3,8 @@ package org.jastadd.tooling.grammar.psi.impl;
 import com.intellij.lang.ASTNode;
 import com.intellij.psi.PsiElement;
 import org.jastadd.tooling.grammar.psi.GrammarElementFactory;
+import org.jastadd.tooling.grammar.psi.GrammarTypeReference;
 import org.jastadd.tooling.grammar.psi.GrammarTypeReferenceExtension;
-import org.jastadd.tooling.grammar.psi.RelAstGrammarTypeReference;
 import org.jetbrains.annotations.NotNull;
 
 public class GrammarTypeReferenceImplExtension extends GrammarNamedElementImpl implements GrammarTypeReferenceExtension {
@@ -22,7 +22,7 @@ public class GrammarTypeReferenceImplExtension extends GrammarNamedElementImpl i
     // FIXME this can break the grammar when the type is used in an unnamed component (and in many other cases probably)
     ASTNode keyNode = getNode().getFirstChildNode();
     if (keyNode != null) {
-      RelAstGrammarTypeReference name = GrammarElementFactory.createTypeReference(getProject(), newName);
+      GrammarTypeReference name = GrammarElementFactory.createTypeReference(getProject(), newName);
       ASTNode newKeyNode = name.getNode().getFirstChildNode();
       getNode().replaceChild(keyNode, newKeyNode);
     }

src/main/resources/META-INF/plugin.xml

@@ -36,7 +36,7 @@
         <lang.refactoringSupport language="JastAddGrammar"
                                  implementationClass="org.jastadd.tooling.grammar.GrammarRefactoringSupportProvider"/>
 
-        <lang.elementManipulator forClass="org.jastadd.tooling.grammar.psi.RelAstGrammarTypeReference"
+        <lang.elementManipulator forClass="org.jastadd.tooling.grammar.psi.GrammarTypeReference"
                                  implementationClass="org.jastadd.tooling.grammar.psi.GrammarTypeReferenceManipulator"/>
 
 

src/main/resources/icons/jastadd.svg

@@ -3,10 +3,9 @@
     xmlns:dc="http://purl.org/dc/elements/1.1/"
     xmlns:cc="http://creativecommons.org/ns#"
     xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
     xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
     xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+    xmlns="http://www.w3.org/2000/svg"
     width="16"
     height="16"
     id="svg4781"