Merge branch 'master' of github.com:consulo/consulo-devkit

# Conflicts: # plugin/src/main/java/consulo/devkit/run/ConsuloSandboxRunState.java
consulo · Sep 8, 2024 · ea698e9 · ea698e9
2 parents cd5cd62 + 7561102
commit ea698e9
Show file tree

Hide file tree

Showing 206 changed files with 17,859 additions and 17,275 deletions.
diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml
@@ -6,6 +6,9 @@ on:
   pull_request:
     branches: [ master ]
 
+env:
+  BUILD_NUMBER: 999999
+
 jobs:
   build:
 

diff --git a/grammar-kit-core/pom.xml b/grammar-kit-core/pom.xml
@@ -54,7 +54,6 @@
       <plugin>
         <groupId>consulo.maven</groupId>
         <artifactId>maven-consulo-plugin</artifactId>
-        <version>3-SNAPSHOT</version>
         <extensions>true</extensions>
         <executions>
           <execution>

diff --git a/grammar-kit-core/src/main/java/consulo/devkit/grammarKit/generator/ErrorReporter.java b/grammar-kit-core/src/main/java/consulo/devkit/grammarKit/generator/ErrorReporter.java
@@ -8,16 +8,13 @@
  * @author VISTALL
  * @since 2018-06-17
  */
