From 21440886278cf36d9fa778c29d1b3d515d34c784 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 23 Jun 2014 10:16:12 +0400 Subject: [PATCH] Don't output full compiler FQ name on -printArgs --- compiler/cli/src/org/jetbrains/jet/cli/common/CLICompiler.java | 2 +- compiler/testData/cli/js/printArgumentsWithManyValue.out | 2 +- compiler/testData/cli/jvm/printArguments.out | 2 +- .../jet/plugin/compilerMessages/JetCompilerMessagingTest.java | 2 +- .../jet/plugin/compilerMessages/K2JSCompilerMessagingTest.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/compiler/cli/src/org/jetbrains/jet/cli/common/CLICompiler.java b/compiler/cli/src/org/jetbrains/jet/cli/common/CLICompiler.java index c1ed663dc05..65b5183f309 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/common/CLICompiler.java +++ b/compiler/cli/src/org/jetbrains/jet/cli/common/CLICompiler.java @@ -200,7 +200,7 @@ public abstract class CLICompiler { String argumentsAsString = StringUtil.join(argumentsAsList, " "); String printArgsMessage = messageRenderer.render(CompilerMessageSeverity.INFO, - "Invoking compiler " + getClass().getName() + + "Invoking " + getClass().getSimpleName() + " with arguments " + argumentsAsString + freeArgs, CompilerMessageLocation.NO_LOCATION); errStream.println(printArgsMessage); diff --git a/compiler/testData/cli/js/printArgumentsWithManyValue.out b/compiler/testData/cli/js/printArgumentsWithManyValue.out index d3a95af24a1..f200514cb24 100644 --- a/compiler/testData/cli/js/printArgumentsWithManyValue.out +++ b/compiler/testData/cli/js/printArgumentsWithManyValue.out @@ -1,3 +1,3 @@ -INFO: Invoking compiler org.jetbrains.jet.cli.js.K2JSCompiler with arguments -suppress warnings -printArgs -sourceFiles compiler/testData/cli/js/simple2js.kt,compiler/testData/cli/js/../warnings.kt +INFO: Invoking K2JSCompiler with arguments -suppress warnings -printArgs -sourceFiles compiler/testData/cli/js/simple2js.kt,compiler/testData/cli/js/../warnings.kt ERROR: Specify output file via -output COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/printArguments.out b/compiler/testData/cli/jvm/printArguments.out index cac7a47734a..94f0cb25018 100644 --- a/compiler/testData/cli/jvm/printArguments.out +++ b/compiler/testData/cli/jvm/printArguments.out @@ -1,3 +1,3 @@ -INFO: Invoking compiler org.jetbrains.jet.cli.jvm.K2JVMCompiler with arguments -printArgs -script compiler/testData/cli/jvm/hello.kts +INFO: Invoking K2JVMCompiler with arguments -printArgs -script compiler/testData/cli/jvm/hello.kts hello OK diff --git a/idea/tests/org/jetbrains/jet/plugin/compilerMessages/JetCompilerMessagingTest.java b/idea/tests/org/jetbrains/jet/plugin/compilerMessages/JetCompilerMessagingTest.java index c023b8c6daa..702f39bd54e 100644 --- a/idea/tests/org/jetbrains/jet/plugin/compilerMessages/JetCompilerMessagingTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/compilerMessages/JetCompilerMessagingTest.java @@ -81,7 +81,7 @@ public final class JetCompilerMessagingTest extends IDECompilerMessagingTest { @Override protected void checkHeader(@NotNull MessageChecker checker) { checker.expect(Message.info().textStartsWith("Using kotlinHome=")); - checker.expect(Message.info().textStartsWith("Invoking compiler")); + checker.expect(Message.info().textStartsWith("Invoking K2JVMCompiler")); checker.expect(Message.info().textStartsWith("Kotlin Compiler version")); checker.expect(Message.stats().textStartsWith("Using Kotlin home directory")); checker.expect(Message.stats().text("Configuring the compilation environment")); diff --git a/idea/tests/org/jetbrains/jet/plugin/compilerMessages/K2JSCompilerMessagingTest.java b/idea/tests/org/jetbrains/jet/plugin/compilerMessages/K2JSCompilerMessagingTest.java index 5b6d24d97df..5f1d0af97a8 100644 --- a/idea/tests/org/jetbrains/jet/plugin/compilerMessages/K2JSCompilerMessagingTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/compilerMessages/K2JSCompilerMessagingTest.java @@ -101,7 +101,7 @@ public final class K2JSCompilerMessagingTest extends IDECompilerMessagingTest { @Override protected void checkHeader(@NotNull MessageChecker checker) { checker.expect(info().textStartsWith("Using kotlinHome=")); - checker.expect(info().textStartsWith("Invoking compiler")); + checker.expect(info().textStartsWith("Invoking K2JSCompiler")); checker.expect(info().textStartsWith("Kotlin Compiler version")); checker.expect(stats().textMatchesRegexp("Compiling source files: .*/src/test.kt")); }