azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed line y-coordinate calculation for popup menu action. Popup menu invocation doesn't move caret, so we can't rely on caret position.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-09-05 20:07:40 +04:00
parent fe126b2d99
commit 11bba8dd77
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/EditSignatureBalloon.java
+7 -11
View File
@@ -21,10 +21,7 @@ import com.intellij.codeInsight.navigation.NavigationUtil;
import com.intellij.openapi.Disposable; import com.intellij.openapi.Disposable;
import com.intellij.openapi.application.Result; import com.intellij.openapi.application.Result;
import com.intellij.openapi.command.WriteCommandAction; import com.intellij.openapi.command.WriteCommandAction;
import com.intellij.openapi.editor.Document; import com.intellij.openapi.editor.*;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.editor.EditorFactory;
import com.intellij.openapi.editor.EditorSettings;
import com.intellij.openapi.editor.colors.EditorColors; import com.intellij.openapi.editor.colors.EditorColors;
import com.intellij.openapi.editor.event.DocumentAdapter; import com.intellij.openapi.editor.event.DocumentAdapter;
import com.intellij.openapi.editor.event.DocumentEvent; import com.intellij.openapi.editor.event.DocumentEvent;
@@ -141,14 +138,13 @@ class EditSignatureBalloon implements Disposable {
return editor; return editor;
} }
private static int getLineY(@Nullable Editor editor) { private static int getLineY(@NotNull Editor editor, @NotNull PsiElement psiElementInEditor) {
return editor == null LogicalPosition logicalPosition = editor.offsetToLogicalPosition(psiElementInEditor.getTextOffset());
? Integer.MAX_VALUE return editor.logicalPositionToXY(logicalPosition).y;
: editor.logicalPositionToXY(editor.getCaretModel().getLogicalPosition()).y;
} }
public void show(@Nullable Point point, @NotNull Editor editor) { public void show(@Nullable Point point, @NotNull Editor editor, @NotNull PsiElement psiElementInEditor) {
int lineY = getLineY(editor); int lineY = getLineY(editor, psiElementInEditor);
EditorGutterComponentEx gutter = (EditorGutterComponentEx) editor.getGutter(); EditorGutterComponentEx gutter = (EditorGutterComponentEx) editor.getGutter();
Point adjustedPoint; Point adjustedPoint;
if (point == null) { if (point == null) {
@@ -224,7 +220,7 @@ class EditSignatureBalloon implements Disposable {
PsiMethod annotationOwner = getAnnotationOwner(element); PsiMethod annotationOwner = getAnnotationOwner(element);
boolean editable = ExternalAnnotationsManager.getInstance(element.getProject()) boolean editable = ExternalAnnotationsManager.getInstance(element.getProject())
.isExternalAnnotationWritable(annotationOwner, KOTLIN_SIGNATURE_ANNOTATION); .isExternalAnnotationWritable(annotationOwner, KOTLIN_SIGNATURE_ANNOTATION);
new EditSignatureBalloon(annotationOwner, getKotlinSignature(annotation), editable).show(point, editor); new EditSignatureBalloon(annotationOwner, getKotlinSignature(annotation), editable).show(point, editor, element);
} }
} }