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

MethodReturnTypeFix: highlight only return statements when method return type doesn't match expected (IDEA-216275)

Browse Source 
GitOrigin-RevId: d5f7dc3b03d68d249ba29532b0e8c0555cae60d6
This commit is contained in:
Artemiy Sartakov
2019-07-08 15:09:05 +03:00
committed by intellij-monorepo-bot
parent ba328fd25a
commit 642c65dd11
37 changed files with 167 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/IllegalVoidType.java
+2 -2
View File
@@ -1,6 +1,6 @@
class C {
<error descr="Illegal type: 'void'">void</error>[] <error descr="Invalid return type">m1</error>() { }
<error descr="Illegal type: 'void'">void</error> <error descr="Invalid return type">m2</error>()[] { }
<error descr="Illegal type: 'void'">void</error>[] m1() { }
<error descr="Illegal type: 'void'">void</error> m2()[] { }
void m3(<error descr="Illegal type: 'void'">void</error> p) {}
{
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/MissingReturn.java
+5 -5
View File
@@ -6,7 +6,7 @@ interface ii {}
int <error descr="Invalid return type">f1</error>() throws Exception {
int f1() throws Exception {
<error descr="Missing return statement">}</error>
Object f2(int i) throws Exception {
@@ -217,7 +217,7 @@ interface ii {}
int <error descr="Invalid return type">f1</error>() throws Exception {
int f1() throws Exception {
<error descr="Missing return statement">}</error>
Object f2(int i) throws Exception {
@@ -421,7 +421,7 @@ interface ii {}
int <error descr="Invalid return type">f1</error>() throws Exception {
int f1() throws Exception {
<error descr="Missing return statement">}</error>
Object f2(int i) throws Exception {
@@ -626,7 +626,7 @@ interface ii {}
int <error descr="Invalid return type">f1</error>() throws Exception {
int f1() throws Exception {
<error descr="Missing return statement">}</error>
Object f2(int i) throws Exception {
@@ -829,7 +829,7 @@ interface ii {}
int <error descr="Invalid return type">f1</error>() throws Exception {
int f1() throws Exception {
<error descr="Missing return statement">}</error>
Object f2(int i) throws Exception {
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/Return.java
+2 -2
View File
@@ -1,12 +1,12 @@
class s {
void <error descr="Invalid return type">f</error>() {
void f() {
<error descr="Cannot return a value from a method with void result type">return 0;</error>
}
void f2() {
return;
}
int <error descr="Invalid return type">f3</error>() {
int f3() {
<error descr="Missing return value">return;</error>
}
int f4() {
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/aClassLoader_hl.java
+1 -1
View File
@@ -1071,7 +1071,7 @@ public abstract class ClassLoader
return parent;
}
static ClassLoader <error descr="Invalid return type">createSystemClassLoader</error>(URL[] urls, ClassLoader parent)
static ClassLoader createSystemClassLoader(URL[] urls, ClassLoader parent)
{
return
new <error descr="Cannot resolve symbol 'URLClassLoader'">URLClassLoader</error>(urls, parent)
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/UncheckedWarning.java
+1 -1
View File
@@ -6,7 +6,7 @@ class Test {
<warning descr="Unchecked call to 'isAssignableFrom(Class<?>)' as a member of raw type 'java.lang.Class'">foo.isAssignableFrom</warning>(Object.class);
}
public List<String> <error descr="Invalid return type">transform</error>(List<List<String>> result) {
public List<String> transform(List<List<String>> result) {
<error descr="Incompatible types. Found: 'java.util.List<java.util.List<java.lang.String>>', required: 'java.util.List<java.lang.String>'">return result;</error>
}
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/FailedInferenceWithBoxing.java
+1 -1
View File
@@ -2,7 +2,7 @@ class Test {
public <T> T doStuff() {
return null;
}
public boolean <error descr="Invalid return type">test</error>() {
public boolean test() {
<error descr="Incompatible types. Found: 'java.lang.Object', required: 'boolean'">return doStuff();</error>
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA120563.java
+1 -1
View File
@@ -9,7 +9,7 @@ public class WrongGenerics {
}
@SuppressWarnings("unchecked")
<T> Set<Foo<? extends T>> <error descr="Invalid return type">bar</error>(Set<Foo<? extends T>> foo) {
<T> Set<Foo<? extends T>> bar(Set<Foo<? extends T>> foo) {
return <error descr="Inconvertible types; cannot cast 'java.util.Set<Foo<? extends T>>' to 'java.util.Set<Foo<?>>'">(Set<Foo<?>>) foo</error>;
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA128159.java
+1 -1
View File
@@ -1,5 +1,5 @@
class Bug {
static A <error descr="Invalid return type">test</error>(A[] as) {
static A test(A[] as) {
for (<error descr="Incompatible types. Found: 'Bug.B', required: 'Bug.A'">B b</error> : as) {
<error descr="Incompatible types. Found: 'Bug.B', required: 'Bug.A'">return b;</error>
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA57411.java
+1 -1
View File
@@ -12,7 +12,7 @@ class B<S> extends A<S> {
<error descr="'foo(T, S)' in 'A' clashes with 'foo(Object, Object)' in 'B'; both methods have same erasure, yet neither overrides the other">class C extends B<String></error> {
@Override
<T> T <error descr="Invalid return type">foo</error>(T x, String y) {
<T> T foo(T x, String y) {
<error descr="Incompatible types. Found: 'java.lang.Object', required: 'T'">return super.foo(x, y);</error>
}
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEADEV13011.java
+1 -1
View File
@@ -16,7 +16,7 @@ class LimitedPool<T> {
void cleanup(T t);
}
public T <error descr="Invalid return type">alloc</error>() {
public T alloc() {
if (index >= capacity) return factory.create();
if (storage[index] == null) {
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/Raw.java
+3 -3
View File
@@ -76,7 +76,7 @@ class d {
}
class e {
String <error descr="Invalid return type">foo</error> () {
String foo () {
MyList myList = new MyList();
<error descr="Incompatible types. Found: 'java.lang.Object', required: 'java.lang.String'">return myList.get(0);</error>
}
@@ -128,7 +128,7 @@ class A111<T> {
return v;
}
String <error descr="Invalid return type">g</error>(A111 a) {
String g(A111 a) {
//noinspection unchecked
<error descr="Incompatible types. Found: 'java.lang.Object', required: 'java.lang.String'">return a.f("");</error>
}
@@ -151,7 +151,7 @@ class A11<T> extends A1 {
class Test1<X> {
X x;
java.util.ArrayList<Number> foo = new java.util.ArrayList<Number>();
public static Number <error descr="Invalid return type">foo</error>() {
public static Number foo() {
<error descr="Incompatible types. Found: 'java.lang.Object', required: 'java.lang.Number'">return new Test1().foo.get(0);</error>
}
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting8/ErasureOfReturnTypeOfNonGenericMethod.java
+1 -1
View File
@@ -4,7 +4,7 @@ import java.util.stream.Collectors;
import java.util.stream.Stream;
class Test {
public static <Om> List<Om> <error descr="Invalid return type">sort</error>(Comparator comp, Stream<Om> stream) {
public static <Om> List<Om> sort(Comparator comp, Stream<Om> stream) {
<error descr="Incompatible types. Found: 'java.lang.Object', required: 'java.util.List<Om>'">return stream.sorted(comp).collect(Collectors.toList());</error>
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting8/IDEA56754.java
+1 -1
View File
@@ -1,5 +1,5 @@
class Foo<T extends Enum> {
public T <error descr="Invalid return type">bar</error>(Class<? extends T> type, String str) {
public T bar(Class<? extends T> type, String str) {
return <error descr="Incompatible types: Enum is not convertible to T">Enum.valueOf(type, str);</error>
}
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting8/IDEA57411.java
+1 -1
View File
@@ -12,7 +12,7 @@ class B<S> extends A<S> {
<error descr="'foo(T, S)' in 'A' clashes with 'foo(Object, Object)' in 'B'; both methods have same erasure, yet neither overrides the other">class C extends B<String></error> {
@Override
<T> T <error descr="Invalid return type">foo</error>(T x, String y) {
<T> T foo(T x, String y) {
<error descr="Incompatible types. Found: 'java.lang.Object', required: 'T'">return super.foo(x, y);</error>
}
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting8/IDEADEV13011.java
+1 -1
View File
@@ -16,7 +16,7 @@ class LimitedPool<T> {
void cleanup(T t);
}
public T <error descr="Invalid return type">alloc</error>() {
public T alloc() {
if (index >= capacity) return factory.create();
if (storage[index] == null) {
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting8/Raw.java
+3 -3
View File
@@ -87,7 +87,7 @@ class d {
}
class e {
String <error descr="Invalid return type">foo</error> () {
String foo () {
MyList myList = new MyList();
<error descr="Incompatible types. Found: 'java.lang.Object', required: 'java.lang.String'">return myList.get(0);</error>
}
@@ -139,7 +139,7 @@ class A111<T> {
return v;
}
String <error descr="Invalid return type">g</error>(A111 a) {
String g(A111 a) {
//noinspection unchecked
<error descr="Incompatible types. Found: 'java.lang.Object', required: 'java.lang.String'">return a.f("");</error>
}
@@ -162,7 +162,7 @@ class A11<T> extends A1 {
class Test1<X> {
X x;
java.util.ArrayList<Number> foo = new java.util.ArrayList<Number>();
public static Number <error descr="Invalid return type">foo</error>() {
public static Number foo() {
<error descr="Incompatible types. Found: 'java.lang.Object', required: 'java.lang.Number'">return new Test1().foo.get(0);</error>
}
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting8/UncheckedWarningsInsideIncorporationPhase.java
+1 -1
View File
@@ -3,7 +3,7 @@ abstract class Group {
public Group() {
}
public <T extends Category> T <error descr="Invalid return type">get</error>(Key<T> key) {
public <T extends Category> T get(Key<T> key) {
return <error descr="Incompatible types: Category is not convertible to T">getCategory(key);</error>
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsInnerClassHighlighting/GenericToRawAssignment.java
+1 -1
View File
@@ -1,6 +1,6 @@
class Outer<T> {
class Inner { }
Foo<Outer.Inner> <error descr="Invalid return type">m</error>(Foo<Outer<Integer>.Inner> foo) {
Foo<Outer.Inner> m(Foo<Outer<Integer>.Inner> foo) {
<error descr="Incompatible types. Found: 'Foo<Outer<java.lang.Integer>.Inner>', required: 'Foo<Outer.Inner>'">return foo;</error>
}
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/graphInference/ErasureOfReturnTypeIffUncheckedConversionWasNecessaryDuringApplicabilityCheckOnly.java
+1 -1
View File
@@ -6,7 +6,7 @@ class Test {
return list.stream().flatMap(List::stream).collect(Collectors.toList());
}
private static List<Object> <error descr="Invalid return type">test1</error>(List<List> list) {
private static List<Object> test1(List<List> list) {
<error descr="Incompatible types. Found: 'java.lang.Object', required: 'java.util.List<java.lang.Object>'">return list.stream().flatMap(l -> l.stream()).collect(Collectors.toList());</error>
}
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/graphInference/InferenceFromNotEqualTypeParamsBounds.java
+1 -1
View File
@@ -26,7 +26,7 @@ public class ConcurrentCollectors {
}
static class Test3 {
static <T, K, D, M1 extends Map<K, D>> C<T, M1> <error descr="Invalid return type">groupingBy</error>(F<M1> f,
static <T, K, D, M1 extends Map<K, D>> C<T, M1> groupingBy(F<M1> f,
C<T, D> c,
BiConsumer<M1, T> consumer) {
return new CImpl<error descr="Cannot infer arguments"><></error>(f, consumer, arg(c.getOp()));
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/newLambda/CapturedWildcardNotOpenedDuringInference.java
+1 -1
View File
@@ -11,7 +11,7 @@ interface Foo<T> {
}
class Bar {
Foo<List<String>> <error descr="Invalid return type">transform</error>(final Foo<? extends String> foo) {
Foo<List<String>> transform(final Foo<? extends String> foo) {
<error descr="Incompatible types. Found: 'Foo<? extends java.util.List<? extends java.lang.String>>', required: 'Foo<java.util.List<java.lang.String>>'">return foo
.map(v2 -> tuple(v2))
.onClose();</error>
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/newMethodRef/PreferErrorOnTopLevelToFailedSubstitutorOnNestedLevel.java
+1 -1
View File
@@ -3,7 +3,7 @@ import java.util.Map;
import java.util.stream.Collectors;
class MyTest {
static Map<String, Meeting> <error descr="Invalid return type">getMeetingsById</error>(List<Meeting> meetings){
static Map<String, Meeting> getMeetingsById(List<Meeting> meetings){
return <error descr="Incompatible types. Found: 'java.util.Map<java.lang.String,java.util.List<Meeting>>', required: 'java.util.Map<java.lang.String,Meeting>'">meetings.stream()
.collect(Collectors.groupingBy(Meeting::getId));</error>
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/methodReturn/beforeInvalidReturnElementNullableReturn.java
+2 -2
View File
@@ -2,8 +2,8 @@
class Test {
void <caret>m(boolean b) {
if (b) return null;
void m(boolean b) {
if (b) return n<caret>ull;
return 42;
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/methodReturn/beforeInvalidReturnElementPrimitiveReturn.java
+2 -2
View File
@@ -2,8 +2,8 @@
class Test {
void <caret>m() {
return 42;
void m() {
return 4<caret>2;
}
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/methodReturn/beforeInvalidReturnElementVoidReturn.java
+2 -2
View File
@@ -2,7 +2,7 @@
class Test {
int <caret>m() {
}
int m() {
}<caret>
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/methodReturn/afterInvalidReturnElementMultipleReturns.java → java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/methodReturn8/afterInvalidReturnElementMultipleReturns.java
View File
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/methodReturn/beforeInvalidReturnElementMultipleReturns.java → java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/methodReturn8/beforeInvalidReturnElementMultipleReturns.java
+2 -2
View File
@@ -3,8 +3,8 @@ import java.util.*;
class Test {
void <caret>m(boolean b) {
if (b) return new ArrayList<>();
void m(boolean b) {
if (b) <caret>return new ArrayList<>();
return new LinkedList<>();
}