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

Minor, delete unnecessary parameter from util method

Browse Source
This commit is contained in:
Alexander Udalov
2014-03-03 21:24:05 +04:00
parent eb5aba560e
commit 4c49c39f8d
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/inline/InlineCodegenUtil.java
+6 -1
View File
@@ -37,6 +37,7 @@ import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedSimpl
import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.resolve.BindingContextUtils; import org.jetbrains.jet.lang.resolve.BindingContextUtils;
import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.DescriptorUtils;
import org.jetbrains.jet.lang.resolve.java.JvmAbi;
import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; import org.jetbrains.jet.lang.resolve.java.PackageClassUtils;
import org.jetbrains.jet.lang.resolve.kotlin.DeserializedResolverUtils; import org.jetbrains.jet.lang.resolve.kotlin.DeserializedResolverUtils;
import org.jetbrains.jet.lang.resolve.kotlin.VirtualFileFinder; import org.jetbrains.jet.lang.resolve.kotlin.VirtualFileFinder;
@@ -125,7 +126,11 @@ public class InlineCodegenUtil {
return PackageClassUtils.getPackageClassFqName(getFqName(containerDescriptor).toSafe()); return PackageClassUtils.getPackageClassFqName(getFqName(containerDescriptor).toSafe());
} }
if (containerDescriptor instanceof ClassDescriptor) { if (containerDescriptor instanceof ClassDescriptor) {
return DeserializedResolverUtils.kotlinFqNameToJavaFqName(getFqName(containerDescriptor), isTrait(containerDescriptor)); FqName fqName = DeserializedResolverUtils.kotlinFqNameToJavaFqName(getFqName(containerDescriptor));
if (isTrait(containerDescriptor)) {
return fqName.parent().child(Name.identifier(fqName.shortName() + JvmAbi.TRAIT_IMPL_SUFFIX));
}
return fqName;
} }
return null; return null;
} }
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializedResolverUtils.java
+1 -9
View File
@@ -34,21 +34,13 @@ public class DeserializedResolverUtils {
private DeserializedResolverUtils() { private DeserializedResolverUtils() {
} }
public static FqName kotlinFqNameToJavaFqName(@NotNull FqNameUnsafe kotlinFqName) {
return kotlinFqNameToJavaFqName(kotlinFqName, false);
}
@NotNull @NotNull
public static FqName kotlinFqNameToJavaFqName(@NotNull FqNameUnsafe kotlinFqName, boolean addTraitImplSuffix) { public static FqName kotlinFqNameToJavaFqName(@NotNull FqNameUnsafe kotlinFqName) {
List<Name> segments = kotlinFqName.pathSegments(); List<Name> segments = kotlinFqName.pathSegments();
List<String> correctedSegments = new ArrayList<String>(segments.size()); List<String> correctedSegments = new ArrayList<String>(segments.size());
for (Name segment : segments) { for (Name segment : segments) {
correctedSegments.add(isClassObjectName(segment) ? JvmAbi.CLASS_OBJECT_CLASS_NAME : segment.getIdentifier()); correctedSegments.add(isClassObjectName(segment) ? JvmAbi.CLASS_OBJECT_CLASS_NAME : segment.getIdentifier());
} }
if (addTraitImplSuffix) {
int lastIndex = correctedSegments.size() - 1;
correctedSegments.set(lastIndex, correctedSegments.get(lastIndex) + JvmAbi.TRAIT_IMPL_SUFFIX);
}
return FqName.fromSegments(correctedSegments); return FqName.fromSegments(correctedSegments);
} }