Moved generated element types to the parser package

This is necessary to migrate to the grammar-kit plugin 2022.3.2.2 It seems that it is wiping out lexer directory for some reason.
Camelcade · Apr 5, 2024 · 2d1727f · 2d1727f
1 parent 397886b
commit 2d1727f
Show file tree

Hide file tree

Showing 457 changed files with 481 additions and 480 deletions.
diff --git a/...n/core/src/main/java/com/perl5/lang/htmlmason/parser/psi/impl/HTMLMasonArgsBlockImpl.java b/...n/core/src/main/java/com/perl5/lang/htmlmason/parser/psi/impl/HTMLMasonArgsBlockImpl.java
@@ -30,7 +30,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.perl5.lang.perl.lexer.PerlElementTypesGenerated.FAT_COMMA;
+import static com.perl5.lang.perl.parser.PerlElementTypesGenerated.FAT_COMMA;
 
 
 public class HTMLMasonArgsBlockImpl extends HTMLMasonStubBasedElement<HTMLMasonArgsBlockStub> implements HTMLMasonArgsBlock {

diff --git a/mason/htmlmason/core/src/main/java/com/perl5/lang/perl/parser/HTMLMasonParserImpl.java b/mason/htmlmason/core/src/main/java/com/perl5/lang/perl/parser/HTMLMasonParserImpl.java
@@ -25,7 +25,7 @@
 import org.jetbrains.annotations.NotNull;
 
 import static com.perl5.lang.htmlmason.elementType.HTMLMasonElementTypes.*;
-import static com.perl5.lang.perl.lexer.PerlElementTypesGenerated.*;
+import static com.perl5.lang.perl.parser.PerlElementTypesGenerated.*;
 
 
 @SuppressWarnings("Duplicates")

diff --git a/mason/mason2/core/src/main/java/com/perl5/lang/mason2/psi/impl/MasonFlagsStatementImpl.java b/mason/mason2/core/src/main/java/com/perl5/lang/mason2/psi/impl/MasonFlagsStatementImpl.java
@@ -31,8 +31,8 @@
 
 import java.util.List;
 
-import static com.perl5.lang.perl.lexer.PerlElementTypesGenerated.COMMA;
-import static com.perl5.lang.perl.lexer.PerlElementTypesGenerated.FAT_COMMA;
+import static com.perl5.lang.perl.parser.PerlElementTypesGenerated.COMMA;
+import static com.perl5.lang.perl.parser.PerlElementTypesGenerated.FAT_COMMA;
 
 
 public class MasonFlagsStatementImpl extends PsiPerlStatementImpl implements MasonFlagsStatement {

diff --git a/mason/mason2/core/src/main/java/com/perl5/lang/perl/parser/Mason2ParserImpl.java b/mason/mason2/core/src/main/java/com/perl5/lang/perl/parser/Mason2ParserImpl.java
@@ -25,7 +25,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import static com.perl5.lang.perl.lexer.PerlElementTypesGenerated.NAMESPACE_CONTENT;
+import static com.perl5.lang.perl.parser.PerlElementTypesGenerated.NAMESPACE_CONTENT;
 
 
 public class Mason2ParserImpl extends PerlParserImpl implements MasonParser {

diff --git a/mason/mason2/core/src/main/java/com/perl5/lang/perl/parser/Mason2TemplatingParserImpl.java b/mason/mason2/core/src/main/java/com/perl5/lang/perl/parser/Mason2TemplatingParserImpl.java
@@ -20,7 +20,7 @@
 import com.intellij.lang.WhitespacesBinders;
 import com.intellij.psi.tree.IElementType;
 
-import static com.perl5.lang.perl.lexer.PerlElementTypesGenerated.*;
+import static com.perl5.lang.perl.parser.PerlElementTypesGenerated.*;
 
 
 public class Mason2TemplatingParserImpl extends Mason2ParserImpl {

diff --git a/...ight/src/main/java/com/perl5/lang/perl/idea/copyright/UpdatePerlPackageFileCopyright.java b/...ight/src/main/java/com/perl5/lang/perl/idea/copyright/UpdatePerlPackageFileCopyright.java
@@ -33,7 +33,7 @@
 import com.maddyhome.idea.copyright.CopyrightProfile;
 import com.maddyhome.idea.copyright.options.LanguageOptions;
 import com.maddyhome.idea.copyright.psi.UpdatePsiFileCopyright;
-import com.perl5.lang.perl.lexer.PerlElementTypesGenerated;
+import com.perl5.lang.perl.parser.PerlElementTypesGenerated;
 import com.perl5.lang.pod.PodLanguage;
 import com.perl5.lang.pod.idea.completion.PodTitleCompletionProvider;
 import com.perl5.lang.pod.parser.psi.PodRecursiveVisitor;
@@ -45,7 +45,7 @@
 import java.util.regex.Pattern;
 
 import static com.perl5.lang.pod.lexer.PodElementTypes.POD_OUTER;
-import static com.perl5.lang.pod.lexer.PodElementTypesGenerated.CUT_SECTION;
+import static com.perl5.lang.pod.parser.PodElementTypesGenerated.CUT_SECTION;
 
 class UpdatePerlPackageFileCopyright extends UpdatePsiFileCopyright {
   private final @NotNull CopyrightProfile myOptions;

diff --git a/plugin/core/grammar/Perl5.bnf b/plugin/core/grammar/Perl5.bnf
@@ -16,7 +16,7 @@
 {
   generate=[psi-factory="no"]
   parserImports=[ "static com.intellij.lang.WhitespacesBinders.*" ]
-  elementTypeHolderClass="com.perl5.lang.perl.lexer.PerlElementTypesGenerated"
+  elementTypeHolderClass="com.perl5.lang.perl.parser.PerlElementTypesGenerated"
   parserClass="com.perl5.lang.perl.parser.PerlParserGenerated"
   extends="com.perl5.lang.perl.psi.impl.PerlCompositeElementImpl"
 

diff --git a/plugin/core/grammar/Pod.bnf b/plugin/core/grammar/Pod.bnf
@@ -16,7 +16,7 @@
 {
   generate=[psi-factory="no"]
   psiVisitorName="PodVisitorGenerated"
-  elementTypeHolderClass="com.perl5.lang.pod.lexer.PodElementTypesGenerated"
+  elementTypeHolderClass="com.perl5.lang.pod.parser.PodElementTypesGenerated"
 
   elementTypeFactory="com.perl5.lang.pod.elementTypes.PodElementTypeFactory.getElementType"
   tokenTypeFactory="com.perl5.lang.pod.elementTypes.PodElementTypeFactory.getTokenType"

diff --git a/...perl/lexer/PerlElementTypesGenerated.java → ...erl/parser/PerlElementTypesGenerated.java b/...perl/lexer/PerlElementTypesGenerated.java → ...erl/parser/PerlElementTypesGenerated.java
diff --git a/plugin/core/src/main/gen/com/perl5/lang/perl/parser/PerlParserGenerated.java b/plugin/core/src/main/gen/com/perl5/lang/perl/parser/PerlParserGenerated.java
diff --git a/plugin/core/src/main/gen/com/perl5/lang/perl/psi/impl/PsiPerlAddExprImpl.java b/plugin/core/src/main/gen/com/perl5/lang/perl/psi/impl/PsiPerlAddExprImpl.java
diff --git a/plugin/core/src/main/gen/com/perl5/lang/perl/psi/impl/PsiPerlAfterModifierImpl.java b/plugin/core/src/main/gen/com/perl5/lang/perl/psi/impl/PsiPerlAfterModifierImpl.java
diff --git a/plugin/core/src/main/gen/com/perl5/lang/perl/psi/impl/PsiPerlAndExprImpl.java b/plugin/core/src/main/gen/com/perl5/lang/perl/psi/impl/PsiPerlAndExprImpl.java
diff --git a/plugin/core/src/main/gen/com/perl5/lang/perl/psi/impl/PsiPerlAnnotationAbstractImpl.java b/plugin/core/src/main/gen/com/perl5/lang/perl/psi/impl/PsiPerlAnnotationAbstractImpl.java
diff --git a/plugin/core/src/main/gen/com/perl5/lang/perl/psi/impl/PsiPerlAnnotationDeprecatedImpl.java b/plugin/core/src/main/gen/com/perl5/lang/perl/psi/impl/PsiPerlAnnotationDeprecatedImpl.java
diff --git a/plugin/core/src/main/gen/com/perl5/lang/perl/psi/impl/PsiPerlAnnotationInjectImpl.java b/plugin/core/src/main/gen/com/perl5/lang/perl/psi/impl/PsiPerlAnnotationInjectImpl.java
diff --git a/plugin/core/src/main/gen/com/perl5/lang/perl/psi/impl/PsiPerlAnnotationMethodImpl.java b/plugin/core/src/main/gen/com/perl5/lang/perl/psi/impl/PsiPerlAnnotationMethodImpl.java
diff --git a/plugin/core/src/main/gen/com/perl5/lang/perl/psi/impl/PsiPerlAnnotationNoInjectImpl.java b/plugin/core/src/main/gen/com/perl5/lang/perl/psi/impl/PsiPerlAnnotationNoInjectImpl.java
diff --git a/plugin/core/src/main/gen/com/perl5/lang/perl/psi/impl/PsiPerlAnnotationNoinspectionImpl.java b/plugin/core/src/main/gen/com/perl5/lang/perl/psi/impl/PsiPerlAnnotationNoinspectionImpl.java
diff --git a/plugin/core/src/main/gen/com/perl5/lang/perl/psi/impl/PsiPerlAnnotationOverrideImpl.java b/plugin/core/src/main/gen/com/perl5/lang/perl/psi/impl/PsiPerlAnnotationOverrideImpl.java
diff --git a/plugin/core/src/main/gen/com/perl5/lang/perl/psi/impl/PsiPerlAnnotationReturnsImpl.java b/plugin/core/src/main/gen/com/perl5/lang/perl/psi/impl/PsiPerlAnnotationReturnsImpl.java
diff --git a/plugin/core/src/main/gen/com/perl5/lang/perl/psi/impl/PsiPerlAnnotationTypeImpl.java b/plugin/core/src/main/gen/com/perl5/lang/perl/psi/impl/PsiPerlAnnotationTypeImpl.java
diff --git a/plugin/core/src/main/gen/com/perl5/lang/perl/psi/impl/PsiPerlAnnotationVariableImpl.java b/plugin/core/src/main/gen/com/perl5/lang/perl/psi/impl/PsiPerlAnnotationVariableImpl.java
diff --git a/plugin/core/src/main/gen/com/perl5/lang/perl/psi/impl/PsiPerlAnonArrayImpl.java b/plugin/core/src/main/gen/com/perl5/lang/perl/psi/impl/PsiPerlAnonArrayImpl.java
diff --git a/plugin/core/src/main/gen/com/perl5/lang/perl/psi/impl/PsiPerlAnonHashImpl.java b/plugin/core/src/main/gen/com/perl5/lang/perl/psi/impl/PsiPerlAnonHashImpl.java
diff --git a/plugin/core/src/main/gen/com/perl5/lang/perl/psi/impl/PsiPerlAroundModifierImpl.java b/plugin/core/src/main/gen/com/perl5/lang/perl/psi/impl/PsiPerlAroundModifierImpl.java
diff --git a/...n/core/src/main/gen/com/perl5/lang/perl/psi/impl/PsiPerlAroundSignatureInvocantsImpl.java b/...n/core/src/main/gen/com/perl5/lang/perl/psi/impl/PsiPerlAroundSignatureInvocantsImpl.java
diff --git a/plugin/core/src/main/gen/com/perl5/lang/perl/psi/impl/PsiPerlArrayCastExprImpl.java b/plugin/core/src/main/gen/com/perl5/lang/perl/psi/impl/PsiPerlArrayCastExprImpl.java
diff --git a/plugin/core/src/main/gen/com/perl5/lang/perl/psi/impl/PsiPerlArrayElementImpl.java b/plugin/core/src/main/gen/com/perl5/lang/perl/psi/impl/PsiPerlArrayElementImpl.java
diff --git a/plugin/core/src/main/gen/com/perl5/lang/perl/psi/impl/PsiPerlArrayIndexImpl.java b/plugin/core/src/main/gen/com/perl5/lang/perl/psi/impl/PsiPerlArrayIndexImpl.java
diff --git a/plugin/core/src/main/gen/com/perl5/lang/perl/psi/impl/PsiPerlArrayIndexVariableImpl.java b/plugin/core/src/main/gen/com/perl5/lang/perl/psi/impl/PsiPerlArrayIndexVariableImpl.java
diff --git a/plugin/core/src/main/gen/com/perl5/lang/perl/psi/impl/PsiPerlArrayPopExprImpl.java b/plugin/core/src/main/gen/com/perl5/lang/perl/psi/impl/PsiPerlArrayPopExprImpl.java
diff --git a/plugin/core/src/main/gen/com/perl5/lang/perl/psi/impl/PsiPerlArrayPushExprImpl.java b/plugin/core/src/main/gen/com/perl5/lang/perl/psi/impl/PsiPerlArrayPushExprImpl.java
diff --git a/plugin/core/src/main/gen/com/perl5/lang/perl/psi/impl/PsiPerlArrayShiftExprImpl.java b/plugin/core/src/main/gen/com/perl5/lang/perl/psi/impl/PsiPerlArrayShiftExprImpl.java
diff --git a/plugin/core/src/main/gen/com/perl5/lang/perl/psi/impl/PsiPerlArraySliceImpl.java b/plugin/core/src/main/gen/com/perl5/lang/perl/psi/impl/PsiPerlArraySliceImpl.java
diff --git a/plugin/core/src/main/gen/com/perl5/lang/perl/psi/impl/PsiPerlArrayUnshiftExprImpl.java b/plugin/core/src/main/gen/com/perl5/lang/perl/psi/impl/PsiPerlArrayUnshiftExprImpl.java
diff --git a/plugin/core/src/main/gen/com/perl5/lang/perl/psi/impl/PsiPerlArrayVariableImpl.java b/plugin/core/src/main/gen/com/perl5/lang/perl/psi/impl/PsiPerlArrayVariableImpl.java
diff --git a/plugin/core/src/main/gen/com/perl5/lang/perl/psi/impl/PsiPerlArrayrefTypeImpl.java b/plugin/core/src/main/gen/com/perl5/lang/perl/psi/impl/PsiPerlArrayrefTypeImpl.java
diff --git a/plugin/core/src/main/gen/com/perl5/lang/perl/psi/impl/PsiPerlAssignExprImpl.java b/plugin/core/src/main/gen/com/perl5/lang/perl/psi/impl/PsiPerlAssignExprImpl.java
diff --git a/plugin/core/src/main/gen/com/perl5/lang/perl/psi/impl/PsiPerlAttributeImpl.java b/plugin/core/src/main/gen/com/perl5/lang/perl/psi/impl/PsiPerlAttributeImpl.java
diff --git a/plugin/core/src/main/gen/com/perl5/lang/perl/psi/impl/PsiPerlAttributesImpl.java b/plugin/core/src/main/gen/com/perl5/lang/perl/psi/impl/PsiPerlAttributesImpl.java
diff --git a/plugin/core/src/main/gen/com/perl5/lang/perl/psi/impl/PsiPerlAugmentModifierImpl.java b/plugin/core/src/main/gen/com/perl5/lang/perl/psi/impl/PsiPerlAugmentModifierImpl.java
diff --git a/plugin/core/src/main/gen/com/perl5/lang/perl/psi/impl/PsiPerlBeforeModifierImpl.java b/plugin/core/src/main/gen/com/perl5/lang/perl/psi/impl/PsiPerlBeforeModifierImpl.java