build: integrate GkPatcher into intellij-aya

build.gradle.kts

@@ -1,10 +1,14 @@
 import org.aya.gradle.BuildUtil
+import org.aya.grammarkit.GkParser
+import org.aya.grammarkit.GkPatcher
+import org.aya.intellij.MarkerNodeWrapper
 import org.jetbrains.changelog.Changelog
 import org.jetbrains.changelog.markdownToHTML
 import org.jetbrains.grammarkit.tasks.GenerateParserTask
 import org.jetbrains.intellij.platform.gradle.TestFrameworkType
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import java.net.URI
 import java.util.*
 
 fun properties(key: String) = providers.gradleProperty(key)
@@ -65,9 +69,11 @@ sourceSets.main {
   java.srcDirs(genDir)
 }
 
+val ayaPsiParserFile = file("src/main/grammar/AyaPsiParser.bnf")
+
 val genAyaPsiParser = tasks.register<GenerateParserTask>("genAyaParser") {
   group = "build setup"
-  sourceFile.set(file("src/main/grammar/AyaPsiParser.bnf"))
+  sourceFile.set(ayaPsiParserFile)
   targetRootOutputDir.set(file("src/main/gen"))
   pathToParser.set("org/aya/parser/AyaPsiParser.java")
   pathToPsiRoot.set("org/aya/intellij/psi")
@@ -104,6 +110,18 @@ tasks {
     dependsOn(genAyaPsiParser)
   }
 
+  register("updateAyaParser") {
+    group = "build setup"
+    doLast {
+      val fileName = ayaPsiParserFile.name
+      val url = URI("https://raw.githubusercontent.com/aya-prover/aya-dev/refs/heads/main/parser/src/main/grammar/$fileName").toURL()
+      val text = url.openStream().use { it.reader().readText() }
+      val syntaxNode = object : GkParser() {}.parse(text)
+      val patchedBNF = GkPatcher.forPlugin(MarkerNodeWrapper(text, syntaxNode))
+      ayaPsiParserFile.writeText(patchedBNF.toString())
+    }
+  }
+
   withType<JavaCompile>().configureEach {
     modularity.inferModulePath.set(true)
     options.apply {
@@ -193,7 +211,6 @@ dependencies {
   intellijPlatform {
     intellijIdeaCommunity("2024.3")
     bundledPlugin("com.intellij.java")
-    instrumentationTools()
     testFramework(TestFrameworkType.Platform)
   }
 

buildSrc/build.gradle.kts

@@ -1,18 +1,14 @@
 import java.util.*
 
-plugins {
-  java
-  groovy
-}
-
-repositories {
-  mavenCentral()
-}
+plugins { java }
+repositories { mavenCentral() }
 
 val rootDir = projectDir.parentFile!!
 
 dependencies {
   val deps = Properties()
   deps.load(rootDir.resolve("gradle/deps.properties").reader())
-  api("org.aya-prover.upstream", "build-util", deps.getProperty("version.aya-upstream"))
+  val buildUtilVersion = deps.getProperty("version.aya-upstream")
+  api("org.aya-prover.upstream", "build-util", buildUtilVersion)
+  api("org.aya-prover.upstream", "ij-gk-parser", buildUtilVersion)
 }

gradle/deps.properties

@@ -1,3 +1,3 @@
 version.project=0.0.1-SNAPSHOT
-version.aya=0.36.0
-version.aya-upstream=0.0.31
+version.aya=0.37.0-SNAPSHOT
+version.aya-upstream=0.0.32

src/main/grammar/AyaPsiParser.bnf

@@ -3,14 +3,15 @@
  * Use of this source code is governed by the MIT license that can be found in the LICENSE.md file.
  */
 
+//noinspection BnfResolveForFile
 {
   // only for the compiler, not the IDE
   generate=[
     java='11'
-//    psi-factory='no'
-//    visitor='no'
+    psi-factory='yes'
+    visitor='yes'
   ]
-//  generatePsi=false
+  generatePsi=true
 
   // we only need the parser and element types.
   parserClass='org.aya.parser.AyaPsiParser'