From 4154e97aa3c1981a22ffc54f2b42c710111f1dd3 Mon Sep 17 00:00:00 2001
From: Alexey Tsvetkov <alexey.tsvetkov@jetbrains.com>
Date: Mon, 18 Feb 2019 14:58:32 +0300
Subject: [PATCH] Fixes after code review

---
 .../kotlin/cli/common/arguments/K2JVMCompilerArguments.kt     | 2 +-
 .../cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt     | 4 ++--
 compiler/testData/cli/jvm/extraHelp.out                       | 2 ++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.kt b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.kt
index 3a07369effd..82009dbf64b 100644
--- a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.kt
+++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.kt
@@ -195,7 +195,7 @@ class K2JVMCompilerArguments : CommonCompilerArguments() {
     @Argument(
         value = "-Xjava-source-roots",
         valueDescription = "<path>",
-        description = "Paths to output directories for friend modules (whose internals should be visible)"
+        description = "Paths to directories with Java source files"
     )
     var javaSourceRoots: Array<String>? by FreezableVar(null)
 
diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt
index 77249547739..834951664e7 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt
@@ -77,11 +77,11 @@ class K2JVMCompiler : CLICompiler<K2JVMCompilerArguments>() {
             for (arg in arguments.freeArgs) {
                 val file = File(arg)
                 if (file.extension == JavaFileType.DEFAULT_EXTENSION) {
-                    configuration.addJavaSourceRoot(file)
+                    configuration.addJavaSourceRoot(file, arguments.javaPackagePrefix)
                 } else {
                     configuration.addKotlinSourceRoot(arg, isCommon = arg in commonSources)
                     if (file.isDirectory) {
-                        configuration.addJavaSourceRoot(file)
+                        configuration.addJavaSourceRoot(file, arguments.javaPackagePrefix)
                     }
                 }
             }
diff --git a/compiler/testData/cli/jvm/extraHelp.out b/compiler/testData/cli/jvm/extraHelp.out
index 922968e9636..e01f6fb4551 100644
--- a/compiler/testData/cli/jvm/extraHelp.out
+++ b/compiler/testData/cli/jvm/extraHelp.out
@@ -22,6 +22,8 @@ where advanced options include:
   -Xfriend-paths=<path>      Paths to output directories for friend modules (whose internals should be visible)
   -Xmultifile-parts-inherit  Compile multifile classes as a hierarchy of parts and facade
   -Xmodule-path=<path>       Paths where to find Java 9+ modules
+  -Xjava-package-prefix      Package prefix for Java files
+  -Xjava-source-roots=<path> Paths to directories with Java source files
   -Xjavac-arguments=<option[,]> Java compiler arguments
   -Xjsr305={ignore/strict/warn}|under-migration:{ignore/strict/warn}|@<fq.name>:{ignore/strict/warn}
                              Specify behavior for JSR-305 nullability annotations: