diff --git a/compiler/cli/src/org/jetbrains/jet/cli/js/K2JSCompiler.java b/compiler/cli/src/org/jetbrains/jet/cli/js/K2JSCompiler.java index 0cb89d81035..6898c93a8de 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/js/K2JSCompiler.java +++ b/compiler/cli/src/org/jetbrains/jet/cli/js/K2JSCompiler.java @@ -40,6 +40,7 @@ import org.jetbrains.k2js.analyze.AnalyzerFacadeForJS; import org.jetbrains.k2js.config.*; import org.jetbrains.k2js.facade.K2JSTranslator; import org.jetbrains.k2js.facade.MainCallParameters; +import org.jetbrains.k2js.utils.JetFileUtils; import java.io.File; import java.util.Arrays; @@ -104,11 +105,17 @@ public class K2JSCompiler extends CLICompiler fileNames = Iterables.transform(environmentForJS.getSourceFiles(), new Function() { + List files = environmentForJS.getSourceFiles(); + Iterable fileNames = Iterables.transform(files, new Function() { @Override public String apply(@Nullable JetFile file) { assert file != null; - return file.getName(); + String packageName = file.getPackageName(); + if (packageName != null && packageName.length() > 0) { + return packageName + "." + file.getName(); + } else { + return file.getName(); + } } }); messageCollector.report(CompilerMessageSeverity.LOGGING, "Compiling source files: " + Joiner.on(", ").join(fileNames),