Switch cli expression evaluation argument syntax to -expression/-e

#KT-35414 fixed

compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.kt

@@ -49,7 +49,11 @@ class K2JVMCompilerArguments : CommonCompilerArguments() {
     @Argument(value = "-no-reflect", description = "Don't automatically include Kotlin reflection into the classpath")
     var noReflect: Boolean by FreezableVar(false)
 
-    @Argument(value = "-Xexpression", description = "Evaluate the given string as a Kotlin script")
+    @Argument(
+        value = "-expression",
+        shortName = "-e",
+        description = "Evaluate the given string as a Kotlin script"
+    )
     var expression: String? by FreezableVar(null)
 
     @Argument(

compiler/cli/cli-runner/src/org/jetbrains/kotlin/runner/runners.kt

@@ -151,7 +151,8 @@ class ExpressionRunner(private val code: String) : RunnerWithCompiler() {
     override fun run(classpath: List<URL>, arguments: List<String>, compilerClasspath: List<URL>) {
         val compilerArgs = ArrayList<String>().apply {
             addClasspathArgIfNeeded(classpath)
-            add("-Xexpression=$code")
+            add("-expression")
+            add(code)
             addAll(arguments)
         }
         runCompiler(compilerClasspath, compilerArgs)

compiler/testData/cli/jvm/expression1.args

@@ -1,4 +1,5 @@
--Xexpression=val x = 2; System.err.println((args + listOf(2,1).map { (it * x).toString() }).joinToString())
+-expression
+val x = 2; System.err.println((args + listOf(2,1).map { (it * x).toString() }).joinToString())
 --
 a
 b

compiler/testData/cli/jvm/extraHelp.out

@@ -19,7 +19,6 @@ where advanced options include:
   -Xdump-declarations-to=<path> Path to JSON file to dump Java to Kotlin declaration mappings
   -Xdisable-standard-script  Disable standard kotlin script support
   -Xemit-jvm-type-annotations Emit JVM type annotations in bytecode
-  -Xexpression               Evaluate the given string as a Kotlin script
   -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
   -Xir-check-local-names     Check that names of local classes and anonymous objects are the same in the IR backend as in the old backend

compiler/testData/cli/jvm/help.out

@@ -2,6 +2,7 @@ Usage: kotlinc-jvm <options> <source files>
 where possible options include:
   -classpath (-cp) <path>    List of directories and JAR/ZIP archives to search for user class files
   -d <directory|jar>         Destination for generated class files
+  -expression (-e)           Evaluate the given string as a Kotlin script
   -include-runtime           Include Kotlin runtime into the resulting JAR
   -java-parameters           Generate metadata for Java 1.8 reflection on method parameters
   -jdk-home <path>           Include a custom JDK from the specified location into the classpath instead of the default JAVA_HOME

plugins/scripting/scripting-compiler/tests/org/jetbrains/kotlin/scripting/compiler/plugin/ScriptingWithCliCompilerTest.kt

@@ -50,7 +50,7 @@ class ScriptingWithCliCompilerTest {
     fun testExpression() {
         runWithK2JVMCompiler(
             arrayOf(
-                "-Xexpression",
+                "-expression",
                 "val x = 7; println(x * 6); for (arg in args) println(arg)",
                 "--",
                 "hi",
@@ -64,7 +64,7 @@ class ScriptingWithCliCompilerTest {
     fun testExpressionWithComma() {
         runWithK2JVMCompiler(
             arrayOf(
-                "-Xexpression",
+                "-expression",
                 "listOf(1,2)"
             ),
             listOf("\\[1, 2\\]")