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

Improve investigation info in PackageCodegenImpl

Browse Source 
Relates to #EA-218779
This commit is contained in:
Vladimir Dolzhenko
2020-01-08 15:16:37 +01:00
parent a63123b556
commit 3260e41111
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/PackageCodegenImpl.java
+11 -4
View File
@@ -16,6 +16,7 @@
package org.jetbrains.kotlin.codegen; package org.jetbrains.kotlin.codegen;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.progress.ProcessCanceledException; import com.intellij.openapi.progress.ProcessCanceledException;
import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.util.SmartList; import com.intellij.util.SmartList;
@@ -37,6 +38,7 @@ import org.jetbrains.kotlin.resolve.BindingContext;
import org.jetbrains.kotlin.resolve.checkers.ExpectedActualDeclarationChecker; import org.jetbrains.kotlin.resolve.checkers.ExpectedActualDeclarationChecker;
import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOriginKt; import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOriginKt;
import org.jetbrains.kotlin.resolve.lazy.descriptors.PackageDescriptorUtilKt; import org.jetbrains.kotlin.resolve.lazy.descriptors.PackageDescriptorUtilKt;
import org.jetbrains.kotlin.utils.KotlinExceptionWithAttachments;
import org.jetbrains.org.objectweb.asm.Type; import org.jetbrains.org.objectweb.asm.Type;
import java.util.ArrayList; import java.util.ArrayList;
@@ -44,6 +46,8 @@ import java.util.Collection;
import java.util.List; import java.util.List;
public class PackageCodegenImpl implements PackageCodegen { public class PackageCodegenImpl implements PackageCodegen {
private static final Logger LOG = Logger.getInstance(PackageCodegenImpl.class);
private final GenerationState state; private final GenerationState state;
private final Collection<KtFile> files; private final Collection<KtFile> files;
private final PackageFragmentDescriptor packageFragment; private final PackageFragmentDescriptor packageFragment;
@@ -147,10 +151,13 @@ public class PackageCodegenImpl implements PackageCodegen {
for (KtFile file : files) { for (KtFile file : files) {
PackageFragmentDescriptor fragment = PackageFragmentDescriptor fragment =
PackageDescriptorUtilKt.findPackageFragmentForFile(state.getModule(), file); PackageDescriptorUtilKt.findPackageFragmentForFile(state.getModule(), file);
assert fragment != null : "package fragment is null for " + file + "\n" + file.getText(); if (fragment == null) {
LOG.error(new KotlinExceptionWithAttachments(
assert expectedPackageFqName.equals(fragment.getFqName()) : "package fragment is not found for module:" + state.getModule() + " file:" + file)
"expected package fq name: " + expectedPackageFqName + ", actual: " + fragment.getFqName(); .withAttachment("file.kt", file.getText()));
} else if (!expectedPackageFqName.equals(fragment.getFqName())) {
LOG.error("expected package fq name: " + expectedPackageFqName + ", actual: " + fragment.getFqName());
}
if (!fragments.contains(fragment)) { if (!fragments.contains(fragment)) {
fragments.add(fragment); fragments.add(fragment);