Remove obsolete code in KotlinBuilder, rename PackageClassUtils

This commit is contained in:
Alexander Udalov
2015-11-20 16:30:46 +03:00
parent 8594cfca46
commit caa6cdb3f7
16 changed files with 19 additions and 60 deletions
@@ -25,7 +25,7 @@ import com.intellij.util.containers.Stack;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.codegen.AbstractClassBuilder;
import org.jetbrains.kotlin.load.kotlin.PackageClassUtils;
import org.jetbrains.kotlin.load.kotlin.OldPackageFacadeClassUtils;
import org.jetbrains.kotlin.name.FqName;
import org.jetbrains.kotlin.psi.KtFile;
import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin;
@@ -81,7 +81,7 @@ public class StubClassBuilder extends AbstractClassBuilder {
if (origin instanceof KtFile) {
FqName packageName = ((KtFile) origin).getPackageFqName();
String packageClassName = PackageClassUtils.getPackageClassName(packageName);
String packageClassName = OldPackageFacadeClassUtils.getPackageClassName(packageName);
if (name.equals(packageClassName) || name.endsWith("/" + packageClassName)) {
isPackageClass = true;