mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
[java, completion] IJPL-207762 introduce JavaMethodCallInsertHandlerHelper
GitOrigin-RevId: b5e9ccc82536b85da0663a3e3b671c4af0e17e16
This commit is contained in:
Max Medvedev
committed by
intellij-monorepo-bot
intellij-monorepo-bot
parent
a1d183b9e6
commit
e43e76db71
+55
@@ -0,0 +1,55 @@
|
||||
// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
|
||||
package com.intellij.codeInsight.completion.method
|
||||
|
||||
import com.intellij.codeInsight.completion.InsertionContext
|
||||
import com.intellij.codeInsight.completion.OffsetKey
|
||||
import com.intellij.codeInsight.completion.method.JavaMethodCallInsertHandlerHelper.findInsertedCall
|
||||
import com.intellij.codeInsight.lookup.LookupElement
|
||||
import com.intellij.openapi.util.Key
|
||||
import com.intellij.psi.PsiCallExpression
|
||||
import com.intellij.psi.PsiMethodCallExpression
|
||||
import com.intellij.psi.util.PsiTreeUtil
|
||||
|
||||
|
||||
object JavaMethodCallInsertHandlerHelper {
|
||||
@JvmStatic
|
||||
fun getReferenceStartOffset(context: InsertionContext, item: LookupElement): Int {
|
||||
val refStartKey = requireNotNull(item.getUserData(refStartKey)) { "refStartKey must have been set" }
|
||||
return context.offsetMap.getOffset(refStartKey)
|
||||
}
|
||||
|
||||
@JvmStatic
|
||||
fun findCallAtOffset(context: InsertionContext, offset: Int): PsiCallExpression? {
|
||||
context.commitDocument()
|
||||
return PsiTreeUtil.findElementOfClassAtOffset(context.file, offset, PsiCallExpression::class.java, false)
|
||||
}
|
||||
|
||||
/**
|
||||
* Use [findInsertedCall] to get PsiCallExpression representing the inserted code, or null if no code was inserted
|
||||
* Can be called in [JavaMethodCallInsertHandler]'s afterHandler
|
||||
*/
|
||||
@JvmStatic
|
||||
fun findInsertedCall(element: LookupElement, context: InsertionContext): PsiCallExpression? {
|
||||
return element.getUserData(callKey)
|
||||
}
|
||||
|
||||
fun installRefStartKey(context: InsertionContext, item: LookupElement) {
|
||||
val refStart = OffsetKey.create("refStart", true)
|
||||
context.offsetMap.addOffset(refStart, context.startOffset)
|
||||
item.putUserData(refStartKey, refStart)
|
||||
}
|
||||
|
||||
fun installCall(context: InsertionContext, item: LookupElement) {
|
||||
val methodCall = findCallAtOffset(context, getReferenceStartOffset(context, item)) ?: return
|
||||
|
||||
// make sure this is the method call we've just added, not the enclosing one
|
||||
val completedElement = (methodCall as? PsiMethodCallExpression)?.methodExpression?.referenceNameElement
|
||||
val completedElementRange = completedElement?.textRange ?: return
|
||||
if (completedElementRange.startOffset != getReferenceStartOffset(context, item)) return
|
||||
|
||||
item.putUserData(callKey, methodCall)
|
||||
}
|
||||
}
|
||||
|
||||
private val callKey = Key.create<PsiCallExpression>("JavaMethodCallInsertHandler.call")
|
||||
private val refStartKey = Key.create<OffsetKey>("JavaMethodCallInsertHandler.refStart")
|
||||
+2
-1
@@ -3,6 +3,7 @@ package com.intellij.codeInsight.completion;
|
||||
|
||||
import com.intellij.codeInsight.ExpectedTypeInfo;
|
||||
import com.intellij.codeInsight.ExpectedTypesProvider;
|
||||
import com.intellij.codeInsight.completion.method.JavaMethodCallInsertHandlerHelper;
|
||||
import com.intellij.codeInsight.completion.util.MethodParenthesesHandler;
|
||||
import com.intellij.codeInsight.generation.*;
|
||||
import com.intellij.codeInsight.intention.impl.TypeExpression;
|
||||
@@ -246,7 +247,7 @@ public final class ConstructorInsertHandler implements InsertHandler<LookupEleme
|
||||
JavaCompletionUtil.insertParentheses(context, delegate, false, hasParams, forAnonymous);
|
||||
|
||||
if (constructor != null) {
|
||||
PsiCallExpression call = JavaMethodCallInsertHandler.findCallAtOffset(context, refEnd.getStartOffset());
|
||||
PsiCallExpression call = JavaMethodCallInsertHandlerHelper.findCallAtOffset(context, refEnd.getStartOffset());
|
||||
if (call != null) {
|
||||
CompletionMemory.registerChosenMethod(constructor, call);
|
||||
}
|
||||
|
||||
+8
-42
@@ -3,9 +3,9 @@ package com.intellij.codeInsight.completion
|
||||
|
||||
import com.intellij.codeInsight.CodeInsightSettings
|
||||
import com.intellij.codeInsight.completion.CodeCompletionFeatures.EXCLAMATION_FINISH
|
||||
import com.intellij.codeInsight.completion.JavaMethodCallInsertHandler.Companion.findCallAtOffset
|
||||
import com.intellij.codeInsight.completion.JavaMethodCallInsertHandler.Companion.findInsertedCall
|
||||
import com.intellij.codeInsight.completion.JavaMethodCallInsertHandler.Companion.showParameterHints
|
||||
import com.intellij.codeInsight.completion.method.*
|
||||
import com.intellij.codeInsight.completion.method.JavaMethodCallInsertHandlerHelper.findInsertedCall
|
||||
import com.intellij.codeInsight.completion.util.MethodParenthesesHandler
|
||||
import com.intellij.codeInsight.hint.ParameterInfoControllerBase
|
||||
import com.intellij.codeInsight.hint.ShowParameterInfoContext
|
||||
@@ -18,7 +18,6 @@ import com.intellij.injected.editor.EditorWindow
|
||||
import com.intellij.openapi.Disposable
|
||||
import com.intellij.openapi.editor.Document
|
||||
import com.intellij.openapi.util.Disposer
|
||||
import com.intellij.openapi.util.Key
|
||||
import com.intellij.openapi.util.registry.Registry
|
||||
import com.intellij.openapi.util.text.StringUtil
|
||||
import com.intellij.psi.*
|
||||
@@ -98,18 +97,6 @@ public class JavaMethodCallInsertHandler(
|
||||
}
|
||||
|
||||
public companion object {
|
||||
@JvmStatic
|
||||
public fun getReferenceStartOffset(context: InsertionContext, item: LookupElement): Int {
|
||||
val refStartKey = requireNotNull(item.getUserData(refStartKey)) { "refStartKey must have been set" }
|
||||
return context.offsetMap.getOffset(refStartKey)
|
||||
}
|
||||
|
||||
@JvmStatic
|
||||
public fun findCallAtOffset(context: InsertionContext, offset: Int): PsiCallExpression? {
|
||||
context.commitDocument()
|
||||
return PsiTreeUtil.findElementOfClassAtOffset(context.file, offset, PsiCallExpression::class.java, false)
|
||||
}
|
||||
|
||||
@JvmStatic
|
||||
public fun showParameterHints(
|
||||
element: LookupElement,
|
||||
@@ -182,23 +169,12 @@ public class JavaMethodCallInsertHandler(
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Use [findInsertedCall] to get PsiCallExpression representing the inserted code, or null if no code was inserted
|
||||
* Can be called in [afterHandler]
|
||||
*/
|
||||
@JvmStatic
|
||||
public fun findInsertedCall(element: LookupElement, context: InsertionContext): PsiCallExpression? {
|
||||
return element.getUserData(callKey)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private class RefStartInsertHandler : InsertHandler<LookupElement> {
|
||||
override fun handleInsert(context: InsertionContext, item: LookupElement) {
|
||||
val refStart = OffsetKey.create("refStart", true)
|
||||
context.offsetMap.addOffset(refStart, context.startOffset)
|
||||
item.putUserData(refStartKey, refStart)
|
||||
JavaMethodCallInsertHandlerHelper.installRefStartKey(context, item)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -229,12 +205,12 @@ private class ImportQualifyAndInsertTypeParametersHandler(
|
||||
val method = item.getObject()
|
||||
|
||||
if (needExplicitTypeParameters) {
|
||||
qualifyMethodCall(item, file, JavaMethodCallInsertHandler.getReferenceStartOffset(context, item), document)
|
||||
qualifyMethodCall(item, file, JavaMethodCallInsertHandlerHelper.getReferenceStartOffset(context, item), document)
|
||||
insertExplicitTypeParameters(item, context)
|
||||
}
|
||||
else if (item.helper != null) {
|
||||
context.commitDocument()
|
||||
importOrQualify(item, document, file, method, JavaMethodCallInsertHandler.getReferenceStartOffset(context, item))
|
||||
importOrQualify(item, document, file, method, JavaMethodCallInsertHandlerHelper.getReferenceStartOffset(context, item))
|
||||
}
|
||||
}
|
||||
|
||||
@@ -299,8 +275,8 @@ private class ImportQualifyAndInsertTypeParametersHandler(
|
||||
|
||||
val typeParams = JavaMethodCallElement.getTypeParamsText(false, item.getObject(), item.inferenceSubstitutor)
|
||||
if (typeParams != null) {
|
||||
context.document.insertString(JavaMethodCallInsertHandler.getReferenceStartOffset(context, item), typeParams)
|
||||
JavaCompletionUtil.shortenReference(context.file, JavaMethodCallInsertHandler.getReferenceStartOffset(context, item))
|
||||
context.document.insertString(JavaMethodCallInsertHandlerHelper.getReferenceStartOffset(context, item), typeParams)
|
||||
JavaCompletionUtil.shortenReference(context.file, JavaMethodCallInsertHandlerHelper.getReferenceStartOffset(context, item))
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -335,14 +311,7 @@ private class ShowParameterInfoInsertHandler : InsertHandler<JavaMethodCallEleme
|
||||
|
||||
private class MethodCallInstallerHandler : InsertHandler<LookupElement> {
|
||||
override fun handleInsert(context: InsertionContext, item: LookupElement) {
|
||||
val methodCall = findCallAtOffset(context, JavaMethodCallInsertHandler.getReferenceStartOffset(context, item)) ?: return
|
||||
|
||||
// make sure this is the method call we've just added, not the enclosing one
|
||||
val completedElement = (methodCall as? PsiMethodCallExpression)?.methodExpression?.referenceNameElement
|
||||
val completedElementRange = completedElement?.textRange ?: return
|
||||
if (completedElementRange.startOffset != JavaMethodCallInsertHandler.getReferenceStartOffset(context, item)) return
|
||||
|
||||
item.putUserData(callKey, methodCall)
|
||||
JavaMethodCallInsertHandlerHelper.installCall(context, item)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -354,6 +323,3 @@ private class MethodCallRegistrationHandler : InsertHandler<JavaMethodCallElemen
|
||||
}
|
||||
}
|
||||
|
||||
private val callKey = Key.create<PsiCallExpression>("JavaMethodCallInsertHandler.call")
|
||||
private val refStartKey = Key.create<OffsetKey>("JavaMethodCallInsertHandler.refStart")
|
||||
|
||||
|
||||
+2
-1
@@ -4,6 +4,7 @@ package com.intellij.codeInsight.completion;
|
||||
import com.intellij.application.options.CodeStyle;
|
||||
import com.intellij.codeInsight.ExpectedTypeInfo;
|
||||
import com.intellij.codeInsight.NullableNotNullManager;
|
||||
import com.intellij.codeInsight.completion.method.JavaMethodCallInsertHandlerHelper;
|
||||
import com.intellij.codeInsight.lookup.DefaultLookupItemRenderer;
|
||||
import com.intellij.codeInsight.lookup.LookupElementPresentation;
|
||||
import com.intellij.codeInsight.lookup.impl.JavaElementLookupRenderer;
|
||||
@@ -407,7 +408,7 @@ public final class JavaQualifierAsArgumentContributor extends CompletionContribu
|
||||
private class AfterInsertHandler implements InsertHandler<JavaMethodCallElement> {
|
||||
@Override
|
||||
public void handleInsert(@NotNull InsertionContext context, @NotNull JavaMethodCallElement item) {
|
||||
PsiCallExpression call = JavaMethodCallInsertHandler.findInsertedCall(item, context);
|
||||
PsiCallExpression call = JavaMethodCallInsertHandlerHelper.findInsertedCall(item, context);
|
||||
context.commitDocument();
|
||||
PsiDocumentManager.getInstance(context.getProject()).doPostponedOperationsAndUnblockDocument(context.getDocument());
|
||||
if (call != null) {
|
||||
|
||||
Reference in New Issue
Block a user