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

Generified EditSignatureBalloon.show(), so it can work with Editor, but without Point.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-08-16 23:54:51 +04:00
parent 80f46af6ad
commit bb02c6f8f7
2 changed files with 61 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/codeInsight/EditSignatureBalloon.java
+24 -15
View File
@@ -17,16 +17,17 @@
package org.jetbrains.jet.plugin.codeInsight;
import com.intellij.codeInsight.ExternalAnnotationsManager;
import com.intellij.ide.DataManager;
import com.intellij.openapi.actionSystem.DataContext;
import com.intellij.openapi.actionSystem.PlatformDataKeys;
import com.intellij.openapi.application.Result;
import com.intellij.openapi.command.WriteCommandAction;
import com.intellij.openapi.editor.*;
import com.intellij.openapi.editor.colors.EditorColors;
import com.intellij.openapi.editor.ex.EditorEx;
import com.intellij.openapi.editor.ex.EditorGutterComponentEx;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.popup.*;
import com.intellij.openapi.ui.popup.Balloon;
import com.intellij.openapi.ui.popup.JBPopupAdapter;
import com.intellij.openapi.ui.popup.JBPopupFactory;
import com.intellij.openapi.ui.popup.LightweightWindowEvent;
import com.intellij.openapi.util.SystemInfo;
import com.intellij.openapi.wm.IdeFocusManager;
import com.intellij.psi.JavaPsiFacade;
@@ -40,7 +41,10 @@ import org.jetbrains.jet.plugin.JetFileType;
import javax.swing.*;
import java.awt.*;
import java.awt.event.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.InputEvent;
import java.awt.event.KeyEvent;
/**
* @author Evgeny Gerashchenko
@@ -155,23 +159,28 @@ class EditSignatureBalloon {
return editor;
}
private int getLineY(@Nullable DataContext dataContext) {
if (dataContext != null) {
Editor mainEditor = PlatformDataKeys.EDITOR.getData(dataContext);
private int getLineY(@Nullable Editor editor) {
if (editor != null) {
Document document = PsiDocumentManager.getInstance(project).getDocument(method.getContainingFile());
if (mainEditor != null && document != null) {
if (document != null) {
int lineNumber = document.getLineNumber(method.getTextOffset());
return mainEditor.logicalPositionToXY(new LogicalPosition(lineNumber, 0)).y;
return editor.logicalPositionToXY(new LogicalPosition(lineNumber, 0)).y;
}
}
return Integer.MAX_VALUE;
}
public void show(MouseEvent e) {
Point eventPoint = e.getPoint();
int lineY = getLineY(DataManager.getInstance().getDataContext(e.getComponent()));
Point point = new Point(eventPoint.x, Math.min(lineY, eventPoint.y));
balloon.show(new RelativePoint(e.getComponent(), point), Balloon.Position.above);
public void show(@Nullable Point point, @NotNull Editor editor) {
int lineY = getLineY(editor);
EditorGutterComponentEx gutter = (EditorGutterComponentEx) editor.getGutter();
Point adjustedPoint;
if (point == null) {
adjustedPoint = new Point(gutter.getIconsAreaWidth() + gutter.getLineMarkerAreaOffset(), lineY);
}
else {
adjustedPoint = new Point(point.x, Math.min(lineY, point.y));
}
balloon.show(new RelativePoint(gutter, adjustedPoint), Balloon.Position.above);
IdeFocusManager.getInstance(editor.getProject()).requestFocus(editor.getContentComponent(), false);
}
idea/src/org/jetbrains/jet/plugin/codeInsight/KotlinSignatureInJavaMarkerProvider.java
+37 -25
View File
@@ -22,7 +22,10 @@ import com.intellij.codeInsight.daemon.GutterIconNavigationHandler;
import com.intellij.codeInsight.daemon.LineMarkerInfo;
import com.intellij.codeInsight.daemon.LineMarkerProvider;
import com.intellij.codeInsight.navigation.NavigationUtil;
import com.intellij.ide.DataManager;
import com.intellij.ide.util.PropertiesComponent;
import com.intellij.openapi.actionSystem.PlatformDataKeys;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.fileEditor.OpenFileDescriptor;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.vfs.VirtualFile;
@@ -34,6 +37,7 @@ import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver;
import org.jetbrains.jet.lang.resolve.java.JvmStdlibNames;
import org.jetbrains.jet.plugin.JetIcons;
import java.awt.*;
import java.awt.event.MouseEvent;
import java.util.Collection;
import java.util.List;
@@ -61,35 +65,14 @@ public class KotlinSignatureInJavaMarkerProvider implements LineMarkerProvider {
public void navigate(MouseEvent e, PsiMethod element) {
if (e.getClickCount() != 1 || e.getButton() != MouseEvent.BUTTON1) return;
PsiAnnotation annotation = findKotlinSignatureAnnotation(element);
assert annotation != null;
if (annotation.getContainingFile() == element.getContainingFile()) {
// not external, go to
for (PsiNameValuePair pair : annotation.getParameterList().getAttributes()) {
if (pair.getName() == null || "value".equals(pair.getName())) {
PsiAnnotationMemberValue value = pair.getValue();
if (value != null) {
PsiElement firstChild = value.getFirstChild();
VirtualFile virtualFile = value.getContainingFile().getVirtualFile();
if (firstChild != null && firstChild.getNode().getElementType() == JavaTokenType.STRING_LITERAL
&& virtualFile != null) {
new OpenFileDescriptor(value.getProject(), virtualFile, value.getTextOffset() + 1).navigate(true);
}
else {
NavigationUtil.activateFileWithPsiElement(value);
}
}
}
}
}
else {
// TODO check if annotations are editable
Editor editor = PlatformDataKeys.EDITOR.getData(DataManager.getInstance().getDataContext(e.getComponent()));
assert editor != null;
new EditSignatureBalloon(element, getKotlinSignature(annotation)).show(e);
}
invokeEditSignature(element, editor, e.getPoint());
}
};
static final String KOTLIN_SIGNATURE_ANNOTATION = JvmStdlibNames.KOTLIN_SIGNATURE.getFqName().getFqName();
@Nullable
@@ -140,4 +123,33 @@ public class KotlinSignatureInJavaMarkerProvider implements LineMarkerProvider {
static void refresh(@NotNull Project project) {
DaemonCodeAnalyzer.getInstance(project).restart();
}
static void invokeEditSignature(@NotNull PsiMethod element, @NotNull Editor editor, @Nullable Point point) {
PsiAnnotation annotation = findKotlinSignatureAnnotation(element);
assert annotation != null;
if (annotation.getContainingFile() == element.getContainingFile()) {
// not external, go to
for (PsiNameValuePair pair : annotation.getParameterList().getAttributes()) {
if (pair.getName() == null || "value".equals(pair.getName())) {
PsiAnnotationMemberValue value = pair.getValue();
if (value != null) {
PsiElement firstChild = value.getFirstChild();
VirtualFile virtualFile = value.getContainingFile().getVirtualFile();
if (firstChild != null && firstChild.getNode().getElementType() == JavaTokenType.STRING_LITERAL
&& virtualFile != null) {
new OpenFileDescriptor(value.getProject(), virtualFile, value.getTextOffset() + 1).navigate(true);
}
else {
NavigationUtil.activateFileWithPsiElement(value);
}
}
}
}
}
else {
// TODO check if annotations are editable
new EditSignatureBalloon(element, getKotlinSignature(annotation)).show(point, editor);
}
}
}