Fix injection jump to parser file

oowekyala · Jan 17, 2020 · dcaf413 · dcaf413
1 parent 7f489aa
commit dcaf413
Show file tree

Hide file tree

Showing 9 changed files with 89 additions and 66 deletions.
diff --git a/core/src/main/kotlin/com/github/oowekyala/ijcc/lang/injection/InjectedTreeBuilderVisitor.kt b/core/src/main/kotlin/com/github/oowekyala/ijcc/lang/injection/InjectedTreeBuilderVisitor.kt
@@ -6,8 +6,10 @@ import com.github.oowekyala.ijcc.lang.model.parserSimpleName
 import com.github.oowekyala.ijcc.lang.psi.*
 import com.github.oowekyala.ijcc.util.pop
 import com.intellij.openapi.util.TextRange
+import com.intellij.psi.ElementManipulators
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiLanguageInjectionHost
+import com.intellij.psi.impl.source.tree.injected.changesHandler.contentRange
 import java.util.*
 
 /**
@@ -20,7 +22,7 @@ class InjectedTreeBuilderVisitor private constructor() : JccVisitor() {
     // If visiting a node entails visiting other subtrees, these must be merged into a single node
     // If the node may not contain injection hosts, EmptyLeaf must be pushed
 
-    private val nodeStackImpl: Deque<InjectionStructureTree> = LinkedList()
+    private val nodeStackImpl: Deque<InjectionStructureTree> = ArrayDeque()
     val nodeStack: List<InjectionStructureTree>
         get() = nodeStackImpl.toList()
 
@@ -32,7 +34,7 @@ class InjectedTreeBuilderVisitor private constructor() : JccVisitor() {
     override fun visitGrammarFileRoot(o: JccGrammarFileRoot) {
 
         // FIXME the compilation unit is not injected in the same injection file as the productions
-        // o.parserDeclaration.javaCompilationUnit?.accept(this)
+//        o.parserDeclaration.javaCompilationUnit?.accept(this)
 
         o.containingFile.nonTerminalProductions.forEach { it.accept(this) }
 
@@ -56,7 +58,7 @@ class InjectedTreeBuilderVisitor private constructor() : JccVisitor() {
         it.innerRange(1, 1) // remove the braces
     }
 
-    override fun visitJavaCompilationUnit(o: JccJavaCompilationUnit) = visitInjectionHost(o)
+//    override fun visitJavaCompilationUnit(o: JccJavaCompilationUnit) = visitInjectionHost(o)
 
     // catch all method, so that the number of leaves
     // corresponds to the number of visited children
@@ -269,7 +271,7 @@ class InjectedTreeBuilderVisitor private constructor() : JccVisitor() {
             """.trimIndent()
             else ""
 
-            return  jjtreeDecls + """
+            return jjtreeDecls + """
 
                         /** Get the next Token. */
                         final public Token getNextToken() {}
@@ -357,17 +359,35 @@ class InjectedTreeBuilderVisitor private constructor() : JccVisitor() {
             val file = element.containingFile
             val jcu = file.parserDeclaration?.javaCompilationUnit
 
-            // TODO stop ignoring contents of the ACU, in order to modify its structure!
-            // TODO add declarations inserted by JJTree (and implements clauses)
 
+            val leaf =
+
+                if (jcu != null)
+                    SurroundNode(
+                        MultiChildNode(
+                            children = listOf(
+                                HostLeaf(jcu) { ElementManipulators.getManipulator(it).getRangeInElement(it) },
+                                node
+                            )
+                        ) { "" },
+                        prefix = "",
+                        suffix = "}"
+                    )
+                else {
+                    SurroundNode(node, prefix = "class SomeParser {" + javaccInsertedDecls(file), suffix = "}")
+                }
 
-            val commonPrefix = jcu?.text?.trim()?.takeIf { it.endsWith("}") }?.removeSuffix("}") ?: "class MyParser {"
 
             return SurroundNode(
-                node,
-                prefix = commonPrefix + javaccInsertedDecls(file),
-                suffix = "}"
+                leaf,
+                prefix = "",
+                suffix = javaccInsertedDecls(file) + "}"
             )
         }
+
+
+        // TODO stop ignoring contents of the ACU, in order to modify its structure!
+        // TODO add declarations inserted by JJTree (and implements clauses)
+
     }
 }
diff --git a/core/src/main/kotlin/com/github/oowekyala/ijcc/lang/injection/InjectionUtil.kt b/core/src/main/kotlin/com/github/oowekyala/ijcc/lang/injection/InjectionUtil.kt
@@ -13,6 +13,6 @@ val JccGrammarFileRoot.linearInjectedStructure: LinearInjectedStructure
     get() = getUserData(LinearStructureKey)
         ?: getLinearStructureFor(this)
             .also {
-                putUserData(LinearStructureKey, it)
+//                putUserData(LinearStructureKey, it)
             }
 
