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

Drop 'OBJECT$' field deprecated in M11

Browse Source
This commit is contained in:
Alexander Udalov
2015-06-26 21:55:13 +03:00
parent 0bad4e0137
commit feb4dd7b8f
23 changed files with 3 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-completion/testData/injava/ClassObjectField.java
Vendored
-1
View File
@@ -5,4 +5,3 @@ public class Testing {
}
// EXIST: Companion
// EXIST: OBJECT$
idea/testData/checker/duplicateJvmSignature/fields/classObjectCopiedFieldObject.kt
Vendored
-8
View File
@@ -11,11 +11,3 @@ class C {
}
}
class D {
companion <error>object A</error> {
<error>val `OBJECT$`</error> = this
}
val `OBJECT$` = D
}
idea/testData/resolve/referenceInJava/DeprecatedClassObjectField.java
Vendored
-7
View File
@@ -1,7 +0,0 @@
public class ClassObjectField {
public static void foo() {
k.ClassWithClassObject.OB<caret>JECT$.f();
}
}
// REF: companion object of (k).ClassWithClassObject
idea/tests/org/jetbrains/kotlin/idea/javaFacade/JetJavaFacadeTest.java
-9
View File
@@ -27,7 +27,6 @@ import org.jetbrains.kotlin.asJava.LightClassUtil;
import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase;
import org.jetbrains.kotlin.idea.test.JetLightProjectDescriptor;
import org.jetbrains.kotlin.idea.test.PluginTestCaseBase;
import org.jetbrains.kotlin.load.java.JvmAbi;
import org.jetbrains.kotlin.name.SpecialNames;
import org.jetbrains.kotlin.psi.*;
@@ -199,14 +198,6 @@ public class JetJavaFacadeTest extends JetLightCodeInsightFixtureTestCase {
assertTrue(instance.hasModifierProperty(PsiModifier.STATIC));
assertTrue(instance.hasModifierProperty(PsiModifier.FINAL));
PsiField deprecatedAccessor = theClass.findFieldByName(JvmAbi.DEPRECATED_COMPANION_OBJECT_FIELD, false);
assertNotNull(deprecatedAccessor);
assertEquals("foo.TheClass." + defaultCompanionObjectName, deprecatedAccessor.getType().getCanonicalText());
assertTrue(deprecatedAccessor.hasModifierProperty(PsiModifier.PUBLIC));
assertTrue(deprecatedAccessor.hasModifierProperty(PsiModifier.STATIC));
assertTrue(deprecatedAccessor.hasModifierProperty(PsiModifier.FINAL));
assertTrue(deprecatedAccessor.isDeprecated());
PsiMethod[] methods = classObjectClass.findMethodsByName("getOut", false);
assertEquals("java.io.PrintStream", methods[0].getReturnType().getCanonicalText());
idea/tests/org/jetbrains/kotlin/idea/resolve/ReferenceResolveInJavaTestGenerated.java
-6
View File
@@ -77,12 +77,6 @@ public class ReferenceResolveInJavaTestGenerated extends AbstractReferenceResolv
doTest(fileName);
}
@TestMetadata("DeprecatedClassObjectField.java")
public void testDeprecatedClassObjectField() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/referenceInJava/DeprecatedClassObjectField.java");
doTest(fileName);
}
@TestMetadata("EnumEntry.java")
public void testEnumEntry() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/referenceInJava/EnumEntry.java");