azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Local interfaces are forbidden now

Browse Source
This commit is contained in:
Mikhail Glukhikh
2015-10-08 20:06:26 +03:00
parent d1ab5168ec
commit 2fee9d362c
24 changed files with 38 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/decompiler/internalClasses/InternalClasses.kt
Vendored
-3
View File
@@ -23,9 +23,6 @@ fun f() {
class MyLocalClass {
}
interface MyLocalTrait {
}
val myAnonymousObject = object {
}
idea/testData/unifier/equivalence/declarations/classesAndObjects/commonSuperclasses.kt
Vendored
-24
View File
@@ -1,24 +0,0 @@
fun foo() {
open class Z(p: Int)
interface T;
{
<selection>class A: Z(1), T</selection>
}
{
class B: Z(1), T
}
{
class C: Z(1)
}
{
class D: Z(2), T
}
{
class E: T
}
}
idea/testData/unifier/equivalence/declarations/classesAndObjects/commonSuperclasses.kt.match
Vendored
-3
View File
@@ -1,3 +0,0 @@
class A: Z(1), T
class B: Z(1), T
idea/testData/unifier/equivalence/declarations/classesAndObjects/matchedSuperclasses.kt
Vendored
-42
View File
@@ -1,42 +0,0 @@
fun foo() {
<selection>{
open class Z<T>(p: T)
interface T
class A: Z<Int>(1), T
}</selection>
{
open class Z<A>(r: A)
interface T
class B: Z<Int>(1), T
}
{
open class T<A>(r: A)
interface Z
class C: T<Int>(1), Z
}
{
open class Z<T>(q: T)
interface T
class D: Z<Int>(2), T
}
{
open class Z<T>(q: T)
class E: Z<Int>(1)
}
{
open class Z<A>(r: A)
interface T
class F: Z<String>("1"), T
}
{
open class Z(r: Int)
interface T
class B: Z(1), T
}
}
idea/testData/unifier/equivalence/declarations/classesAndObjects/matchedSuperclasses.kt.match
Vendored
-17
View File
@@ -1,17 +0,0 @@
{
open class Z<T>(p: T)
interface T
class A: Z<Int>(1), T
}
{
open class Z<A>(r: A)
interface T
class B: Z<Int>(1), T
}
{
open class T<A>(r: A)
interface Z
class C: T<Int>(1), Z
}
idea/testData/unifier/equivalence/declarations/classesAndObjects/superTypeOrder.kt
Vendored
-25
View File
@@ -1,25 +0,0 @@
fun foo() {
open class Z(p: Int)
interface T
interface U;
{
<selection>class A: Z(1), T, U</selection>
}
{
class B: Z(1), U, T
}
{
class C: Z(1)
}
{
class D: Z(1), T
}
{
class E: Z(1), U
}
}
idea/testData/unifier/equivalence/declarations/classesAndObjects/superTypeOrder.kt.match
Vendored
-3
View File
@@ -1,3 +0,0 @@
class A: Z(1), T, U
class B: Z(1), U, T
idea/testData/unifier/equivalence/declarations/typeParameters/boundsAndConstraints.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
fun foo() {
interface T
abstract class T
<selection>fun bar1<A, B, C>(a: A, b: B, c: C): A where B: A, C: B, C: T = c</selection>
idea/tests/org/jetbrains/kotlin/psi/patternMatching/JetPsiUnifierTestGenerated.java
-18
View File
@@ -179,12 +179,6 @@ public class JetPsiUnifierTestGenerated extends AbstractJetPsiUnifierTest {
doTest(fileName);
}
@TestMetadata("commonSuperclasses.kt")
public void testCommonSuperclasses() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/declarations/classesAndObjects/commonSuperclasses.kt");
doTest(fileName);
}
@TestMetadata("delegation.kt")
public void testDelegation() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/declarations/classesAndObjects/delegation.kt");
@@ -209,23 +203,11 @@ public class JetPsiUnifierTestGenerated extends AbstractJetPsiUnifierTest {
doTest(fileName);
}
@TestMetadata("matchedSuperclasses.kt")
public void testMatchedSuperclasses() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/declarations/classesAndObjects/matchedSuperclasses.kt");
doTest(fileName);
}
@TestMetadata("members.kt")
public void testMembers() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/declarations/classesAndObjects/members.kt");
doTest(fileName);
}
@TestMetadata("superTypeOrder.kt")
public void testSuperTypeOrder() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/declarations/classesAndObjects/superTypeOrder.kt");
doTest(fileName);
}
}
@TestMetadata("idea/testData/unifier/equivalence/declarations/localCallables")