diff --git a/core/src/main/kotlin/com/github/oowekyala/ijcc/lang/psi/JccJavaCompilationUnit.kt b/core/src/main/kotlin/com/github/oowekyala/ijcc/lang/psi/JccJavaCompilationUnit.kt
@@ -1,17 +1,20 @@
 package com.github.oowekyala.ijcc.lang.psi
 
-import com.github.oowekyala.ijcc.lang.injection.HostSpec
 import com.github.oowekyala.ijcc.lang.injection.MultilineTextEscaper
-import com.github.oowekyala.ijcc.lang.psi.impl.jccEltFactory
+import com.github.oowekyala.ijcc.lang.psi.manipulators.JccJavaCompilationUnitManipulator
+import com.intellij.psi.ElementManipulators
 import com.intellij.psi.LiteralTextEscaper
 import com.intellij.psi.PsiLanguageInjectionHost
 
 interface JccJavaCompilationUnit : PsiLanguageInjectionHost, JccPsiElement {
     @JvmDefault
     override fun updateText(text: String): PsiLanguageInjectionHost =
-        this.replace(project.jccEltFactory.createJcu(text))
-            .let { it as PsiLanguageInjectionHost }
-            .also { HostSpec.replaceHost(this, it) }
+        this.also {
+            ElementManipulators.handleContentChange(this, text)
+        }
+//        this.replace(project.jccEltFactory.createJcu(text))
+//            .let { it as PsiLanguageInjectionHost }
+//            .also { HostSpec.replaceHost(this, it) }
 
     @JvmDefault
     override fun createLiteralTextEscaper(): LiteralTextEscaper<out PsiLanguageInjectionHost> =

diff --git a/...tlin/com/github/oowekyala/ijcc/lang/psi/manipulators/JccJavaCompilationUnitManipulator.kt b/...tlin/com/github/oowekyala/ijcc/lang/psi/manipulators/JccJavaCompilationUnitManipulator.kt
@@ -0,0 +1,33 @@
+package com.github.oowekyala.ijcc.lang.psi.manipulators
+
+import com.github.oowekyala.ijcc.lang.JccTypes
+import com.github.oowekyala.ijcc.lang.psi.JccJavaCompilationUnit
+import com.github.oowekyala.ijcc.lang.psi.impl.jccEltFactory
+import com.github.oowekyala.ijcc.lang.psi.isOfType
+import com.github.oowekyala.ijcc.lang.psi.siblingSequence
+import com.intellij.openapi.util.TextRange
+import com.intellij.psi.AbstractElementManipulator
+
+
+/**
+ * @author Clément Fournier
+ * @since 1.0
+ */
+class JccJavaCompilationUnitManipulator : AbstractElementManipulator<JccJavaCompilationUnit>() {
+
+
+    override fun getRangeInElement(element: JccJavaCompilationUnit): TextRange {
+        val braceOffset = element.lastChild.siblingSequence(false).first { it.isOfType(JccTypes.JCC_RBRACE) }
+        return TextRange.from(0, braceOffset.textRange.startOffset - element.textRange.startOffset)
+    }
+
+
+    override fun handleContentChange(element: JccJavaCompilationUnit,
+                                     range: TextRange,
+                                     newContent: String?): JccJavaCompilationUnit? {
+        val oldText = element.text
+        val newText = oldText.substring(0, range.startOffset) + newContent +
+            oldText.substring(range.endOffset)
+        return element.replace(element.project.jccEltFactory.createJcu(newText)) as JccJavaCompilationUnit
+    }
+}
diff --git a/idea/changelog.html b/idea/changelog.html
@@ -11,4 +11,5 @@
     <li>Add title to configuration options</li>
     <li>Better resilience to mistyped Jjtree annotations</li>
     <li>Fix private regexes defined in eg SPECIAL_TOKEN being reported as inaccessible</li>
+    <li>Fix jump to methods defined in parser (in injected fragments)</li>
 </ul>
diff --git a/idea/src/main/kotlin/com/github/oowekyala/ijcc/lang/injection/JavaccLanguageInjector.kt b/idea/src/main/kotlin/com/github/oowekyala/ijcc/lang/injection/JavaccLanguageInjector.kt
@@ -28,24 +28,24 @@ object JavaccLanguageInjector : MultiHostInjector {
         try {
             when (context) {
                 // FIXME inject both into the same injection file
-                is JccJavaCompilationUnit -> registrar.injectIntoJCU(context)
+//                is JccJavaCompilationUnit -> registrar.injectIntoJCU(context)
                 is JccGrammarFileRoot     -> registrar.injectIntoGrammar(context)
             }
         } catch (e: Exception) {
             // TODO log?
         }
     }
-
-    private fun MultiHostRegistrar.injectIntoJCU(jcu: JccJavaCompilationUnit) {
-        startInjecting(JavaLanguage.INSTANCE)
-
-        val suffix = InjectedTreeBuilderVisitor.javaccInsertedDecls(
-            jcu.containingFile
-        ) + "}"
-
-        addPlace(null, suffix, jcu, jcu.innerRange(endOffset = 1)) // remove last brace
-        doneInjecting()
-    }
+//
+//    private fun MultiHostRegistrar.injectIntoJCU(jcu: JccJavaCompilationUnit) {
+//        startInjecting(JavaLanguage.INSTANCE)
+//
+//        val suffix = InjectedTreeBuilderVisitor.javaccInsertedDecls(
+//            jcu.containingFile
+//        ) + "}"
+//
+//        addPlace(null, suffix, jcu, jcu.innerRange(endOffset = 1)) // remove last brace
+//        doneInjecting()
+//    }
 
     private fun MultiHostRegistrar.injectIntoGrammar(context: JccGrammarFileRoot) {
         context.linearInjectedStructure.register(this)

diff --git a/idea/src/main/resources/META-INF/plugin.xml b/idea/src/main/resources/META-INF/plugin.xml
@@ -90,6 +90,8 @@
                                  implementationClass="com.github.oowekyala.ijcc.lang.psi.manipulators.JccLiteralRegexManipulator"/>
         <lang.elementManipulator forClass="com.github.oowekyala.ijcc.lang.psi.JccIdentifier"
                                  implementationClass="com.github.oowekyala.ijcc.lang.psi.manipulators.JccIdentifierManipulator"/>
+        <lang.elementManipulator forClass="com.github.oowekyala.ijcc.lang.psi.JccJavaCompilationUnit"
+                                 implementationClass="com.github.oowekyala.ijcc.lang.psi.manipulators.JccJavaCompilationUnitManipulator"/>
         <lang.braceMatcher language="JavaCC" implementationClass="com.github.oowekyala.ijcc.JavaccPairedBraceMatcher"/>
 
 

diff --git a/sandbox/Java.jjt b/sandbox/Java.jjt
@@ -1667,7 +1667,6 @@ ASTCompilationUnit CompilationUnit() :
  return jjtThis;
 }
 }
