ctrl+click for inlay type hints

pontem-network · Oct 24, 2024 · a783a4f · a783a4f
1 parent a3beaeb
commit a783a4f
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 36 deletions.
diff --git a/src/main/kotlin/org/move/cli/runConfigurations/aptos/FunctionCall.kt b/src/main/kotlin/org/move/cli/runConfigurations/aptos/FunctionCall.kt
@@ -1,6 +1,7 @@
 package org.move.cli.runConfigurations.aptos
 
 import com.intellij.psi.SmartPsiElementPointer
+import com.intellij.psi.createSmartPointer
 import org.move.lang.core.psi.MvFunction
 import org.move.lang.core.psi.parametersAsBindings
 import org.move.lang.core.psi.ext.*
@@ -59,7 +60,7 @@ data class FunctionCall(
             for (parameterName in parameterNames) {
                 nullParams[parameterName] = null
             }
-            return FunctionCall(function.asSmartPointer(), nullTypeParams, nullParams)
+            return FunctionCall(function.createSmartPointer(), nullTypeParams, nullParams)
         }
     }
 }
diff --git a/src/main/kotlin/org/move/cli/toolwindow/ProjectsTreeMouseListener.kt b/src/main/kotlin/org/move/cli/toolwindow/ProjectsTreeMouseListener.kt
@@ -12,6 +12,7 @@ import com.intellij.openapi.diagnostic.LogLevel.WARNING
 import com.intellij.openapi.diagnostic.logger
 import com.intellij.psi.NavigatablePsiElement
 import com.intellij.psi.PsiElement
+import com.intellij.util.PsiNavigateUtil
 import org.move.cli.toolwindow.MoveProjectsTreeStructure.MoveSimpleNode
 import org.move.ide.notifications.logOrShowBalloon
 import java.awt.event.MouseAdapter

diff --git a/src/main/kotlin/org/move/ide/hints/type/MvTypeHintsFactory.kt b/src/main/kotlin/org/move/ide/hints/type/MvTypeHintsFactory.kt
@@ -1,9 +1,9 @@
 package org.move.ide.hints.type
 
-import com.intellij.codeInsight.hints.declarative.CollapseState
+import com.intellij.codeInsight.hints.declarative.*
 import com.intellij.codeInsight.hints.declarative.CollapseState.Collapsed
 import com.intellij.codeInsight.hints.declarative.CollapseState.Expanded
-import com.intellij.codeInsight.hints.declarative.PresentationTreeBuilder
+import com.intellij.psi.createSmartPointer
 import org.move.ide.presentation.hintText
 import org.move.lang.core.types.ty.Ty
 import org.move.lang.core.types.ty.TyAdt
@@ -15,7 +15,7 @@ object MvTypeHintsFactory {
         treeBuilder.typeHint(0, type)
     }
 
-//    private const val UNNAMED_MARK = "<unnamed>"
+    //    private const val UNNAMED_MARK = "<unnamed>"
     private const val ANONYMOUS_MARK = "<anonymous>"
 
     private fun PresentationTreeBuilder.typeHint(level: Int, type: Ty) {
@@ -31,7 +31,13 @@ object MvTypeHintsFactory {
 
     private fun PresentationTreeBuilder.adtTypeHint(level: Int, tyAdt: TyAdt) {
         val itemName = tyAdt.item.name ?: ANONYMOUS_MARK
-        text(itemName)
+        text(
+            itemName,
+            InlayActionData(
+                PsiPointerInlayActionPayload(tyAdt.item.createSmartPointer()),
+                PsiPointerInlayActionNavigationHandler.HANDLER_ID
+            )
+        )
         if (tyAdt.typeArguments.isEmpty()) return
         collapsibleList(
             state = calcCollapseState(level, tyAdt),
@@ -84,35 +90,6 @@ object MvTypeHintsFactory {
             })
     }
 
-//    private fun PresentationTreeBuilder.classTypeHint(level: Int, classType: PsiClassType) {
-//        val aClass = classType.resolve()
-//
-//        val className = classType.className ?: ANONYMOUS_MARK // TODO here it may be not exactly true, the class might be unresolved
-//        text(className, aClass?.qualifiedName?.let { InlayActionData(StringInlayActionPayload(it), JavaFqnDeclarativeInlayActionHandler.HANDLER_NAME) })
-//        if (classType.parameterCount == 0) return
-//        collapsibleList(expandedState = {
-//            toggleButton {
-//                text("<")
-//            }
-//            join(
-//                classType.parameters,
-//                op = {
-//                    typeHint(level + 1, it)
-//                },
-//                separator = {
-//                    text(", ")
-//                }
-//            )
-//            toggleButton {
-//                text(">")
-//            }
-//        }, collapsedState = {
-//            toggleButton {
-//                text("<...>")
-//            }
-//        })
-//    }
-
     private fun <T> PresentationTreeBuilder.join(
         elements: List<T>,
         op: PresentationTreeBuilder.(T) -> Unit,

diff --git a/src/main/kotlin/org/move/lang/core/psi/ext/PsiElement.kt b/src/main/kotlin/org/move/lang/core/psi/ext/PsiElement.kt
@@ -295,8 +295,6 @@ fun PsiElement.cameBefore(element: PsiElement) =
 inline val <T: StubElement<*>> StubBasedPsiElement<T>.greenStub: T?
     get() = (this as? StubBasedPsiElementBase<T>)?.greenStub
 
-fun <T: PsiElement> T.asSmartPointer() = SmartPointerManager.createPointer(this)
-
 val PsiElement.stubParent: PsiElement?
     get() {
         if (this is StubBasedPsiElement<*>) {