-public abstract class ErrorReporter
-{
-	public static ErrorReporter ourInstance = new ErrorReporter()
-	{
-		@Override
-		public void reportWarning(@Nonnull Project project, @Nonnull String text)
-		{
-			System.out.println(text);
-		}
-	};
+public abstract class ErrorReporter {
+    public static ErrorReporter ourInstance = new ErrorReporter() {
+        @Override
+        public void reportWarning(@Nonnull Project project, @Nonnull String text) {
+            System.out.println(text);
+        }
+    };
 
-	public abstract void reportWarning(@Nonnull Project project, @Nonnull String text);
+    public abstract void reportWarning(@Nonnull Project project, @Nonnull String text);
 }
diff --git a/grammar-kit-core/src/main/java/consulo/devkit/grammarKit/generator/PlatformClass.java b/grammar-kit-core/src/main/java/consulo/devkit/grammarKit/generator/PlatformClass.java
@@ -4,51 +4,45 @@
  * @author VISTALL
  * @since 25-Mar-22
  */
-public enum PlatformClass
-{
-	PSI_ELEMENT("com.intellij.psi.PsiElement", "consulo.language.psi.PsiElement"),
-	PSI_TREE_UTIL("com.intellij.psi.util.PsiTreeUtil", "consulo.language.psi.util.PsiTreeUtil"),
-	AST_NODE("com.intellij.lang.ASTNode", "consulo.language.ast.ASTNode"),
-	AST_WRAPPER_PSI_ELEMENT("com.intellij.extapi.psi.ASTWrapperPsiElement", "consulo.language.impl.psi.ASTWrapperPsiElement"),
-	COMPOSITE_PSI_ELEMENT("com.intellij.psi.impl.source.tree.CompositePsiElement", "consulo.language.impl.psi.CompositePsiElement"),
-	TOKEN_SET("com.intellij.psi.tree.TokenSet", "consulo.language.ast.TokenSet"),
-	LANGUAGE("com.intellij.lang.Language", "consulo.language.Language"),
-	LANGUAGE_VERSION("consulo.lang.LanguageVersion", "consulo.language.version.LanguageVersion"),
-	PSI_BUILDER("com.intellij.lang.PsiBuilder", "consulo.language.parser.PsiBuilder"),
-	PSI_PARSER("com.intellij.lang.PsiParser", "consulo.language.parser.PsiParser"),
-	PSI_ELEMENT_VISITOR("com.intellij.psi.PsiElementVisitor", "consulo.language.psi.PsiElementVisitor"),
-	STUB_BASED_PSI_ELEMENT("com.intellij.psi.StubBasedPsiElement", "consulo.language.psi.StubBasedPsiElement"),
-	STUB_BASED_PSI_ELEMENT_BASE("com.intellij.extapi.psi.StubBasedPsiElementBase", "com.intellij.extapi.psi.StubBasedPsiElementBase"),
-	ISTUB_ELEMENT_TYPE("com.intellij.psi.stubs.IStubElementType", "consulo.language.psi.stub.IStubElementType"),
-	GENERATED_PARSER_UTIL_BASE("com.intellij.lang.parser.GeneratedParserUtilBase", "consulo.language.impl.parser.GeneratedParserUtilBase"),
-	IELEMENT_TYPE("com.intellij.psi.tree.IElementType", "consulo.language.ast.IElementType");
+public enum PlatformClass {
+    PSI_ELEMENT("com.intellij.psi.PsiElement", "consulo.language.psi.PsiElement"),
+    PSI_TREE_UTIL("com.intellij.psi.util.PsiTreeUtil", "consulo.language.psi.util.PsiTreeUtil"),
+    AST_NODE("com.intellij.lang.ASTNode", "consulo.language.ast.ASTNode"),
+    AST_WRAPPER_PSI_ELEMENT("com.intellij.extapi.psi.ASTWrapperPsiElement", "consulo.language.impl.psi.ASTWrapperPsiElement"),
+    COMPOSITE_PSI_ELEMENT("com.intellij.psi.impl.source.tree.CompositePsiElement", "consulo.language.impl.psi.CompositePsiElement"),
+    TOKEN_SET("com.intellij.psi.tree.TokenSet", "consulo.language.ast.TokenSet"),
+    LANGUAGE("com.intellij.lang.Language", "consulo.language.Language"),
+    LANGUAGE_VERSION("consulo.lang.LanguageVersion", "consulo.language.version.LanguageVersion"),
+    PSI_BUILDER("com.intellij.lang.PsiBuilder", "consulo.language.parser.PsiBuilder"),
+    PSI_PARSER("com.intellij.lang.PsiParser", "consulo.language.parser.PsiParser"),
+    PSI_ELEMENT_VISITOR("com.intellij.psi.PsiElementVisitor", "consulo.language.psi.PsiElementVisitor"),
+    STUB_BASED_PSI_ELEMENT("com.intellij.psi.StubBasedPsiElement", "consulo.language.psi.StubBasedPsiElement"),
+    STUB_BASED_PSI_ELEMENT_BASE("com.intellij.extapi.psi.StubBasedPsiElementBase", "com.intellij.extapi.psi.StubBasedPsiElementBase"),
+    ISTUB_ELEMENT_TYPE("com.intellij.psi.stubs.IStubElementType", "consulo.language.psi.stub.IStubElementType"),
+    GENERATED_PARSER_UTIL_BASE("com.intellij.lang.parser.GeneratedParserUtilBase", "consulo.language.impl.parser.GeneratedParserUtilBase"),
+    IELEMENT_TYPE("com.intellij.psi.tree.IElementType", "consulo.language.ast.IElementType");
 
-	private final String myClassNameV2;
-	private final String myClassNameV3;
+    private final String myClassNameV2;
+    private final String myClassNameV3;
 
-	PlatformClass(String v2, String v3)
-	{
-		myClassNameV2 = v2;
-		myClassNameV3 = v3;
-	}
+    PlatformClass(String v2, String v3) {
+        myClassNameV2 = v2;
+        myClassNameV3 = v3;
+    }
 
-	public String getClassNameV2()
-	{
-		return myClassNameV2;
-	}
+    public String getClassNameV2() {
+        return myClassNameV2;
+    }
 
-	public String getClassNameV3()
-	{
-		return myClassNameV3;
-	}
+    public String getClassNameV3() {
+        return myClassNameV3;
+    }
 
-	public String select(String version)
-	{
-		if("3".equals(version))
-		{
-			return myClassNameV3;
-		}
+    public String select(String version) {
+        if ("3".equals(version)) {
+            return myClassNameV3;
+        }
 
-		return myClassNameV2;
-	}
+        return myClassNameV2;
+    }
 }
diff --git a/...t-core/src/main/java/consulo/devkit/grammarKit/generator/PlatformClassKnownAttribute.java b/...t-core/src/main/java/consulo/devkit/grammarKit/generator/PlatformClassKnownAttribute.java
@@ -6,19 +6,16 @@
  * @author VISTALL
  * @since 25-Mar-22
  */
-public class PlatformClassKnownAttribute extends KnownAttribute<String>
-{
-	private final PlatformClass myPlatformClass;
+public class PlatformClassKnownAttribute extends KnownAttribute<String> {
+    private final PlatformClass myPlatformClass;
 
-	public PlatformClassKnownAttribute(boolean global, String name, PlatformClass platformClass)
-	{
-		super(global, name, String.class, platformClass.select(null));
-		myPlatformClass = platformClass;
-	}
+    public PlatformClassKnownAttribute(boolean global, String name, PlatformClass platformClass) {
+        super(global, name, String.class, platformClass.select(null));
+        myPlatformClass = platformClass;
+    }
 
-	@Override
-	public String getDefaultValue(String version)
-	{
-		return myPlatformClass.select(version);
-	}
+    @Override
+    public String getDefaultValue(String version) {
+        return myPlatformClass.select(version);
+    }
 }
diff --git a/grammar-kit-core/src/main/java/module-info.java b/grammar-kit-core/src/main/java/module-info.java
@@ -3,17 +3,17 @@
  * @since 10/02/2023
  */
 module consulo.devkit.grammar.kit.core {
-  requires consulo.language.api;
-  requires consulo.language.impl;
+    requires consulo.language.api;
+    requires consulo.language.impl;
 
-  exports consulo.devkit.grammarKit.generator;
-  exports consulo.devkit.grammarKit.icon;
-  exports org.intellij.grammar;
-  exports org.intellij.grammar.analysis;
-  exports org.intellij.grammar.config;
-  exports org.intellij.grammar.generator;
-  exports org.intellij.grammar.java;
-  exports org.intellij.grammar.parser;
-  exports org.intellij.grammar.psi;
-  exports org.intellij.grammar.psi.impl;
+    exports consulo.devkit.grammarKit.generator;
+    exports consulo.devkit.grammarKit.icon;
+    exports org.intellij.grammar;
+    exports org.intellij.grammar.analysis;
+    exports org.intellij.grammar.config;
+    exports org.intellij.grammar.generator;
+    exports org.intellij.grammar.java;
+    exports org.intellij.grammar.parser;
+    exports org.intellij.grammar.psi;
+    exports org.intellij.grammar.psi.impl;
 }
diff --git a/grammar-kit-core/src/main/java/org/intellij/grammar/BnfFileType.java b/grammar-kit-core/src/main/java/org/intellij/grammar/BnfFileType.java
@@ -29,32 +29,32 @@
  * Time: 22:46
  */
 public class BnfFileType extends LanguageFileType {
-  public static final BnfFileType INSTANCE = new BnfFileType();
-
-  protected BnfFileType() {
-    super(BnfLanguage.INSTANCE);
-  }
-
-  @Nonnull
-  @Override
-  public String getId() {
-    return "BNF";
-  }
-
-  @Nonnull
-  @Override
-  public LocalizeValue getDescription() {
-    return LocalizeValue.localizeTODO("BNF Grammar");
-  }
-
-  @Nonnull
-  @Override
-  public String getDefaultExtension() {
-    return "bnf";
-  }
-
-  @Override
-  public Image getIcon() {
-    return GrammarKitIconGroup.grammarfile();
-  }
+    public static final BnfFileType INSTANCE = new BnfFileType();
+
+    protected BnfFileType() {
+        super(BnfLanguage.INSTANCE);
+    }
+
+    @Nonnull
+    @Override
+    public String getId() {
+        return "BNF";
+    }
+
+    @Nonnull
+    @Override
+    public LocalizeValue getDescription() {
+        return LocalizeValue.localizeTODO("BNF Grammar");
+    }
+
+    @Nonnull
+    @Override
+    public String getDefaultExtension() {
+        return "bnf";
+    }
+
+    @Override
+    public Image getIcon() {
+        return GrammarKitIconGroup.grammarfile();
+    }
 }
diff --git a/grammar-kit-core/src/main/java/org/intellij/grammar/BnfFileTypeFactory.java b/grammar-kit-core/src/main/java/org/intellij/grammar/BnfFileTypeFactory.java
@@ -29,8 +29,8 @@
  */
 @ExtensionImpl
 public class BnfFileTypeFactory extends FileTypeFactory {
-  @Override
-  public void createFileTypes(@Nonnull FileTypeConsumer fileTypeConsumer) {
-    fileTypeConsumer.consume(BnfFileType.INSTANCE);
-  }
+    @Override
+    public void createFileTypes(@Nonnull FileTypeConsumer fileTypeConsumer) {
+        fileTypeConsumer.consume(BnfFileType.INSTANCE);
+    }
 }
diff --git a/grammar-kit-core/src/main/java/org/intellij/grammar/BnfIcons.java b/grammar-kit-core/src/main/java/org/intellij/grammar/BnfIcons.java
@@ -23,9 +23,9 @@
  * Date: 17.07.11 2:55
  */
 public interface BnfIcons {
-  Image RULE = AllIcons.Nodes.Method;
-  Image EXTERNAL_RULE = AllIcons.Nodes.AbstractMethod;
-  Image ATTRIBUTE = AllIcons.Nodes.Attribute;
+    Image RULE = AllIcons.Nodes.Method;
+    Image EXTERNAL_RULE = AllIcons.Nodes.AbstractMethod;
+    Image ATTRIBUTE = AllIcons.Nodes.Attribute;
 
-  Image RELATED_METHOD = AllIcons.Gutter.ImplementedMethod;
+    Image RELATED_METHOD = AllIcons.Gutter.ImplementedMethod;
 }
diff --git a/grammar-kit-core/src/main/java/org/intellij/grammar/BnfLanguage.java b/grammar-kit-core/src/main/java/org/intellij/grammar/BnfLanguage.java
@@ -26,16 +26,15 @@
  * Time: 22:44
  */
 public class BnfLanguage extends Language {
+    public static final BnfLanguage INSTANCE = new BnfLanguage();
 
-  public static final BnfLanguage INSTANCE = new BnfLanguage();
+    protected BnfLanguage() {
+        super("BNF");
+    }
 
-  protected BnfLanguage() {
-    super("BNF");
-  }
-
-  @Nonnull
-  @Override
-  public String getDisplayName() {
-    return "Grammar-Kit BNF";
-  }
+    @Nonnull
+    @Override
+    public String getDisplayName() {
+        return "Grammar-Kit BNF";
+    }
 }