-
 void PackageDeclaration() :
 {}
 {
@@ -1731,24 +1730,7 @@ void TypeDeclaration():
   )
 }
 
-void ClassOrInterfaceDeclaration(int modifiers):
-{
-    Token t = null;
-    jjtThis.setModifiers(modifiers);
-    boolean inInterfaceOld = inInterface;
-    inInterface = false;
-}
-{
-  ( /* See note about this optional final modifier in BlockStatement */
-    ["final"|"abstract"] "class" | "interface" { jjtThis.setInterface(); inInterface = true; } )
-  t=<IDENTIFIER> { checkForBadTypeIdentifierUsage(t.image); jjtThis.setImage(t.image); }
-  [ TypeParameters() ]
-  [ ExtendsList() ]
-  [ ImplementsList() ]
-  ClassOrInterfaceBody()
-  { inInterface = inInterfaceOld; } // always restore the flag after leaving the node
-}
-
+void ClassOrInterfaceDeclaration
 void ExtendsList():
 {
    boolean extendsMoreThanOne = false;
@@ -1771,6 +1753,7 @@ void EnumDeclaration(int modifiers):
 Token t;
 jjtThis.setModifiers(modifiers);
 }
+
 {
   t = <IDENTIFIER> {
     if (!"enum".equals(t.image)) {

diff --git a/sandbox/JavaCC.jjt b/sandbox/JavaCC.jjt
@@ -1309,25 +1309,6 @@ void node_descriptor() :
 }
 
 
-JAVACODE
-void node_descriptor_expression()
-{
-  IElementType kind;
-  int nesting = 1;
-  while (true) {
-    kind = getType();
-    if (kind == JavaCCConstants._EOF)
-      builder.error("Unexpected <EOF>");
-    if (kind == JavaCCConstants.LPAREN) nesting++;
-    if (kind == JavaCCConstants.RPAREN) {
-      nesting--;
-      if (nesting == 0) break;
-    }
-    builder.advanceLexer();
-  }
-}
-
-
 /**********************************************
  * THE JAVA GRAMMAR SPECIFICATION STARTS HERE *
  **********************************************/