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

[analysis] IDEA-241656 Provide a fix for "static member qualifying type may not be annotated"

Browse Source 
This patch fixes notes from the code review, it includes:

1. moving MoveAnnotationOnStaticMemberQualifyingTypeFix to top level
2. reusing MoveAnnotationOnStaticMemberQualifyingTypeFix#getFamilyName in MoveAnnotationOnStaticMemberQualifyingTypeFix#getName
3. using PsiTreeUtil#findSiblingBackwards to find the rightmost dot token instead of custom code
4. removing redundant test data

Signed-off-by: Nikita Eshkeev <nikita.eshkeev@jetbrains.com>

GitOrigin-RevId: a539ed96c3883947b621525fc4bd017eefd7b458
This commit is contained in:
Nikita Eshkeev
2020-06-08 15:31:57 +03:00
committed by intellij-monorepo-bot
parent 73835fbb74
commit d7ceab7d2d
26 changed files with 78 additions and 438 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/annotatedStaticMemberQualifyingType/afterAnnotatedLocalVariable.java
-14
View File
@@ -1,14 +0,0 @@
// "Move type annotation" "true"
import java.lang.annotation.ElementType;
import java.lang.annotation.Target;
@Target(ElementType.TYPE_USE)
@interface Meta { }
class Main {
public static class Data { }
static {
final /*1 */ /*2*/ /*5 *//*6 */ synchronized transient Main.@/* 3 */ /* 4*/ Meta Data var = null;
}
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/annotatedStaticMemberQualifyingType/afterAnnotatedMethodParameter.java
-12
View File
@@ -1,12 +0,0 @@
// "Move type annotation" "true"
import java.lang.annotation.ElementType;
import java.lang.annotation.Target;
@Target(ElementType.TYPE_USE)
@interface Meta { }
class Main {
public static class Data { }
void func(final /*1 */ /*2*/ /*5 *//*6 */ synchronized transient Main.@/* 3 */ /* 4*/ Meta Data var) { }
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/annotatedStaticMemberQualifyingType/afterMultipleAnnotatedLocalVariableMoveFirst.java
-16
View File
@@ -1,16 +0,0 @@
// "Move type annotation" "true"
import java.lang.annotation.ElementType;
import java.lang.annotation.Target;
@Target(ElementType.TYPE_USE)
@interface First { }
@Target(ElementType.TYPE_USE)
@interface Second { }
class Main {
public static class Data { }
static {
final /*1 */ /*2*//*one*/ @/*two*/Second /*5 *//*6 */ synchronized transient Main.@/* 3 */ /* 4*/ First Data var = null;
}
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/annotatedStaticMemberQualifyingType/afterMultipleAnnotatedLocalVariableMoveSecond.java
-16
View File
@@ -1,16 +0,0 @@
// "Move type annotation" "true"
import java.lang.annotation.ElementType;
import java.lang.annotation.Target;
@Target(ElementType.TYPE_USE)
@interface First { }
@Target(ElementType.TYPE_USE)
@interface Second { }
class Main {
public static class Data { }
static {
final /*1 */ /*2*/@/* 3 */ /* 4*/ First/*one*/ /*5 *//*6 */ synchronized transient Main.@/*two*/Second Data var = null;
}
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/annotatedStaticMemberQualifyingType/afterMultipleAnnotatedMethodParameterMoveFirst.java
-14
View File
@@ -1,14 +0,0 @@
// "Move type annotation" "true"
import java.lang.annotation.ElementType;
import java.lang.annotation.Target;
@Target(ElementType.TYPE_USE)
@interface First { }
@Target(ElementType.TYPE_USE)
@interface Second { }
class Main {
public static class Data { }
void func(final /*1 */ /*2*//*one*/ @/*two*/Second /*5 *//*6 */ synchronized transient Main.@/* 3 */ /* 4*/ First Data var) { }
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/annotatedStaticMemberQualifyingType/afterMultipleAnnotatedMethodParameterMoveSecond.java
-14
View File
@@ -1,14 +0,0 @@
// "Move type annotation" "true"
import java.lang.annotation.ElementType;
import java.lang.annotation.Target;
@Target(ElementType.TYPE_USE)
@interface First { }
@Target(ElementType.TYPE_USE)
@interface Second { }
class Main {
public static class Data { }
void func(final /*1 */ /*2*/@/* 3 */ /* 4*/ First/*one*/ /*5 *//*6 */ synchronized transient Main.@/*two*/Second Data var) { }
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/annotatedStaticMemberQualifyingType/afterNestedAnnotatedLocalVariable.java
-16
View File
@@ -1,16 +0,0 @@
// "Move type annotation" "true"
import java.lang.annotation.ElementType;
import java.lang.annotation.Target;
@Target(ElementType.TYPE_USE)
@interface Meta { }
class Main {
public static class Data {
public static class Nested { }
}
static {
final /*1 */ /*2*/ /*5 *//*6 */ synchronized transient Main.Data.@/* 3 */ /* 4*/ Meta Nested var = null;
}
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/annotatedStaticMemberQualifyingType/afterNestedAnnotatedMethodParameter.java
-14
View File
@@ -1,14 +0,0 @@
// "Move type annotation" "true"
import java.lang.annotation.ElementType;
import java.lang.annotation.Target;
@Target(ElementType.TYPE_USE)
@interface Meta { }
class Main {
public static class Data {
public static class Nested { }
}
void func(final /*1 */ /*2*/ /*5 *//*6 */ synchronized transient Main.Data.@/* 3 */ /* 4*/ Meta Nested var) { }
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/annotatedStaticMemberQualifyingType/afterNestedMultipleAnnotatedLocalVariableMoveFirst.java
-18
View File
@@ -1,18 +0,0 @@
// "Move type annotation" "true"
import java.lang.annotation.ElementType;
import java.lang.annotation.Target;
@Target(ElementType.TYPE_USE)
@interface First { }
@Target(ElementType.TYPE_USE)
@interface Second { }
class Main {
public static class Data {
public static class Nested { }
}
static {
final /*1 */ /*2*//*one*/ @/*two*/Second /*5 *//*6 */ synchronized transient Main.Data.@/* 3 */ /* 4*/ First Nested var = null;
}
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/annotatedStaticMemberQualifyingType/afterNestedMultipleAnnotatedLocalVariableMoveSecond.java
-18
View File
@@ -1,18 +0,0 @@
// "Move type annotation" "true"
import java.lang.annotation.ElementType;
import java.lang.annotation.Target;
@Target(ElementType.TYPE_USE)
@interface First { }
@Target(ElementType.TYPE_USE)
@interface Second { }
class Main {
public static class Data {
public static class Nested { }
}
static {
final /*1 */ /*2*/@/* 3 */ /* 4*/ First/*one*/ /*5 *//*6 */ synchronized transient Main.Data.@/*two*/Second Nested var = null;
}
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/annotatedStaticMemberQualifyingType/afterNestedMultipleAnnotatedMethodParameterMoveFirst.java
-16
View File
@@ -1,16 +0,0 @@
// "Move type annotation" "true"
import java.lang.annotation.ElementType;
import java.lang.annotation.Target;
@Target(ElementType.TYPE_USE)
@interface First { }
@Target(ElementType.TYPE_USE)
@interface Second { }
class Main {
public static class Data {
public static class Nested { }
}
void func(final /*1 */ /*2*//*one*/ @/*two*/Second /*5 *//*6 */ synchronized transient Main.Data.@/* 3 */ /* 4*/ First Nested var) { }
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/annotatedStaticMemberQualifyingType/afterNestedMultipleAnnotatedMethodParameterMoveSecond.java
-16
View File
@@ -1,16 +0,0 @@
// "Move type annotation" "true"
import java.lang.annotation.ElementType;
import java.lang.annotation.Target;
@Target(ElementType.TYPE_USE)
@interface First { }
@Target(ElementType.TYPE_USE)
@interface Second { }
class Main {
public static class Data {
public static class Nested { }
}
void func(final /*1 */ /*2*/@/* 3 */ /* 4*/ First/*one*/ /*5 *//*6 */ synchronized transient Main.Data.@/*two*/Second Nested var) { }
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/annotatedStaticMemberQualifyingType/beforeAnnotatedLocalVariable.java
-14
View File
@@ -1,14 +0,0 @@
// "Move type annotation" "true"
import java.lang.annotation.ElementType;
import java.lang.annotation.Target;
@Target(ElementType.TYPE_USE)
@interface Meta { }
class Main {
public static class Data { }
static {
final /*1 */ /*2*/@<caret>/* 3 */ /* 4*/ Meta /*5 *//*6 */ synchronized transient Main.Data var = null;
}
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/annotatedStaticMemberQualifyingType/beforeAnnotatedMethodParameter.java
-12
View File
@@ -1,12 +0,0 @@
// "Move type annotation" "true"
import java.lang.annotation.ElementType;
import java.lang.annotation.Target;
@Target(ElementType.TYPE_USE)
@interface Meta { }
class Main {
public static class Data { }
void func(final /*1 */ /*2*/@<caret>/* 3 */ /* 4*/ Meta /*5 *//*6 */ synchronized transient Main.Data var) { }
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/annotatedStaticMemberQualifyingType/beforeMultipleAnnotatedLocalVariableMoveFirst.java
-16
View File
@@ -1,16 +0,0 @@
// "Move type annotation" "true"
import java.lang.annotation.ElementType;
import java.lang.annotation.Target;
@Target(ElementType.TYPE_USE)
@interface First { }
@Target(ElementType.TYPE_USE)
@interface Second { }
class Main {
public static class Data { }
static {
final /*1 */ /*2*/@<caret>/* 3 */ /* 4*/ First/*one*/ @/*two*/Second /*5 *//*6 */ synchronized transient Main.Data var = null;
}
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/annotatedStaticMemberQualifyingType/beforeMultipleAnnotatedLocalVariableMoveSecond.java
-16
View File
@@ -1,16 +0,0 @@
// "Move type annotation" "true"
import java.lang.annotation.ElementType;
import java.lang.annotation.Target;
@Target(ElementType.TYPE_USE)
@interface First { }
@Target(ElementType.TYPE_USE)
@interface Second { }
class Main {
public static class Data { }
static {
final /*1 */ /*2*/@/* 3 */ /* 4*/ First/*one*/ @/*two*/<caret>Second /*5 *//*6 */ synchronized transient Main.Data var = null;
}
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/annotatedStaticMemberQualifyingType/beforeMultipleAnnotatedMethodParameterMoveFirst.java
-14
View File
@@ -1,14 +0,0 @@
// "Move type annotation" "true"
import java.lang.annotation.ElementType;
import java.lang.annotation.Target;
@Target(ElementType.TYPE_USE)
@interface First { }
@Target(ElementType.TYPE_USE)
@interface Second { }
class Main {
public static class Data { }
void func(final /*1 */ /*2*/@<caret>/* 3 */ /* 4*/ First/*one*/ @/*two*/Second /*5 *//*6 */ synchronized transient Main.Data var) { }
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/annotatedStaticMemberQualifyingType/beforeMultipleAnnotatedMethodParameterMoveSecond.java
-14
View File
@@ -1,14 +0,0 @@
// "Move type annotation" "true"
import java.lang.annotation.ElementType;
import java.lang.annotation.Target;
@Target(ElementType.TYPE_USE)
@interface First { }
@Target(ElementType.TYPE_USE)
@interface Second { }
class Main {
public static class Data { }
void func(final /*1 */ /*2*/@/* 3 */ /* 4*/ First/*one*/ @/*two*/<caret>Second /*5 *//*6 */ synchronized transient Main.Data var) { }
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/annotatedStaticMemberQualifyingType/beforeNestedAnnotatedLocalVariable.java
-16
View File
@@ -1,16 +0,0 @@
// "Move type annotation" "true"
import java.lang.annotation.ElementType;
import java.lang.annotation.Target;
@Target(ElementType.TYPE_USE)
@interface Meta { }
class Main {
public static class Data {
public static class Nested { }
}
static {
final /*1 */ /*2*/@<caret>/* 3 */ /* 4*/ Meta /*5 *//*6 */ synchronized transient Main.Data.Nested var = null;
}
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/annotatedStaticMemberQualifyingType/beforeNestedAnnotatedMethodParameter.java
-14
View File
@@ -1,14 +0,0 @@
// "Move type annotation" "true"
import java.lang.annotation.ElementType;
import java.lang.annotation.Target;
@Target(ElementType.TYPE_USE)
@interface Meta { }
class Main {
public static class Data {
public static class Nested { }
}
void func(final /*1 */ /*2*/@<caret>/* 3 */ /* 4*/ Meta /*5 *//*6 */ synchronized transient Main.Data.Nested var) { }
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/annotatedStaticMemberQualifyingType/beforeNestedMultipleAnnotatedLocalVariableMoveFirst.java
-18
View File
@@ -1,18 +0,0 @@
// "Move type annotation" "true"
import java.lang.annotation.ElementType;
import java.lang.annotation.Target;
@Target(ElementType.TYPE_USE)
@interface First { }
@Target(ElementType.TYPE_USE)
@interface Second { }
class Main {
public static class Data {
public static class Nested { }
}
static {
final /*1 */ /*2*/@<caret>/* 3 */ /* 4*/ First/*one*/ @/*two*/Second /*5 *//*6 */ synchronized transient Main.Data.Nested var = null;
}
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/annotatedStaticMemberQualifyingType/beforeNestedMultipleAnnotatedLocalVariableMoveSecond.java
-18
View File
@@ -1,18 +0,0 @@
// "Move type annotation" "true"
import java.lang.annotation.ElementType;
import java.lang.annotation.Target;
@Target(ElementType.TYPE_USE)
@interface First { }
@Target(ElementType.TYPE_USE)
@interface Second { }
class Main {
public static class Data {
public static class Nested { }
}
static {
final /*1 */ /*2*/@/* 3 */ /* 4*/ First/*one*/ @/*two*/<caret>Second /*5 *//*6 */ synchronized transient Main.Data.Nested var = null;
}
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/annotatedStaticMemberQualifyingType/beforeNestedMultipleAnnotatedMethodParameterMoveFirst.java
-16
View File
@@ -1,16 +0,0 @@
// "Move type annotation" "true"
import java.lang.annotation.ElementType;
import java.lang.annotation.Target;
@Target(ElementType.TYPE_USE)
@interface First { }
@Target(ElementType.TYPE_USE)
@interface Second { }
class Main {
public static class Data {
public static class Nested { }
}
void func(final /*1 */ /*2*/@<caret>/* 3 */ /* 4*/ First/*one*/ @/*two*/Second /*5 *//*6 */ synchronized transient Main.Data.Nested var) { }
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/annotatedStaticMemberQualifyingType/beforeNestedMultipleAnnotatedMethodParameterMoveSecond.java
-16
View File
@@ -1,16 +0,0 @@
// "Move type annotation" "true"
import java.lang.annotation.ElementType;
import java.lang.annotation.Target;
@Target(ElementType.TYPE_USE)
@interface First { }
@Target(ElementType.TYPE_USE)
@interface Second { }
class Main {
public static class Data {
public static class Nested { }
}
void func(final /*1 */ /*2*/@/* 3 */ /* 4*/ First/*one*/ @/*two*/<caret>Second /*5 *//*6 */ synchronized transient Main.Data.Nested var) { }
}