diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-03-10 14:45:16 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2014-03-10 21:44:32 +0000 |
| commit | 869f44d03c83dbaf7429b1c8c2ff82f33920dedf (patch) | |
| tree | 692580c33ff11dd96e405d07662f6c05d0c37642 /java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/methodRef/StaticProblems.java | |
| parent | dd7dafee94f064b00f0d3e30b87c7dfa234f16c6 (diff) | |
| download | idea-869f44d03c83dbaf7429b1c8c2ff82f33920dedf.tar.gz | |
Merge remote-tracking branch 'aosp/snapshot-master' into merge
Conflicts:
platform/bootstrap/src/com/intellij/idea/Main.java
platform/lang-impl/src/com/intellij/openapi/file/exclude/EnforcedPlainTextFileTypeManager.java
platform/lang-impl/src/com/intellij/openapi/file/exclude/PersistentFileSetManager.java
updater/src/com/intellij/updater/Runner.java
Change-Id: I515792652054e4857affba47efbcaa36cb385d32
(cherry picked from commit 132117747ccf002d6f09f7c410e0d9e29214bec5)
Diffstat (limited to 'java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/methodRef/StaticProblems.java')
| -rw-r--r-- | java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/methodRef/StaticProblems.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/methodRef/StaticProblems.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/methodRef/StaticProblems.java index 3375ceb2a090..8d482f2920ab 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/methodRef/StaticProblems.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/methodRef/StaticProblems.java @@ -41,14 +41,14 @@ class MyTest1 { static void call2(I2 s) { } static void test1() { - <error descr="Incompatible types. Found: '<method reference>', required: 'MyTest1.I1'">I1 s1 = MyTest1 ::m1;</error> - call1<error descr="'call1(MyTest1.I1)' in 'MyTest1' cannot be applied to '(<method reference>)'">(MyTest1::m1)</error>; + I1 s1 = <error descr="Non-static method cannot be referenced from a static context">MyTest1 ::m1</error>; + call1(<error descr="Non-static method cannot be referenced from a static context">MyTest1::m1</error>); I1 s2 = MyTest1 :: m2; call1(MyTest1::m2); I1 s3 = MyTest1::m3; call1(MyTest1::m3); - <error descr="Incompatible types. Found: '<method reference>', required: 'MyTest1.I1'">I1 s4 = MyTest1::m4;</error> - call1<error descr="'call1(MyTest1.I1)' in 'MyTest1' cannot be applied to '(<method reference>)'">(MyTest1::m4)</error>; + I1 s4 = <error descr="Non-static method cannot be referenced from a static context">MyTest1::m4</error>; + call1(<error descr="Non-static method cannot be referenced from a static context">MyTest1::m4</error>); } static void test2() { @@ -90,14 +90,14 @@ class MyTest2 { static void call2(I2 s) { } static void test1() { - <error descr="Incompatible types. Found: '<method reference>', required: 'MyTest2.I1'">I1 s1 = MyTest2 ::m1;</error> - call1<error descr="'call1(MyTest2.I1)' in 'MyTest2' cannot be applied to '(<method reference>)'">(MyTest2::m1)</error>; + I1 s1 = <error descr="Non-static method cannot be referenced from a static context">MyTest2 ::m1</error>; + call1(<error descr="Non-static method cannot be referenced from a static context">MyTest2::m1</error>); I1 s2 = MyTest2 :: m2; call1(MyTest2::m2); I1 s3 = MyTest2::m3; call1(MyTest2::m3); - <error descr="Incompatible types. Found: '<method reference>', required: 'MyTest2.I1'">I1 s4 = MyTest2::m4;</error> - call1<error descr="'call1(MyTest2.I1)' in 'MyTest2' cannot be applied to '(<method reference>)'">(MyTest2::m4)</error>; + I1 s4 = <error descr="Non-static method cannot be referenced from a static context">MyTest2::m4</error>; + call1(<error descr="Non-static method cannot be referenced from a static context">MyTest2::m4</error>); } static void test2() { |