Merge 3547fc8 into 61916b8

.github/workflows/_tests.yml

@@ -218,6 +218,7 @@ jobs:
       PERL_TEST_VERSION: 5.32.1
       TEST_SYSTEM_PERL_INTERPRETER_PATH: C:/hostedtoolcache/windows/strawberry-perl/5.32.1/x64/perl/bin/perl.exe
       PERL_CONFIGURATORS: LOCAL_SYSTEM
+      NO_FS_ROOTS_ACCESS_CHECK: true
 
     steps:
       - uses: actions/checkout@v4

build.gradle.kts

@@ -35,7 +35,7 @@ plugins {
   id("idea")
   id("jacoco")
   id("org.jetbrains.intellij") version "1.17.3"
-  id("org.jetbrains.grammarkit") version "2022.3.2.1"
+  id("org.jetbrains.grammarkit") version "2022.3.2.2"
   id("com.github.kt3k.coveralls") version "2.12.2"
   id("org.sonarqube") version "5.0.0.4638"
   id("org.jetbrains.qodana") version "0.1.13"

embedded/core/build.gradle.kts

@@ -37,8 +37,7 @@ dependencies {
 tasks {
   val generateLexerTask = register<GenerateLexerTask>("generateEmbeddedPerlLexer") {
     sourceFile.set(file("grammar/EmbeddedPerl.flex"))
-    targetDir.set("src/main/gen/com/perl5/lang/embedded/lexer/")
-    targetClass.set("EmbeddedPerlLexer")
+    targetOutputDir.set(file("src/main/gen/com/perl5/lang/embedded/lexer/"))
     skeleton.set(rootProject.file(properties("templating_lexer_skeleton").get()))
     purgeOldFiles.set(true)
   }

gradle.properties

@@ -17,15 +17,15 @@
 # https://www.jetbrains.com/intellij-repository/releases
 # https://www.jetbrains.com/intellij-repository/snapshots
 name="Perl5 Support (Camelcade)"
-platformVersion=2023
-platformBranch=.3
+platformVersion=2024
+platformBranch=.1
 platformBuild=
-pluginVersion=2023
-pluginBranch=
-pluginBuild=.2
+pluginVersion=2024
+pluginBranch=.1
+pluginBuild=
 pycharmVersion=192.4787.5-EAP-SNAPSHOT
 clionVersion=192.4787.12-EAP-SNAPSHOT
-psiViewerVersion=233.2
+psiViewerVersion=241-SNAPSHOT
 intelliLangPlugin=org.intellij.intelliLang
 remoteRunPlugin=org.jetbrains.plugins.remote-run
 coveragePlugin=Coverage

mason/htmlmason/core/build.gradle.kts

@@ -38,8 +38,7 @@ dependencies {
 tasks {
   val generateLexerTask = register<GenerateLexerTask>("generateHTMLMasonLexer") {
     sourceFile.set(file("grammar/HTMLMason.flex"))
-    targetDir.set("src/main/gen/com/perl5/lang/htmlmason/lexer/")
-    targetClass.set("HTMLMasonLexer")
+    targetOutputDir.set(file("src/main/gen/com/perl5/lang/htmlmason/lexer/"))
     skeleton.set(rootProject.file(properties("templating_lexer_skeleton").get()))
     purgeOldFiles.set(true)
   }

mason/htmlmason/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 {

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")

mason/mason2/core/build.gradle.kts

@@ -38,8 +38,7 @@ dependencies {
 tasks {
   val generateLexerTask = register<GenerateLexerTask>("generateMason2Lexer") {
     sourceFile.set(file("grammar/Mason2.flex"))
-    targetDir.set("src/main/gen/com/perl5/lang/mason2/lexer/")
-    targetClass.set("Mason2TemplatingLexer")
+    targetOutputDir.set(file("src/main/gen/com/perl5/lang/mason2/lexer/"))
     skeleton.set(rootProject.file(properties("templating_lexer_skeleton").get()))
     purgeOldFiles.set(true)
   }

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 {

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 {

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 {

mojo/core/build.gradle.kts

@@ -38,8 +38,7 @@ dependencies {
 tasks {
   val generateLexerTask = register<GenerateLexerTask>("generateMojoliciousLexer") {
     sourceFile.set(file("grammar/Mojolicious.flex"))
-    targetDir.set("src/main/gen/com/perl5/lang/mojolicious/lexer/")
-    targetClass.set("MojoliciousLexer")
+    targetOutputDir.set(file("src/main/gen/com/perl5/lang/mojolicious/lexer/"))
     skeleton.set(rootProject.file(properties("templating_lexer_skeleton").get()))
     purgeOldFiles.set(true)
   }

plugin/copyright/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;

plugin/core/build.gradle.kts

@@ -43,15 +43,13 @@ tasks {
 
   val generatePerlLexerTask = register<GenerateLexerTask>("generatePerlLexer") {
     sourceFile.set(file("grammar/Perl.flex"))
-    targetDir.set("src/main/gen/com/perl5/lang/perl/lexer/")
-    targetClass.set("PerlLexer")
+    targetOutputDir.set(file("src/main/gen/com/perl5/lang/perl/lexer/"))
 
     dependsOn(generatePerlParserTask)
   }
   val generatePodLexerTask = register<GenerateLexerTask>("generatePodLexer") {
     sourceFile.set(file("grammar/Pod.flex"))
-    targetDir.set("src/main/gen/com/perl5/lang/pod/lexer/")
-    targetClass.set("PodLexerGenerated")
+    targetOutputDir.set(file("src/main/gen/com/perl5/lang/pod/lexer/"))
 
     dependsOn(generatePodParserTask)
   }
@@ -66,7 +64,7 @@ tasks {
   }
 
   withType<GenerateParserTask> {
-    targetRoot.set(genRoot.canonicalPath)
+    targetRootOutputDir.set(genRoot)
     purgeOldFiles.set(true)
   }
 

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"
 

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"