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

Extract SpecialNames utility class

Browse Source
This commit is contained in:
Alexander Udalov
2013-10-25 20:51:45 +04:00
parent d6aa7c2d23
commit 69ed375ce1
15 changed files with 55 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaEnumClassObjectDescriptor.java
+1 -1
View File
@@ -28,7 +28,7 @@ import org.jetbrains.jet.lang.resolve.DescriptorFactory;
import java.util.Collection;
import java.util.Collections;
import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getClassObjectName;
import static org.jetbrains.jet.lang.resolve.name.SpecialNames.getClassObjectName;
public class JavaEnumClassObjectDescriptor extends MutableClassDescriptorLite {
private ConstructorDescriptor constructor;
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java
+2 -2
View File
@@ -50,8 +50,8 @@ import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import javax.inject.Inject;
import java.util.*;
import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getClassObjectName;
import static org.jetbrains.jet.lang.resolve.java.DescriptorSearchRule.INCLUDE_KOTLIN_SOURCES;
import static org.jetbrains.jet.lang.resolve.name.SpecialNames.getClassObjectName;
public final class JavaClassResolver {
@NotNull
@@ -401,7 +401,7 @@ public final class JavaClassResolver {
if (JvmAbi.CLASS_OBJECT_CLASS_NAME.equals(segment.asString())) {
assert !correctedSegments.isEmpty();
Name previous = correctedSegments.get(correctedSegments.size() - 1);
correctedSegments.add(DescriptorUtils.getClassObjectName(previous));
correctedSegments.add(getClassObjectName(previous));
}
else {
correctedSegments.add(segment);