MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[python] PyParameterInfoHandler - do not store reference to PyArgumentList to avoid project leak

Browse Source 
GitOrigin-RevId: 60dad81303c261cefc611e2f66fcc18316916ba6
This commit is contained in:
Daniil Kalinin
2024-10-14 15:42:19 +00:00
committed by intellij-monorepo-bot
parent 6bea9cfe04
commit fa240427fa
1 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/PyParameterInfoHandler.java
+19 -5
View File
@@ -5,6 +5,8 @@ import com.intellij.codeInsight.CodeInsightBundle;
import com.intellij.codeInsight.parameterInfo.ParameterFlag;
import com.intellij.lang.parameterInfo.*;
import com.intellij.openapi.actionSystem.IdeActions;
import com.intellij.openapi.application.ModalityState;
import com.intellij.openapi.application.ReadAction;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.keymap.KeymapUtil;
import com.intellij.openapi.util.Pair;
@@ -12,6 +14,7 @@ import com.intellij.openapi.util.registry.Registry;
import com.intellij.psi.PsiFile;
import com.intellij.ui.ExperimentalUI;
import com.intellij.ui.components.ActionLink;
import com.intellij.util.concurrency.AppExecutorUtil;
import com.intellij.util.ui.JBUI;
import com.jetbrains.python.codeInsight.parameterInfo.ParameterHints;
import com.jetbrains.python.codeInsight.parameterInfo.PyParameterInfoUtils;
@@ -34,10 +37,10 @@ public final class PyParameterInfoHandler implements ParameterInfoHandler<PyArgu
private static final int MAX_PARAMETER_INFO_TO_SHOW = 20;
private boolean hideOverloads = true;
private boolean isDisposed = false;
private int myRealOffset = -1;
private CreateParameterInfoContext myCreateContext;
private Object[] myObjectsToShow;
private PyArgumentList myArgumentList;
private static final EnumMap<ParameterFlag, ParameterInfoUIContextEx.Flag> PARAM_FLAG_TO_UI_FLAG = new EnumMap<>(Map.of(
ParameterFlag.HIGHLIGHT, ParameterInfoUIContextEx.Flag.HIGHLIGHT,
@@ -78,6 +81,7 @@ public final class PyParameterInfoHandler implements ParameterInfoHandler<PyArgu
public void showParameterInfo(@NotNull PyArgumentList element, @NotNull CreateParameterInfoContext context) {
// Show all overloads on second shortcut hit at the same offset
myCreateContext = context;
isDisposed = false;
int actualOffset = getRealCaretOffset(context.getEditor());
if (actualOffset == myRealOffset) {
hideOverloads = !hideOverloads;
@@ -98,7 +102,6 @@ public final class PyParameterInfoHandler implements ParameterInfoHandler<PyArgu
*/
@Override
public void updateParameterInfo(@NotNull PyArgumentList argumentList, @NotNull UpdateParameterInfoContext context) {
myArgumentList = argumentList;
myObjectsToShow = context.getObjectsToView();
final int allegedCursorOffset = context.getOffset(); // this is already shifted backwards to skip spaces
@@ -170,8 +173,19 @@ public final class PyParameterInfoHandler implements ParameterInfoHandler<PyArgu
JLabel shortCut = new JLabel(showMoreShortCut);
ActionLink actionLink = new ActionLink(getActionLinkText(numOfOverloads), event -> {
if (myArgumentList != null && myCreateContext != null) {
showParameterInfo(myArgumentList, myCreateContext);
if (myCreateContext != null) {
ReadAction
.nonBlocking(() -> {
return findElementForParameterInfo(myCreateContext);
})
.finishOnUiThread(ModalityState.defaultModalityState(), argumentList -> {
if (argumentList != null) {
showParameterInfo(argumentList, myCreateContext);
}
})
.coalesceBy(myCreateContext, this)
.expireWhen(() -> isDisposed)
.submit(AppExecutorUtil.getAppExecutorService());
}
});
@@ -216,7 +230,7 @@ public final class PyParameterInfoHandler implements ParameterInfoHandler<PyArgu
public void dispose(@NotNull DeleteParameterInfoContext context) {
resetDisplayState();
myCreateContext = null;
myArgumentList = null;
isDisposed = true;
ParameterInfoHandler.super.dispose(context);
}