From b9209962cd40326ecb9948e19145b0badfe245dc Mon Sep 17 00:00:00 2001
From: Xin Wang <scaventz@outlook.com>
Date: Tue, 11 May 2021 16:30:49 +0800
Subject: [PATCH] CLI: Add documentation for -J argument in `kotlinc -help`

---
 .../cli/src/org/jetbrains/kotlin/cli/common/Usage.java | 10 ++++++++++
 compiler/testData/cli/js-dce/dceHelp.out               |  1 +
 compiler/testData/cli/js/jsHelp.out                    |  1 +
 compiler/testData/cli/jvm/help.out                     |  1 +
 4 files changed, 13 insertions(+)

diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/common/Usage.java b/compiler/cli/src/org/jetbrains/kotlin/cli/common/Usage.java
index 44d342ff682..910fba361fb 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/common/Usage.java
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/common/Usage.java
@@ -53,6 +53,7 @@ public class Usage {
             appendln(sb, "Advanced options are non-standard and may be changed or removed without any notice.");
         }
         else {
+            renderOptionJUsage(sb);
             renderArgfileUsage(sb);
         }
 
@@ -103,6 +104,15 @@ public class Usage {
         appendln(sb, argument.description().replace("\n", "\n" + StringsKt.repeat(" ", OPTION_NAME_PADDING_WIDTH)));
     }
 
+    private static void renderOptionJUsage(@NotNull StringBuilder sb) {
+        int descriptionStart = sb.length() + OPTION_NAME_PADDING_WIDTH;
+        sb.append("  -J<option>");
+        while (sb.length() < descriptionStart) {
+            sb.append(" ");
+        }
+        appendln(sb, "Pass an option directly to JVM");
+    }
+
     private static void renderArgfileUsage(@NotNull StringBuilder sb) {
         int descriptionStart = sb.length() + OPTION_NAME_PADDING_WIDTH;
         sb.append("  ");
diff --git a/compiler/testData/cli/js-dce/dceHelp.out b/compiler/testData/cli/js-dce/dceHelp.out
index a34d402886e..9bc34288231 100644
--- a/compiler/testData/cli/js-dce/dceHelp.out
+++ b/compiler/testData/cli/js-dce/dceHelp.out
@@ -10,5 +10,6 @@ where possible options include:
   -nowarn                    Generate no warnings
   -verbose                   Enable verbose logging output
   -version                   Display compiler version
+  -J<option>                 Pass an option directly to JVM
   @<argfile>                 Read compiler arguments and file paths from the given file
 OK
diff --git a/compiler/testData/cli/js/jsHelp.out b/compiler/testData/cli/js/jsHelp.out
index 1f880213b02..bd1d1172116 100644
--- a/compiler/testData/cli/js/jsHelp.out
+++ b/compiler/testData/cli/js/jsHelp.out
@@ -32,6 +32,7 @@ where possible options include:
   -nowarn                    Generate no warnings
   -verbose                   Enable verbose logging output
   -version                   Display compiler version
+  -J<option>                 Pass an option directly to JVM
   @<argfile>                 Read compiler arguments and file paths from the given file
 
 For details, see https://kotl.in/cli
diff --git a/compiler/testData/cli/jvm/help.out b/compiler/testData/cli/jvm/help.out
index 4c2500e86cb..a637d1cf697 100644
--- a/compiler/testData/cli/jvm/help.out
+++ b/compiler/testData/cli/jvm/help.out
@@ -30,6 +30,7 @@ where possible options include:
   -nowarn                    Generate no warnings
   -verbose                   Enable verbose logging output
   -version                   Display compiler version
+  -J<option>                 Pass an option directly to JVM
   @<argfile>                 Read compiler arguments and file paths from the given file
 
 For details, see https://kotl.in/cli