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

[java] drops unneeded annotation shuffling (IDEA-156150)

Browse Source
This commit is contained in:
Roman Shevchenko
2016-07-22 10:46:39 +02:00
parent b25654b727
commit 1d2b570e16
2 changed files with 39 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-impl/src/com/intellij/psi/impl/source/PsiJavaCodeReferenceElementImpl.java
-2
View File
@@ -574,7 +574,6 @@ public class PsiJavaCodeReferenceElementImpl extends CompositePsiElement impleme
return this;
}
List<PsiAnnotation> annotations = getAnnotations();
String text = qName;
PsiReferenceParameterList parameterList = getParameterList();
if (parameterList != null) {
@@ -589,7 +588,6 @@ public class PsiJavaCodeReferenceElementImpl extends CompositePsiElement impleme
throw new IncorrectOperationException(e.getMessage() + " [qname=" + qName + " class=" + aClass + ";" + aClass.getClass().getName() + "]");
}
((PsiJavaCodeReferenceElementImpl)ref).setAnnotations(annotations);
getTreeParent().replaceChildInternal(this, (TreeElement)ref.getNode());
if (!preserveQualification) {
java/java-tests/testSrc/com/intellij/codeInsight/intention/AddImportActionTest.groovy
+39 -43
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
* Copyright 2000-2016 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.
@@ -227,67 +227,63 @@ class C {
'''
}
public void testAnnotatedImport() {
myFixture.addClass '''
import java.lang.annotation.*;
@Target(ElementType.TYPE_USE) @interface TA { }'''.stripIndent().trim()
myFixture.configureByText 'a.java', '''
import java.lang.annotation.*;
class Test {
@TA
public <caret>Collection<@TA String> c;
}'''.stripIndent().trim()
@Target(ElementType.TYPE_USE) @interface TA { }
importClass()
class Test {
@TA Collection<caret> c;
}
'''
importClass();
myFixture.checkResult '''
import java.lang.annotation.*;
import java.util.Collection;
import java.util.Collection;
@Target(ElementType.TYPE_USE) @interface TA { }
class Test {
@TA Collection<caret> c;
}
'''
class Test {
@TA
public <caret>Collection<@TA String> c;
}'''.stripIndent().trim()
}
public void testAnnotatedQualifiedImport() {
myFixture.addClass '''
import java.lang.annotation.*;
@Target(ElementType.TYPE_USE) @interface TA { }'''.stripIndent().trim()
myFixture.configureByText 'a.java', '''
import java.lang.annotation.*;
class Test {
java.util.@TA <caret>Collection<@TA String> c;
}'''.stripIndent().trim()
@Target(ElementType.TYPE_USE) @interface TA { }
reimportClass()
class Test {
java.util.@TA Collection<caret> c;
}
'''
reimportClass();
myFixture.checkResult '''
import java.lang.annotation.*;
import java.util.Collection;
import java.util.Collection;
@Target(ElementType.TYPE_USE) @interface TA { }
class Test {
@TA Collection<caret> c;
}
'''
class Test {
@TA <caret>Collection<@TA String> c;
}'''.stripIndent().trim()
}
public void testUnresolvedAnnotatedImport() {
myFixture.configureByText 'a.java', '''
class Test {
@Nullable Collection<caret> c;
}
'''
importClass();
myFixture.checkResult '''import java.util.Collection;
class Test {
@Nullable Collection<caret> c;
}'''.stripIndent().trim()
class Test {
@Nullable
Collection<caret> c;
}
'''
importClass()
myFixture.checkResult '''
import java.util.Collection;
class Test {
@Nullable
Collection<caret> c;
}'''.stripIndent().trim()
}
public void "test import class in class reference expression"() {