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

Replace object$ -> OBJECT$, instance$ -> INSTANCE$ in the project

Browse Source
This commit is contained in:
Alexander Udalov
2014-07-26 00:21:05 +04:00
parent 549a38ca6f
commit de0f751207
110 changed files with 183 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/checker/duplicateJvmSignature/fields/classObjectCopiedFieldObject.kt
+2 -2
View File
@@ -1,7 +1,7 @@
class C {
<error>class object</error> {
<error>val `object$`</error> = this
<error>val `OBJECT$`</error> = this
}
val `object$` = C
val `OBJECT$` = C
}
idea/testData/completion/injava/ClassObject.java
+1 -1
View File
@@ -1,6 +1,6 @@
public class Testing {
public static void test() {
mockLib.foo.LibClass.object$.<caret>
mockLib.foo.LibClass.OBJECT$.<caret>
}
}
idea/testData/completion/injava/NestedObjectInstance.java
+1 -1
View File
@@ -4,4 +4,4 @@ public class Testing {
}
}
// EXIST: instance$
// EXIST: INSTANCE$
idea/testData/completion/injava/ObjectInstance.java
+1 -1
View File
@@ -4,4 +4,4 @@ public class Testing {
}
}
// EXIST: instance$
// EXIST: INSTANCE$
idea/testData/findUsages/kotlin/findObjectUsages/javaObjectUsages.1.java
+1 -1
View File
@@ -4,6 +4,6 @@ import server.O
class Client {
fun fooBar() {
println("foo = " + O.instance$.getFoo())
println("foo = " + O.INSTANCE$.getFoo())
}
}
idea/testData/findUsages/kotlin/findObjectUsages/javaObjectUsages.results.txt
+1 -1
View File
@@ -1,2 +1,2 @@
Class static member access (7: 28) println("foo = " + O.instance$.getFoo())
Class static member access (7: 28) println("foo = " + O.INSTANCE$.getFoo())
Usage in import (3: 15) import server.O
idea/testData/findUsages/kotlin/findPropertyUsages/javaClassObjectPropertyUsages.1.java
+2 -2
View File
@@ -4,9 +4,9 @@ import server.*
class Client {
fun fooBar() {
A.object$.setFoo("a");
A.OBJECT$.setFoo("a");
A.foo = "a";
println("a.foo = " + A.object$.getFoo());
println("a.foo = " + A.OBJECT$.getFoo());
println("a.foo = " + A.foo);
}
}
idea/testData/findUsages/kotlin/findPropertyUsages/javaClassObjectPropertyUsages.results.txt
+2 -2
View File
@@ -1,4 +1,4 @@
Unclassified usage (10: 32) println("a.foo = " + A.foo);
Unclassified usage (7: 19) A.object$.setFoo("a");
Unclassified usage (7: 19) A.OBJECT$.setFoo("a");
Unclassified usage (8: 11) A.foo = "a";
Unclassified usage (9: 40) println("a.foo = " + A.object$.getFoo());
Unclassified usage (9: 40) println("a.foo = " + A.OBJECT$.getFoo());
idea/testData/kotlinAndJavaChecker/ClassObjects.java
+8 -8
View File
@@ -1,12 +1,12 @@
class ClassObject {
void foo() {
WithClassObject.object$.getValue();
WithClassObject.object$.getValue();
WithClassObject.object$.foo();
WithClassObject.object$.getValueWithGetter();
WithClassObject.object$.getVariable();
WithClassObject.object$.setVariable(0);
WithClassObject.object$.getVariableWithAccessors();
WithClassObject.object$.setVariableWithAccessors(0);
WithClassObject.OBJECT$.getValue();
WithClassObject.OBJECT$.getValue();
WithClassObject.OBJECT$.foo();
WithClassObject.OBJECT$.getValueWithGetter();
WithClassObject.OBJECT$.getVariable();
WithClassObject.OBJECT$.setVariable(0);
WithClassObject.OBJECT$.getVariableWithAccessors();
WithClassObject.OBJECT$.setVariableWithAccessors(0);
}
}
idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/a/noImports.java
+1 -1
View File
@@ -4,6 +4,6 @@ import b.Test;
class J {
void bar() {
Test t = Test.instance$;
Test t = Test.INSTANCE$;
}
}
idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/b/noImports.java
+1 -1
View File
@@ -2,6 +2,6 @@ package b;
class J {
void bar() {
Test t = Test.instance$;
Test t = Test.INSTANCE$;
}
}
idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/b/onDemandImport.java
+1 -1
View File
@@ -2,6 +2,6 @@ package b;
class J {
void bar() {
Test t = Test.instance$;
Test t = Test.INSTANCE$;
}
}
idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/b/specificImports.java
+1 -1
View File
@@ -2,6 +2,6 @@ package b;
class J {
void bar() {
Test t = Test.instance$;
Test t = Test.INSTANCE$;
}
}
idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/c/noImports.java
+1 -1
View File
@@ -4,6 +4,6 @@ import b.Test;
class J {
void bar() {
Test t = Test.instance$;
Test t = Test.INSTANCE$;
}
}
idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/c/onDemandImport.java
+1 -1
View File
@@ -4,6 +4,6 @@ import b.Test;
class J {
void bar() {
Test t = Test.instance$;
Test t = Test.INSTANCE$;
}
}
idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/c/specificImports.java
+1 -1
View File
@@ -4,6 +4,6 @@ import b.Test;
class J {
void bar() {
Test t = Test.instance$;
Test t = Test.INSTANCE$;
}
}
idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/a/noImports.java
+1 -1
View File
@@ -2,6 +2,6 @@ package a;
class J {
void bar() {
Test t = Test.instance$;
Test t = Test.INSTANCE$;
}
}
idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/b/noImports.java
+1 -1
View File
@@ -2,6 +2,6 @@ package b;
class J {
void bar() {
a.Test t = a.Test.instance$;
a.Test t = a.Test.INSTANCE$;
}
}
idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/b/onDemandImport.java
+1 -1
View File
@@ -4,6 +4,6 @@ import a.*;
class J {
void bar() {
Test t = Test.instance$;
Test t = Test.INSTANCE$;
}
}
idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/b/specificImports.java
+1 -1
View File
@@ -4,6 +4,6 @@ import a.Test;
class J {
void bar() {
Test t = Test.instance$;
Test t = Test.INSTANCE$;
}
}
idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/c/noImports.java
+1 -1
View File
@@ -2,6 +2,6 @@ package c;
class J {
void bar() {
a.Test t = a.Test.instance$;
a.Test t = a.Test.INSTANCE$;
}
}
idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/c/onDemandImport.java
+1 -1
View File
@@ -4,6 +4,6 @@ import a.*;
class J {
void bar() {
Test t = Test.instance$;
Test t = Test.INSTANCE$;
}
}
idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/c/specificImports.java
+1 -1
View File
@@ -4,6 +4,6 @@ import a.Test;
class J {
void bar() {
Test t = Test.instance$;
Test t = Test.INSTANCE$;
}
}
idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/a/noImports.java
+1 -1
View File
@@ -4,6 +4,6 @@ import b.Test;
class J {
void bar() {
Test t = Test.instance$;
Test t = Test.INSTANCE$;
}
}
idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/b/noImports.java
+1 -1
View File
@@ -2,6 +2,6 @@ package b;
class J {
void bar() {
Test t = Test.instance$;
Test t = Test.INSTANCE$;
}
}
idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/b/onDemandImport.java
+1 -1
View File
@@ -2,6 +2,6 @@ package b;
class J {
void bar() {
Test t = Test.instance$;
Test t = Test.INSTANCE$;
}
}
idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/b/specificImports.java
+1 -1
View File
@@ -2,6 +2,6 @@ package b;
class J {
void bar() {
Test t = Test.instance$;
Test t = Test.INSTANCE$;
}
}
idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/c/noImports.java
+1 -1
View File
@@ -4,6 +4,6 @@ import b.Test;
class J {
void bar() {
Test t = Test.instance$;
Test t = Test.INSTANCE$;
}
}
idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/c/onDemandImport.java
+1 -1
View File
@@ -4,6 +4,6 @@ import b.Test;
class J {
void bar() {
Test t = Test.instance$;
Test t = Test.INSTANCE$;
}
}
idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/c/specificImports.java
+1 -1
View File
@@ -4,6 +4,6 @@ import b.Test;
class J {
void bar() {
Test t = Test.instance$;
Test t = Test.INSTANCE$;
}
}
idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/before/a/noImports.java
+1 -1
View File
@@ -2,6 +2,6 @@ package a;
class J {
void bar() {
Test t = Test.instance$;
Test t = Test.INSTANCE$;
}
}
idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/before/b/noImports.java
+1 -1
View File
@@ -2,6 +2,6 @@ package b;
class J {
void bar() {
a.Test t = a.Test.instance$;
a.Test t = a.Test.INSTANCE$;
}
}
idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/before/b/onDemandImport.java
+1 -1
View File
@@ -4,6 +4,6 @@ import a.*;
class J {
void bar() {
Test t = Test.instance$;
Test t = Test.INSTANCE$;
}
}
idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/before/b/specificImports.java
+1 -1
View File
@@ -4,6 +4,6 @@ import a.Test;
class J {
void bar() {
Test t = Test.instance$;
Test t = Test.INSTANCE$;
}
}
idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/before/c/noImports.java
+1 -1
View File
@@ -2,6 +2,6 @@ package c;
class J {
void bar() {
a.Test t = a.Test.instance$;
a.Test t = a.Test.INSTANCE$;
}
}
idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/before/c/onDemandImport.java
+1 -1
View File
@@ -4,6 +4,6 @@ import a.*;
class J {
void bar() {
Test t = Test.instance$;
Test t = Test.INSTANCE$;
}
}
idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/before/c/specificImports.java
+1 -1
View File
@@ -4,6 +4,6 @@ import a.Test;
class J {
void bar() {
Test t = Test.instance$;
Test t = Test.INSTANCE$;
}
}
idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackageWithConflicts/after/a/noImports.java
+1 -1
View File
@@ -2,6 +2,6 @@ package a;
class J {
void bar() {
Test t = Test.instance$;
Test t = Test.INSTANCE$;
}
}
idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackageWithConflicts/before/a/noImports.java
+1 -1
View File
@@ -2,6 +2,6 @@ package a;
class J {
void bar() {
Test t = Test.instance$;
Test t = Test.INSTANCE$;
}
}