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

Fixed balloon position for library with sources.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-09-14 14:39:39 +04:00
parent c33b880a57
commit be4c0194d9
4 changed files with 14 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/TraceEntryFilter.java
-16
View File
@@ -1,19 +1,3 @@
/*
* Copyright 2010-2012 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jetbrains.jet.lang.resolve;
import org.jetbrains.annotations.NotNull;
idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/DeleteSignatureAction.java
+3 -5
View File
@@ -26,9 +26,7 @@ import com.intellij.psi.PsiAnnotation;
import com.intellij.psi.PsiMethod;
import org.jetbrains.annotations.NotNull;
import static org.jetbrains.jet.plugin.codeInsight.ktSignature.KotlinSignatureUtil.KOTLIN_SIGNATURE_ANNOTATION;
import static org.jetbrains.jet.plugin.codeInsight.ktSignature.KotlinSignatureUtil.findKotlinSignatureAnnotation;
import static org.jetbrains.jet.plugin.codeInsight.ktSignature.KotlinSignatureUtil.refreshMarkers;
import static org.jetbrains.jet.plugin.codeInsight.ktSignature.KotlinSignatureUtil.*;
/**
* @author Evgeny Gerashchenko
@@ -37,9 +35,9 @@ import static org.jetbrains.jet.plugin.codeInsight.ktSignature.KotlinSignatureUt
public class DeleteSignatureAction extends AnAction {
private final PsiMethod annotationOwner;
public DeleteSignatureAction(@NotNull PsiMethod annotationOwner) {
public DeleteSignatureAction(@NotNull PsiMethod elementInEditor) {
super("Delete");
this.annotationOwner = annotationOwner;
this.annotationOwner = getAnnotationOwner(elementInEditor);
}
@Override
idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/EditSignatureAction.java
+10 -10
View File
@@ -38,11 +38,11 @@ import static org.jetbrains.jet.plugin.codeInsight.ktSignature.KotlinSignatureUt
* @since 5 Sep 12
*/
public class EditSignatureAction extends AnAction {
private final PsiMethod annotationOwner;
private final PsiMethod elementInEditor;
public EditSignatureAction(@NotNull PsiMethod annotationOwner) {
public EditSignatureAction(@NotNull PsiMethod elementInEditor) {
super("Edit");
this.annotationOwner = annotationOwner;
this.elementInEditor = elementInEditor;
}
@Override
@@ -53,13 +53,13 @@ public class EditSignatureAction extends AnAction {
public void actionPerformed(@NotNull DataContext dataContext, @Nullable Point point) {
Editor editor = PlatformDataKeys.EDITOR.getData(dataContext);
assert editor != null;
invokeEditSignature(annotationOwner, editor, point);
invokeEditSignature(elementInEditor, editor, point);
}
static void invokeEditSignature(@NotNull PsiMethod element, @NotNull Editor editor, @Nullable Point point) {
PsiAnnotation annotation = findKotlinSignatureAnnotation(element);
static void invokeEditSignature(@NotNull PsiMethod elementInEditor, @NotNull Editor editor, @Nullable Point point) {
PsiAnnotation annotation = findKotlinSignatureAnnotation(elementInEditor);
assert annotation != null;
if (annotation.getContainingFile() == element.getContainingFile()) {
if (annotation.getContainingFile() == elementInEditor.getContainingFile()) {
// not external, go to
for (PsiNameValuePair pair : annotation.getParameterList().getAttributes()) {
if (pair.getName() == null || "value".equals(pair.getName())) {
@@ -80,10 +80,10 @@ public class EditSignatureAction extends AnAction {
}
}
else {
PsiMethod annotationOwner = getAnnotationOwner(element);
boolean editable = ExternalAnnotationsManager.getInstance(element.getProject())
PsiMethod annotationOwner = getAnnotationOwner(elementInEditor);
boolean editable = ExternalAnnotationsManager.getInstance(elementInEditor.getProject())
.isExternalAnnotationWritable(annotationOwner, KOTLIN_SIGNATURE_ANNOTATION);
new EditSignatureBalloon(annotationOwner, getKotlinSignature(annotation), editable).show(point, editor, element);
new EditSignatureBalloon(annotationOwner, getKotlinSignature(annotation), editable).show(point, editor, elementInEditor);
}
}
}
idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/KotlinSignatureInJavaMarkerProvider.java
+1 -7
View File
@@ -106,16 +106,10 @@ public class KotlinSignatureInJavaMarkerProvider implements LineMarkerProvider {
@Nullable
@Override
public ActionGroup getPopupMenuActions() {
DefaultActionGroup actionGroup = new DefaultActionGroup();
PsiMethod element = getElement();
assert element != null;
PsiMethod annotationOwner = getAnnotationOwner(element);
actionGroup.add(new EditSignatureAction(annotationOwner));
actionGroup.add(new DeleteSignatureAction(annotationOwner));
return actionGroup;
return new DefaultActionGroup(new EditSignatureAction(element), new DeleteSignatureAction(element));
}
};
}