fix: do not use features that are internal in future versions (#145)

SirYwell · Nov 14, 2024 · e3c391b · e3c391b
1 parent e86af05
commit e3c391b
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 16 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -208,9 +208,12 @@ jobs:
           path: ${{ needs.build.outputs.pluginVerifierHomeDir }}/ides
           key: plugin-verifier-${{ hashFiles('build/listProductsReleases.txt') }}
 
-      # Run Verify Plugin task and IntelliJ Plugin Verifier tool
-      - name: Run Plugin Verification tasks
+      # Run Verify Plugin task
+      - name: Run Plugin Verification task
         run: ./gradlew verifyPlugin -Dplugin.verifier.home.dir=${{ needs.build.outputs.pluginVerifierHomeDir }}
+      - name: Run IntelliJ Plugin Verifier task
+        run: ./gradlew runPluginVerifier -Dplugin.verifier.home.dir=${{ needs.build.outputs.pluginVerifierHomeDir }}
+      # and IntelliJ Plugin Verifier tool
 
       # Collect Plugin Verifier Result
       - name: Collect Plugin Verifier Result

diff --git a/gradle.properties b/gradle.properties
@@ -4,7 +4,7 @@ pluginGroup = de.sirywell.handlehints
 pluginName = HandleHints
 pluginRepositoryUrl = https://github.com/SirYwell/HandleHints
 # SemVer format -> https://semver.org
-pluginVersion = 0.3.0
+pluginVersion = 0.3.1
 
 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 pluginSinceBuild = 233

diff --git a/src/main/kotlin/de/sirywell/handlehints/presentation/TypeDocumentationTarget.kt b/src/main/kotlin/de/sirywell/handlehints/presentation/TypeDocumentationTarget.kt
@@ -6,7 +6,7 @@ import com.intellij.platform.backend.documentation.DocumentationTarget
 import com.intellij.platform.backend.presentation.TargetPresentation
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiIdentifier
-import com.intellij.refactoring.suggested.createSmartPointer
+import com.intellij.psi.SmartPointerManager
 import de.sirywell.handlehints.TypeData
 
 @Suppress("UnstableApiUsage")
@@ -18,8 +18,9 @@ class TypeDocumentationTarget(private val identifier: PsiIdentifier, private val
     }
 
     override fun createPointer(): Pointer<out DocumentationTarget> {
-        val idPointer = identifier.createSmartPointer()
-        val elPointer = element.createSmartPointer()
+        val pointerManager = SmartPointerManager.getInstance(identifier.project)
+        val idPointer = pointerManager.createSmartPsiElementPointer(identifier)
+        val elPointer = pointerManager.createSmartPsiElementPointer(element)
         return Pointer {
             val identifier = idPointer.element ?: return@Pointer null
             val element = elPointer.element ?: return@Pointer null

diff --git a/src/main/kotlin/de/sirywell/handlehints/presentation/TypeInlayHintsCollector.kt b/src/main/kotlin/de/sirywell/handlehints/presentation/TypeInlayHintsCollector.kt
@@ -6,8 +6,6 @@ import com.intellij.psi.PsiDeclarationStatement
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiParameterList
 import com.intellij.psi.PsiReferenceExpression
-import com.intellij.refactoring.suggested.endOffset
-import com.intellij.refactoring.suggested.startOffset
 import de.sirywell.handlehints.TypeData
 import de.sirywell.handlehints.getVariable
 import de.sirywell.handlehints.type.*
@@ -16,20 +14,20 @@ class TypeInlayHintsCollector : SharedBypassCollector {
 
     override fun collectFromElement(element: PsiElement, sink: InlayTreeSink) {
         val (pos, belongsToBefore) = when (element) {
-            is PsiDeclarationStatement -> (element.getVariable()?.nameIdentifier?.endOffset
-                ?: element.endOffset) to true
+            is PsiDeclarationStatement -> (element.getVariable()?.nameIdentifier?.textRange?.endOffset
+                ?: element.textRange.endOffset) to true
 
-            is PsiAssignmentExpression -> (element.lExpression.endOffset) to true
+            is PsiAssignmentExpression -> (element.lExpression.textRange.endOffset) to true
             is PsiReferenceExpression -> {
                 // TODO ????
                 if (element.parent is PsiParameterList) {
-                    element.startOffset to false
+                    element.textRange.startOffset to false
                 } else {
-                    element.endOffset to true
+                    element.textRange.endOffset to true
                 }
             }
 
-            else -> element.endOffset to true
+            else -> element.textRange.endOffset to true
         }
         val typeData = TypeData.forFile(element.containingFile)
         val type = typeData[element] ?: return

diff --git a/src/test/kotlin/de/sirywell/handlehints/mhtype/TypeAnalysisTestBase.kt b/src/test/kotlin/de/sirywell/handlehints/mhtype/TypeAnalysisTestBase.kt
@@ -1,6 +1,5 @@
 package de.sirywell.handlehints.mhtype
 
-import com.intellij.refactoring.suggested.startOffset
 import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase
 import de.sirywell.handlehints.inspection.MethodHandleEditInspection
 
@@ -23,7 +22,7 @@ abstract class TypeAnalysisTestBase : LightJavaCodeInsightFixtureTestCase() {
 
     protected fun doTypeCheckingTest(onlyAfterCaret: Boolean) {
         val methodHandleTypeHelperInspection =
-            if (onlyAfterCaret) MethodHandleTypeHelperInspection { it.startOffset > myFixture.caretOffset }
+            if (onlyAfterCaret) MethodHandleTypeHelperInspection { it.textRange.startOffset > myFixture.caretOffset }
             else MethodHandleTypeHelperInspection { true }
         myFixture.enableInspections(methodHandleTypeHelperInspection)
         myFixture.testHighlighting(false, true, false, getTestName(false) + ".java")