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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anna Kozlova
2014-11-10 17:55:44 +01:00
parent 657b346513 ca3481dbd3
commit 38f8f6e322
14 changed files with 116 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/completion/JavaGenerateMemberCompletionContributor.java
+20 -12
View File
@@ -23,11 +23,9 @@ import com.intellij.openapi.util.Iconable;
import com.intellij.openapi.util.Key;
import com.intellij.psi.*;
import com.intellij.psi.infos.CandidateInfo;
import com.intellij.psi.util.MethodSignature;
import com.intellij.psi.util.PsiFormatUtil;
import com.intellij.psi.util.PsiFormatUtilBase;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.util.*;
import com.intellij.ui.RowIcon;
import com.intellij.util.ObjectUtils;
import com.intellij.util.VisibilityUtil;
import com.intellij.util.containers.ContainerUtil;
@@ -54,17 +52,26 @@ public class JavaGenerateMemberCompletionContributor {
if (psiElement(PsiIdentifier.class).withParents(PsiJavaCodeReferenceElement.class, PsiTypeElement.class, PsiClass.class).
andNot(JavaCompletionData.AFTER_DOT).
andNot(psiElement().afterLeaf(psiElement().inside(PsiModifierList.class))).accepts(position)) {
final PsiClass parent = CompletionUtil.getOriginalElement((PsiClass)position.getParent().getParent().getParent());
if (parent != null) {
Set<MethodSignature> addedSignatures = ContainerUtil.newHashSet();
addGetterSetterElements(result, parent, addedSignatures);
addSuperSignatureElements(parent, true, result, addedSignatures);
addSuperSignatureElements(parent, false, result, addedSignatures);
}
suggestGeneratedMethods(result, position);
} else if (psiElement(PsiIdentifier.class)
.withParents(PsiJavaCodeReferenceElement.class, PsiAnnotation.class, PsiModifierList.class, PsiClass.class).accepts(position)) {
PsiAnnotation annotation = ObjectUtils.assertNotNull(PsiTreeUtil.getParentOfType(position, PsiAnnotation.class));
int annoStart = annotation.getTextRange().getStartOffset();
suggestGeneratedMethods(result.withPrefixMatcher(annotation.getText().substring(0, parameters.getOffset() - annoStart)), position);
}
}
private static void suggestGeneratedMethods(CompletionResultSet result, PsiElement position) {
PsiClass parent = CompletionUtil.getOriginalElement(ObjectUtils.assertNotNull(PsiTreeUtil.getParentOfType(position, PsiClass.class)));
if (parent != null) {
Set<MethodSignature> addedSignatures = ContainerUtil.newHashSet();
addGetterSetterElements(result, parent, addedSignatures);
addSuperSignatureElements(parent, true, result, addedSignatures);
addSuperSignatureElements(parent, false, result, addedSignatures);
}
}
private static void addGetterSetterElements(CompletionResultSet result, PsiClass parent, Set<MethodSignature> addedSignatures) {
List<PsiMethod> prototypes = ContainerUtil.newArrayList();
for (PsiField field : parent.getFields()) {
@@ -148,8 +155,9 @@ public class JavaGenerateMemberCompletionContributor {
String parameters = PsiFormatUtil.formatMethod(prototype, substitutor, PsiFormatUtilBase.SHOW_PARAMETERS, PsiFormatUtilBase.SHOW_NAME);
String overrideSignature = " @Override " + signature; // leading space to make it a middle match, under all annotation suggestions
LookupElementBuilder element = LookupElementBuilder.create(prototype, signature).withLookupString(methodName).
withLookupString(signature).withInsertHandler(insertHandler).
withLookupString(signature).withLookupString(overrideSignature).withInsertHandler(insertHandler).
appendTailText(parameters, false).appendTailText(" {...}", true).withTypeText(typeText).withIcon(icon);
element.putUserData(GENERATE_ELEMENT, true);
return element;
java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/MissingReturnExpressionFixer.java
+1 -1
View File
@@ -83,7 +83,7 @@ public class MissingReturnExpressionFixer implements Fixer {
if (!(prev instanceof PsiJavaToken)) {
int offset = returnStatement.getTextRange().getEndOffset();
final PsiMethod method = PsiTreeUtil.getParentOfType(returnStatement, PsiMethod.class);
final PsiMethod method = PsiTreeUtil.getParentOfType(returnStatement, PsiMethod.class, true, PsiLambdaExpression.class);
if (method != null && method.getReturnType() == PsiType.VOID) {
offset = returnStatement.getTextRange().getStartOffset() + "return".length();
}
java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/SemicolonFixer.java
+1 -1
View File
@@ -47,7 +47,7 @@ public class SemicolonFixer implements Fixer {
private static boolean fixReturn(@NotNull Editor editor, @Nullable PsiElement psiElement) {
if (psiElement instanceof PsiReturnStatement) {
PsiMethod method = PsiTreeUtil.getParentOfType(psiElement, PsiMethod.class);
PsiMethod method = PsiTreeUtil.getParentOfType(psiElement, PsiMethod.class, true, PsiLambdaExpression.class);
if (method != null && PsiType.VOID.equals(method.getReturnType())) {
PsiReturnStatement stmt = (PsiReturnStatement)psiElement;
if (stmt.getReturnValue() != null) {
java/java-tests/testData/codeInsight/completeStatement/ReturnInLambda.java
+15
View File
@@ -0,0 +1,15 @@
public class Class1 {
interface Lamb {
Object call(Object... args);
}
public void m(Lamb l) {
}
public static void main(String[] args) {
new Ex().m((arg) -> {
return "<caret>"
});
}
}
java/java-tests/testData/codeInsight/completeStatement/ReturnInLambda_after.java
+15
View File
@@ -0,0 +1,15 @@
public class Class1 {
interface Lamb {
Object call(Object... args);
}
public void m(Lamb l) {
}
public static void main(String[] args) {
new Ex().m((arg) -> {
return "";<caret>
});
}
}
java/java-tests/testData/codeInsight/completion/normal/ImplementViaOverrideCompletion.java
+7
View File
@@ -0,0 +1,7 @@
interface Foo<T> {
void run(T t, int myInt);
}
public class A implements Foo<String> {
@Overr<caret>
}
java/java-tests/testData/codeInsight/completion/normal/ImplementViaOverrideCompletion_after.java
+10
View File
@@ -0,0 +1,10 @@
interface Foo<T> {
void run(T t, int myInt);
}
public class A implements Foo<String> {
@Override
public void run(String s, int myInt) {
<caret>
}
}
java/java-tests/testSrc/com/intellij/codeInsight/CompleteStatementTest.java
+2
View File
@@ -270,6 +270,8 @@ public class CompleteStatementTest extends EditorActionTestCase {
public void testArrayInitializerRBracket() throws Exception { doTest(); }
public void testReturnInLambda() { doTest(); }
private void doTestBracesNextLineStyle() throws Exception {
CodeStyleSettings settings = CodeStyleSettingsManager.getSettings(getProject());
settings.BRACE_STYLE = CommonCodeStyleSettings.NEXT_LINE;
java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy
+8
View File
@@ -1355,6 +1355,14 @@ class XInternalError {}
checkResult()
}
public void testImplementViaOverrideCompletion() {
configure()
myFixture.assertPreferredCompletionItems 0, 'Override', 'public void run'
lookup.currentItem = lookup.items[1]
myFixture.type('\n')
checkResult()
}
public void testAccessorViaCompletion() {
configure()
platform/platform-impl/src/com/intellij/diagnostic/AbstractMessage.java
+9
View File
@@ -16,10 +16,14 @@
package com.intellij.diagnostic;
import com.intellij.notification.Notification;
import com.intellij.openapi.diagnostic.Attachment;
import com.intellij.openapi.diagnostic.SubmittedReportInfo;
import org.jetbrains.annotations.NotNull;
import java.util.Calendar;
import java.util.Collections;
import java.util.Date;
import java.util.List;
public abstract class AbstractMessage {
@@ -98,4 +102,9 @@ public abstract class AbstractMessage {
public void setAssigneeId(Integer assigneeId) {
myAssigneeId = assigneeId;
}
@NotNull
public List<Attachment> getAttachments() {
return Collections.emptyList();
}
}
platform/platform-impl/src/com/intellij/diagnostic/GroupedLogMessage.java
+17
View File
@@ -15,6 +15,12 @@
*/
package com.intellij.diagnostic;
import com.intellij.openapi.diagnostic.Attachment;
import com.intellij.util.Function;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
import java.util.Collection;
import java.util.List;
public class GroupedLogMessage extends AbstractMessage {
@@ -60,4 +66,15 @@ public class GroupedLogMessage extends AbstractMessage {
}
super.setAssigneeId(assigneeId);
}
@NotNull
@Override
public List<Attachment> getAttachments() {
return ContainerUtil.concat(getMessages(), new Function<AbstractMessage, Collection<? extends Attachment>>() {
@Override
public Collection<? extends Attachment> fun(AbstractMessage message) {
return message.getAttachments();
}
});
}
}
platform/platform-impl/src/com/intellij/diagnostic/ITNReporter.java
+1 -3
View File
@@ -111,9 +111,7 @@ public class ITNReporter extends ErrorReportSubmitter {
Object data = event.getData();
if (data instanceof AbstractMessage) {
errorBean.setAssigneeId(((AbstractMessage)data).getAssigneeId());
}
if (data instanceof LogMessageEx) {
errorBean.setAttachments(((LogMessageEx)data).getAttachments());
errorBean.setAttachments(((AbstractMessage)data).getAttachments());
}
String login = settings.ITN_LOGIN;
platform/platform-impl/src/com/intellij/diagnostic/IdeErrorsDialog.java
+8 -10
View File
@@ -468,13 +468,12 @@ public class IdeErrorsDialog extends DialogWrapper implements MessagePoolListene
}
private void updateAttachmentWarning(final AbstractMessage message) {
final List<Attachment> includedAttachments;
if (message instanceof LogMessageEx &&
!(includedAttachments = ContainerUtil.filter(((LogMessageEx)message).getAttachments(), new Condition<Attachment>() {
public boolean value(final Attachment attachment) {
return attachment.isIncluded();
}
})).isEmpty()) {
final List<Attachment> includedAttachments = ContainerUtil.filter(message.getAttachments(), new Condition<Attachment>() {
public boolean value(final Attachment attachment) {
return attachment.isIncluded();
}
});
if (!includedAttachments.isEmpty()) {
myAttachmentWarningPanel.setVisible(true);
if (includedAttachments.size() == 1) {
myAttachmentWarningLabel.setHtmlText(
@@ -649,7 +648,7 @@ public class IdeErrorsDialog extends DialogWrapper implements MessagePoolListene
boolean hasAttachment = false;
for (ArrayList<AbstractMessage> merged : myMergedMessages) {
final AbstractMessage message = merged.get(0);
if (message instanceof LogMessageEx && !((LogMessageEx)message).getAttachments().isEmpty()) {
if (!message.getAttachments().isEmpty()) {
hasAttachment = true;
break;
}
@@ -693,8 +692,7 @@ public class IdeErrorsDialog extends DialogWrapper implements MessagePoolListene
myDetailsTabForm.setAssigneeId(message == null ? null : message.getAssigneeId());
List<Attachment> attachments =
message instanceof LogMessageEx ? ((LogMessageEx)message).getAttachments() : Collections.<Attachment>emptyList();
List<Attachment> attachments = message != null ? message.getAttachments() : Collections.<Attachment>emptyList();
if (!attachments.isEmpty()) {
if (myTabs.indexOfComponent(myAttachmentsTabForm.getContentPane()) == -1) {
myTabs.addTab(DiagnosticBundle.message("error.attachments.tab.title"), myAttachmentsTabForm.getContentPane());
platform/platform-impl/src/com/intellij/diagnostic/LogMessageEx.java
+2
View File
@@ -76,6 +76,8 @@ public class LogMessageEx extends LogMessage {
myAttachments.add(attachment);
}
@NotNull
@Override
public List<Attachment> getAttachments() {
return myAttachments != null ? myAttachments : Collections.<Attachment>emptyList();
}