From 84c473d800bdcfbbbcec1d72a06db0d78c74d3f7 Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <nikolay.krasko@jetbrains.com>
Date: Mon, 20 Mar 2017 15:16:50 +0300
Subject: [PATCH] Speed up debugger tests by replacing base output preprocessor

Avoid calling InetAddress.getLocalHost() that can be very slow.
Exact connection or disconnection string isn't relevant for tests
anyway.
---
 idea/testData/debugger/tinyApp/outs/_kt.out   |   6 +-
 .../debugger/tinyApp/outs/abstractFunCall.out |   6 +-
 ...essToOverridenPropertyWithBackingField.out |   6 +-
 .../debugger/tinyApp/outs/accessors.out       |   6 +-
 .../tinyApp/outs/anonymousObjects.out         |   6 +-
 .../testData/debugger/tinyApp/outs/arrays.out |   6 +-
 .../debugger/tinyApp/outs/asIterableInFor.out |   6 +-
 .../debugger/tinyApp/outs/boxParam.out        |   6 +-
 .../debugger/tinyApp/outs/boxReturnValue.out  |   6 +-
 .../tinyApp/outs/breakpointInInlineFun.out    |   6 +-
 .../debugger/tinyApp/outs/callableBug.out     |   6 +-
 .../debugger/tinyApp/outs/catchVariable.out   |   6 +-
 .../tinyApp/outs/ceAnonymousObject.out        |   6 +-
 .../ceAnonymousObjectCapturedInClosure.out    |   6 +-
 .../outs/ceAnonymousObjectThisAsReceiver.out  |   6 +-
 .../debugger/tinyApp/outs/ceLambda.out        |   6 +-
 .../debugger/tinyApp/outs/ceLocalClass.out    |   6 +-
 .../tinyApp/outs/ceLocalClassMembers.out      |   6 +-
 .../outs/ceLocalClassWithSuperClass.out       |   6 +-
 .../debugger/tinyApp/outs/ceMembers.out       |   6 +-
 .../debugger/tinyApp/outs/ceObject.out        |   6 +-
 .../tinyApp/outs/ceSeveralLambdas.out         |   6 +-
 .../debugger/tinyApp/outs/ceSuperAccess.out   |   6 +-
 .../debugger/tinyApp/outs/checkNotNull.out    |   6 +-
 .../tinyApp/outs/classFromAnotherPackage.out  |   6 +-
 .../tinyApp/outs/classObjectFunFromClass.out  |   6 +-
 .../outs/classObjectFunFromTopLevel.out       |   6 +-
 .../debugger/tinyApp/outs/classObjectVal.out  |   6 +-
 .../debugger/tinyApp/outs/clearCache.out      |   6 +-
 .../debugger/tinyApp/outs/collections.out     |   6 +-
 .../debugger/tinyApp/outs/constructors.out    |   6 +-
 .../debugger/tinyApp/outs/continueLabel.out   |   6 +-
 .../debugger/tinyApp/outs/coroutine.out       |   6 +-
 .../outs/createExpressionCastToBuiltIn.out    |   6 +-
 .../tinyApp/outs/createExpressionSimple.out   |   6 +-
 .../outs/createExpressionWithArray.out        |   6 +-
 .../tinyApp/outs/crossinlineLiteral.out       |   6 +-
 .../tinyApp/outs/customLibClassName.out       |   6 +-
 .../tinyApp/outs/defaultAccessors.out         |   6 +-
 .../tinyApp/outs/delegatedPropertyInClass.out |   6 +-
 .../delegatedPropertyInClassWithToString.out  |   6 +-
 .../delegatedPropertyInClassWoRenderer.out    |   6 +-
 .../outs/delegatedPropertyInOtherFile.out     |   6 +-
 .../debugger/tinyApp/outs/dependentOnFile.out |   6 +-
 .../tinyApp/outs/destructuringParam.out       |   6 +-
 .../tinyApp/outs/doNotSkipClassloader.out     |   6 +-
 .../tinyApp/outs/doNotSkipConstructors.out    |   6 +-
 .../debugger/tinyApp/outs/doubles.out         |   6 +-
 idea/testData/debugger/tinyApp/outs/enums.out |   6 +-
 .../testData/debugger/tinyApp/outs/errors.out |   6 +-
 .../evBreakpointOnPropertyDeclaration.out     |   6 +-
 .../tinyApp/outs/evDelegatedProperty.out      |   6 +-
 .../tinyApp/outs/evDuplicateItems.out         |   6 +-
 .../debugger/tinyApp/outs/evFinalProperty.out |   6 +-
 .../tinyApp/outs/evFunctionDeclaration.out    |   6 +-
 .../debugger/tinyApp/outs/evLineRange.out     |   6 +-
 .../debugger/tinyApp/outs/evProperty.out      |   6 +-
 .../tinyApp/outs/evPropertyRefExpr.out        |   6 +-
 .../tinyApp/outs/evSkipAnonymousObject.out    |   6 +-
 .../debugger/tinyApp/outs/evSkipLambda.out    |   6 +-
 .../tinyApp/outs/evSkipLocalClass.out         |   6 +-
 .../debugger/tinyApp/outs/exceptions.out      |   6 +-
 .../testData/debugger/tinyApp/outs/extFun.out |   6 +-
 .../tinyApp/outs/extensionMemberFunction.out  |   6 +-
 .../outs/extensionMemberFunctionInObject.out  |   6 +-
 .../tinyApp/outs/extensionMemberProperty.out  |   6 +-
 .../tinyApp/outs/extractLocalVariables.out    |   6 +-
 .../debugger/tinyApp/outs/extractThis.out     |   6 +-
 .../tinyApp/outs/extractThisInTrait.out       |   6 +-
 .../tinyApp/outs/extractVariablesFromCall.out |   6 +-
 .../debugger/tinyApp/outs/fileWithError.out   |   6 +-
 .../debugger/tinyApp/outs/forLoop.out         |   6 +-
 .../tinyApp/outs/frameAnonymousObject.out     |   6 +-
 .../tinyApp/outs/frameClassObject.out         |   6 +-
 .../tinyApp/outs/frameClosingBracket.out      |   6 +-
 .../tinyApp/outs/frameExtFunExtFun.out        |   6 +-
 .../tinyApp/outs/frameExtensionFun.out        |   6 +-
 .../tinyApp/outs/frameInlineArgument.out      |   6 +-
 .../frameInlineArgumentInsideInlineFun.out    |   6 +-
 .../debugger/tinyApp/outs/frameInlineFun.out  |   6 +-
 .../frameInlineFunCallInsideInlineFun.out     |   6 +-
 .../debugger/tinyApp/outs/frameInnerClass.out |   6 +-
 .../tinyApp/outs/frameInnerLambda.out         |   6 +-
 .../debugger/tinyApp/outs/frameLambda.out     |   6 +-
 .../tinyApp/outs/frameLambdaNotUsed.out       |   6 +-
 .../tinyApp/outs/frameLocalVariable.out       |   6 +-
 .../debugger/tinyApp/outs/frameObject.out     |   6 +-
 .../debugger/tinyApp/outs/frameSharedVar.out  |   6 +-
 .../tinyApp/outs/frameSharedVarLocalVar.out   |   6 +-
 .../debugger/tinyApp/outs/frameSimple.out     |   6 +-
 .../debugger/tinyApp/outs/frameThis0.out      |   6 +-
 .../debugger/tinyApp/outs/frameThis0Ext.out   |   6 +-
 .../debugger/tinyApp/outs/frameThis0This0.out |   6 +-
 .../outs/funFromOuterClassInLamdba.out        |   6 +-
 .../tinyApp/outs/funFromSuperClass.out        |   6 +-
 .../debugger/tinyApp/outs/funLiteral.out      |   6 +-
 .../outs/functionCallStoredToVariable.out     |   6 +-
 .../tinyApp/outs/functionReference.out        |   6 +-
 .../tinyApp/outs/fwAbstractProperty.out       |   6 +-
 .../debugger/tinyApp/outs/fwBackingField.out  |   6 +-
 .../debugger/tinyApp/outs/fwInitializer.out   |   6 +-
 .../tinyApp/outs/fwPropertyInInterface.out    |   6 +-
 .../outs/genericCrossinlineArgument.out       |   6 +-
 .../tinyApp/outs/ifCapturedVariableKt9118.out |   6 +-
 .../debugger/tinyApp/outs/imports.out         |   6 +-
 .../tinyApp/outs/importsLambdaContext.out     |   6 +-
 .../outs/inapplicableFieldWatchpoints.out     |   6 +-
 .../debugger/tinyApp/outs/initializer.out     |   6 +-
 .../outs/inlineCallInForRangeExpression.out   |   6 +-
 .../debugger/tinyApp/outs/inlineDex.out       |   6 +-
 .../debugger/tinyApp/outs/inlineFunction.out  |   6 +-
 .../inlineFunctionBreakpointAnotherFile.out   |   6 +-
 .../outs/inlineFunctionBreakpointVariants.out |   6 +-
 .../tinyApp/outs/inlineFunctionSameLines.out  |   6 +-
 .../outs/inlineFunctionalExpression.out       |   6 +-
 .../tinyApp/outs/inlineInClassDex.out         |   6 +-
 .../debugger/tinyApp/outs/inlineInIfFalse.out |   6 +-
 .../tinyApp/outs/inlineInIfFalseDex.out       |   6 +-
 .../debugger/tinyApp/outs/inlineInIfTrue.out  |   6 +-
 .../tinyApp/outs/inlineInIfTrueDex.out        |   6 +-
 .../debugger/tinyApp/outs/inlineInObject.out  |   6 +-
 .../tinyApp/outs/inlineInObjectDex.out        |   6 +-
 .../outs/inlineInObjectSameFileDex.out        |   6 +-
 .../debugger/tinyApp/outs/inlineLambda.out    |   6 +-
 .../debugger/tinyApp/outs/inlineOnly.out      |   6 +-
 .../debugger/tinyApp/outs/innerClass.out      |   6 +-
 .../debugger/tinyApp/outs/insertInBlock.out   |   6 +-
 .../tinyApp/outs/isInsideInlineLambda.out     |   6 +-
 .../debugger/tinyApp/outs/javaFun.out         |   6 +-
 .../debugger/tinyApp/outs/jcBlock.out         |   6 +-
 .../debugger/tinyApp/outs/jcImports.out       |   6 +-
 .../debugger/tinyApp/outs/jcLocalVariable.out |   6 +-
 .../debugger/tinyApp/outs/jcMarkedObject.out  |   6 +-
 .../debugger/tinyApp/outs/jcProperty.out      |   6 +-
 .../debugger/tinyApp/outs/jcSimple.out        |   6 +-
 ...kt12206BasePropertyWithoutBackingField.out |   6 +-
 .../outs/kt5554OnlyIntsShouldBeCoerced.out    |   6 +-
 .../tinyApp/outs/kt7046localVarInInline.out   |   6 +-
 .../tinyApp/outs/lCallOnLabeledObj.out        |   6 +-
 .../debugger/tinyApp/outs/lIdentifier.out     |   6 +-
 .../debugger/tinyApp/outs/lSeveralLabels.out  |   6 +-
 .../debugger/tinyApp/outs/lSimple.out         |   6 +-
 .../debugger/tinyApp/outs/lambdaOnReturn.out  |   6 +-
 .../tinyApp/outs/lambdaOnSecondLine.out       |   6 +-
 .../debugger/tinyApp/outs/ldifferentTypes.out |   6 +-
 .../debugger/tinyApp/outs/localClass.out      |   6 +-
 .../debugger/tinyApp/outs/localFun.out        |   6 +-
 .../tinyApp/outs/localFunInLibrary.out        |   6 +-
 .../debugger/tinyApp/outs/localVariables.out  |   6 +-
 .../outs/manyFilesWithInlineCalls1Dex.out     |   6 +-
 .../outs/manyFilesWithInlineCalls2Dex.out     |   6 +-
 .../tinyApp/outs/memberFunFromClass.out       |   6 +-
 .../tinyApp/outs/memberFunFromTopLevel.out    |   6 +-
 .../tinyApp/outs/memberGetterFromClass.out    |   6 +-
 .../tinyApp/outs/memberGetterFromTopLevel.out |   6 +-
 .../tinyApp/outs/methodWithBreakpoint.out     |   6 +-
 .../outs/multilineExpressionAtBreakpoint.out  |   6 +-
 .../outs/multipleBreakpointsAtLine.out        |   6 +-
 .../tinyApp/outs/nestedInlineArguments.out    |   6 +-
 .../noParameterLambdaArgumentCallInInline.out |   6 +-
 .../noParameterLambdaArgumentCallInLambda.out |   6 +-
 idea/testData/debugger/tinyApp/outs/npe.out   |   6 +-
 .../debugger/tinyApp/outs/objectFun.out       |   6 +-
 .../debugger/tinyApp/outs/onClassHeader.out   |   6 +-
 .../debugger/tinyApp/outs/onGetter.out        |   6 +-
 .../debugger/tinyApp/outs/onObjectHeader.out  |   6 +-
 .../outs/oneLineFunctionalExpression.out      |   6 +-
 .../debugger/tinyApp/outs/oneLineLambda.out   |   6 +-
 .../debugger/tinyApp/outs/package.out         |   6 +-
 .../tinyApp/outs/parametersOfInlineFun.out    |   6 +-
 .../parametersOfInlineFunSeveralOnLine.out    |   6 +-
 .../debugger/tinyApp/outs/privateClass.out    |   6 +-
 .../debugger/tinyApp/outs/privateMember.out   |   6 +-
 .../tinyApp/outs/privateMembersPriority.out   |   6 +-
 ...ivatePropertyWithExplicitDefaultGetter.out |   6 +-
 .../tinyApp/outs/propertyReference.out        |   6 +-
 .../debugger/tinyApp/outs/protectedMember.out |   6 +-
 .../debugger/tinyApp/outs/rawTypeskt11831.out |   6 +-
 .../debugger/tinyApp/outs/reflectKClass.out   |   6 +-
 .../outs/remappedParameterInInline.out        |   6 +-
 .../debugger/tinyApp/outs/returnVoid.out      |   6 +-
 .../debugger/tinyApp/outs/samAdapter.out      |   6 +-
 .../tinyApp/outs/severalFunLiterals.out       |   6 +-
 .../outs/severalFunLiteralsInClass.out        |   6 +-
 .../severalInlineCallsFromOtherFileDex.out    |   6 +-
 .../severalInlineFunctionsInOneFileDex.out    |   6 +-
 .../testData/debugger/tinyApp/outs/simple.out |   6 +-
 .../outs/simpleConditionalBreakpoint.out      |   6 +-
 .../debugger/tinyApp/outs/skipClassloader.out |   6 +-
 .../tinyApp/outs/skipConstructors.out         |   6 +-
 .../tinyApp/outs/skipSimpleGetter.out         |   6 +-
 .../tinyApp/outs/skipSimpleGetterLocalVal.out |   6 +-
 .../skipSimpleGetterMethodWithProperty.out    |   6 +-
 .../outs/smartStepIntoComponentFunction.out   |   6 +-
 .../tinyApp/outs/smartStepIntoConstructor.out |   6 +-
 .../outs/smartStepIntoFunWithDefaultArgs.out  |   6 +-
 .../outs/smartStepIntoInlinedFunLiteral.out   |   6 +-
 ...artStepIntoInlinedFunctionalExpression.out |   6 +-
 .../outs/smartStepIntoInsideLambda.out        |   6 +-
 .../outs/smartStepIntoInterfaceFun.out        |   6 +-
 .../outs/smartStepIntoInterfaceImpl.out       |   6 +-
 .../outs/smartStepIntoStoredLambda.out        |   6 +-
 .../tinyApp/outs/smartStepIntoSubClass.out    |   6 +-
 .../outs/smartStepIntoWithDelegates.out       |   6 +-
 .../outs/smartStepIntoWithOverrides.out       |   6 +-
 .../debugger/tinyApp/outs/smartcasts.out      |   6 +-
 .../soInlineAnonymousFunctionArgument.out     |   6 +-
 .../soInlineAnonymousFunctionArgumentDex.out  |   6 +-
 .../soInlineCallInLastStatementInInline.out   |   6 +-
 ...soInlineCallInLastStatementInInlineDex.out |   6 +-
 ...nLastStatementInInlineFunctionArgument.out |   6 +-
 ...stStatementInInlineFunctionArgumentDex.out |   6 +-
 ...ineCallInLastStatementInInlineInInline.out |   6 +-
 ...ntOfInlineWithArgumentFromCalleeAndOwn.out |   6 +-
 .../debugger/tinyApp/outs/soInlineFunDex.out  |   6 +-
 .../tinyApp/outs/soInlineFunOnOneLineFor.out  |   6 +-
 .../outs/soInlineFunOnOneLineForDex.out       |   6 +-
 .../tinyApp/outs/soInlineFunWithFor.out       |   6 +-
 ...WithLastStatementMultilineArgumentCall.out |   6 +-
 ...unWithLastStatementOneLineArgumentCall.out |   6 +-
 .../outs/soInlineIfConditionLambdaFalse.out   |   6 +-
 .../outs/soInlineIfConditionLambdaTrue.out    |   6 +-
 .../tinyApp/outs/soInlineIterableFunDex.out   |   6 +-
 .../tinyApp/outs/soInlineLibFunDex.out        |   6 +-
 .../tinyApp/outs/soInlineOperatorIterator.out |   6 +-
 .../tinyApp/outs/soInlineWhileCondition.out   |   6 +-
 .../outs/soInlineWhileConditionDex.out        |   6 +-
 .../outs/soReifiedInlineIfConditionFalse.out  |   6 +-
 .../outs/soSimpleInlineIfCondition.out        |   6 +-
 .../testData/debugger/tinyApp/outs/stdlib.out |   6 +-
 .../debugger/tinyApp/outs/stdlibStep.out      |   6 +-
 .../tinyApp/outs/stepIntoFromInlineFun.out    |   6 +-
 .../tinyApp/outs/stepIntoInlineFun.out        |   6 +-
 .../tinyApp/outs/stepIntoMultiFileFacade.out  |   6 +-
 .../outs/stepIntoSpecificKotlinClasses.out    |   6 +-
 .../tinyApp/outs/stepIntoStdLibInlineFun.out  |   6 +-
 .../debugger/tinyApp/outs/stepIntoStdlib.out  |   6 +-
 .../outs/stepIntoStdlibFacadeClass.out        |   6 +-
 .../outs/stepIntoStdlibInlineFun2step.out     |   6 +-
 .../tinyApp/outs/stepOutInlineFunction.out    |   6 +-
 .../outs/stepOutInlineFunctionStdlib.out      |   6 +-
 .../outs/stepOutInlinedLambdaArgument.out     |   6 +-
 .../stepOutInlinedLambdaArgumentOneLine.out   |   6 +-
 .../stepOutSeveralInlineArgumentDeepest.out   |   6 +-
 .../outs/stepOutSeveralInlineFunctions.out    |   6 +-
 .../stepOutSeveralInlineFunctionsDeepest.out  |   6 +-
 .../tinyApp/outs/stepOverCatchClause.out      |   6 +-
 .../outs/stepOverDeclarationInInlineFun.out   |   6 +-
 .../stepOverFalseConditionInLastIfInWhile.out |   6 +-
 .../tinyApp/outs/stepOverForWithInline.out    |   6 +-
 .../tinyApp/outs/stepOverIfWithInline.out     |   6 +-
 .../stepOverInlineFunWithRecursionCall.out    |   6 +-
 .../outs/stepOverInlineFunctionInReturn.out   |   6 +-
 .../tinyApp/outs/stepOverInlinedLambda.out    |   6 +-
 .../outs/stepOverInlinedLambdaStdlib.out      |   6 +-
 .../tinyApp/outs/stepOverInsideInlineFun.out  |   6 +-
 .../outs/stepOverNonLocalReturnInLambda.out   |   6 +-
 .../tinyApp/outs/stepOverReifiedParam.out     |   6 +-
 .../tinyApp/outs/stepOverSimpleFun.out        |   6 +-
 .../outs/stepOverTryCatchWithInline.out       |   6 +-
 .../tinyApp/outs/stepOverWhenInReturn.out     |   6 +-
 .../tinyApp/outs/stepOverWhenWithInline.out   |   6 +-
 .../tinyApp/outs/stepOverWhileWithInline.out  |   6 +-
 ...usFunctionInInlinedCallWithCrossInline.out |   6 +-
 ...unctionInInlinedCallWithCrossInlineDex.out |   6 +-
 .../outs/stopInCrossinlineInSuspend.out       |   6 +-
 .../outs/stopInExtensionInlineCall.out        |   6 +-
 .../tinyApp/outs/stopInInlineCallInField.out  |   6 +-
 ...allInFieldInClassWithNonDefaultPrimary.out |   6 +-
 .../stopInInlineCallInFieldInDelegate.out     |   6 +-
 .../stopInInlineCallInFieldInLocalClass.out   |   6 +-
 .../outs/stopInInlineCallLocalFunLambda.out   |   6 +-
 .../tinyApp/outs/stopInInlineFunDex.out       |   6 +-
 .../outs/stopInInlineInOtherFileDex.out       |   6 +-
 ...InlineInOtherFileWithLambdaArgumentDex.out |   6 +-
 .../outs/stopInInlineUnderOtherCall.out       |   6 +-
 .../outs/stopInInlineUnderSamConversion.out   |   6 +-
 .../outs/stopInInlinedInSpecialNamedFun.out   |   6 +-
 .../stopInInlinedInSpecialNamedFunWithGet.out |   6 +-
 ...nctionWithSuspendPointsInObjectLiteral.out |   6 +-
 ...pInLabdaOfCrossinlineCalledInAnonymous.out |   6 +-
 ...opInLambdaInInlinedCallWithCrossInline.out |   6 +-
 ...nLambdaInInlinedCallWithCrossInlineDex.out |   6 +-
 .../outs/stopInLambdaInlineCallLambda.out     |   6 +-
 .../stopInLocalFunInSecondaryConstructor.out  |   6 +-
 .../outs/stopInLocalFunInlineCallLambda.out   |   6 +-
 .../outs/stopInNamelessFunInInlineCall.out    |   6 +-
 ...onInlinedLambdaInInlineCallWithClosure.out |   6 +-
 ...nlinedLambdaInInlineCallWithoutClosure.out |   6 +-
 ...opInObjectLiteralInInlineCallNoClosure.out |   6 +-
 ...InObjectLiteralInInlineCallWithClosure.out |   6 +-
 ...eralInInlineCallWithClosureInAnonymous.out |   6 +-
 ...stopInSuspendFunctionWithSuspendPoints.out |   6 +-
 ...tionWithSuspendPointsInAnonymousObject.out |   6 +-
 ...InObjectLiteralInInlineCallWithClosure.out |   6 +-
 ...pInSuspendFunctionWithoutSuspendPoints.out |   6 +-
 ...neCallInLocalFunInSecondaryConstructor.out |   6 +-
 .../tinyApp/outs/syntheticMethods.out         |   6 +-
 .../tinyApp/outs/syntheticMethodsSkip.out     |   6 +-
 .../tinyApp/outs/syntheticProvider.out        |   6 +-
 .../tinyApp/outs/toStringRenderer.out         |   6 +-
 .../tinyApp/outs/topLevelFunFromClass.out     |   6 +-
 .../tinyApp/outs/topLevelFunFromTopLevel.out  |   6 +-
 .../tinyApp/outs/topLevelGetterFromClass.out  |   6 +-
 .../outs/topLevelGetterFromTopLevel.out       |   6 +-
 .../testData/debugger/tinyApp/outs/traits.out |   6 +-
 .../tinyApp/outs/twoLambdasOnOneLineFirst.out |   6 +-
 .../outs/twoLambdasOnOneLineSecond.out        |   6 +-
 .../tinyApp/outs/typeParameterRef.out         |   6 +-
 .../debugger/tinyApp/outs/unboxParam.out      |   6 +-
 .../debugger/tinyApp/outs/underscoreNames.out |   6 +-
 .../debugger/tinyApp/outs/unsafeCall.out      |   6 +-
 idea/testData/debugger/tinyApp/outs/vars.out  |   6 +-
 .../debugger/tinyApp/outs/whenEntry.out       |   6 +-
 .../debugger/tinyApp/outs/whenExpr.out        |   6 +-
 .../tinyApp/outs/withoutBodyFunctions.out     |   6 +-
 .../tinyApp/outs/withoutBodyProperties.out    |   6 +-
 .../tinyApp/outs/withoutBodyProperties2.out   |   6 +-
 .../outs/withoutBodyTypeParameters.out        |   6 +-
 .../idea/debugger/KotlinDebuggerTestCase.java |  21 ---
 .../idea/debugger/KotlinOutputChecker.kt      | 125 ++++++++++++++++++
 321 files changed, 1082 insertions(+), 978 deletions(-)
 create mode 100644 idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinOutputChecker.kt

diff --git a/idea/testData/debugger/tinyApp/outs/_kt.out b/idea/testData/debugger/tinyApp/outs/_kt.out
index 0e547b84ef1..029c85c8ffc 100644
--- a/idea/testData/debugger/tinyApp/outs/_kt.out
+++ b/idea/testData/debugger/tinyApp/outs/_kt.out
@@ -1,9 +1,9 @@
 LineBreakpoint created at .kt.kt:5
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! _ktKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 .kt.kt:5
 Compile bytecode for 1 + 1
 Compile bytecode for Test(1).a
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/abstractFunCall.out b/idea/testData/debugger/tinyApp/outs/abstractFunCall.out
index 6d074015bab..2acb081bb1e 100644
--- a/idea/testData/debugger/tinyApp/outs/abstractFunCall.out
+++ b/idea/testData/debugger/tinyApp/outs/abstractFunCall.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at abstractFunCall.kt:5
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! abstractFunCall.AbstractFunCallKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 abstractFunCall.kt:5
 Compile bytecode for (1 as java.lang.Number).intValue()
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/accessToOverridenPropertyWithBackingField.out b/idea/testData/debugger/tinyApp/outs/accessToOverridenPropertyWithBackingField.out
index 70ebad5928a..2c783517e78 100644
--- a/idea/testData/debugger/tinyApp/outs/accessToOverridenPropertyWithBackingField.out
+++ b/idea/testData/debugger/tinyApp/outs/accessToOverridenPropertyWithBackingField.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at accessToOverridenPropertyWithBackingField.kt:12
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! accessToOverridenPropertyWithBackingField.AccessToOverridenPropertyWithBackingFieldKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 accessToOverridenPropertyWithBackingField.kt:12
 Compile bytecode for d.prop
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/accessors.out b/idea/testData/debugger/tinyApp/outs/accessors.out
index a11612b8845..311824d0f4d 100644
--- a/idea/testData/debugger/tinyApp/outs/accessors.out
+++ b/idea/testData/debugger/tinyApp/outs/accessors.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at accessors.kt:10
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! accessors.AccessorsKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 accessors.kt:10
 accessors.kt:15
 accessors.kt:17
@@ -19,6 +19,6 @@ accessors.kt:26
 accessors.kt:15
 accessors.kt:13
 accessors.kt:5
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/anonymousObjects.out b/idea/testData/debugger/tinyApp/outs/anonymousObjects.out
index 92dfafa0176..ff6a7228696 100644
--- a/idea/testData/debugger/tinyApp/outs/anonymousObjects.out
+++ b/idea/testData/debugger/tinyApp/outs/anonymousObjects.out
@@ -1,9 +1,9 @@
 LineBreakpoint created at anonymousObjects.kt:11
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! anonymousObjects.AnonymousObjectsKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 anonymousObjects.kt:11
 Compile bytecode for test(2)
 Compile bytecode for i
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/arrays.out b/idea/testData/debugger/tinyApp/outs/arrays.out
index 8674c3c4857..642f427a1d6 100644
--- a/idea/testData/debugger/tinyApp/outs/arrays.out
+++ b/idea/testData/debugger/tinyApp/outs/arrays.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at arrays.kt:5
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! arrays.ArraysKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 arrays.kt:5
 Compile bytecode for arrayOf(1, 2).map { it.toString() }
 Compile bytecode for arrayOf(1, 2, 101, 102).filter { it > 100 }
@@ -11,6 +11,6 @@ Compile bytecode for arrayOf(1, 2).first()
 Compile bytecode for arrayOf(1, 2).last()
 Compile bytecode for intArrayOf(1, 2).max()
 Compile bytecode for arrayOf(1, 2).max()
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/asIterableInFor.out b/idea/testData/debugger/tinyApp/outs/asIterableInFor.out
index 4554c86e3d6..560cff92963 100644
--- a/idea/testData/debugger/tinyApp/outs/asIterableInFor.out
+++ b/idea/testData/debugger/tinyApp/outs/asIterableInFor.out
@@ -1,11 +1,11 @@
 LineBreakpoint created at asIterableInFor.kt:7
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! asIterableInFor.AsIterableInForKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 asIterableInFor.kt:7
 asIterableInFor.kt:8
 asIterableInFor.kt:9
 asIterableInFor.kt:8
 asIterableInFor.kt:9
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/boxParam.out b/idea/testData/debugger/tinyApp/outs/boxParam.out
index 23bae656647..5cbb8f0e4f1 100644
--- a/idea/testData/debugger/tinyApp/outs/boxParam.out
+++ b/idea/testData/debugger/tinyApp/outs/boxParam.out
@@ -1,9 +1,9 @@
 LineBreakpoint created at boxParam.kt:13
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! boxParam.BoxParamKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 boxParam.kt:13
 Compile bytecode for nullableInt?.plus(1)
 Compile bytecode for nullableByte?.plus(1)
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/boxReturnValue.out b/idea/testData/debugger/tinyApp/outs/boxReturnValue.out
index a004873fc48..1fd9798459f 100644
--- a/idea/testData/debugger/tinyApp/outs/boxReturnValue.out
+++ b/idea/testData/debugger/tinyApp/outs/boxReturnValue.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at boxReturnValue.kt:7
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! boxReturnValue.BoxReturnValueKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 boxReturnValue.kt:7
 Compile bytecode for x
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/breakpointInInlineFun.out b/idea/testData/debugger/tinyApp/outs/breakpointInInlineFun.out
index 5134c79cc1f..ac64e84f497 100644
--- a/idea/testData/debugger/tinyApp/outs/breakpointInInlineFun.out
+++ b/idea/testData/debugger/tinyApp/outs/breakpointInInlineFun.out
@@ -1,9 +1,9 @@
 LineBreakpoint created at inlineFunInLibrary.kt:4
 LineBreakpoint created at inlineFunInLibrary.kt:12
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! breakpointInInlineFun.BreakpointInInlineFunKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 inlineFunInLibrary.kt:4
 inlineFunInLibrary.kt:12
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/callableBug.out b/idea/testData/debugger/tinyApp/outs/callableBug.out
index 3d2cb0c21cd..22ee7536e1c 100644
--- a/idea/testData/debugger/tinyApp/outs/callableBug.out
+++ b/idea/testData/debugger/tinyApp/outs/callableBug.out
@@ -1,11 +1,11 @@
 LineBreakpoint created at callableBug.kt:8
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! callableBug.CallableBugKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 callableBug.kt:8
 callableBug.kt:8
 Compile bytecode for callable
 Compile bytecode for it
 callableBug.kt:8
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/catchVariable.out b/idea/testData/debugger/tinyApp/outs/catchVariable.out
index 23465273f2e..58f2929a62c 100644
--- a/idea/testData/debugger/tinyApp/outs/catchVariable.out
+++ b/idea/testData/debugger/tinyApp/outs/catchVariable.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at catchVariable.kt:9
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! catchVariable.CatchVariableKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 catchVariable.kt:9
 package catchVariable
 
@@ -18,6 +18,6 @@ fun main(args: Array<String>) {
 // PRINT_FRAME
  frame    = main:9, CatchVariableKt {catchVariable}
    local    = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = catchVariable.kt, 3)
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/ceAnonymousObject.out b/idea/testData/debugger/tinyApp/outs/ceAnonymousObject.out
index 6c6fc1f0ba0..a8c0f68a6d9 100644
--- a/idea/testData/debugger/tinyApp/outs/ceAnonymousObject.out
+++ b/idea/testData/debugger/tinyApp/outs/ceAnonymousObject.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at ceAnonymousObject.kt:18
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! ceAnonymousObject.CeAnonymousObjectKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 ceAnonymousObject.kt:18
 Compile bytecode for publicTopLevelObject
 Compile bytecode for privateTopLevelObject
@@ -8,6 +8,6 @@ Compile bytecode for publicObject
 Compile bytecode for protectedObject
 Compile bytecode for localObject
 Compile bytecode for localObject.test()
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/ceAnonymousObjectCapturedInClosure.out b/idea/testData/debugger/tinyApp/outs/ceAnonymousObjectCapturedInClosure.out
index 9b53beb9883..92306145e52 100644
--- a/idea/testData/debugger/tinyApp/outs/ceAnonymousObjectCapturedInClosure.out
+++ b/idea/testData/debugger/tinyApp/outs/ceAnonymousObjectCapturedInClosure.out
@@ -1,9 +1,9 @@
 LineBreakpoint created at ceAnonymousObjectCapturedInClosure.kt:7 lambdaOrdinal = -1
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! ceAnonymousObjectCapturedInClosure.CeAnonymousObjectCapturedInClosureKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 ceAnonymousObjectCapturedInClosure.kt:7
 Compile bytecode for lambda { localObject.test() }
 Compile bytecode for lambda { localObjectVar.test() }
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/ceAnonymousObjectThisAsReceiver.out b/idea/testData/debugger/tinyApp/outs/ceAnonymousObjectThisAsReceiver.out
index 690baa5007a..282ff8ee43b 100644
--- a/idea/testData/debugger/tinyApp/outs/ceAnonymousObjectThisAsReceiver.out
+++ b/idea/testData/debugger/tinyApp/outs/ceAnonymousObjectThisAsReceiver.out
@@ -1,9 +1,9 @@
 LineBreakpoint created at ceAnonymousObjectThisAsReceiver.kt:9
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! ceAnonymousObjectThisAsReceiver.CeAnonymousObjectThisAsReceiverKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 ceAnonymousObjectThisAsReceiver.kt:9
 Compile bytecode for test()
 Compile bytecode for this.test()
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/ceLambda.out b/idea/testData/debugger/tinyApp/outs/ceLambda.out
index 57e07f4f8ad..b89f4a7ad25 100644
--- a/idea/testData/debugger/tinyApp/outs/ceLambda.out
+++ b/idea/testData/debugger/tinyApp/outs/ceLambda.out
@@ -1,9 +1,9 @@
 LineBreakpoint created at ceLambda.kt:6
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! ceLambda.CeLambdaKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 ceLambda.kt:6
 Compile bytecode for foo { 1 }
 Compile bytecode for foo { a }
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/ceLocalClass.out b/idea/testData/debugger/tinyApp/outs/ceLocalClass.out
index 994718642ab..7e097ff71cc 100644
--- a/idea/testData/debugger/tinyApp/outs/ceLocalClass.out
+++ b/idea/testData/debugger/tinyApp/outs/ceLocalClass.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at ceLocalClass.kt:6
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! ceLocalClass.CeLocalClassKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 ceLocalClass.kt:6
 Compile bytecode for class MyClass {
     fun test() = 2
@@ -11,6 +11,6 @@ a.test()
 
 // RESULT: 2: I
 
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/ceLocalClassMembers.out b/idea/testData/debugger/tinyApp/outs/ceLocalClassMembers.out
index 9f01857eb72..b8309efe328 100644
--- a/idea/testData/debugger/tinyApp/outs/ceLocalClassMembers.out
+++ b/idea/testData/debugger/tinyApp/outs/ceLocalClassMembers.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at ceLocalClassMembers.kt:19
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! ceLocalClassMembers.CeLocalClassMembersKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 ceLocalClassMembers.kt:19
 Compile bytecode for class MyClass {
     fun test() = publicFun() + publicVal + protectedFun() + protectedVal + privateFun() + privateFun()
@@ -11,6 +11,6 @@ a.test()
 
 // RESULT: 6: I
 
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/ceLocalClassWithSuperClass.out b/idea/testData/debugger/tinyApp/outs/ceLocalClassWithSuperClass.out
index c75f3963948..f3f8f99d31d 100644
--- a/idea/testData/debugger/tinyApp/outs/ceLocalClassWithSuperClass.out
+++ b/idea/testData/debugger/tinyApp/outs/ceLocalClassWithSuperClass.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at ceLocalClassWithSuperClass.kt:19
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! ceLocalClassWithSuperClass.CeLocalClassWithSuperClassKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 ceLocalClassWithSuperClass.kt:19
 Compile bytecode for class MyClass: MySuperClass() {
     fun test() = publicFun()
@@ -11,6 +11,6 @@ a.test()
 
 // RESULT: 1: I
 
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/ceMembers.out b/idea/testData/debugger/tinyApp/outs/ceMembers.out
index c2c53e2b5e2..c427c444bcd 100644
--- a/idea/testData/debugger/tinyApp/outs/ceMembers.out
+++ b/idea/testData/debugger/tinyApp/outs/ceMembers.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at ceMembers.kt:19
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! ceMembers.CeMembersKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 ceMembers.kt:19
 Compile bytecode for foo { publicFun() }
 Compile bytecode for foo { publicVal }
@@ -8,6 +8,6 @@ Compile bytecode for foo { protectedFun() }
 Compile bytecode for foo { protectedVal }
 Compile bytecode for foo { privateFun() }
 Compile bytecode for foo { privateVal }
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/ceObject.out b/idea/testData/debugger/tinyApp/outs/ceObject.out
index 6d622e9b168..efcae5a0c01 100644
--- a/idea/testData/debugger/tinyApp/outs/ceObject.out
+++ b/idea/testData/debugger/tinyApp/outs/ceObject.out
@@ -1,10 +1,10 @@
 LineBreakpoint created at ceObject.kt:5
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! ceObject.CeObjectKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 ceObject.kt:5
 Compile bytecode for (object: T {}).test()
 Compile bytecode for (object: T { fun a() = 1 }).a()
 Compile bytecode for object: T {}
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/ceSeveralLambdas.out b/idea/testData/debugger/tinyApp/outs/ceSeveralLambdas.out
index 4c72811a6aa..b6f798c1cdb 100644
--- a/idea/testData/debugger/tinyApp/outs/ceSeveralLambdas.out
+++ b/idea/testData/debugger/tinyApp/outs/ceSeveralLambdas.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at ceSeveralLambdas.kt:5
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! ceSeveralLambdas.CeSeveralLambdasKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 ceSeveralLambdas.kt:5
 Compile bytecode for foo { 1 } + foo { 1 }
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/ceSuperAccess.out b/idea/testData/debugger/tinyApp/outs/ceSuperAccess.out
index 345b62e3bca..8fea69e855e 100644
--- a/idea/testData/debugger/tinyApp/outs/ceSuperAccess.out
+++ b/idea/testData/debugger/tinyApp/outs/ceSuperAccess.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at ceSuperAccess.kt:20
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! ceSuperAccess.CeSuperAccessKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 ceSuperAccess.kt:20
 Compile bytecode for foo { publicFun() }
 Compile bytecode for foo { publicVal }
@@ -8,6 +8,6 @@ Compile bytecode for foo { protectedFun() }
 Compile bytecode for foo { protectedVal }
 Compile bytecode for foo { privateFun() }
 Compile bytecode for foo { privateVal }
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/checkNotNull.out b/idea/testData/debugger/tinyApp/outs/checkNotNull.out
index 27274948201..6ad8b44b937 100644
--- a/idea/testData/debugger/tinyApp/outs/checkNotNull.out
+++ b/idea/testData/debugger/tinyApp/outs/checkNotNull.out
@@ -1,10 +1,10 @@
 LineBreakpoint created at checkNotNull.kt:8
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! checkNotNull.CheckNotNullKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 checkNotNull.kt:8
 MyJavaClass.java:13
 checkNotNull.kt:8
 checkNotNull.kt:9
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/classFromAnotherPackage.out b/idea/testData/debugger/tinyApp/outs/classFromAnotherPackage.out
index ccecb1e8881..07977b5c426 100644
--- a/idea/testData/debugger/tinyApp/outs/classFromAnotherPackage.out
+++ b/idea/testData/debugger/tinyApp/outs/classFromAnotherPackage.out
@@ -1,9 +1,9 @@
 LineBreakpoint created at classFromAnotherPackage.kt:7
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! classFromAnotherPackage.ClassFromAnotherPackageKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 classFromAnotherPackage.kt:7
 Compile bytecode for MyJavaClass()
 Compile bytecode for forTests.MyJavaClass()
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/classObjectFunFromClass.out b/idea/testData/debugger/tinyApp/outs/classObjectFunFromClass.out
index 7caaeeffd58..ed353d61d21 100644
--- a/idea/testData/debugger/tinyApp/outs/classObjectFunFromClass.out
+++ b/idea/testData/debugger/tinyApp/outs/classObjectFunFromClass.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at classObjectFunFromClass.kt:6
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! classObjectFunFromClass.ClassObjectFunFromClassKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 classObjectFunFromClass.kt:6
 classObjectFunFromClass.kt:11
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/classObjectFunFromTopLevel.out b/idea/testData/debugger/tinyApp/outs/classObjectFunFromTopLevel.out
index dab62e84c76..9645737830c 100644
--- a/idea/testData/debugger/tinyApp/outs/classObjectFunFromTopLevel.out
+++ b/idea/testData/debugger/tinyApp/outs/classObjectFunFromTopLevel.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at classObjectFunFromTopLevel.kt:13
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! classObjectFunFromTopLevel.ClassObjectFunFromTopLevelKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 classObjectFunFromTopLevel.kt:13
 classObjectFunFromTopLevel.kt:6
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/classObjectVal.out b/idea/testData/debugger/tinyApp/outs/classObjectVal.out
index 836d0b90a69..eb6bd0fd4dc 100644
--- a/idea/testData/debugger/tinyApp/outs/classObjectVal.out
+++ b/idea/testData/debugger/tinyApp/outs/classObjectVal.out
@@ -1,9 +1,9 @@
 LineBreakpoint created at classObjectVal.kt:10
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! classObjectVal.ClassObjectValKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 classObjectVal.kt:10
 Compile bytecode for coProp
 Compile bytecode for MyClass.coProp
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/clearCache.out b/idea/testData/debugger/tinyApp/outs/clearCache.out
index e02c9b66c3a..f84688b5e5f 100644
--- a/idea/testData/debugger/tinyApp/outs/clearCache.out
+++ b/idea/testData/debugger/tinyApp/outs/clearCache.out
@@ -15,8 +15,8 @@ LineBreakpoint created at clearCache.kt:149
 LineBreakpoint created at clearCache.kt:154
 LineBreakpoint created at clearCache.kt:161
 LineBreakpoint created at clearCache.kt:169
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! clearCache.ClearCacheKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 clearCache.kt:12
 Compile bytecode for a
 clearCache.kt:20
@@ -47,6 +47,6 @@ clearCache.kt:161
 Compile bytecode for o.test()
 clearCache.kt:169
 Compile bytecode for o.test()
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/collections.out b/idea/testData/debugger/tinyApp/outs/collections.out
index 5fd319054da..a1e4614fcbc 100644
--- a/idea/testData/debugger/tinyApp/outs/collections.out
+++ b/idea/testData/debugger/tinyApp/outs/collections.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at collections.kt:6
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! collections.CollectionsKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 collections.kt:6
 Compile bytecode for arrayListOf(1, 2).map { it.toString() }
 Compile bytecode for arrayListOf(1, 2, 101, 102).filter { it > 100 }
@@ -13,6 +13,6 @@ Compile bytecode for ar.map { if (it > 50) "big" else "small" }
   .size
 
 // RESULT: 2: I
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/constructors.out b/idea/testData/debugger/tinyApp/outs/constructors.out
index 0540efa158a..2e886698e64 100644
--- a/idea/testData/debugger/tinyApp/outs/constructors.out
+++ b/idea/testData/debugger/tinyApp/outs/constructors.out
@@ -7,8 +7,8 @@ LineBreakpoint created at constructors.kt:53
 LineBreakpoint created at constructors.kt:58
 LineBreakpoint created at constructors.kt:64
 LineBreakpoint created at constructors.kt:70
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! constructors.ConstructorsKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 constructors.kt:9
 Compile bytecode for p
 constructors.kt:13
@@ -27,6 +27,6 @@ constructors.kt:64
 Compile bytecode for 1 + 3
 constructors.kt:70
 Compile bytecode for i
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/continueLabel.out b/idea/testData/debugger/tinyApp/outs/continueLabel.out
index 455f8fc35a8..5f61c05af23 100644
--- a/idea/testData/debugger/tinyApp/outs/continueLabel.out
+++ b/idea/testData/debugger/tinyApp/outs/continueLabel.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at continueLabel.kt:5
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! continueLabel.ContinueLabelKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 continueLabel.kt:5
 continueLabel.kt:6
 continueLabel.kt:7
@@ -11,6 +11,6 @@ continueLabel.kt:7
 continueLabel.kt:10
 continueLabel.kt:5
 continueLabel.kt:12
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/coroutine.out b/idea/testData/debugger/tinyApp/outs/coroutine.out
index ac2063169c3..200a3ba8ac3 100644
--- a/idea/testData/debugger/tinyApp/outs/coroutine.out
+++ b/idea/testData/debugger/tinyApp/outs/coroutine.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at coroutine.kt:15
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! coroutine.CoroutineKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 coroutine.kt:15
 coroutine.kt:16
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/createExpressionCastToBuiltIn.out b/idea/testData/debugger/tinyApp/outs/createExpressionCastToBuiltIn.out
index 59cc16881a8..bded1f27e21 100644
--- a/idea/testData/debugger/tinyApp/outs/createExpressionCastToBuiltIn.out
+++ b/idea/testData/debugger/tinyApp/outs/createExpressionCastToBuiltIn.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at createExpressionCastToBuiltIn.kt:7
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! createExpressionCastToBuiltIn.CreateExpressionCastToBuiltInKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 createExpressionCastToBuiltIn.kt:7
 package createExpressionCastToBuiltIn
 
@@ -26,6 +26,6 @@ Compile bytecode for stringArray[0]
      element  = 0 (expression = primitiveArray[0])
    local    = stringArray (expression = stringArray)
      element  = 0 (expression = stringArray[0])
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/createExpressionSimple.out b/idea/testData/debugger/tinyApp/outs/createExpressionSimple.out
index a203bb1eea6..ca28d91f61e 100644
--- a/idea/testData/debugger/tinyApp/outs/createExpressionSimple.out
+++ b/idea/testData/debugger/tinyApp/outs/createExpressionSimple.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at createExpressionSimple.kt:15
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! createExpressionSimple.CreateExpressionSimpleKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 createExpressionSimple.kt:15
 package createExpressionSimple
 
@@ -29,6 +29,6 @@ fun main(args: Array<String>) {
      field    = baseI (expression = (myClass as MyClass).baseI)
    local    = myBase (expression = myBase)
      field    = baseI (expression = myBase.baseI)
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/createExpressionWithArray.out b/idea/testData/debugger/tinyApp/outs/createExpressionWithArray.out
index 5fd1999f290..48f921a30db 100644
--- a/idea/testData/debugger/tinyApp/outs/createExpressionWithArray.out
+++ b/idea/testData/debugger/tinyApp/outs/createExpressionWithArray.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at createExpressionWithArray.kt:11
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! createExpressionWithArray.CreateExpressionWithArrayKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 createExpressionWithArray.kt:11
 package createExpressionWithArray
 
@@ -35,6 +35,6 @@ Compile bytecode for (innerArray[0] as InnerClass).i2
      element  = 0 (expression = innerArray[0])
        field    = i (expression = (innerArray[0] as InnerClass).i)
        field    = i2 (expression = (innerArray[0] as InnerClass).i2)
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/crossinlineLiteral.out b/idea/testData/debugger/tinyApp/outs/crossinlineLiteral.out
index 13e678bf960..74e96ace397 100644
--- a/idea/testData/debugger/tinyApp/outs/crossinlineLiteral.out
+++ b/idea/testData/debugger/tinyApp/outs/crossinlineLiteral.out
@@ -20,8 +20,8 @@ LineBreakpoint created at crossinlineLiteral.kt:128
 LineBreakpoint created at crossinlineLiteral.kt:138
 LineBreakpoint created at crossinlineLiteral.kt:154
 LineBreakpoint created at crossinlineLiteral.kt:157
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! crossinlineLiteral.CrossinlineLiteralKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 crossinlineLiteral.kt:75
 crossinlineLiteral.kt:13
 crossinlineLiteral.kt:75
@@ -58,6 +58,6 @@ crossinlineLiteral.kt:109
 crossinlineLiteral.kt:67
 crossinlineLiteral.kt:154
 crossinlineLiteral.kt:157
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/customLibClassName.out b/idea/testData/debugger/tinyApp/outs/customLibClassName.out
index ef9d1ae2a23..64a6003bc65 100644
--- a/idea/testData/debugger/tinyApp/outs/customLibClassName.out
+++ b/idea/testData/debugger/tinyApp/outs/customLibClassName.out
@@ -3,8 +3,8 @@ LineBreakpoint created at a1.kt:6
 LineBreakpoint created at a1.kt:6
 LineBreakpoint created at a1.kt:6
 LineBreakpoint created at simpleLibFile.kt:4
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! customLibClassName.CustomLibClassNameKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 a1.kt:6
 Compile bytecode for 1 + 1
 a1.kt:6
@@ -15,6 +15,6 @@ a1.kt:6
 Compile bytecode for 1 + 4
 simpleLibFile.kt:4
 Compile bytecode for 1 + 5
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/defaultAccessors.out b/idea/testData/debugger/tinyApp/outs/defaultAccessors.out
index ee76fe930f1..e7492b4c9d8 100644
--- a/idea/testData/debugger/tinyApp/outs/defaultAccessors.out
+++ b/idea/testData/debugger/tinyApp/outs/defaultAccessors.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at defaultAccessors.kt:5
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! defaultAccessors.DefaultAccessorsKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 defaultAccessors.kt:5
 defaultAccessors.kt:11
 defaultAccessors.kt:17
@@ -17,6 +17,6 @@ defaultAccessors.kt:23
 simpleLibFile.kt:8
 defaultAccessors.kt:24
 defaultAccessors.kt:7
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/delegatedPropertyInClass.out b/idea/testData/debugger/tinyApp/outs/delegatedPropertyInClass.out
index 7f295f2091b..0b1caeafe50 100644
--- a/idea/testData/debugger/tinyApp/outs/delegatedPropertyInClass.out
+++ b/idea/testData/debugger/tinyApp/outs/delegatedPropertyInClass.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at delegatedPropertyInClass.kt:9
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! delegatedPropertyInClass.DelegatedPropertyInClassKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 delegatedPropertyInClass.kt:9
 package delegatedPropertyInClass
 
@@ -42,6 +42,6 @@ Compile bytecode for args.size
      field    = propEx: int = {java.lang.IllegalStateException@uniqueID}java.lang.IllegalStateException (sp = delegatedPropertyInClass.kt, 14)
        field    = detailMessage: java.lang.String = null (sp = Throwable.!EXT!)
        field    = cause: java.lang.Throwable = {java.lang.IllegalStateException@uniqueID}java.lang.IllegalStateException (sp = Throwable.!EXT!)
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/delegatedPropertyInClassWithToString.out b/idea/testData/debugger/tinyApp/outs/delegatedPropertyInClassWithToString.out
index 17450df2cbf..7eeef786495 100644
--- a/idea/testData/debugger/tinyApp/outs/delegatedPropertyInClassWithToString.out
+++ b/idea/testData/debugger/tinyApp/outs/delegatedPropertyInClassWithToString.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at delegatedPropertyInClassWithToString.kt:8
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! delegatedPropertyInClassWithToString.DelegatedPropertyInClassWithToStringKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 delegatedPropertyInClassWithToString.kt:8
 package delegatedPropertyInClassWithToString
 
@@ -31,6 +31,6 @@ Compile bytecode for args.size
      field    = prop$delegate: delegatedPropertyInClassWithToString.MyDelegate = {delegatedPropertyInClassWithToString.MyDelegate@uniqueID} (sp = delegatedPropertyInClassWithToString.kt, 12)
                 - Class has no fields
      field    = prop: int = 1 (sp = delegatedPropertyInClassWithToString.kt, 12)
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/delegatedPropertyInClassWoRenderer.out b/idea/testData/debugger/tinyApp/outs/delegatedPropertyInClassWoRenderer.out
index bd001381765..1618b1d0ee0 100644
--- a/idea/testData/debugger/tinyApp/outs/delegatedPropertyInClassWoRenderer.out
+++ b/idea/testData/debugger/tinyApp/outs/delegatedPropertyInClassWoRenderer.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at delegatedPropertyInClassWoRenderer.kt:9
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! delegatedPropertyInClassWoRenderer.DelegatedPropertyInClassWoRendererKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 delegatedPropertyInClassWoRenderer.kt:9
 package delegatedPropertyInClassWoRenderer
 
@@ -30,6 +30,6 @@ Compile bytecode for args.size
    local    = a: delegatedPropertyInClassWoRenderer.A = {delegatedPropertyInClassWoRenderer.A@uniqueID} (sp = delegatedPropertyInClassWoRenderer.kt, 7)
      field    = prop: int = {delegatedPropertyInClassWoRenderer.MyDelegate@uniqueID} (sp = delegatedPropertyInClassWoRenderer.kt, 13)
                 - Class has no fields
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/delegatedPropertyInOtherFile.out b/idea/testData/debugger/tinyApp/outs/delegatedPropertyInOtherFile.out
index d0e2494e02c..124bc04a986 100644
--- a/idea/testData/debugger/tinyApp/outs/delegatedPropertyInOtherFile.out
+++ b/idea/testData/debugger/tinyApp/outs/delegatedPropertyInOtherFile.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at delegatedPropertyInOtherFile.kt:9
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! delegatedPropertyInOtherFile.DelegatedPropertyInOtherFileKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 delegatedPropertyInOtherFile.kt:9
 Compile bytecode for t.a
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/dependentOnFile.out b/idea/testData/debugger/tinyApp/outs/dependentOnFile.out
index c0d2ae81cc6..a5166e348fc 100644
--- a/idea/testData/debugger/tinyApp/outs/dependentOnFile.out
+++ b/idea/testData/debugger/tinyApp/outs/dependentOnFile.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at dependentOnFile.kt:7
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! dependentOnFile.DependentOnFileKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 dependentOnFile.kt:7
 Compile bytecode for TestClass().testFun()
 Compile bytecode for testFun()
@@ -10,6 +10,6 @@ Compile bytecode for 1.testExtFun()
 Compile bytecode for testVal
 Compile bytecode for 1.testExtVal
 Compile bytecode for testDelVal
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/destructuringParam.out b/idea/testData/debugger/tinyApp/outs/destructuringParam.out
index 4cd711ee8b7..186f8fc2390 100644
--- a/idea/testData/debugger/tinyApp/outs/destructuringParam.out
+++ b/idea/testData/debugger/tinyApp/outs/destructuringParam.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at destructuringParam.kt:12 lambdaOrdinal = 1
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! destructuringParam.DestructuringParamKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 destructuringParam.kt:12
 Compile bytecode for x
 Compile bytecode for y
@@ -46,6 +46,6 @@ fun main(args: Array<String>) {
      field    = value: char[] = {char[1]@uniqueID} (sp = String.!EXT!)
        element  = 0 = 'K' 75
      field    = hash: int = 0 (sp = String.!EXT!)
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/doNotSkipClassloader.out b/idea/testData/debugger/tinyApp/outs/doNotSkipClassloader.out
index 582285abfcc..01dd0b47062 100644
--- a/idea/testData/debugger/tinyApp/outs/doNotSkipClassloader.out
+++ b/idea/testData/debugger/tinyApp/outs/doNotSkipClassloader.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at doNotSkipClassloader.kt:7
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! doNotSkipClassloader.DoNotSkipClassloaderKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 doNotSkipClassloader.kt:7
 ClassLoader.!EXT!
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/doNotSkipConstructors.out b/idea/testData/debugger/tinyApp/outs/doNotSkipConstructors.out
index 071c0516f0b..ba3c2acd517 100644
--- a/idea/testData/debugger/tinyApp/outs/doNotSkipConstructors.out
+++ b/idea/testData/debugger/tinyApp/outs/doNotSkipConstructors.out
@@ -1,10 +1,10 @@
 LineBreakpoint created at doNotSkipConstructors.kt:5
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! doNotSkipConstructors.DoNotSkipConstructorsKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 doNotSkipConstructors.kt:5
 doNotSkipConstructors.kt:9
 doNotSkipConstructors.kt:11
 doNotSkipConstructors.kt:5
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/doubles.out b/idea/testData/debugger/tinyApp/outs/doubles.out
index 5e365e66311..d195ed6b5ce 100644
--- a/idea/testData/debugger/tinyApp/outs/doubles.out
+++ b/idea/testData/debugger/tinyApp/outs/doubles.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at doubles.kt:7
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! doubles.DoublesKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 doubles.kt:7
 Compile bytecode for d1 + d2
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/enums.out b/idea/testData/debugger/tinyApp/outs/enums.out
index 4a817bb109b..e24b0f44f40 100644
--- a/idea/testData/debugger/tinyApp/outs/enums.out
+++ b/idea/testData/debugger/tinyApp/outs/enums.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at enums.kt:7
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! enums.EnumsKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 enums.kt:7
 Compile bytecode for A == MyEnum.A
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/errors.out b/idea/testData/debugger/tinyApp/outs/errors.out
index 517980448d2..92e3d25312c 100644
--- a/idea/testData/debugger/tinyApp/outs/errors.out
+++ b/idea/testData/debugger/tinyApp/outs/errors.out
@@ -1,12 +1,12 @@
 LineBreakpoint created at errors.kt:13
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! errors.ErrorsKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 errors.kt:13
 Compile bytecode for prop += 1
 prop2 +=2
 prop + prop2
 
 // RESULT: instance of kotlin.Triple(id=ID): Lkotlin/Triple;
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/evBreakpointOnPropertyDeclaration.out b/idea/testData/debugger/tinyApp/outs/evBreakpointOnPropertyDeclaration.out
index 63002fee89d..49d8e4d9f31 100644
--- a/idea/testData/debugger/tinyApp/outs/evBreakpointOnPropertyDeclaration.out
+++ b/idea/testData/debugger/tinyApp/outs/evBreakpointOnPropertyDeclaration.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at evBreakpointOnPropertyDeclaration.kt:14
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! evBreakpointOnPropertyDeclaration.EvBreakpointOnPropertyDeclarationKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 evBreakpointOnPropertyDeclaration.kt:14
 package evBreakpointOnPropertyDeclaration
 
@@ -30,6 +30,6 @@ Compile bytecode for a2.prop
    local    = a3: evBreakpointOnPropertyDeclaration.A = {evBreakpointOnPropertyDeclaration.A@uniqueID} (sp = evBreakpointOnPropertyDeclaration.kt, 10)
      field    = prop: int = 1 (sp = evBreakpointOnPropertyDeclaration.kt, 4)
    local    = p1: int = 1 (sp = evBreakpointOnPropertyDeclaration.kt, 12)
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/evDelegatedProperty.out b/idea/testData/debugger/tinyApp/outs/evDelegatedProperty.out
index fede6417a6e..a259911f281 100644
--- a/idea/testData/debugger/tinyApp/outs/evDelegatedProperty.out
+++ b/idea/testData/debugger/tinyApp/outs/evDelegatedProperty.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at evDelegatedProperty.kt:13
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! evDelegatedProperty.EvDelegatedPropertyKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 evDelegatedProperty.kt:13
 package evDelegatedProperty
 
@@ -25,6 +25,6 @@ fun main(args: Array<String>) {
        field    = value: java.lang.Object = {java.lang.Integer@uniqueID}1 (sp = Delegates.!EXT!)
          field    = value: int = 1 (sp = Integer.!EXT!)
      field    = prop: int = 1 (sp = evDelegatedProperty.kt, 6)
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/evDuplicateItems.out b/idea/testData/debugger/tinyApp/outs/evDuplicateItems.out
index e9e60aa4141..b134a0dda3b 100644
--- a/idea/testData/debugger/tinyApp/outs/evDuplicateItems.out
+++ b/idea/testData/debugger/tinyApp/outs/evDuplicateItems.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at evDuplicateItems.kt:10
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! evDuplicateItems.EvDuplicateItemsKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 evDuplicateItems.kt:10
 package evDuplicateItems
 
@@ -20,6 +20,6 @@ Compile bytecode for a.prop
    local    = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = evDuplicateItems.kt, 7)
    local    = a: evDuplicateItems.A = {evDuplicateItems.A@uniqueID} (sp = evDuplicateItems.kt, 8)
      field    = prop: int = 1 (sp = evDuplicateItems.kt, 4)
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/evFinalProperty.out b/idea/testData/debugger/tinyApp/outs/evFinalProperty.out
index 2ddc99c9c33..fdff4f47b61 100644
--- a/idea/testData/debugger/tinyApp/outs/evFinalProperty.out
+++ b/idea/testData/debugger/tinyApp/outs/evFinalProperty.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at evFinalProperty.kt:10
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! evFinalProperty.EvFinalPropertyKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 evFinalProperty.kt:10
 package evFinalProperty
 
@@ -19,6 +19,6 @@ fun main(args: Array<String>) {
    local    = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = evFinalProperty.kt, 7)
    local    = a: evFinalProperty.A = {evFinalProperty.A@uniqueID} (sp = evFinalProperty.kt, 8)
      field    = prop: int = 1 (sp = evFinalProperty.kt, 4)
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/evFunctionDeclaration.out b/idea/testData/debugger/tinyApp/outs/evFunctionDeclaration.out
index 5a42607e791..afe1f07084c 100644
--- a/idea/testData/debugger/tinyApp/outs/evFunctionDeclaration.out
+++ b/idea/testData/debugger/tinyApp/outs/evFunctionDeclaration.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at evFunctionDeclaration.kt:5
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! evFunctionDeclaration.EvFunctionDeclarationKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 evFunctionDeclaration.kt:5
 package evFunctionDeclaration
 
@@ -18,6 +18,6 @@ Compile bytecode for a
  frame    = foo:5, A {evFunctionDeclaration}
    this     = this = {evFunctionDeclaration.A@uniqueID}
      field    = a: int = 1 (sp = evFunctionDeclaration.kt, 3)
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/evLineRange.out b/idea/testData/debugger/tinyApp/outs/evLineRange.out
index 63c03ed32f0..ac685db3053 100644
--- a/idea/testData/debugger/tinyApp/outs/evLineRange.out
+++ b/idea/testData/debugger/tinyApp/outs/evLineRange.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at evLineRange.kt:15
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! evLineRange.EvLineRangeKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 evLineRange.kt:15
 package evLineRange
 
@@ -34,6 +34,6 @@ Compile bytecode for a2.prop
    local    = a3: evLineRange.A = {evLineRange.A@uniqueID} (sp = evLineRange.kt, 10)
      field    = prop: int = 1 (sp = evLineRange.kt, 4)
    local    = i1: int = 1 (sp = evLineRange.kt, 13)
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/evProperty.out b/idea/testData/debugger/tinyApp/outs/evProperty.out
index 1926ffba24b..de3192b313d 100644
--- a/idea/testData/debugger/tinyApp/outs/evProperty.out
+++ b/idea/testData/debugger/tinyApp/outs/evProperty.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at evProperty.kt:10
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! evProperty.EvPropertyKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 evProperty.kt:10
 package evProperty
 
@@ -22,6 +22,6 @@ Compile bytecode for a.prop
    local    = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = evProperty.kt, 7)
    local    = a: evProperty.A = {evProperty.A@uniqueID} (sp = evProperty.kt, 8)
      field    = prop: int = 1 (sp = evProperty.kt, 4)
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/evPropertyRefExpr.out b/idea/testData/debugger/tinyApp/outs/evPropertyRefExpr.out
index 1479aac0ba0..6a1ecde0610 100644
--- a/idea/testData/debugger/tinyApp/outs/evPropertyRefExpr.out
+++ b/idea/testData/debugger/tinyApp/outs/evPropertyRefExpr.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at evPropertyRefExpr.kt:8
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! evPropertyRefExpr.EvPropertyRefExprKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 evPropertyRefExpr.kt:8
 package evPropertyRefExpr
 
@@ -24,6 +24,6 @@ Compile bytecode for prop
  frame    = test:8, A {evPropertyRefExpr}
    this     = this = {evPropertyRefExpr.A@uniqueID}
      field    = prop: int = 1 (sp = evPropertyRefExpr.kt, 4)
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/evSkipAnonymousObject.out b/idea/testData/debugger/tinyApp/outs/evSkipAnonymousObject.out
index 84be6867f72..03252654425 100644
--- a/idea/testData/debugger/tinyApp/outs/evSkipAnonymousObject.out
+++ b/idea/testData/debugger/tinyApp/outs/evSkipAnonymousObject.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at evSkipAnonymousObject.kt:12
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! evSkipAnonymousObject.EvSkipAnonymousObjectKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 evSkipAnonymousObject.kt:12
 package evSkipAnonymousObject
 
@@ -35,6 +35,6 @@ Compile bytecode for a1.prop
      field    = prop: int = 1 (sp = evSkipAnonymousObject.kt, 4)
    local    = a2: evSkipAnonymousObject.A = {evSkipAnonymousObject.A@uniqueID} (sp = evSkipAnonymousObject.kt, 9)
      field    = prop: int = 1 (sp = evSkipAnonymousObject.kt, 4)
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/evSkipLambda.out b/idea/testData/debugger/tinyApp/outs/evSkipLambda.out
index cb853d76a3c..2db9bdc7cca 100644
--- a/idea/testData/debugger/tinyApp/outs/evSkipLambda.out
+++ b/idea/testData/debugger/tinyApp/outs/evSkipLambda.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at evSkipLambda.kt:12
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! evSkipLambda.EvSkipLambdaKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 evSkipLambda.kt:12
 package evSkipLambda
 
@@ -30,6 +30,6 @@ Compile bytecode for a1.prop
      field    = prop: int = 1 (sp = evSkipLambda.kt, 4)
    local    = a2: evSkipLambda.A = {evSkipLambda.A@uniqueID} (sp = evSkipLambda.kt, 9)
      field    = prop: int = 1 (sp = evSkipLambda.kt, 4)
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/evSkipLocalClass.out b/idea/testData/debugger/tinyApp/outs/evSkipLocalClass.out
index e1913c7a610..60c21d27af8 100644
--- a/idea/testData/debugger/tinyApp/outs/evSkipLocalClass.out
+++ b/idea/testData/debugger/tinyApp/outs/evSkipLocalClass.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at evSkipLocalClass.kt:12
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! evSkipLocalClass.EvSkipLocalClassKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 evSkipLocalClass.kt:12
 package evSkipLocalClass
 
@@ -31,6 +31,6 @@ Compile bytecode for a1.prop
      field    = prop: int = 1 (sp = evSkipLocalClass.kt, 4)
    local    = a2: evSkipLocalClass.A = {evSkipLocalClass.A@uniqueID} (sp = evSkipLocalClass.kt, 9)
      field    = prop: int = 1 (sp = evSkipLocalClass.kt, 4)
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/exceptions.out b/idea/testData/debugger/tinyApp/outs/exceptions.out
index f340823574b..fb99a563f3f 100644
--- a/idea/testData/debugger/tinyApp/outs/exceptions.out
+++ b/idea/testData/debugger/tinyApp/outs/exceptions.out
@@ -4,8 +4,8 @@ LineBreakpoint created at exceptions.kt:26
 LineBreakpoint created at exceptions.kt:31
 LineBreakpoint created at exceptions.kt:42
 LineBreakpoint created at exceptions.kt:51
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! exceptions.ExceptionsKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 exceptions.kt:9
 Compile bytecode for fail()
 exceptions.kt:14
@@ -15,6 +15,6 @@ exceptions.kt:31
 exceptions.kt:42
 Compile bytecode for c.get(0)
 exceptions.kt:51
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/extFun.out b/idea/testData/debugger/tinyApp/outs/extFun.out
index 57e0a11202e..35391c4c74e 100644
--- a/idea/testData/debugger/tinyApp/outs/extFun.out
+++ b/idea/testData/debugger/tinyApp/outs/extFun.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at extFun.kt:12
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! extFun.ExtFunKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 extFun.kt:12
 extFun.kt:6
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/extensionMemberFunction.out b/idea/testData/debugger/tinyApp/outs/extensionMemberFunction.out
index 6fc55073d04..45df8f3754c 100644
--- a/idea/testData/debugger/tinyApp/outs/extensionMemberFunction.out
+++ b/idea/testData/debugger/tinyApp/outs/extensionMemberFunction.out
@@ -14,8 +14,8 @@ LineBreakpoint created at extensionMemberFunction.kt:98
 LineBreakpoint created at extensionMemberFunction.kt:103
 LineBreakpoint created at extensionMemberFunction.kt:108
 LineBreakpoint created at extensionMemberFunction.kt:113
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! extensionMemberFunction.ExtensionMemberFunctionKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 extensionMemberFunction.kt:13
 Compile bytecode for extClass.testPublic()
 extensionMemberFunction.kt:19
@@ -48,6 +48,6 @@ extensionMemberFunction.kt:108
 Compile bytecode for testCompPrivate()
 extensionMemberFunction.kt:113
 Compile bytecode for this.testCompPrivate()
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/extensionMemberFunctionInObject.out b/idea/testData/debugger/tinyApp/outs/extensionMemberFunctionInObject.out
index c6152b6a508..06012d7652e 100644
--- a/idea/testData/debugger/tinyApp/outs/extensionMemberFunctionInObject.out
+++ b/idea/testData/debugger/tinyApp/outs/extensionMemberFunctionInObject.out
@@ -1,11 +1,11 @@
 LineBreakpoint created at extensionMemberFunctionInObject.kt:14
 LineBreakpoint created at extensionMemberFunctionInObject.kt:20
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! extensionMemberFunctionInObject.ExtensionMemberFunctionInObjectKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 extensionMemberFunctionInObject.kt:14
 Compile bytecode for "OK".baz()
 extensionMemberFunctionInObject.kt:20
 Compile bytecode for baz()
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/extensionMemberProperty.out b/idea/testData/debugger/tinyApp/outs/extensionMemberProperty.out
index 3cc8bbf4ab5..be7fb158286 100644
--- a/idea/testData/debugger/tinyApp/outs/extensionMemberProperty.out
+++ b/idea/testData/debugger/tinyApp/outs/extensionMemberProperty.out
@@ -14,8 +14,8 @@ LineBreakpoint created at extensionMemberProperty.kt:102
 LineBreakpoint created at extensionMemberProperty.kt:107
 LineBreakpoint created at extensionMemberProperty.kt:112
 LineBreakpoint created at extensionMemberProperty.kt:117
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! extensionMemberProperty.ExtensionMemberPropertyKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 extensionMemberProperty.kt:13
 Compile bytecode for extClass.testPublic
 extensionMemberProperty.kt:19
@@ -48,6 +48,6 @@ extensionMemberProperty.kt:112
 Compile bytecode for testCompPrivate
 extensionMemberProperty.kt:117
 Compile bytecode for this.testCompPrivate
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/extractLocalVariables.out b/idea/testData/debugger/tinyApp/outs/extractLocalVariables.out
index 993020af211..0f5fc708b1b 100644
--- a/idea/testData/debugger/tinyApp/outs/extractLocalVariables.out
+++ b/idea/testData/debugger/tinyApp/outs/extractLocalVariables.out
@@ -1,11 +1,11 @@
 LineBreakpoint created at extractLocalVariables.kt:7
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! extractLocalVariables.ExtractLocalVariablesKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 extractLocalVariables.kt:7
 Compile bytecode for a
 Compile bytecode for klass.f1(1)
 Compile bytecode for args.size
 Compile bytecode for klass.b
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/extractThis.out b/idea/testData/debugger/tinyApp/outs/extractThis.out
index d725df31162..dd1102ea3eb 100644
--- a/idea/testData/debugger/tinyApp/outs/extractThis.out
+++ b/idea/testData/debugger/tinyApp/outs/extractThis.out
@@ -1,10 +1,10 @@
 LineBreakpoint created at extractThis.kt:13
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! extractThis.ExtractThisKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 extractThis.kt:13
 Compile bytecode for prop
 Compile bytecode for this.prop
 Compile bytecode for prop + a
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/extractThisInTrait.out b/idea/testData/debugger/tinyApp/outs/extractThisInTrait.out
index fda7d39b5fa..f505c357d3f 100644
--- a/idea/testData/debugger/tinyApp/outs/extractThisInTrait.out
+++ b/idea/testData/debugger/tinyApp/outs/extractThisInTrait.out
@@ -1,9 +1,9 @@
 LineBreakpoint created at extractThisInTrait.kt:10
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! extractThisInTrait.ExtractThisInTraitKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 extractThisInTrait.kt:10
 Compile bytecode for prop
 Compile bytecode for this.prop
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/extractVariablesFromCall.out b/idea/testData/debugger/tinyApp/outs/extractVariablesFromCall.out
index b3b01b85e88..7f7dc8c9168 100644
--- a/idea/testData/debugger/tinyApp/outs/extractVariablesFromCall.out
+++ b/idea/testData/debugger/tinyApp/outs/extractVariablesFromCall.out
@@ -1,11 +1,11 @@
 LineBreakpoint created at extractVariablesFromCall.kt:8
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! extractVariablesFromCall.ExtractVariablesFromCallKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 extractVariablesFromCall.kt:8
 Compile bytecode for f1(a, s)
 Compile bytecode for a.f2(s)
 Compile bytecode for a f2 s
 Compile bytecode for klass.f1(a, s)
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/fileWithError.out b/idea/testData/debugger/tinyApp/outs/fileWithError.out
index eabb8503456..6719c130808 100644
--- a/idea/testData/debugger/tinyApp/outs/fileWithError.out
+++ b/idea/testData/debugger/tinyApp/outs/fileWithError.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at fileWithInternal.kt:5
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! fileWithError.FileWithErrorKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 fileWithInternal.kt:5
 Compile bytecode for 1
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/forLoop.out b/idea/testData/debugger/tinyApp/outs/forLoop.out
index 92166265f1a..7a2e4027f9a 100644
--- a/idea/testData/debugger/tinyApp/outs/forLoop.out
+++ b/idea/testData/debugger/tinyApp/outs/forLoop.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at forLoop.kt:6
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! forLoop.ForLoopKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 forLoop.kt:6
 forLoop.kt:7
 forLoop.kt:8
@@ -16,6 +16,6 @@ forLoop.kt:12
 forLoop.kt:13
 forLoop.kt:11
 forLoop.kt:15
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/frameAnonymousObject.out b/idea/testData/debugger/tinyApp/outs/frameAnonymousObject.out
index 760ef02a005..ae3f7148b33 100644
--- a/idea/testData/debugger/tinyApp/outs/frameAnonymousObject.out
+++ b/idea/testData/debugger/tinyApp/outs/frameAnonymousObject.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at frameAnonymousObject.kt:11
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! frameAnonymousObject.FrameAnonymousObjectKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 frameAnonymousObject.kt:11
 package frameAnonymousObject
 
@@ -31,6 +31,6 @@ fun foo(f: () -> Unit) {
        field    = obProp: int = 1 (sp = frameAnonymousObject.kt, 6)
        field    = $val1: int = 1 (sp = null)
      field    = arity: int = 0 (sp = Lambda.!EXT!)
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/frameClassObject.out b/idea/testData/debugger/tinyApp/outs/frameClassObject.out
index e07c6576734..d33db064ce7 100644
--- a/idea/testData/debugger/tinyApp/outs/frameClassObject.out
+++ b/idea/testData/debugger/tinyApp/outs/frameClassObject.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at frameClassObject.kt:16
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! frameClassObject.FrameClassObjectKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 frameClassObject.kt:16
 Compile bytecode for prop
 Compile bytecode for myFun()
@@ -38,6 +38,6 @@ fun foo(f: () -> Unit) {
  frame    = invoke:16, A$test$1 {frameClassObject}
    this     = this = {frameClassObject.A$test$1@uniqueID}Function0<kotlin.Unit>
      field    = arity: int = 0 (sp = Lambda.!EXT!)
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/frameClosingBracket.out b/idea/testData/debugger/tinyApp/outs/frameClosingBracket.out
index f9f363f72e6..bbe7a024820 100644
--- a/idea/testData/debugger/tinyApp/outs/frameClosingBracket.out
+++ b/idea/testData/debugger/tinyApp/outs/frameClosingBracket.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at frameClosingBracket.kt:6
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! frameClosingBracket.FrameClosingBracketKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 frameClosingBracket.kt:6
 Compile bytecode for a
 package frameClosingBracket
@@ -17,6 +17,6 @@ fun main(args: Array<String>) {
  frame    = main:6, FrameClosingBracketKt {frameClosingBracket}
    local    = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = frameClosingBracket.kt, 3)
    local    = a: int = 1 (sp = frameClosingBracket.kt, 4)
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/frameExtFunExtFun.out b/idea/testData/debugger/tinyApp/outs/frameExtFunExtFun.out
index 383951cf211..c391fc83f2e 100644
--- a/idea/testData/debugger/tinyApp/outs/frameExtFunExtFun.out
+++ b/idea/testData/debugger/tinyApp/outs/frameExtFunExtFun.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at frameExtFunExtFun.kt:24
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! frameExtFunExtFun.FrameExtFunExtFunKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 frameExtFunExtFun.kt:24
 Compile bytecode for valFoo
 Compile bytecode for valTest
@@ -96,6 +96,6 @@ fun lambda(f: () -> Unit) {
        field    = bProp: int = 1 (sp = frameExtFunExtFun.kt, 41)
      field    = $valTest: int = 1 (sp = null)
      field    = arity: int = 0 (sp = Lambda.!EXT!)
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/frameExtensionFun.out b/idea/testData/debugger/tinyApp/outs/frameExtensionFun.out
index 52d11d3218e..28485cd6bca 100644
--- a/idea/testData/debugger/tinyApp/outs/frameExtensionFun.out
+++ b/idea/testData/debugger/tinyApp/outs/frameExtensionFun.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at frameExtensionFun.kt:14
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! frameExtensionFun.FrameExtensionFunKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 frameExtensionFun.kt:14
 Compile bytecode for prop
 Compile bytecode for myFun()
@@ -30,6 +30,6 @@ fun A.foo() {
  frame    = foo:14, FrameExtensionFunKt {frameExtensionFun}
    local    = $receiver: frameExtensionFun.A = {frameExtensionFun.A@uniqueID} (sp = null)
      field    = prop: int = 1 (sp = frameExtensionFun.kt, 8)
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/frameInlineArgument.out b/idea/testData/debugger/tinyApp/outs/frameInlineArgument.out
index f41f1197e8b..d0dbc055ef2 100644
--- a/idea/testData/debugger/tinyApp/outs/frameInlineArgument.out
+++ b/idea/testData/debugger/tinyApp/outs/frameInlineArgument.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at frameInlineArgument.kt:7
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! frameInlineArgument.FrameInlineArgumentKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 frameInlineArgument.kt:7
 Compile bytecode for element
 package frameInlineArgument
@@ -34,6 +34,6 @@ class A {
    local    = this_$iv: frameInlineArgument.A = {frameInlineArgument.A@uniqueID} (sp = null)
      field    = prop: int = 1 (sp = frameInlineArgument.kt, 17)
    local    = element$iv: double = 1.0 (sp = frameInlineArgument.kt, 4)
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/frameInlineArgumentInsideInlineFun.out b/idea/testData/debugger/tinyApp/outs/frameInlineArgumentInsideInlineFun.out
index cf2442eb61a..f83f7a12476 100644
--- a/idea/testData/debugger/tinyApp/outs/frameInlineArgumentInsideInlineFun.out
+++ b/idea/testData/debugger/tinyApp/outs/frameInlineArgumentInsideInlineFun.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at frameInlineArgumentInsideInlineFun.kt:16
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! frameInlineArgumentInsideInlineFun.FrameInlineArgumentInsideInlineFunKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 frameInlineArgumentInsideInlineFun.kt:16
 Compile bytecode for element
 // KT-10674: Debugger: Evaluate Expression / Watches fail for variable/parameter captured from one inline function to another
@@ -52,6 +52,6 @@ fun main(args: Array<String>) {
               - Class has no fields
    local    = element$iv$iv: double = 1.0 (sp = frameInlineArgumentInsideInlineFun.kt, 13)
    local    = it$iv: int = 1 (sp = null)
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/frameInlineFun.out b/idea/testData/debugger/tinyApp/outs/frameInlineFun.out
index 2873bed2bba..651d2b0a1f5 100644
--- a/idea/testData/debugger/tinyApp/outs/frameInlineFun.out
+++ b/idea/testData/debugger/tinyApp/outs/frameInlineFun.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at frameInlineFun.kt:14
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! frameInlineFun.FrameInlineFunKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 frameInlineFun.kt:14
 Compile bytecode for element
 Compile bytecode for this.prop
@@ -38,6 +38,6 @@ class A {
    local    = this_$iv: frameInlineFun.A = {frameInlineFun.A@uniqueID} (sp = null)
      field    = prop: int = 1 (sp = frameInlineFun.kt, 17)
    local    = element$iv: double = 1.0 (sp = frameInlineFun.kt, 12)
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/frameInlineFunCallInsideInlineFun.out b/idea/testData/debugger/tinyApp/outs/frameInlineFunCallInsideInlineFun.out
index 645aa07ad3c..7c8b96a4fbe 100644
--- a/idea/testData/debugger/tinyApp/outs/frameInlineFunCallInsideInlineFun.out
+++ b/idea/testData/debugger/tinyApp/outs/frameInlineFunCallInsideInlineFun.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at frameInlineFunCallInsideInlineFun.kt:20
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! frameInlineFunCallInsideInlineFun.FrameInlineFunCallInsideInlineFunKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 frameInlineFunCallInsideInlineFun.kt:20
 frameInlineFunCallInsideInlineFun.kt:5
 frameInlineFunCallInsideInlineFun.kt:7
@@ -66,6 +66,6 @@ fun main(args: Array<String>) {
    local    = this_$iv$iv: frameInlineFunCallInsideInlineFun.A = {frameInlineFunCallInsideInlineFun.A@uniqueID} (sp = null)
      field    = prop: int = 1 (sp = frameInlineFunCallInsideInlineFun.kt, 10)
    local    = element$iv$iv: double = 1.0 (sp = frameInlineFunCallInsideInlineFun.kt, 5)
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/frameInnerClass.out b/idea/testData/debugger/tinyApp/outs/frameInnerClass.out
index 3a87abd7025..31a1a8eef6b 100644
--- a/idea/testData/debugger/tinyApp/outs/frameInnerClass.out
+++ b/idea/testData/debugger/tinyApp/outs/frameInnerClass.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at frameInnerClass.kt:17
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! frameInnerClass.FrameInnerClassKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 frameInnerClass.kt:17
 Compile bytecode for prop1
 Compile bytecode for prop2
@@ -45,6 +45,6 @@ class A {
      field    = prop2: int = 1 (sp = frameInnerClass.kt, 12)
      field    = this$0: frameInnerClass.A = {frameInnerClass.A@uniqueID} (sp = null)
        field    = prop1: int = 1 (sp = frameInnerClass.kt, 8)
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/frameInnerLambda.out b/idea/testData/debugger/tinyApp/outs/frameInnerLambda.out
index 2af8e80ad6e..f4c3988b199 100644
--- a/idea/testData/debugger/tinyApp/outs/frameInnerLambda.out
+++ b/idea/testData/debugger/tinyApp/outs/frameInnerLambda.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at frameInnerLambda.kt:9
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! frameInnerLambda.FrameInnerLambdaKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 frameInnerLambda.kt:9
 Compile bytecode for val1
 Compile bytecode for val2
@@ -39,6 +39,6 @@ fun foo(f: () -> Unit) {
        field    = arity: int = 0 (sp = Lambda.!EXT!)
      field    = $val2: int = 1 (sp = null)
      field    = arity: int = 0 (sp = Lambda.!EXT!)
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/frameLambda.out b/idea/testData/debugger/tinyApp/outs/frameLambda.out
index ce23e71bed6..d192fbeb370 100644
--- a/idea/testData/debugger/tinyApp/outs/frameLambda.out
+++ b/idea/testData/debugger/tinyApp/outs/frameLambda.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at frameLambda.kt:7
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! frameLambda.FrameLambdaKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 frameLambda.kt:7
 Compile bytecode for val1
 package frameLambda
@@ -25,6 +25,6 @@ fun foo(f: () -> Unit) {
    this     = this = {frameLambda.FrameLambdaKt$main$1@uniqueID}Function0<kotlin.Unit>
      field    = $val1: int = 1 (sp = null)
      field    = arity: int = 0 (sp = Lambda.!EXT!)
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/frameLambdaNotUsed.out b/idea/testData/debugger/tinyApp/outs/frameLambdaNotUsed.out
index 8103ced0c2c..8e9d0b98db0 100644
--- a/idea/testData/debugger/tinyApp/outs/frameLambdaNotUsed.out
+++ b/idea/testData/debugger/tinyApp/outs/frameLambdaNotUsed.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at frameLambdaNotUsed.kt:7
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! frameLambdaNotUsed.FrameLambdaNotUsedKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 frameLambdaNotUsed.kt:7
 Compile bytecode for val1
 package frameLambdaNotUsed
@@ -24,6 +24,6 @@ fun foo(f: () -> Unit) {
  frame    = invoke:7, FrameLambdaNotUsedKt$main$1 {frameLambdaNotUsed}
    this     = this = {frameLambdaNotUsed.FrameLambdaNotUsedKt$main$1@uniqueID}Function0<kotlin.Unit>
      field    = arity: int = 0 (sp = Lambda.!EXT!)
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/frameLocalVariable.out b/idea/testData/debugger/tinyApp/outs/frameLocalVariable.out
index c3069bb2c84..e6e50eb413c 100644
--- a/idea/testData/debugger/tinyApp/outs/frameLocalVariable.out
+++ b/idea/testData/debugger/tinyApp/outs/frameLocalVariable.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at frameLocalVariable.kt:6
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! frameLocalVariable.FrameLocalVariableKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 frameLocalVariable.kt:6
 package frameLocalVariable
 
@@ -14,6 +14,6 @@ fun main(args: Array<String>) {
  frame    = main:6, FrameLocalVariableKt {frameLocalVariable}
    local    = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = frameLocalVariable.kt, 3)
    local    = val1: int = 1 (sp = frameLocalVariable.kt, 4)
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/frameObject.out b/idea/testData/debugger/tinyApp/outs/frameObject.out
index 57c576b3109..ffb4a20a188 100644
--- a/idea/testData/debugger/tinyApp/outs/frameObject.out
+++ b/idea/testData/debugger/tinyApp/outs/frameObject.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at frameObject.kt:6
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! frameObject.FrameObjectKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 frameObject.kt:6
 Compile bytecode for O.obProp
 Compile bytecode for O.obMyFun()
@@ -32,6 +32,6 @@ fun foo(f: () -> Unit) {
  frame    = invoke:6, FrameObjectKt$main$1 {frameObject}
    this     = this = {frameObject.FrameObjectKt$main$1@uniqueID}Function0<kotlin.Unit>
      field    = arity: int = 0 (sp = Lambda.!EXT!)
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/frameSharedVar.out b/idea/testData/debugger/tinyApp/outs/frameSharedVar.out
index 48928095b5a..73593efa8b5 100644
--- a/idea/testData/debugger/tinyApp/outs/frameSharedVar.out
+++ b/idea/testData/debugger/tinyApp/outs/frameSharedVar.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at frameSharedVar.kt:7
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! frameSharedVar.FrameSharedVarKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 frameSharedVar.kt:7
 Compile bytecode for var1
 package frameSharedVar
@@ -26,6 +26,6 @@ fun foo(f: () -> Unit) {
      field    = $var1: kotlin.jvm.internal.Ref$IntRef = {kotlin.jvm.internal.Ref$IntRef@uniqueID}1 (sp = null)
        field    = element: int = 1 (sp = Ref.!EXT!)
      field    = arity: int = 0 (sp = Lambda.!EXT!)
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/frameSharedVarLocalVar.out b/idea/testData/debugger/tinyApp/outs/frameSharedVarLocalVar.out
index 9675d4d5032..f96314ab98b 100644
--- a/idea/testData/debugger/tinyApp/outs/frameSharedVarLocalVar.out
+++ b/idea/testData/debugger/tinyApp/outs/frameSharedVarLocalVar.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at frameSharedVarLocalVar.kt:7
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! frameSharedVarLocalVar.FrameSharedVarLocalVarKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 frameSharedVarLocalVar.kt:7
 Compile bytecode for var1
 package frameSharedVarLocalVar
@@ -24,6 +24,6 @@ inline fun foo(f: () -> Unit) {
  frame    = main:7, FrameSharedVarLocalVarKt {frameSharedVarLocalVar}
    local    = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = frameSharedVarLocalVar.kt, 3)
    local    = var1: int = 1 (sp = frameSharedVarLocalVar.kt, 4)
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/frameSimple.out b/idea/testData/debugger/tinyApp/outs/frameSimple.out
index 369d1f9a31b..351ba2f7dab 100644
--- a/idea/testData/debugger/tinyApp/outs/frameSimple.out
+++ b/idea/testData/debugger/tinyApp/outs/frameSimple.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at frameSimple.kt:9
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! frameSimple.FrameSimpleKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 frameSimple.kt:9
 Compile bytecode for val1
 Compile bytecode for val2
@@ -39,6 +39,6 @@ class MyClass
    local    = val1: int = 1 (sp = frameSimple.kt, 6)
    local    = val2: frameSimple.MyClass = {frameSimple.MyClass@uniqueID} (sp = frameSimple.kt, 7)
               - Class has no fields
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/frameThis0.out b/idea/testData/debugger/tinyApp/outs/frameThis0.out
index 65111d42071..b311da9b70d 100644
--- a/idea/testData/debugger/tinyApp/outs/frameThis0.out
+++ b/idea/testData/debugger/tinyApp/outs/frameThis0.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at frameThis0.kt:16
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! frameThis0.FrameThis0Kt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 frameThis0.kt:16
 Compile bytecode for val1
 Compile bytecode for val2
@@ -54,6 +54,6 @@ fun foo(f: () -> Unit) {
      field    = $val1: int = 1 (sp = null)
      field    = arity: int = 0 (sp = Lambda.!EXT!)
    local    = val2: int = 1 (sp = frameThis0.kt, 14)
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/frameThis0Ext.out b/idea/testData/debugger/tinyApp/outs/frameThis0Ext.out
index 106e274d73e..0530387adeb 100644
--- a/idea/testData/debugger/tinyApp/outs/frameThis0Ext.out
+++ b/idea/testData/debugger/tinyApp/outs/frameThis0Ext.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at frameThis0Ext.kt:15
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! frameThis0Ext.FrameThis0ExtKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 frameThis0Ext.kt:15
 Compile bytecode for val1
 Compile bytecode for prop1
@@ -71,6 +71,6 @@ fun foo(f: () -> Unit) {
        field    = prop2: int = 1 (sp = frameThis0Ext.kt, 25)
      field    = $val1: int = 1 (sp = null)
      field    = arity: int = 0 (sp = Lambda.!EXT!)
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/frameThis0This0.out b/idea/testData/debugger/tinyApp/outs/frameThis0This0.out
index 363eec1a794..e882011ef3b 100644
--- a/idea/testData/debugger/tinyApp/outs/frameThis0This0.out
+++ b/idea/testData/debugger/tinyApp/outs/frameThis0This0.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at frameThis0This0.kt:17
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! frameThis0This0.FrameThis0This0Kt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 frameThis0This0.kt:17
 Compile bytecode for val1
 Compile bytecode for val2
@@ -58,6 +58,6 @@ fun foo(f: () -> Unit) {
        field    = arity: int = 0 (sp = Lambda.!EXT!)
      field    = $val2: int = 1 (sp = null)
      field    = arity: int = 0 (sp = Lambda.!EXT!)
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/funFromOuterClassInLamdba.out b/idea/testData/debugger/tinyApp/outs/funFromOuterClassInLamdba.out
index 0ea0e9a571a..2d117b89039 100644
--- a/idea/testData/debugger/tinyApp/outs/funFromOuterClassInLamdba.out
+++ b/idea/testData/debugger/tinyApp/outs/funFromOuterClassInLamdba.out
@@ -1,14 +1,14 @@
 LineBreakpoint created at funFromOuterClassInLamdba.kt:20
 LineBreakpoint created at funFromOuterClassInLamdba.kt:28
 LineBreakpoint created at funFromOuterClassInLamdba.kt:36
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! funFromOuterClassInLamdba.FunFromOuterClassInLamdbaKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 funFromOuterClassInLamdba.kt:20
 Compile bytecode for foo() + 1
 funFromOuterClassInLamdba.kt:28
 Compile bytecode for foo() + 2
 funFromOuterClassInLamdba.kt:36
 Compile bytecode for foo() + 3
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/funFromSuperClass.out b/idea/testData/debugger/tinyApp/outs/funFromSuperClass.out
index 545f30b1f9a..0ecfdc102cf 100644
--- a/idea/testData/debugger/tinyApp/outs/funFromSuperClass.out
+++ b/idea/testData/debugger/tinyApp/outs/funFromSuperClass.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at funFromSuperClass.kt:12
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! funFromSuperClass.FunFromSuperClassKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 funFromSuperClass.kt:12
 Compile bytecode for foo()
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/funLiteral.out b/idea/testData/debugger/tinyApp/outs/funLiteral.out
index 939e689fcf9..5eb1e89e4aa 100644
--- a/idea/testData/debugger/tinyApp/outs/funLiteral.out
+++ b/idea/testData/debugger/tinyApp/outs/funLiteral.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at funLiteral.kt:5
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! funLiteral.FunLiteralKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 funLiteral.kt:5
 funLiteral.kt:6
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/functionCallStoredToVariable.out b/idea/testData/debugger/tinyApp/outs/functionCallStoredToVariable.out
index ac06ea7bb05..f0afcb86766 100644
--- a/idea/testData/debugger/tinyApp/outs/functionCallStoredToVariable.out
+++ b/idea/testData/debugger/tinyApp/outs/functionCallStoredToVariable.out
@@ -2,8 +2,8 @@ LineBreakpoint created at functionCallStoredToVariable.kt:7
 LineBreakpoint created at functionCallStoredToVariable.kt:14
 LineBreakpoint created at functionCallStoredToVariable.kt:21
 LineBreakpoint created at functionCallStoredToVariable.kt:28
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! functionCallStoredToVariable.FunctionCallStoredToVariableKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 functionCallStoredToVariable.kt:7
 functionCallStoredToVariable.kt:4
 functionCallStoredToVariable.kt:14
@@ -16,6 +16,6 @@ functionCallStoredToVariable.kt:28
 functionCallStoredToVariable.kt:29
 functionCallStoredToVariable.kt:47
 functionCallStoredToVariable.kt:25
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/functionReference.out b/idea/testData/debugger/tinyApp/outs/functionReference.out
index 5f7c515c331..89339a3520a 100644
--- a/idea/testData/debugger/tinyApp/outs/functionReference.out
+++ b/idea/testData/debugger/tinyApp/outs/functionReference.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at functionReference.kt:11
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! functionReference.FunctionReferenceKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 functionReference.kt:11
 functionReference.kt:4
 functionReference.kt:7
@@ -8,6 +8,6 @@ functionReference.kt:11
 functionReference.kt:4
 functionReference.kt:5
 functionReference.kt:12
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/fwAbstractProperty.out b/idea/testData/debugger/tinyApp/outs/fwAbstractProperty.out
index baf0b9bc7fa..fde950bae0a 100644
--- a/idea/testData/debugger/tinyApp/outs/fwAbstractProperty.out
+++ b/idea/testData/debugger/tinyApp/outs/fwAbstractProperty.out
@@ -2,8 +2,8 @@ KotlinFieldBreakpoint created at fwAbstractProperty.kt:6
 KotlinFieldBreakpoint created at fwAbstractProperty.kt:9
 KotlinFieldBreakpoint created at fwAbstractProperty.kt:43
 KotlinFieldBreakpoint created at fwAbstractProperty.kt:46
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! fwAbstractProperty.FwAbstractPropertyKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 fwAbstractProperty.kt:57
 fwAbstractProperty.kt:59
 fwAbstractProperty.kt:61
@@ -21,6 +21,6 @@ fwAbstractProperty.kt:46
 fwAbstractProperty.kt:43
 fwAbstractProperty.kt:46
 fwAbstractProperty.kt:46
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/fwBackingField.out b/idea/testData/debugger/tinyApp/outs/fwBackingField.out
index 8d319844209..ade6904d75e 100644
--- a/idea/testData/debugger/tinyApp/outs/fwBackingField.out
+++ b/idea/testData/debugger/tinyApp/outs/fwBackingField.out
@@ -6,8 +6,8 @@ KotlinFieldBreakpoint created at fwBackingField.kt:31
 KotlinFieldBreakpoint created at fwBackingField.kt:33
 KotlinFieldBreakpoint created at fwBackingField.kt:45
 KotlinFieldBreakpoint created at fwBackingField.kt:48
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! fwBackingField.FwBackingFieldKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 fwBackingField.kt:18
 fwBackingField.kt:21
 fwBackingField.kt:59
@@ -42,6 +42,6 @@ fwBackingField.kt:42
 fwBackingField.kt:48
 fwBackingField.kt:54
 fwBackingField.kt:63
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/fwInitializer.out b/idea/testData/debugger/tinyApp/outs/fwInitializer.out
index 9aabec76701..a7e479925dd 100644
--- a/idea/testData/debugger/tinyApp/outs/fwInitializer.out
+++ b/idea/testData/debugger/tinyApp/outs/fwInitializer.out
@@ -1,11 +1,11 @@
 KotlinFieldBreakpoint created at fwInitializer.kt:12
 KotlinFieldBreakpoint created at fwInitializer.kt:17
 KotlinFieldBreakpoint created at fwInitializer.kt:21
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! fwInitializer.FwInitializerKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 fwInitializer.kt:12
 fwInitializer.kt:17
 fwInitializer.kt:21
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/fwPropertyInInterface.out b/idea/testData/debugger/tinyApp/outs/fwPropertyInInterface.out
index a51c8a6a354..611eb271fb7 100644
--- a/idea/testData/debugger/tinyApp/outs/fwPropertyInInterface.out
+++ b/idea/testData/debugger/tinyApp/outs/fwPropertyInInterface.out
@@ -2,8 +2,8 @@ KotlinFieldBreakpoint created at fwPropertyInInterface.kt:6
 KotlinFieldBreakpoint created at fwPropertyInInterface.kt:9
 KotlinFieldBreakpoint created at fwPropertyInInterface.kt:43
 KotlinFieldBreakpoint created at fwPropertyInInterface.kt:46
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! fwPropertyInInterface.FwPropertyInInterfaceKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 fwPropertyInInterface.kt:57
 fwPropertyInInterface.kt:59
 fwPropertyInInterface.kt:61
@@ -21,6 +21,6 @@ fwPropertyInInterface.kt:46
 fwPropertyInInterface.kt:43
 fwPropertyInInterface.kt:46
 fwPropertyInInterface.kt:46
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/genericCrossinlineArgument.out b/idea/testData/debugger/tinyApp/outs/genericCrossinlineArgument.out
index d0de2bb4036..87350af6839 100644
--- a/idea/testData/debugger/tinyApp/outs/genericCrossinlineArgument.out
+++ b/idea/testData/debugger/tinyApp/outs/genericCrossinlineArgument.out
@@ -1,7 +1,7 @@
 LineBreakpoint created at genericCrossinlineArgument.kt:14
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! genericCrossinlineArgument.GenericCrossinlineArgumentKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 genericCrossinlineArgument.kt:14
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/ifCapturedVariableKt9118.out b/idea/testData/debugger/tinyApp/outs/ifCapturedVariableKt9118.out
index cf15f867675..919cc7476b0 100644
--- a/idea/testData/debugger/tinyApp/outs/ifCapturedVariableKt9118.out
+++ b/idea/testData/debugger/tinyApp/outs/ifCapturedVariableKt9118.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at ifCapturedVariableKt9118.kt:5
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! ifCapturedVariableKt9118.IfCapturedVariableKt9118Kt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 ifCapturedVariableKt9118.kt:5
 ifCapturedVariableKt9118.kt:8
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/imports.out b/idea/testData/debugger/tinyApp/outs/imports.out
index dc0f4697338..f2955f1667e 100644
--- a/idea/testData/debugger/tinyApp/outs/imports.out
+++ b/idea/testData/debugger/tinyApp/outs/imports.out
@@ -1,11 +1,11 @@
 LineBreakpoint created at imports.kt:10
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! imports.ImportsKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 imports.kt:10
 Compile bytecode for Collections.emptyList<String>()
 Compile bytecode for ArrayList<Int>()
 Compile bytecode for HashSet<Int>()
 Compile bytecode for JHashMap<Int, Int>()
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/importsLambdaContext.out b/idea/testData/debugger/tinyApp/outs/importsLambdaContext.out
index 974b55bfbc5..e3a1d987c57 100644
--- a/idea/testData/debugger/tinyApp/outs/importsLambdaContext.out
+++ b/idea/testData/debugger/tinyApp/outs/importsLambdaContext.out
@@ -1,11 +1,11 @@
 LineBreakpoint created at importsLambdaContext.kt:10 lambdaOrdinal = 1
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! importsLambdaContext.ImportsLambdaContextKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 importsLambdaContext.kt:10
 Compile bytecode for Collections.emptyList<String>()
 Compile bytecode for ArrayList<Int>()
 Compile bytecode for HashSet<Int>()
 Compile bytecode for JHashMap<Int, Int>()
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/inapplicableFieldWatchpoints.out b/idea/testData/debugger/tinyApp/outs/inapplicableFieldWatchpoints.out
index 8180697c81c..8f188a2b23f 100644
--- a/idea/testData/debugger/tinyApp/outs/inapplicableFieldWatchpoints.out
+++ b/idea/testData/debugger/tinyApp/outs/inapplicableFieldWatchpoints.out
@@ -1,5 +1,5 @@
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! inapplicableFieldWatchpoints.InapplicableFieldWatchpointsKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/initializer.out b/idea/testData/debugger/tinyApp/outs/initializer.out
index 9bc5ae0128c..fd135049df6 100644
--- a/idea/testData/debugger/tinyApp/outs/initializer.out
+++ b/idea/testData/debugger/tinyApp/outs/initializer.out
@@ -1,10 +1,10 @@
 LineBreakpoint created at initializer.kt:12
 LineBreakpoint created at initializer.kt:18 lambdaOrdinal = -1
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! initializer.InitializerKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 initializer.kt:12
 Compile bytecode for prop
 initializer.kt:18
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/inlineCallInForRangeExpression.out b/idea/testData/debugger/tinyApp/outs/inlineCallInForRangeExpression.out
index 99d30a814fe..49a2c93441a 100644
--- a/idea/testData/debugger/tinyApp/outs/inlineCallInForRangeExpression.out
+++ b/idea/testData/debugger/tinyApp/outs/inlineCallInForRangeExpression.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at inlineCallInForRangeExpression.kt:7
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! inlineCallInForRangeExpression.InlineCallInForRangeExpressionKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 inlineCallInForRangeExpression.kt:7
 inlineCallInForRangeExpression.kt:8
 inlineCallInForRangeExpression.kt:9
@@ -8,6 +8,6 @@ inlineCallInForRangeExpression.kt:8
 inlineCallInForRangeExpression.kt:9
 inlineCallInForRangeExpression.kt:8
 inlineCallInForRangeExpression.kt:11
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/inlineDex.out b/idea/testData/debugger/tinyApp/outs/inlineDex.out
index 26a2ac35cf0..39be06dd295 100644
--- a/idea/testData/debugger/tinyApp/outs/inlineDex.out
+++ b/idea/testData/debugger/tinyApp/outs/inlineDex.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at inlineDex.kt:5
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! inlineDex.InlineDexKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 inlineDex.kt:5
 inlineDex.kt:9
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/inlineFunction.out b/idea/testData/debugger/tinyApp/outs/inlineFunction.out
index aee6f8c3130..6814059eaef 100644
--- a/idea/testData/debugger/tinyApp/outs/inlineFunction.out
+++ b/idea/testData/debugger/tinyApp/outs/inlineFunction.out
@@ -1,9 +1,9 @@
 LineBreakpoint created at inlineFunction.kt:7
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! inlineFunction.InlineFunctionKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 inlineFunction.kt:7
 Compile bytecode for myFun { 1 }
 Compile bytecode for foo()
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/inlineFunctionBreakpointAnotherFile.out b/idea/testData/debugger/tinyApp/outs/inlineFunctionBreakpointAnotherFile.out
index f431679b130..c062e25fd8a 100644
--- a/idea/testData/debugger/tinyApp/outs/inlineFunctionBreakpointAnotherFile.out
+++ b/idea/testData/debugger/tinyApp/outs/inlineFunctionBreakpointAnotherFile.out
@@ -1,7 +1,7 @@
 LineBreakpoint created at inlineFunctionWithBreakpoint.kt:4
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! inlineFunctionBreakpointAnotherFile.InlineFunctionBreakpointAnotherFileKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 inlineFunctionWithBreakpoint.kt:4
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/inlineFunctionBreakpointVariants.out b/idea/testData/debugger/tinyApp/outs/inlineFunctionBreakpointVariants.out
index 766451c1f76..ec4311bc478 100644
--- a/idea/testData/debugger/tinyApp/outs/inlineFunctionBreakpointVariants.out
+++ b/idea/testData/debugger/tinyApp/outs/inlineFunctionBreakpointVariants.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at inlineFunctionBreakpointVariants.kt:8 lambdaOrdinal = -1
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! inlineFunctionBreakpointVariants.InlineFunctionBreakpointVariantsKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 inlineFunctionBreakpointVariants.kt:8
 inlineFunctionBreakpointVariants.kt:8
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/inlineFunctionSameLines.out b/idea/testData/debugger/tinyApp/outs/inlineFunctionSameLines.out
index cf4b4cd6c6e..2ae6771b10d 100644
--- a/idea/testData/debugger/tinyApp/outs/inlineFunctionSameLines.out
+++ b/idea/testData/debugger/tinyApp/outs/inlineFunctionSameLines.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at inlineFunctionSameLines.kt:12
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! inlineFunctionSameLines.InlineFunctionSameLinesKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 inlineFunctionSameLines.kt:12
 inlineFunctionSameLines.kt:13
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/inlineFunctionalExpression.out b/idea/testData/debugger/tinyApp/outs/inlineFunctionalExpression.out
index f7191679118..5d1036eaa75 100644
--- a/idea/testData/debugger/tinyApp/outs/inlineFunctionalExpression.out
+++ b/idea/testData/debugger/tinyApp/outs/inlineFunctionalExpression.out
@@ -1,9 +1,9 @@
 LineBreakpoint created at inlineFunctionalExpression.kt:9
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! inlineFunctionalExpression.InlineFunctionalExpressionKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 inlineFunctionalExpression.kt:9
 inlineFunctionalExpression.kt:9
 Compile bytecode for it
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/inlineInClassDex.out b/idea/testData/debugger/tinyApp/outs/inlineInClassDex.out
index 3c8657a3331..6aa50e0bc2a 100644
--- a/idea/testData/debugger/tinyApp/outs/inlineInClassDex.out
+++ b/idea/testData/debugger/tinyApp/outs/inlineInClassDex.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at inlineInClassDex.Other.kt:6
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! inlineInClassDex.InlineInClassDexKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 inlineInClassDex.Other.kt:6
 inlineInClassDex.Other.kt:7
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/inlineInIfFalse.out b/idea/testData/debugger/tinyApp/outs/inlineInIfFalse.out
index 6e86975ae8e..f1198a252ed 100644
--- a/idea/testData/debugger/tinyApp/outs/inlineInIfFalse.out
+++ b/idea/testData/debugger/tinyApp/outs/inlineInIfFalse.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at inlineInIfFalse.kt:6
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! inlineInIfFalse.InlineInIfFalseKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 inlineInIfFalse.kt:6
 inlineInIfFalse.kt:9
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/inlineInIfFalseDex.out b/idea/testData/debugger/tinyApp/outs/inlineInIfFalseDex.out
index 8600a9e8d36..bb1e59cc6df 100644
--- a/idea/testData/debugger/tinyApp/outs/inlineInIfFalseDex.out
+++ b/idea/testData/debugger/tinyApp/outs/inlineInIfFalseDex.out
@@ -1,9 +1,9 @@
 LineBreakpoint created at inlineInIfFalseDex.kt:6
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! inlineInIfFalseDex.InlineInIfFalseDexKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 inlineInIfFalseDex.kt:6
 inlineInIfFalseDex.kt:9
 inlineInIfFalseDex.kt:10
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/inlineInIfTrue.out b/idea/testData/debugger/tinyApp/outs/inlineInIfTrue.out
index 1dfda07583f..5f73caa5684 100644
--- a/idea/testData/debugger/tinyApp/outs/inlineInIfTrue.out
+++ b/idea/testData/debugger/tinyApp/outs/inlineInIfTrue.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at inlineInIfTrue.kt:6
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! inlineInIfTrue.InlineInIfTrueKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 inlineInIfTrue.kt:6
 inlineInIfTrue.kt:7
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/inlineInIfTrueDex.out b/idea/testData/debugger/tinyApp/outs/inlineInIfTrueDex.out
index 8e53db9c3dc..9f357b73742 100644
--- a/idea/testData/debugger/tinyApp/outs/inlineInIfTrueDex.out
+++ b/idea/testData/debugger/tinyApp/outs/inlineInIfTrueDex.out
@@ -1,9 +1,9 @@
 LineBreakpoint created at inlineInIfTrueDex.kt:6
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! inlineInIfTrueDex.InlineInIfTrueDexKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 inlineInIfTrueDex.kt:6
 inlineInIfTrueDex.kt:7
 inlineInIfTrueDex.kt:9
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/inlineInObject.out b/idea/testData/debugger/tinyApp/outs/inlineInObject.out
index 6d6003c49a3..6b1b0e438c0 100644
--- a/idea/testData/debugger/tinyApp/outs/inlineInObject.out
+++ b/idea/testData/debugger/tinyApp/outs/inlineInObject.out
@@ -1,10 +1,10 @@
 LineBreakpoint created at inlineInObject.kt:5
 LineBreakpoint created at inlineInObject.kt:11
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! inlineInObject.InlineInObjectKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 inlineInObject.kt:5
 inlineInObject.kt:11
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
 
diff --git a/idea/testData/debugger/tinyApp/outs/inlineInObjectDex.out b/idea/testData/debugger/tinyApp/outs/inlineInObjectDex.out
index f5eacc34858..a1ac11e076a 100644
--- a/idea/testData/debugger/tinyApp/outs/inlineInObjectDex.out
+++ b/idea/testData/debugger/tinyApp/outs/inlineInObjectDex.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at inlineInObjectDex.Other.kt:6
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! inlineInObjectDex.InlineInObjectDexKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 inlineInObjectDex.Other.kt:6
 inlineInObjectDex.Other.kt:7
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/inlineInObjectSameFileDex.out b/idea/testData/debugger/tinyApp/outs/inlineInObjectSameFileDex.out
index 3b2f5fbc899..6740d5df2fd 100644
--- a/idea/testData/debugger/tinyApp/outs/inlineInObjectSameFileDex.out
+++ b/idea/testData/debugger/tinyApp/outs/inlineInObjectSameFileDex.out
@@ -1,10 +1,10 @@
 LineBreakpoint created at inlineInObjectSameFileDex.kt:5
 LineBreakpoint created at inlineInObjectSameFileDex.kt:11
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! inlineInObjectSameFileDex.InlineInObjectSameFileDexKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 inlineInObjectSameFileDex.kt:5
 inlineInObjectSameFileDex.kt:11
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
 
diff --git a/idea/testData/debugger/tinyApp/outs/inlineLambda.out b/idea/testData/debugger/tinyApp/outs/inlineLambda.out
index 8994c04e9b8..adcfd42e19a 100644
--- a/idea/testData/debugger/tinyApp/outs/inlineLambda.out
+++ b/idea/testData/debugger/tinyApp/outs/inlineLambda.out
@@ -1,9 +1,9 @@
 LineBreakpoint created at inlineLambda.kt:9
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! inlineLambda.InlineLambdaKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 inlineLambda.kt:9
 inlineLambda.kt:9
 Compile bytecode for it
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/inlineOnly.out b/idea/testData/debugger/tinyApp/outs/inlineOnly.out
index a1799035c79..edb5a34b1b8 100644
--- a/idea/testData/debugger/tinyApp/outs/inlineOnly.out
+++ b/idea/testData/debugger/tinyApp/outs/inlineOnly.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at inlineOnly.kt:5
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! inlineOnly.InlineOnlyKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 inlineOnly.kt:5
 inlineOnly.kt:7
 inlineOnly.kt:13
@@ -11,7 +11,7 @@ inlineOnly.kt:14
 inlineOnly.kt:7
 inlineOnly.kt:9
 PrintStream.!EXT!
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
 OK
diff --git a/idea/testData/debugger/tinyApp/outs/innerClass.out b/idea/testData/debugger/tinyApp/outs/innerClass.out
index 4c61898280f..de750dbacd8 100644
--- a/idea/testData/debugger/tinyApp/outs/innerClass.out
+++ b/idea/testData/debugger/tinyApp/outs/innerClass.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at innerClass.kt:13
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! innerClass.InnerClassKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 innerClass.kt:13
 Compile bytecode for baseFun(innerProp)
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/insertInBlock.out b/idea/testData/debugger/tinyApp/outs/insertInBlock.out
index cf75427461b..5689a6a3bc2 100644
--- a/idea/testData/debugger/tinyApp/outs/insertInBlock.out
+++ b/idea/testData/debugger/tinyApp/outs/insertInBlock.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at insertInBlock.kt:6
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! insertInBlock.InsertInBlockKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 insertInBlock.kt:6
 Compile bytecode for 1 + 1
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/isInsideInlineLambda.out b/idea/testData/debugger/tinyApp/outs/isInsideInlineLambda.out
index ccc40ad56fb..37ff1025589 100644
--- a/idea/testData/debugger/tinyApp/outs/isInsideInlineLambda.out
+++ b/idea/testData/debugger/tinyApp/outs/isInsideInlineLambda.out
@@ -8,8 +8,8 @@ LineBreakpoint created at isInsideInlineLambda.kt:17 lambdaOrdinal = 1
 LineBreakpoint created at isInsideInlineLambda.kt:25 lambdaOrdinal = 1
 LineBreakpoint created at isInsideInlineLambda.kt:33 lambdaOrdinal = 1
 LineBreakpoint created at isInsideInlineLambda.kt:43 lambdaOrdinal = 1
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! isInsideInlineLambda.IsInsideInlineLambdaKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 isInsideInlineLambda.kt:9
 Compile bytecode for it + 1
 isInsideInlineLambda.kt:17
@@ -30,6 +30,6 @@ isInsideInlineLambdaInLibrary.kt:23
 Compile bytecode for it + 14
 isInsideInlineLambdaInLibrary.kt:31
 Compile bytecode for it + 15
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/javaFun.out b/idea/testData/debugger/tinyApp/outs/javaFun.out
index ac8b873bd03..ef83f61b22e 100644
--- a/idea/testData/debugger/tinyApp/outs/javaFun.out
+++ b/idea/testData/debugger/tinyApp/outs/javaFun.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at javaFun.kt:8
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! javaFun.JavaFunKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 javaFun.kt:8
 MyJavaClass.java:8
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/jcBlock.out b/idea/testData/debugger/tinyApp/outs/jcBlock.out
index 7e6d74f1155..670b5ffa537 100644
--- a/idea/testData/debugger/tinyApp/outs/jcBlock.out
+++ b/idea/testData/debugger/tinyApp/outs/jcBlock.out
@@ -1,12 +1,12 @@
 LineBreakpoint created at jcBlock.kt:6
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! jcBlock.JcBlockKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 jcBlock.kt:6
 JavaClass.java:16
 JavaClass.java:18
 JavaClass.java:19
 Compile bytecode for bodyVal
 Compile bytecode for thenVal
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/jcImports.out b/idea/testData/debugger/tinyApp/outs/jcImports.out
index 6a328de018c..b255f355174 100644
--- a/idea/testData/debugger/tinyApp/outs/jcImports.out
+++ b/idea/testData/debugger/tinyApp/outs/jcImports.out
@@ -1,10 +1,10 @@
 LineBreakpoint created at jcImports.kt:6
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! jcImports.JcImportsKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 jcImports.kt:6
 JavaClass.java:27
 JavaClass.java:28
 Compile bytecode for list.filter { it == 1 }.size
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/jcLocalVariable.out b/idea/testData/debugger/tinyApp/outs/jcLocalVariable.out
index 279e6f8db51..205e29d95d2 100644
--- a/idea/testData/debugger/tinyApp/outs/jcLocalVariable.out
+++ b/idea/testData/debugger/tinyApp/outs/jcLocalVariable.out
@@ -1,10 +1,10 @@
 LineBreakpoint created at jcLocalVariable.kt:6
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! jcLocalVariable.JcLocalVariableKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 jcLocalVariable.kt:6
 JavaClass.java:11
 JavaClass.java:12
 Compile bytecode for i
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/jcMarkedObject.out b/idea/testData/debugger/tinyApp/outs/jcMarkedObject.out
index 2cd9d3e8d34..e7e1adcaf75 100644
--- a/idea/testData/debugger/tinyApp/outs/jcMarkedObject.out
+++ b/idea/testData/debugger/tinyApp/outs/jcMarkedObject.out
@@ -1,11 +1,11 @@
 LineBreakpoint created at jcMarkedObject.kt:6
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! jcMarkedObject.JcMarkedObjectKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 jcMarkedObject.kt:6
 JavaClass.java:39
 JavaClass.java:40
 Compile bytecode for i
 Compile bytecode for i_DebugLabel
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/jcProperty.out b/idea/testData/debugger/tinyApp/outs/jcProperty.out
index 19732f262e2..1f902cc7b49 100644
--- a/idea/testData/debugger/tinyApp/outs/jcProperty.out
+++ b/idea/testData/debugger/tinyApp/outs/jcProperty.out
@@ -1,11 +1,11 @@
 LineBreakpoint created at jcProperty.kt:6
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! jcProperty.JcPropertyKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 jcProperty.kt:6
 JavaClass.java:47
 Compile bytecode for this.javaProperty
 Compile bytecode for javaProperty
 Compile bytecode for javaPrivateProperty
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/jcSimple.out b/idea/testData/debugger/tinyApp/outs/jcSimple.out
index 7ce1e0a7453..a97015b25b3 100644
--- a/idea/testData/debugger/tinyApp/outs/jcSimple.out
+++ b/idea/testData/debugger/tinyApp/outs/jcSimple.out
@@ -1,9 +1,9 @@
 LineBreakpoint created at jcSimple.kt:6
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! jcSimple.JcSimpleKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 jcSimple.kt:6
 JavaClass.java:7
 Compile bytecode for 1 + 1
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/kt12206BasePropertyWithoutBackingField.out b/idea/testData/debugger/tinyApp/outs/kt12206BasePropertyWithoutBackingField.out
index 111953ca158..88c8bd88685 100644
--- a/idea/testData/debugger/tinyApp/outs/kt12206BasePropertyWithoutBackingField.out
+++ b/idea/testData/debugger/tinyApp/outs/kt12206BasePropertyWithoutBackingField.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at kt12206BasePropertyWithoutBackingField.kt:13
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! kt12206BasePropertyWithoutBackingField.Kt12206BasePropertyWithoutBackingFieldKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 kt12206BasePropertyWithoutBackingField.kt:13
 Compile bytecode for d.prop
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/kt5554OnlyIntsShouldBeCoerced.out b/idea/testData/debugger/tinyApp/outs/kt5554OnlyIntsShouldBeCoerced.out
index 710b3f1f99e..515e4ce7940 100644
--- a/idea/testData/debugger/tinyApp/outs/kt5554OnlyIntsShouldBeCoerced.out
+++ b/idea/testData/debugger/tinyApp/outs/kt5554OnlyIntsShouldBeCoerced.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at kt5554OnlyIntsShouldBeCoerced.kt:5
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! kt5554OnlyIntsShouldBeCoerced.Kt5554OnlyIntsShouldBeCoercedKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 kt5554OnlyIntsShouldBeCoerced.kt:5
 Compile bytecode for Class.forName("java.lang.Object").getGenericInterfaces()
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/kt7046localVarInInline.out b/idea/testData/debugger/tinyApp/outs/kt7046localVarInInline.out
index 8028ffb0f2c..514ac943c01 100644
--- a/idea/testData/debugger/tinyApp/outs/kt7046localVarInInline.out
+++ b/idea/testData/debugger/tinyApp/outs/kt7046localVarInInline.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at kt7046localVarInInline.kt:12
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! kt7046localVarInInline.Kt7046localVarInInlineKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 kt7046localVarInInline.kt:12
 Compile bytecode for a*b
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/lCallOnLabeledObj.out b/idea/testData/debugger/tinyApp/outs/lCallOnLabeledObj.out
index bc4f24e22d1..9d7c2ba3c57 100644
--- a/idea/testData/debugger/tinyApp/outs/lCallOnLabeledObj.out
+++ b/idea/testData/debugger/tinyApp/outs/lCallOnLabeledObj.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at lCallOnLabeledObj.kt:6
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! lCallOnLabeledObj.LCallOnLabeledObjKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 lCallOnLabeledObj.kt:6
 Compile bytecode for myClass_DebugLabel.foo()
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/lIdentifier.out b/idea/testData/debugger/tinyApp/outs/lIdentifier.out
index 3f6da8f3da8..42ed0ce1f76 100644
--- a/idea/testData/debugger/tinyApp/outs/lIdentifier.out
+++ b/idea/testData/debugger/tinyApp/outs/lIdentifier.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at lIdentifier.kt:10
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! lIdentifier.LIdentifierKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 lIdentifier.kt:10
 Compile bytecode for a
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/lSeveralLabels.out b/idea/testData/debugger/tinyApp/outs/lSeveralLabels.out
index dfa9d81ff57..83743c042ec 100644
--- a/idea/testData/debugger/tinyApp/outs/lSeveralLabels.out
+++ b/idea/testData/debugger/tinyApp/outs/lSeveralLabels.out
@@ -1,10 +1,10 @@
 LineBreakpoint created at lSeveralLabels.kt:8
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! lSeveralLabels.LSeveralLabelsKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 lSeveralLabels.kt:8
 Compile bytecode for a_DebugLabel
 Compile bytecode for b_DebugLabel
 Compile bytecode for c_DebugLabel
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/lSimple.out b/idea/testData/debugger/tinyApp/outs/lSimple.out
index 7a606aae03a..14b04463c74 100644
--- a/idea/testData/debugger/tinyApp/outs/lSimple.out
+++ b/idea/testData/debugger/tinyApp/outs/lSimple.out
@@ -1,9 +1,9 @@
 LineBreakpoint created at lSimple.kt:6
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! lSimple.LSimpleKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 lSimple.kt:6
 Compile bytecode for a
 Compile bytecode for aLabel_DebugLabel
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/lambdaOnReturn.out b/idea/testData/debugger/tinyApp/outs/lambdaOnReturn.out
index 36ba40a6ea9..d742a3c53d7 100644
--- a/idea/testData/debugger/tinyApp/outs/lambdaOnReturn.out
+++ b/idea/testData/debugger/tinyApp/outs/lambdaOnReturn.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at lambdaOnReturn.kt:14 lambdaOrdinal = 1
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! lambdaOnReturn.LambdaOnReturnKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 lambdaOnReturn.kt:14
 Compile bytecode for y
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/lambdaOnSecondLine.out b/idea/testData/debugger/tinyApp/outs/lambdaOnSecondLine.out
index 1ecb75384ab..f793b71e275 100644
--- a/idea/testData/debugger/tinyApp/outs/lambdaOnSecondLine.out
+++ b/idea/testData/debugger/tinyApp/outs/lambdaOnSecondLine.out
@@ -1,10 +1,10 @@
 LineBreakpoint created at lambdaOnSecondLine.kt:10
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! lambdaOnSecondLine.LambdaOnSecondLineKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 lambdaOnSecondLine.kt:10
 lambdaOnSecondLine.kt:15
 lambdaOnSecondLine.kt:10
 Compile bytecode for it
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/ldifferentTypes.out b/idea/testData/debugger/tinyApp/outs/ldifferentTypes.out
index af0a46f8fa2..4b8d7408d75 100644
--- a/idea/testData/debugger/tinyApp/outs/ldifferentTypes.out
+++ b/idea/testData/debugger/tinyApp/outs/ldifferentTypes.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at ldifferentTypes.kt:88
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! ldifferentTypes.LdifferentTypesKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 ldifferentTypes.kt:88
 Compile bytecode for str_DebugLabel
 Compile bytecode for strArray_DebugLabel
@@ -21,6 +21,6 @@ Compile bytecode for nestedClass_DebugLabel
 Compile bytecode for nestedClass_DebugLabel.test()
 Compile bytecode for nestedClassArray_DebugLabel
 Compile bytecode for nestedClassArray_DebugLabel[0].test()
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/localClass.out b/idea/testData/debugger/tinyApp/outs/localClass.out
index 350e9ad5a1e..3b449090aca 100644
--- a/idea/testData/debugger/tinyApp/outs/localClass.out
+++ b/idea/testData/debugger/tinyApp/outs/localClass.out
@@ -1,9 +1,9 @@
 LineBreakpoint created at localClass.kt:10
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! localClass.LocalClassKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 localClass.kt:10
 Compile bytecode for local
 Compile bytecode for local.test()
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/localFun.out b/idea/testData/debugger/tinyApp/outs/localFun.out
index 26009ef3e5b..535f06aa4a7 100644
--- a/idea/testData/debugger/tinyApp/outs/localFun.out
+++ b/idea/testData/debugger/tinyApp/outs/localFun.out
@@ -5,8 +5,8 @@ LineBreakpoint created at localFun.kt:34
 LineBreakpoint created at localFun.kt:43
 LineBreakpoint created at localFun.kt:54
 LineBreakpoint created at localFun.kt:61
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! localFun.LocalFunKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 localFun.kt:9
 Compile bytecode for myLocalFun1()
 localFun.kt:15
@@ -21,6 +21,6 @@ localFun.kt:54
 Compile bytecode for myLocalFun6()
 localFun.kt:61
 Compile bytecode for myLocalFun6() + 1
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/localFunInLibrary.out b/idea/testData/debugger/tinyApp/outs/localFunInLibrary.out
index a1512b6c20a..5418a959332 100644
--- a/idea/testData/debugger/tinyApp/outs/localFunInLibrary.out
+++ b/idea/testData/debugger/tinyApp/outs/localFunInLibrary.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at localFunCustomLib.kt:6
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! localFunInLibrary.LocalFunInLibraryKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 localFunCustomLib.kt:6
 Compile bytecode for localFun()
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/localVariables.out b/idea/testData/debugger/tinyApp/outs/localVariables.out
index c272379bb33..5d9ef3ccf54 100644
--- a/idea/testData/debugger/tinyApp/outs/localVariables.out
+++ b/idea/testData/debugger/tinyApp/outs/localVariables.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at localVariables.kt:6
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! localVariables.LocalVariablesKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 localVariables.kt:6
 Compile bytecode for aaa1
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/manyFilesWithInlineCalls1Dex.out b/idea/testData/debugger/tinyApp/outs/manyFilesWithInlineCalls1Dex.out
index 45245cf26c5..1edc8ca929a 100644
--- a/idea/testData/debugger/tinyApp/outs/manyFilesWithInlineCalls1Dex.out
+++ b/idea/testData/debugger/tinyApp/outs/manyFilesWithInlineCalls1Dex.out
@@ -1,7 +1,7 @@
 LineBreakpoint created at manyFilesWithInlineCalls1Dex.First.kt:5
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! manyFilesWithInlineCalls1Dex.ManyFilesWithInlineCalls1DexKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 manyFilesWithInlineCalls1Dex.First.kt:5
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/manyFilesWithInlineCalls2Dex.out b/idea/testData/debugger/tinyApp/outs/manyFilesWithInlineCalls2Dex.out
index 3270b43d6f0..18207f05d15 100644
--- a/idea/testData/debugger/tinyApp/outs/manyFilesWithInlineCalls2Dex.out
+++ b/idea/testData/debugger/tinyApp/outs/manyFilesWithInlineCalls2Dex.out
@@ -1,7 +1,7 @@
 LineBreakpoint created at manyFilesWithInlineCalls2Dex.Second.kt:5
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! manyFilesWithInlineCalls2Dex.ManyFilesWithInlineCalls2DexKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 manyFilesWithInlineCalls2Dex.Second.kt:5
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/memberFunFromClass.out b/idea/testData/debugger/tinyApp/outs/memberFunFromClass.out
index ec13983cc3f..1faf2695886 100644
--- a/idea/testData/debugger/tinyApp/outs/memberFunFromClass.out
+++ b/idea/testData/debugger/tinyApp/outs/memberFunFromClass.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at memberFunFromClass.kt:6
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! memberFunFromClass.MemberFunFromClassKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 memberFunFromClass.kt:6
 memberFunFromClass.kt:10
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/memberFunFromTopLevel.out b/idea/testData/debugger/tinyApp/outs/memberFunFromTopLevel.out
index b637283b795..1b90cd32e43 100644
--- a/idea/testData/debugger/tinyApp/outs/memberFunFromTopLevel.out
+++ b/idea/testData/debugger/tinyApp/outs/memberFunFromTopLevel.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at memberFunFromTopLevel.kt:13
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! memberFunFromTopLevel.MemberFunFromTopLevelKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 memberFunFromTopLevel.kt:13
 memberFunFromTopLevel.kt:5
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/memberGetterFromClass.out b/idea/testData/debugger/tinyApp/outs/memberGetterFromClass.out
index d9eef881142..c690ca8a1eb 100644
--- a/idea/testData/debugger/tinyApp/outs/memberGetterFromClass.out
+++ b/idea/testData/debugger/tinyApp/outs/memberGetterFromClass.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at memberGetterFromClass.kt:6
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! memberGetterFromClass.MemberGetterFromClassKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 memberGetterFromClass.kt:6
 memberGetterFromClass.kt:11
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/memberGetterFromTopLevel.out b/idea/testData/debugger/tinyApp/outs/memberGetterFromTopLevel.out
index 201159285a3..fd28ec70634 100644
--- a/idea/testData/debugger/tinyApp/outs/memberGetterFromTopLevel.out
+++ b/idea/testData/debugger/tinyApp/outs/memberGetterFromTopLevel.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at memberGetterFromTopLevel.kt:15
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! memberGetterFromTopLevel.MemberGetterFromTopLevelKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 memberGetterFromTopLevel.kt:15
 memberGetterFromTopLevel.kt:6
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/methodWithBreakpoint.out b/idea/testData/debugger/tinyApp/outs/methodWithBreakpoint.out
index 99aa3284d32..5a517280455 100644
--- a/idea/testData/debugger/tinyApp/outs/methodWithBreakpoint.out
+++ b/idea/testData/debugger/tinyApp/outs/methodWithBreakpoint.out
@@ -1,9 +1,9 @@
 LineBreakpoint created at methodWithBreakpoint.kt:5
 LineBreakpoint created at methodWithBreakpoint.kt:10
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! methodWithBreakpoint.MethodWithBreakpointKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 methodWithBreakpoint.kt:5
 Compile bytecode for foo()
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/multilineExpressionAtBreakpoint.out b/idea/testData/debugger/tinyApp/outs/multilineExpressionAtBreakpoint.out
index 058ce19e017..31f876f8081 100644
--- a/idea/testData/debugger/tinyApp/outs/multilineExpressionAtBreakpoint.out
+++ b/idea/testData/debugger/tinyApp/outs/multilineExpressionAtBreakpoint.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at multilineExpressionAtBreakpoint.kt:5
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! multilineExpressionAtBreakpoint.MultilineExpressionAtBreakpointKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 multilineExpressionAtBreakpoint.kt:5
 Compile bytecode for 1 + 1
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/multipleBreakpointsAtLine.out b/idea/testData/debugger/tinyApp/outs/multipleBreakpointsAtLine.out
index acd6d840642..af30c156599 100644
--- a/idea/testData/debugger/tinyApp/outs/multipleBreakpointsAtLine.out
+++ b/idea/testData/debugger/tinyApp/outs/multipleBreakpointsAtLine.out
@@ -7,8 +7,8 @@ LineBreakpoint created at multipleBreakpointsAtLine.kt:43 lambdaOrdinal = 1
 LineBreakpoint created at multipleBreakpointsAtLine.kt:48 lambdaOrdinal = 2
 LineBreakpoint created at multipleBreakpointsAtLine.kt:62
 LineBreakpoint created at multipleBreakpointsAtLine.kt:67 lambdaOrdinal = 2
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! multipleBreakpointsAtLine.MultipleBreakpointsAtLineKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 multipleBreakpointsAtLine.kt:9
 multipleBreakpointsAtLine.kt:14
 Compile bytecode for it + 2
@@ -33,6 +33,6 @@ multipleBreakpointsAtLine.kt:62
 Compile bytecode for it + 14
 multipleBreakpointsAtLine.kt:67
 Compile bytecode for it + 15
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/nestedInlineArguments.out b/idea/testData/debugger/tinyApp/outs/nestedInlineArguments.out
index d398cdf3998..b11d1c53975 100644
--- a/idea/testData/debugger/tinyApp/outs/nestedInlineArguments.out
+++ b/idea/testData/debugger/tinyApp/outs/nestedInlineArguments.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at nestedInlineArguments.kt:13 lambdaOrdinal = 1
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! nestedInlineArguments.NestedInlineArgumentsKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 nestedInlineArguments.kt:13
 Compile bytecode for it.i
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/noParameterLambdaArgumentCallInInline.out b/idea/testData/debugger/tinyApp/outs/noParameterLambdaArgumentCallInInline.out
index dbff975ea0a..a7c3472905a 100644
--- a/idea/testData/debugger/tinyApp/outs/noParameterLambdaArgumentCallInInline.out
+++ b/idea/testData/debugger/tinyApp/outs/noParameterLambdaArgumentCallInInline.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at noParameterLambdaArgumentCallInInline.kt:16
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! noParameterLambdaArgumentCallInInline.NoParameterLambdaArgumentCallInInlineKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 noParameterLambdaArgumentCallInInline.kt:16
 noParameterLambdaArgumentCallInInline.kt:17
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/noParameterLambdaArgumentCallInLambda.out b/idea/testData/debugger/tinyApp/outs/noParameterLambdaArgumentCallInLambda.out
index 81cfdb7f48c..83a0085e887 100644
--- a/idea/testData/debugger/tinyApp/outs/noParameterLambdaArgumentCallInLambda.out
+++ b/idea/testData/debugger/tinyApp/outs/noParameterLambdaArgumentCallInLambda.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at noParameterLambdaArgumentCallInLambda.kt:5 lambdaOrdinal = 1
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! noParameterLambdaArgumentCallInLambda.NoParameterLambdaArgumentCallInLambdaKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 noParameterLambdaArgumentCallInLambda.kt:5
 noParameterLambdaArgumentCallInLambda.kt:6
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/npe.out b/idea/testData/debugger/tinyApp/outs/npe.out
index f632a025f3f..fee79cad972 100644
--- a/idea/testData/debugger/tinyApp/outs/npe.out
+++ b/idea/testData/debugger/tinyApp/outs/npe.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at npe.kt:7
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! npe.NpeKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 npe.kt:7
 npe.kt:10
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/objectFun.out b/idea/testData/debugger/tinyApp/outs/objectFun.out
index 400c3d15a0f..d6ec6df003e 100644
--- a/idea/testData/debugger/tinyApp/outs/objectFun.out
+++ b/idea/testData/debugger/tinyApp/outs/objectFun.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at objectFun.kt:11
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! objectFun.ObjectFunKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 objectFun.kt:11
 objectFun.kt:5
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/onClassHeader.out b/idea/testData/debugger/tinyApp/outs/onClassHeader.out
index 704aaef5f43..09b695f503c 100644
--- a/idea/testData/debugger/tinyApp/outs/onClassHeader.out
+++ b/idea/testData/debugger/tinyApp/outs/onClassHeader.out
@@ -1,11 +1,11 @@
 LineBreakpoint created at onClassHeader.kt:6
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! onClassHeader.OnClassHeaderKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 onClassHeader.kt:6
 onClassHeader.kt:16
 Compile bytecode for 1 + 1
 Compile bytecode for this
 Compile bytecode for this.foo("a")
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/onGetter.out b/idea/testData/debugger/tinyApp/outs/onGetter.out
index 6b89e8ff169..141372c55fc 100644
--- a/idea/testData/debugger/tinyApp/outs/onGetter.out
+++ b/idea/testData/debugger/tinyApp/outs/onGetter.out
@@ -1,9 +1,9 @@
 LineBreakpoint created at onGetter.kt:9
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! onGetter.OnGetterKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 onGetter.kt:9
 onGetter.kt:12
 Compile bytecode for prop
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/onObjectHeader.out b/idea/testData/debugger/tinyApp/outs/onObjectHeader.out
index 3eef47baed1..2e4073db494 100644
--- a/idea/testData/debugger/tinyApp/outs/onObjectHeader.out
+++ b/idea/testData/debugger/tinyApp/outs/onObjectHeader.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at onObjectHeader.kt:5
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! onObjectHeader.OnObjectHeaderKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 onObjectHeader.kt:5
 onObjectHeader.kt:10
 onObjectHeader.kt:16
@@ -8,6 +8,6 @@ onObjectHeader.kt:8
 onObjectHeader.kt:11
 onObjectHeader.kt:8
 Compile bytecode for 1 + 1
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/oneLineFunctionalExpression.out b/idea/testData/debugger/tinyApp/outs/oneLineFunctionalExpression.out
index 5d211df4019..bc40ee7fd86 100644
--- a/idea/testData/debugger/tinyApp/outs/oneLineFunctionalExpression.out
+++ b/idea/testData/debugger/tinyApp/outs/oneLineFunctionalExpression.out
@@ -1,10 +1,10 @@
 LineBreakpoint created at oneLineFunctionalExpression.kt:9
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! oneLineFunctionalExpression.OneLineFunctionalExpressionKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 oneLineFunctionalExpression.kt:9
 oneLineFunctionalExpression.kt:14
 oneLineFunctionalExpression.kt:9
 Compile bytecode for it
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/oneLineLambda.out b/idea/testData/debugger/tinyApp/outs/oneLineLambda.out
index 38f9b24af8a..953c338a5b2 100644
--- a/idea/testData/debugger/tinyApp/outs/oneLineLambda.out
+++ b/idea/testData/debugger/tinyApp/outs/oneLineLambda.out
@@ -1,10 +1,10 @@
 LineBreakpoint created at oneLineLambda.kt:9
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! oneLineLambda.OneLineLambdaKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 oneLineLambda.kt:9
 oneLineLambda.kt:14
 oneLineLambda.kt:9
 Compile bytecode for it
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/package.out b/idea/testData/debugger/tinyApp/outs/package.out
index b8b3bfe3a95..1437e5fb730 100644
--- a/idea/testData/debugger/tinyApp/outs/package.out
+++ b/idea/testData/debugger/tinyApp/outs/package.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at package.kt:6
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! package.PackageKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 package.kt:6
 Compile bytecode for 1
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/parametersOfInlineFun.out b/idea/testData/debugger/tinyApp/outs/parametersOfInlineFun.out
index 9a5c3749c49..c7a32becdae 100644
--- a/idea/testData/debugger/tinyApp/outs/parametersOfInlineFun.out
+++ b/idea/testData/debugger/tinyApp/outs/parametersOfInlineFun.out
@@ -1,12 +1,12 @@
 LineBreakpoint created at parametersOfInlineFun.kt:15
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! parametersOfInlineFun.ParametersOfInlineFunKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 parametersOfInlineFun.kt:15
 Compile bytecode for primitive
 Compile bytecode for array
 Compile bytecode for str
 Compile bytecode for list
 Compile bytecode for this.prop
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/parametersOfInlineFunSeveralOnLine.out b/idea/testData/debugger/tinyApp/outs/parametersOfInlineFunSeveralOnLine.out
index 1bc3985c9ff..c6a028e8785 100644
--- a/idea/testData/debugger/tinyApp/outs/parametersOfInlineFunSeveralOnLine.out
+++ b/idea/testData/debugger/tinyApp/outs/parametersOfInlineFunSeveralOnLine.out
@@ -1,11 +1,11 @@
 LineBreakpoint created at parametersOfInlineFunSeveralOnLine.kt:8
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! parametersOfInlineFunSeveralOnLine.ParametersOfInlineFunSeveralOnLineKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 parametersOfInlineFunSeveralOnLine.kt:8
 parametersOfInlineFunSeveralOnLine.kt:8
 parametersOfInlineFunSeveralOnLine.kt:8
 parametersOfInlineFunSeveralOnLine.kt:8
 Compile bytecode for it
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/privateClass.out b/idea/testData/debugger/tinyApp/outs/privateClass.out
index 4908e4d7fed..747851f438c 100644
--- a/idea/testData/debugger/tinyApp/outs/privateClass.out
+++ b/idea/testData/debugger/tinyApp/outs/privateClass.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at privateClass.kt:5
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! privateClass.PrivateClassKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 privateClass.kt:5
 Compile bytecode for A.PrivateClass()
 Compile bytecode for A.PrivateClass().prop
@@ -8,6 +8,6 @@ Compile bytecode for A().PrivateInnerClass()
 Compile bytecode for A().PrivateInnerClass().prop
 Compile bytecode for forTests.MyJavaClass.PrivateJavaClass()
 Compile bytecode for forTests.MyJavaClass.PrivateJavaClass().prop
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/privateMember.out b/idea/testData/debugger/tinyApp/outs/privateMember.out
index 4cda22277ad..5855d137cbf 100644
--- a/idea/testData/debugger/tinyApp/outs/privateMember.out
+++ b/idea/testData/debugger/tinyApp/outs/privateMember.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at privateMember.kt:9
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! privateMember.PrivateMemberKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 privateMember.kt:9
 Compile bytecode for MyClass().privateFun()
 Compile bytecode for MyClass().privateVal
@@ -8,6 +8,6 @@ Compile bytecode for MyClass.PrivateClass().a
 Compile bytecode for base.privateFun()
 Compile bytecode for derived.privateFun()
 Compile bytecode for derivedAsBase.privateFun()
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/privateMembersPriority.out b/idea/testData/debugger/tinyApp/outs/privateMembersPriority.out
index d96cff870b3..f82080274ac 100644
--- a/idea/testData/debugger/tinyApp/outs/privateMembersPriority.out
+++ b/idea/testData/debugger/tinyApp/outs/privateMembersPriority.out
@@ -1,14 +1,14 @@
 LineBreakpoint created at privateMembersPriority.kt:22
 LineBreakpoint created at privateMembersPriority.kt:34
 LineBreakpoint created at privateMembersPriority.kt:41
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! privateMembersPriority.PrivateMembersPriorityKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 privateMembersPriority.kt:22
 Compile bytecode for privateFun()
 privateMembersPriority.kt:34
 Compile bytecode for javaClass.size
 privateMembersPriority.kt:41
 Compile bytecode for TwoPrivateFun().foo(1)
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/privatePropertyWithExplicitDefaultGetter.out b/idea/testData/debugger/tinyApp/outs/privatePropertyWithExplicitDefaultGetter.out
index 20c79dc5fed..9564bc25479 100644
--- a/idea/testData/debugger/tinyApp/outs/privatePropertyWithExplicitDefaultGetter.out
+++ b/idea/testData/debugger/tinyApp/outs/privatePropertyWithExplicitDefaultGetter.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at privatePropertyWithExplicitDefaultGetter.kt:7
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! privatePropertyWithExplicitDefaultGetter.PrivatePropertyWithExplicitDefaultGetterKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 privatePropertyWithExplicitDefaultGetter.kt:7
 Compile bytecode for base.a
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/propertyReference.out b/idea/testData/debugger/tinyApp/outs/propertyReference.out
index 52e401c842d..3e0573cd027 100644
--- a/idea/testData/debugger/tinyApp/outs/propertyReference.out
+++ b/idea/testData/debugger/tinyApp/outs/propertyReference.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at propertyReference.kt:11
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! propertyReference.PropertyReferenceKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 propertyReference.kt:11
 propertyReference.kt:4
 propertyReference.kt:7
@@ -8,6 +8,6 @@ propertyReference.kt:11
 propertyReference.kt:4
 propertyReference.kt:5
 propertyReference.kt:12
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/protectedMember.out b/idea/testData/debugger/tinyApp/outs/protectedMember.out
index 733f6e5cd1c..e9018891c82 100644
--- a/idea/testData/debugger/tinyApp/outs/protectedMember.out
+++ b/idea/testData/debugger/tinyApp/outs/protectedMember.out
@@ -1,10 +1,10 @@
 LineBreakpoint created at protectedMember.kt:5
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! protectedMember.ProtectedMemberKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 protectedMember.kt:5
 Compile bytecode for MyClass().protectedFun()
 Compile bytecode for MyClass().protectedVal
 Compile bytecode for MyClass.ProtectedClass().a
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/rawTypeskt11831.out b/idea/testData/debugger/tinyApp/outs/rawTypeskt11831.out
index 6fd9d58d68b..00e7cf052e0 100644
--- a/idea/testData/debugger/tinyApp/outs/rawTypeskt11831.out
+++ b/idea/testData/debugger/tinyApp/outs/rawTypeskt11831.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at rawTypeskt11831.kt:7
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! rawTypeskt11831.RawTypeskt11831Kt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 rawTypeskt11831.kt:7
 Compile bytecode for foo
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/reflectKClass.out b/idea/testData/debugger/tinyApp/outs/reflectKClass.out
index 6579a3da74e..f0e7b9548e7 100644
--- a/idea/testData/debugger/tinyApp/outs/reflectKClass.out
+++ b/idea/testData/debugger/tinyApp/outs/reflectKClass.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at reflectKClass.kt:5
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! reflectKClass.ReflectKClassKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 reflectKClass.kt:5
 reflectKClass.kt:6
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/remappedParameterInInline.out b/idea/testData/debugger/tinyApp/outs/remappedParameterInInline.out
index 7b21384b864..bd28a4b388f 100644
--- a/idea/testData/debugger/tinyApp/outs/remappedParameterInInline.out
+++ b/idea/testData/debugger/tinyApp/outs/remappedParameterInInline.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at remappedParameterInInline.kt:11
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! remappedParameterInInline.RemappedParameterInInlineKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 remappedParameterInInline.kt:11
 Compile bytecode for p
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/returnVoid.out b/idea/testData/debugger/tinyApp/outs/returnVoid.out
index fe7bdbdccfd..fa430735d5c 100644
--- a/idea/testData/debugger/tinyApp/outs/returnVoid.out
+++ b/idea/testData/debugger/tinyApp/outs/returnVoid.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at returnVoid.kt:5
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! returnVoid.ReturnVoidKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 returnVoid.kt:5
 returnVoid.kt:6
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/samAdapter.out b/idea/testData/debugger/tinyApp/outs/samAdapter.out
index 1046e01334d..24bc6a962c7 100644
--- a/idea/testData/debugger/tinyApp/outs/samAdapter.out
+++ b/idea/testData/debugger/tinyApp/outs/samAdapter.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at samAdapter.kt:5
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! samAdapter.SamAdapterKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 samAdapter.kt:5
 samAdapter.kt:6
 samAdapter.kt:10
@@ -10,6 +10,6 @@ MyJavaClass.java:21
 samAdapter.kt:10
 samAdapter.kt:6
 samAdapter.kt:7
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/severalFunLiterals.out b/idea/testData/debugger/tinyApp/outs/severalFunLiterals.out
index 5eb1945ff6b..4b877ddc3ab 100644
--- a/idea/testData/debugger/tinyApp/outs/severalFunLiterals.out
+++ b/idea/testData/debugger/tinyApp/outs/severalFunLiterals.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at severalFunLiterals.kt:6 lambdaOrdinal = -1
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! severalFunLiterals.SeveralFunLiteralsKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 severalFunLiterals.kt:6
 severalFunLiterals.kt:7
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/severalFunLiteralsInClass.out b/idea/testData/debugger/tinyApp/outs/severalFunLiteralsInClass.out
index 4fd8001dc7d..5fefd18419e 100644
--- a/idea/testData/debugger/tinyApp/outs/severalFunLiteralsInClass.out
+++ b/idea/testData/debugger/tinyApp/outs/severalFunLiteralsInClass.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at severalFunLiteralsInClass.kt:20 lambdaOrdinal = -1
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! severalFunLiteralsInClass.SeveralFunLiteralsInClassKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 severalFunLiteralsInClass.kt:20
 severalFunLiteralsInClass.kt:21
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/severalInlineCallsFromOtherFileDex.out b/idea/testData/debugger/tinyApp/outs/severalInlineCallsFromOtherFileDex.out
index aae16a6dd3e..5b4cf1c8875 100644
--- a/idea/testData/debugger/tinyApp/outs/severalInlineCallsFromOtherFileDex.out
+++ b/idea/testData/debugger/tinyApp/outs/severalInlineCallsFromOtherFileDex.out
@@ -1,10 +1,10 @@
 LineBreakpoint created at severalInlineCallsFromOtherFileDex.Other.kt:6
 LineBreakpoint created at severalInlineCallsFromOtherFileDex.kt:5
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! severalInlineCallsFromOtherFileDex.SeveralInlineCallsFromOtherFileDexKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 severalInlineCallsFromOtherFileDex.kt:5
 severalInlineCallsFromOtherFileDex.Other.kt:6
 severalInlineCallsFromOtherFileDex.Other.kt:6
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/severalInlineFunctionsInOneFileDex.out b/idea/testData/debugger/tinyApp/outs/severalInlineFunctionsInOneFileDex.out
index 87d29f79994..75665cb5f7d 100644
--- a/idea/testData/debugger/tinyApp/outs/severalInlineFunctionsInOneFileDex.out
+++ b/idea/testData/debugger/tinyApp/outs/severalInlineFunctionsInOneFileDex.out
@@ -1,6 +1,6 @@
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! severalInlineFunctionsInOneFileDex.SeveralInlineFunctionsInOneFileDexKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
+Disconnected from the target VM
 
 Process finished with exit code 1
 Error: Could not find or load main class severalInlineFunctionsInOneFileDex.SeveralInlineFunctionsInOneFileDexKt
diff --git a/idea/testData/debugger/tinyApp/outs/simple.out b/idea/testData/debugger/tinyApp/outs/simple.out
index 905ba4fb8cd..5d7731dd6c2 100644
--- a/idea/testData/debugger/tinyApp/outs/simple.out
+++ b/idea/testData/debugger/tinyApp/outs/simple.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at simple.kt:6
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! simple.SimpleKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 simple.kt:6
 Compile bytecode for 1
 Compile bytecode for 1 + 1
@@ -9,6 +9,6 @@ a + args.size
 
 // RESULT: 1: I
 
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/simpleConditionalBreakpoint.out b/idea/testData/debugger/tinyApp/outs/simpleConditionalBreakpoint.out
index c0872dcc4c6..3217787669a 100644
--- a/idea/testData/debugger/tinyApp/outs/simpleConditionalBreakpoint.out
+++ b/idea/testData/debugger/tinyApp/outs/simpleConditionalBreakpoint.out
@@ -1,7 +1,7 @@
 LineBreakpoint created at simpleConditionalBreakpoint.kt:5 condition = 1 == 1
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! simpleConditionalBreakpoint.SimpleConditionalBreakpointKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 simpleConditionalBreakpoint.kt:5
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/skipClassloader.out b/idea/testData/debugger/tinyApp/outs/skipClassloader.out
index 0b9482cb540..c8831e4a163 100644
--- a/idea/testData/debugger/tinyApp/outs/skipClassloader.out
+++ b/idea/testData/debugger/tinyApp/outs/skipClassloader.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at skipClassloader.kt:7
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! skipClassloader.SkipClassloaderKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 skipClassloader.kt:7
 skipClassloader.kt:13
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/skipConstructors.out b/idea/testData/debugger/tinyApp/outs/skipConstructors.out
index f9c30a333ab..686562ed0d0 100644
--- a/idea/testData/debugger/tinyApp/outs/skipConstructors.out
+++ b/idea/testData/debugger/tinyApp/outs/skipConstructors.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at skipConstructors.kt:5
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! skipConstructors.SkipConstructorsKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 skipConstructors.kt:5
 skipConstructors.kt:6
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/skipSimpleGetter.out b/idea/testData/debugger/tinyApp/outs/skipSimpleGetter.out
index c1934b73180..a5234818a80 100644
--- a/idea/testData/debugger/tinyApp/outs/skipSimpleGetter.out
+++ b/idea/testData/debugger/tinyApp/outs/skipSimpleGetter.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at skipSimpleGetter.kt:8
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! skipSimpleGetter.SkipSimpleGetterKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 skipSimpleGetter.kt:8
 skipSimpleGetter.kt:9
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/skipSimpleGetterLocalVal.out b/idea/testData/debugger/tinyApp/outs/skipSimpleGetterLocalVal.out
index 142a01762d5..6ea2fcd3c92 100644
--- a/idea/testData/debugger/tinyApp/outs/skipSimpleGetterLocalVal.out
+++ b/idea/testData/debugger/tinyApp/outs/skipSimpleGetterLocalVal.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at skipSimpleGetterLocalVal.kt:13
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! skipSimpleGetterLocalVal.SkipSimpleGetterLocalValKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 skipSimpleGetterLocalVal.kt:13
 skipSimpleGetterLocalVal.kt:15
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/skipSimpleGetterMethodWithProperty.out b/idea/testData/debugger/tinyApp/outs/skipSimpleGetterMethodWithProperty.out
index 8f6f81ac3e3..ff5b49c305c 100644
--- a/idea/testData/debugger/tinyApp/outs/skipSimpleGetterMethodWithProperty.out
+++ b/idea/testData/debugger/tinyApp/outs/skipSimpleGetterMethodWithProperty.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at skipSimpleGetterMethodWithProperty.kt:5
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! skipSimpleGetterMethodWithProperty.SkipSimpleGetterMethodWithPropertyKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 skipSimpleGetterMethodWithProperty.kt:5
 skipSimpleGetterMethodWithProperty.kt:10
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/smartStepIntoComponentFunction.out b/idea/testData/debugger/tinyApp/outs/smartStepIntoComponentFunction.out
index d0d129b02d8..344c0804d33 100644
--- a/idea/testData/debugger/tinyApp/outs/smartStepIntoComponentFunction.out
+++ b/idea/testData/debugger/tinyApp/outs/smartStepIntoComponentFunction.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at smartStepIntoComponentFunction.kt:10
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! smartStepIntoComponentFunction.SmartStepIntoComponentFunctionKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 smartStepIntoComponentFunction.kt:10
 smartStepIntoComponentFunction.kt:11
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/smartStepIntoConstructor.out b/idea/testData/debugger/tinyApp/outs/smartStepIntoConstructor.out
index 53843329e55..bcdac9ae9c1 100644
--- a/idea/testData/debugger/tinyApp/outs/smartStepIntoConstructor.out
+++ b/idea/testData/debugger/tinyApp/outs/smartStepIntoConstructor.out
@@ -11,8 +11,8 @@ LineBreakpoint created at smartStepIntoConstructor.kt:43
 LineBreakpoint created at smartStepIntoConstructor.kt:47
 LineBreakpoint created at smartStepIntoConstructor.kt:51
 LineBreakpoint created at smartStepIntoConstructor.kt:55
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! smartStepIntoConstructor.SmartStepIntoConstructorKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 smartStepIntoConstructor.kt:7
 smartStepIntoConstructor.kt:59
 smartStepIntoConstructor.kt:11
@@ -39,6 +39,6 @@ smartStepIntoConstructor.kt:51
 smartStepIntoConstructor.kt:112
 smartStepIntoConstructor.kt:55
 smartStepIntoConstructor.kt:113
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/smartStepIntoFunWithDefaultArgs.out b/idea/testData/debugger/tinyApp/outs/smartStepIntoFunWithDefaultArgs.out
index c8f8efaf349..2a1ef494b93 100644
--- a/idea/testData/debugger/tinyApp/outs/smartStepIntoFunWithDefaultArgs.out
+++ b/idea/testData/debugger/tinyApp/outs/smartStepIntoFunWithDefaultArgs.out
@@ -2,8 +2,8 @@ LineBreakpoint created at smartStepIntoFunWithDefaultArgs.kt:17
 LineBreakpoint created at smartStepIntoFunWithDefaultArgs.kt:22
 LineBreakpoint created at smartStepIntoFunWithDefaultArgs.kt:27
 LineBreakpoint created at smartStepIntoFunWithDefaultArgs.kt:32
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! smartStepIntoFunWithDefaultArgs.SmartStepIntoFunWithDefaultArgsKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 smartStepIntoFunWithDefaultArgs.kt:17
 smartStepIntoFunWithDefaultArgs.kt:4
 smartStepIntoFunWithDefaultArgs.kt:22
@@ -12,6 +12,6 @@ smartStepIntoFunWithDefaultArgs.kt:27
 smartStepIntoFunWithDefaultArgs.kt:8
 smartStepIntoFunWithDefaultArgs.kt:32
 smartStepIntoFunWithDefaultArgs.kt:8
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/smartStepIntoInlinedFunLiteral.out b/idea/testData/debugger/tinyApp/outs/smartStepIntoInlinedFunLiteral.out
index 34aa59e6e58..a0f303d5d74 100644
--- a/idea/testData/debugger/tinyApp/outs/smartStepIntoInlinedFunLiteral.out
+++ b/idea/testData/debugger/tinyApp/outs/smartStepIntoInlinedFunLiteral.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at smartStepIntoInlinedFunLiteral.kt:6
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! smartStepIntoInlinedFunLiteral.SmartStepIntoInlinedFunLiteralKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 smartStepIntoInlinedFunLiteral.kt:6
 smartStepIntoInlinedFunLiteral.kt:11
 smartStepIntoInlinedFunLiteral.kt:12
@@ -10,6 +10,6 @@ smartStepIntoInlinedFunLiteral.kt:24
 smartStepIntoInlinedFunLiteral.kt:26
 smartStepIntoInlinedFunLiteral.kt:32
 smartStepIntoInlinedFunLiteral.kt:32
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/smartStepIntoInlinedFunctionalExpression.out b/idea/testData/debugger/tinyApp/outs/smartStepIntoInlinedFunctionalExpression.out
index c4ece0f490a..fb58dbf22cc 100644
--- a/idea/testData/debugger/tinyApp/outs/smartStepIntoInlinedFunctionalExpression.out
+++ b/idea/testData/debugger/tinyApp/outs/smartStepIntoInlinedFunctionalExpression.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at smartStepIntoInlinedFunctionalExpression.kt:6
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! smartStepIntoInlinedFunctionalExpression.SmartStepIntoInlinedFunctionalExpressionKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 smartStepIntoInlinedFunctionalExpression.kt:6
 smartStepIntoInlinedFunctionalExpression.kt:11
 smartStepIntoInlinedFunctionalExpression.kt:12
@@ -10,6 +10,6 @@ smartStepIntoInlinedFunctionalExpression.kt:24
 smartStepIntoInlinedFunctionalExpression.kt:26
 smartStepIntoInlinedFunctionalExpression.kt:31
 smartStepIntoInlinedFunctionalExpression.kt:31
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/smartStepIntoInsideLambda.out b/idea/testData/debugger/tinyApp/outs/smartStepIntoInsideLambda.out
index 6d793b06488..c9f3e0649a1 100644
--- a/idea/testData/debugger/tinyApp/outs/smartStepIntoInsideLambda.out
+++ b/idea/testData/debugger/tinyApp/outs/smartStepIntoInsideLambda.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at smartStepIntoInsideLambda.kt:6 lambdaOrdinal = 1
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! smartStepIntoInsideLambda.SmartStepIntoInsideLambdaKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 smartStepIntoInsideLambda.kt:6
 smartStepIntoInsideLambda.kt:14
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/smartStepIntoInterfaceFun.out b/idea/testData/debugger/tinyApp/outs/smartStepIntoInterfaceFun.out
index 7961ee09529..16e142ab51f 100644
--- a/idea/testData/debugger/tinyApp/outs/smartStepIntoInterfaceFun.out
+++ b/idea/testData/debugger/tinyApp/outs/smartStepIntoInterfaceFun.out
@@ -1,12 +1,12 @@
 LineBreakpoint created at smartStepIntoInterfaceFun.kt:23
 LineBreakpoint created at smartStepIntoInterfaceFun.kt:27
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! smartStepIntoInterfaceFun.SmartStepIntoInterfaceFunKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 smartStepIntoInterfaceFun.kt:23
 smartStepIntoInterfaceFun.kt:11
 smartStepIntoInterfaceFun.kt:27
 smartStepIntoInterfaceFun.kt:14
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
 
diff --git a/idea/testData/debugger/tinyApp/outs/smartStepIntoInterfaceImpl.out b/idea/testData/debugger/tinyApp/outs/smartStepIntoInterfaceImpl.out
index 7697d7a0d50..9057a991f36 100644
--- a/idea/testData/debugger/tinyApp/outs/smartStepIntoInterfaceImpl.out
+++ b/idea/testData/debugger/tinyApp/outs/smartStepIntoInterfaceImpl.out
@@ -10,8 +10,8 @@ LineBreakpoint created at smartStepIntoInterfaceImpl.kt:138
 LineBreakpoint created at smartStepIntoInterfaceImpl.kt:143
 LineBreakpoint created at smartStepIntoInterfaceImpl.kt:148
 LineBreakpoint created at smartStepIntoInterfaceImpl.kt:154
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! smartStepIntoInterfaceImpl.SmartStepIntoInterfaceImplKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 smartStepIntoInterfaceImpl.kt:90
 smartStepIntoInterfaceImpl.kt:95
 smartStepIntoInterfaceImpl.kt:8
@@ -35,6 +35,6 @@ smartStepIntoInterfaceImpl.kt:148
 smartStepIntoInterfaceImpl.kt:64
 smartStepIntoInterfaceImpl.kt:154
 smartStepIntoInterfaceImpl.kt:70
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/smartStepIntoStoredLambda.out b/idea/testData/debugger/tinyApp/outs/smartStepIntoStoredLambda.out
index ddf236d4d25..de1c53b58b0 100644
--- a/idea/testData/debugger/tinyApp/outs/smartStepIntoStoredLambda.out
+++ b/idea/testData/debugger/tinyApp/outs/smartStepIntoStoredLambda.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at smartStepIntoStoredLambda.kt:12
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! smartStepIntoStoredLambda.SmartStepIntoStoredLambdaKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 smartStepIntoStoredLambda.kt:12
 smartStepIntoStoredLambda.kt:16
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/smartStepIntoSubClass.out b/idea/testData/debugger/tinyApp/outs/smartStepIntoSubClass.out
index 1fb02f9b2ab..cc50b2554b3 100644
--- a/idea/testData/debugger/tinyApp/outs/smartStepIntoSubClass.out
+++ b/idea/testData/debugger/tinyApp/outs/smartStepIntoSubClass.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at smartStepIntoSubClass.kt:7
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! smartStepIntoSubClass.SmartStepIntoSubClassKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 smartStepIntoSubClass.kt:7
 smartStepIntoSubClass.kt:18
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/smartStepIntoWithDelegates.out b/idea/testData/debugger/tinyApp/outs/smartStepIntoWithDelegates.out
index 51cf00b3c8e..67a684b8be3 100644
--- a/idea/testData/debugger/tinyApp/outs/smartStepIntoWithDelegates.out
+++ b/idea/testData/debugger/tinyApp/outs/smartStepIntoWithDelegates.out
@@ -3,8 +3,8 @@ LineBreakpoint created at smartStepIntoWithDelegates.kt:32
 LineBreakpoint created at smartStepIntoWithDelegates.kt:40
 LineBreakpoint created at smartStepIntoWithDelegates.kt:49
 LineBreakpoint created at smartStepIntoWithDelegates.kt:58
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! smartStepIntoWithDelegates.SmartStepIntoWithDelegatesKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 smartStepIntoWithDelegates.kt:24
 smartStepIntoWithDelegates.kt:12
 smartStepIntoWithDelegates.kt:32
@@ -15,6 +15,6 @@ smartStepIntoWithDelegates.kt:49
 smartStepIntoWithDelegates.kt:8
 smartStepIntoWithDelegates.kt:58
 smartStepIntoWithDelegates.kt:12
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/smartStepIntoWithOverrides.out b/idea/testData/debugger/tinyApp/outs/smartStepIntoWithOverrides.out
index 23acc546932..586c198607d 100644
--- a/idea/testData/debugger/tinyApp/outs/smartStepIntoWithOverrides.out
+++ b/idea/testData/debugger/tinyApp/outs/smartStepIntoWithOverrides.out
@@ -3,8 +3,8 @@ LineBreakpoint created at smartStepIntoWithOverrides.kt:30
 LineBreakpoint created at smartStepIntoWithOverrides.kt:38
 LineBreakpoint created at smartStepIntoWithOverrides.kt:47
 LineBreakpoint created at smartStepIntoWithOverrides.kt:56
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! smartStepIntoWithOverrides.SmartStepIntoWithOverridesKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 smartStepIntoWithOverrides.kt:22
 smartStepIntoWithOverrides.kt:12
 smartStepIntoWithOverrides.kt:30
@@ -15,6 +15,6 @@ smartStepIntoWithOverrides.kt:47
 smartStepIntoWithOverrides.kt:8
 smartStepIntoWithOverrides.kt:56
 smartStepIntoWithOverrides.kt:12
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/smartcasts.out b/idea/testData/debugger/tinyApp/outs/smartcasts.out
index 28892724790..55ecdfb8f2a 100644
--- a/idea/testData/debugger/tinyApp/outs/smartcasts.out
+++ b/idea/testData/debugger/tinyApp/outs/smartcasts.out
@@ -1,13 +1,13 @@
 LineBreakpoint created at smartcasts.kt:19
 LineBreakpoint created at smartcasts.kt:29
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! smartcasts.SmartcastsKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 smartcasts.kt:19
 Compile bytecode for derived.prop
 smartcasts.kt:19
 smartcasts.kt:29
 Compile bytecode for nullable.prop
 smartcasts.kt:29
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/soInlineAnonymousFunctionArgument.out b/idea/testData/debugger/tinyApp/outs/soInlineAnonymousFunctionArgument.out
index 644fa726ca0..938243c105b 100644
--- a/idea/testData/debugger/tinyApp/outs/soInlineAnonymousFunctionArgument.out
+++ b/idea/testData/debugger/tinyApp/outs/soInlineAnonymousFunctionArgument.out
@@ -1,10 +1,10 @@
 LineBreakpoint created at soInlineAnonymousFunctionArgument.kt:5
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! soInlineAnonymousFunctionArgument.SoInlineAnonymousFunctionArgumentKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 soInlineAnonymousFunctionArgument.kt:5
 soInlineAnonymousFunctionArgument.kt:7
 soInlineAnonymousFunctionArgument.kt:11
 soInlineAnonymousFunctionArgument.kt:12
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/soInlineAnonymousFunctionArgumentDex.out b/idea/testData/debugger/tinyApp/outs/soInlineAnonymousFunctionArgumentDex.out
index ee0367ec442..a17bbbdc68a 100644
--- a/idea/testData/debugger/tinyApp/outs/soInlineAnonymousFunctionArgumentDex.out
+++ b/idea/testData/debugger/tinyApp/outs/soInlineAnonymousFunctionArgumentDex.out
@@ -1,10 +1,10 @@
 LineBreakpoint created at soInlineAnonymousFunctionArgumentDex.kt:5
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! soInlineAnonymousFunctionArgumentDex.SoInlineAnonymousFunctionArgumentDexKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 soInlineAnonymousFunctionArgumentDex.kt:5
 soInlineAnonymousFunctionArgumentDex.kt:7
 soInlineAnonymousFunctionArgumentDex.kt:11
 soInlineAnonymousFunctionArgumentDex.kt:12
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/soInlineCallInLastStatementInInline.out b/idea/testData/debugger/tinyApp/outs/soInlineCallInLastStatementInInline.out
index db31454d764..2540e995245 100644
--- a/idea/testData/debugger/tinyApp/outs/soInlineCallInLastStatementInInline.out
+++ b/idea/testData/debugger/tinyApp/outs/soInlineCallInLastStatementInInline.out
@@ -1,9 +1,9 @@
 LineBreakpoint created at soInlineCallInLastStatementInInline.kt:9
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! soInlineCallInLastStatementInInline.SoInlineCallInLastStatementInInlineKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 soInlineCallInLastStatementInInline.kt:9
 soInlineCallInLastStatementInInline.kt:10
 soInlineCallInLastStatementInInline.kt:5
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/soInlineCallInLastStatementInInlineDex.out b/idea/testData/debugger/tinyApp/outs/soInlineCallInLastStatementInInlineDex.out
index 0038d30c213..6744f38ebec 100644
--- a/idea/testData/debugger/tinyApp/outs/soInlineCallInLastStatementInInlineDex.out
+++ b/idea/testData/debugger/tinyApp/outs/soInlineCallInLastStatementInInlineDex.out
@@ -1,10 +1,10 @@
 LineBreakpoint created at soInlineCallInLastStatementInInlineDex.kt:10
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! soInlineCallInLastStatementInInlineDex.SoInlineCallInLastStatementInInlineDexKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 soInlineCallInLastStatementInInlineDex.kt:10
 soInlineCallInLastStatementInInlineDex.kt:11
 soInlineCallInLastStatementInInlineDex.kt:5
 soInlineCallInLastStatementInInlineDex.kt:6
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/soInlineCallInLastStatementInInlineFunctionArgument.out b/idea/testData/debugger/tinyApp/outs/soInlineCallInLastStatementInInlineFunctionArgument.out
index 255f4082d07..b41b510fe09 100644
--- a/idea/testData/debugger/tinyApp/outs/soInlineCallInLastStatementInInlineFunctionArgument.out
+++ b/idea/testData/debugger/tinyApp/outs/soInlineCallInLastStatementInInlineFunctionArgument.out
@@ -1,9 +1,9 @@
 LineBreakpoint created at soInlineCallInLastStatementInInlineFunctionArgument.kt:7
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! soInlineCallInLastStatementInInlineFunctionArgument.SoInlineCallInLastStatementInInlineFunctionArgumentKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 soInlineCallInLastStatementInInlineFunctionArgument.kt:7
 soInlineCallInLastStatementInInlineFunctionArgument.kt:8
 soInlineCallInLastStatementInInlineFunctionArgument.kt:9
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/soInlineCallInLastStatementInInlineFunctionArgumentDex.out b/idea/testData/debugger/tinyApp/outs/soInlineCallInLastStatementInInlineFunctionArgumentDex.out
index 7fbd0d59c0e..c1599ff8e1d 100644
--- a/idea/testData/debugger/tinyApp/outs/soInlineCallInLastStatementInInlineFunctionArgumentDex.out
+++ b/idea/testData/debugger/tinyApp/outs/soInlineCallInLastStatementInInlineFunctionArgumentDex.out
@@ -1,9 +1,9 @@
 LineBreakpoint created at soInlineCallInLastStatementInInlineFunctionArgumentDex.kt:7
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! soInlineCallInLastStatementInInlineFunctionArgumentDex.SoInlineCallInLastStatementInInlineFunctionArgumentDexKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 soInlineCallInLastStatementInInlineFunctionArgumentDex.kt:7
 soInlineCallInLastStatementInInlineFunctionArgumentDex.kt:8
 soInlineCallInLastStatementInInlineFunctionArgumentDex.kt:9
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/soInlineCallInLastStatementInInlineInInline.out b/idea/testData/debugger/tinyApp/outs/soInlineCallInLastStatementInInlineInInline.out
index bdd3bd5772e..563e267ae2c 100644
--- a/idea/testData/debugger/tinyApp/outs/soInlineCallInLastStatementInInlineInInline.out
+++ b/idea/testData/debugger/tinyApp/outs/soInlineCallInLastStatementInInlineInInline.out
@@ -1,9 +1,9 @@
 LineBreakpoint created at soInlineCallInLastStatementInInlineInInline.kt:15
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! soInlineCallInLastStatementInInlineInInline.SoInlineCallInLastStatementInInlineInInlineKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 soInlineCallInLastStatementInInlineInInline.kt:15
 soInlineCallInLastStatementInInlineInInline.kt:5
 soInlineCallInLastStatementInInlineInInline.kt:6
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/soInlineFunCallInLastStatementOfInlineWithArgumentFromCalleeAndOwn.out b/idea/testData/debugger/tinyApp/outs/soInlineFunCallInLastStatementOfInlineWithArgumentFromCalleeAndOwn.out
index 57e87d9bd77..49309978548 100644
--- a/idea/testData/debugger/tinyApp/outs/soInlineFunCallInLastStatementOfInlineWithArgumentFromCalleeAndOwn.out
+++ b/idea/testData/debugger/tinyApp/outs/soInlineFunCallInLastStatementOfInlineWithArgumentFromCalleeAndOwn.out
@@ -1,9 +1,9 @@
 LineBreakpoint created at soInlineFunCallInLastStatementOfInlineWithArgumentFromCalleeAndOwn.kt:11 lambdaOrdinal = -1
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! soInlineFunCallInLastStatementOfInlineWithArgumentFromCalleeAndOwn.SoInlineFunCallInLastStatementOfInlineWithArgumentFromCalleeAndOwnKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 soInlineFunCallInLastStatementOfInlineWithArgumentFromCalleeAndOwn.kt:11
 soInlineFunCallInLastStatementOfInlineWithArgumentFromCalleeAndOwn.kt:7
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
 
diff --git a/idea/testData/debugger/tinyApp/outs/soInlineFunDex.out b/idea/testData/debugger/tinyApp/outs/soInlineFunDex.out
index a82bb12cad0..39c669decc2 100644
--- a/idea/testData/debugger/tinyApp/outs/soInlineFunDex.out
+++ b/idea/testData/debugger/tinyApp/outs/soInlineFunDex.out
@@ -1,10 +1,10 @@
 LineBreakpoint created at soInlineFunDex.kt:7
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! soInlineFunDex.SoInlineFunDexKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 soInlineFunDex.kt:7
 soInlineFunDex.kt:9
 soInlineFunDex.kt:11
 soInlineFunDex.kt:12
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/soInlineFunOnOneLineFor.out b/idea/testData/debugger/tinyApp/outs/soInlineFunOnOneLineFor.out
index 45170392c3d..13ade0aa699 100644
--- a/idea/testData/debugger/tinyApp/outs/soInlineFunOnOneLineFor.out
+++ b/idea/testData/debugger/tinyApp/outs/soInlineFunOnOneLineFor.out
@@ -1,10 +1,10 @@
 LineBreakpoint created at soInlineFunOnOneLineFor.kt:17
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! soInlineFunOnOneLineFor.SoInlineFunOnOneLineForKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 soInlineFunOnOneLineFor.kt:17
 soInlineFunOnOneLineFor.kt:18
 soInlineFunOnOneLineFor.kt:8
 soInlineFunOnOneLineFor.kt:9
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/soInlineFunOnOneLineForDex.out b/idea/testData/debugger/tinyApp/outs/soInlineFunOnOneLineForDex.out
index d02523426c6..81b499fe5aa 100644
--- a/idea/testData/debugger/tinyApp/outs/soInlineFunOnOneLineForDex.out
+++ b/idea/testData/debugger/tinyApp/outs/soInlineFunOnOneLineForDex.out
@@ -1,10 +1,10 @@
 LineBreakpoint created at soInlineFunOnOneLineForDex.kt:17
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! soInlineFunOnOneLineForDex.SoInlineFunOnOneLineForDexKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 soInlineFunOnOneLineForDex.kt:17
 soInlineFunOnOneLineForDex.kt:18
 soInlineFunOnOneLineForDex.kt:8
 soInlineFunOnOneLineForDex.kt:9
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/soInlineFunWithFor.out b/idea/testData/debugger/tinyApp/outs/soInlineFunWithFor.out
index f8952b6b747..22bda3692f1 100644
--- a/idea/testData/debugger/tinyApp/outs/soInlineFunWithFor.out
+++ b/idea/testData/debugger/tinyApp/outs/soInlineFunWithFor.out
@@ -1,10 +1,10 @@
 LineBreakpoint created at soInlineFunWithFor.kt:5
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! soInlineFunWithFor.SoInlineFunWithForKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 soInlineFunWithFor.kt:5
 soInlineFunWithFor.kt:7
 soInlineFunWithFor.kt:9
 soInlineFunWithFor.kt:10
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/soInlineFunWithLastStatementMultilineArgumentCall.out b/idea/testData/debugger/tinyApp/outs/soInlineFunWithLastStatementMultilineArgumentCall.out
index bbc290db03e..537fd250eff 100644
--- a/idea/testData/debugger/tinyApp/outs/soInlineFunWithLastStatementMultilineArgumentCall.out
+++ b/idea/testData/debugger/tinyApp/outs/soInlineFunWithLastStatementMultilineArgumentCall.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at soInlineFunWithLastStatementMultilineArgumentCall.kt:14
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! soInlineFunWithLastStatementMultilineArgumentCall.SoInlineFunWithLastStatementMultilineArgumentCallKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 soInlineFunWithLastStatementMultilineArgumentCall.kt:14
 soInlineFunWithLastStatementMultilineArgumentCall.kt:9
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/soInlineFunWithLastStatementOneLineArgumentCall.out b/idea/testData/debugger/tinyApp/outs/soInlineFunWithLastStatementOneLineArgumentCall.out
index a547ee6b1de..ae2d136bd8e 100644
--- a/idea/testData/debugger/tinyApp/outs/soInlineFunWithLastStatementOneLineArgumentCall.out
+++ b/idea/testData/debugger/tinyApp/outs/soInlineFunWithLastStatementOneLineArgumentCall.out
@@ -1,9 +1,9 @@
 LineBreakpoint created at soInlineFunWithLastStatementOneLineArgumentCall.kt:11
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! soInlineFunWithLastStatementOneLineArgumentCall.SoInlineFunWithLastStatementOneLineArgumentCallKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 soInlineFunWithLastStatementOneLineArgumentCall.kt:11
 soInlineFunWithLastStatementOneLineArgumentCall.kt:6
 soInlineFunWithLastStatementOneLineArgumentCall.kt:7
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/soInlineIfConditionLambdaFalse.out b/idea/testData/debugger/tinyApp/outs/soInlineIfConditionLambdaFalse.out
index 53a706cd02a..8364f946bd5 100644
--- a/idea/testData/debugger/tinyApp/outs/soInlineIfConditionLambdaFalse.out
+++ b/idea/testData/debugger/tinyApp/outs/soInlineIfConditionLambdaFalse.out
@@ -1,10 +1,10 @@
 LineBreakpoint created at soInlineIfConditionLambdaFalse.kt:11
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! soInlineIfConditionLambdaFalse.SoInlineIfConditionLambdaFalseKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 soInlineIfConditionLambdaFalse.kt:11
 soInlineIfConditionLambdaFalse.kt:15
 soInlineIfConditionLambdaFalse.kt:18
 soInlineIfConditionLambdaFalse.kt:7
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/soInlineIfConditionLambdaTrue.out b/idea/testData/debugger/tinyApp/outs/soInlineIfConditionLambdaTrue.out
index 3228552d0a5..d6e07164582 100644
--- a/idea/testData/debugger/tinyApp/outs/soInlineIfConditionLambdaTrue.out
+++ b/idea/testData/debugger/tinyApp/outs/soInlineIfConditionLambdaTrue.out
@@ -1,10 +1,10 @@
 LineBreakpoint created at soInlineIfConditionLambdaTrue.kt:11
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! soInlineIfConditionLambdaTrue.SoInlineIfConditionLambdaTrueKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 soInlineIfConditionLambdaTrue.kt:11
 soInlineIfConditionLambdaTrue.kt:12
 soInlineIfConditionLambdaTrue.kt:18
 soInlineIfConditionLambdaTrue.kt:7
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/soInlineIterableFunDex.out b/idea/testData/debugger/tinyApp/outs/soInlineIterableFunDex.out
index 5701ae61c29..7920ac09aa8 100644
--- a/idea/testData/debugger/tinyApp/outs/soInlineIterableFunDex.out
+++ b/idea/testData/debugger/tinyApp/outs/soInlineIterableFunDex.out
@@ -1,10 +1,10 @@
 LineBreakpoint created at soInlineIterableFunDex.kt:5
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! soInlineIterableFunDex.SoInlineIterableFunDexKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 soInlineIterableFunDex.kt:5
 soInlineIterableFunDex.kt:7
 soInlineIterableFunDex.kt:9
 soInlineIterableFunDex.kt:10
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/soInlineLibFunDex.out b/idea/testData/debugger/tinyApp/outs/soInlineLibFunDex.out
index 7fb6456a7a1..63412318129 100644
--- a/idea/testData/debugger/tinyApp/outs/soInlineLibFunDex.out
+++ b/idea/testData/debugger/tinyApp/outs/soInlineLibFunDex.out
@@ -1,11 +1,11 @@
 LineBreakpoint created at soInlineLibFunDex.kt:5
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! soInlineLibFunDex.SoInlineLibFunDexKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 soInlineLibFunDex.kt:5
 soInlineLibFunDex.kt:7
 soInlineLibFunDex.kt:9
 soInlineLibFunDex.kt:10
 soInlineLibFunDex.kt:12
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/soInlineOperatorIterator.out b/idea/testData/debugger/tinyApp/outs/soInlineOperatorIterator.out
index a57b0993a6f..a913a3d55d9 100644
--- a/idea/testData/debugger/tinyApp/outs/soInlineOperatorIterator.out
+++ b/idea/testData/debugger/tinyApp/outs/soInlineOperatorIterator.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at soInlineOperatorIterator.kt:7
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! soInlineOperatorIterator.SoInlineOperatorIteratorKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 soInlineOperatorIterator.kt:7
 soInlineOperatorIterator.kt:8
 soInlineOperatorIterator.kt:23
@@ -17,6 +17,6 @@ soInlineOperatorIterator.kt:9
 soInlineOperatorIterator.kt:8
 soInlineOperatorIterator.kt:23
 soInlineOperatorIterator.kt:11
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/soInlineWhileCondition.out b/idea/testData/debugger/tinyApp/outs/soInlineWhileCondition.out
index 5244a0e2cb0..df9d78ee5f4 100644
--- a/idea/testData/debugger/tinyApp/outs/soInlineWhileCondition.out
+++ b/idea/testData/debugger/tinyApp/outs/soInlineWhileCondition.out
@@ -1,12 +1,12 @@
 LineBreakpoint created at soInlineWhileCondition.kt:5
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! soInlineWhileCondition.SoInlineWhileConditionKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 soInlineWhileCondition.kt:5
 soInlineWhileCondition.kt:7
 soInlineWhileCondition.kt:8
 soInlineWhileCondition.kt:7
 soInlineWhileCondition.kt:12
 soInlineWhileCondition.kt:15
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/soInlineWhileConditionDex.out b/idea/testData/debugger/tinyApp/outs/soInlineWhileConditionDex.out
index ff17de57eb6..823cd63a7f1 100644
--- a/idea/testData/debugger/tinyApp/outs/soInlineWhileConditionDex.out
+++ b/idea/testData/debugger/tinyApp/outs/soInlineWhileConditionDex.out
@@ -1,12 +1,12 @@
 LineBreakpoint created at soInlineWhileConditionDex.kt:5
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! soInlineWhileConditionDex.SoInlineWhileConditionDexKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 soInlineWhileConditionDex.kt:5
 soInlineWhileConditionDex.kt:7
 soInlineWhileConditionDex.kt:8
 soInlineWhileConditionDex.kt:7
 soInlineWhileConditionDex.kt:12
 soInlineWhileConditionDex.kt:15
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/soReifiedInlineIfConditionFalse.out b/idea/testData/debugger/tinyApp/outs/soReifiedInlineIfConditionFalse.out
index d96eab77aff..a58744ea629 100644
--- a/idea/testData/debugger/tinyApp/outs/soReifiedInlineIfConditionFalse.out
+++ b/idea/testData/debugger/tinyApp/outs/soReifiedInlineIfConditionFalse.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at soReifiedInlineIfConditionFalse.kt:6
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! soReifiedInlineIfConditionFalse.SoReifiedInlineIfConditionFalseKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 soReifiedInlineIfConditionFalse.kt:6
 soReifiedInlineIfConditionFalse.kt:9
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/soSimpleInlineIfCondition.out b/idea/testData/debugger/tinyApp/outs/soSimpleInlineIfCondition.out
index f312f1fdc02..2931962a946 100644
--- a/idea/testData/debugger/tinyApp/outs/soSimpleInlineIfCondition.out
+++ b/idea/testData/debugger/tinyApp/outs/soSimpleInlineIfCondition.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at soSimpleInlineIfCondition.kt:5
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! soSimpleInlineIfCondition.SoSimpleInlineIfConditionKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 soSimpleInlineIfCondition.kt:5
 soSimpleInlineIfCondition.kt:8
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/stdlib.out b/idea/testData/debugger/tinyApp/outs/stdlib.out
index daf3baea579..0beeeb69d4d 100644
--- a/idea/testData/debugger/tinyApp/outs/stdlib.out
+++ b/idea/testData/debugger/tinyApp/outs/stdlib.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at stdlib.kt:5
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stdlib.StdlibKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 stdlib.kt:5
 Compile bytecode for arrayOf(100, 101)
 Compile bytecode for arrayOf("a", "b", "c")
@@ -10,6 +10,6 @@ Compile bytecode for Int::class.java
 Compile bytecode for 100.toInt()
 Compile bytecode for 100.toLong()
 Compile bytecode for args.sortedBy { it }.size
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/stdlibStep.out b/idea/testData/debugger/tinyApp/outs/stdlibStep.out
index 112feba3841..00a68eff043 100644
--- a/idea/testData/debugger/tinyApp/outs/stdlibStep.out
+++ b/idea/testData/debugger/tinyApp/outs/stdlibStep.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at stdlibStep.kt:6
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stdlibStep.StdlibStepKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 stdlibStep.kt:6
 stdlibStep.kt:7
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/stepIntoFromInlineFun.out b/idea/testData/debugger/tinyApp/outs/stepIntoFromInlineFun.out
index 096233758b4..b3f533c7c9b 100644
--- a/idea/testData/debugger/tinyApp/outs/stepIntoFromInlineFun.out
+++ b/idea/testData/debugger/tinyApp/outs/stepIntoFromInlineFun.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at stepIntoFromInlineFun.kt:13
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stepIntoFromInlineFun.StepIntoFromInlineFunKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 stepIntoFromInlineFun.kt:13
 stepIntoFromInlineFun.kt:7
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/stepIntoInlineFun.out b/idea/testData/debugger/tinyApp/outs/stepIntoInlineFun.out
index ec8c4ebf041..b5c4ff56c24 100644
--- a/idea/testData/debugger/tinyApp/outs/stepIntoInlineFun.out
+++ b/idea/testData/debugger/tinyApp/outs/stepIntoInlineFun.out
@@ -1,9 +1,9 @@
 LineBreakpoint created at stepIntoInlineFun.kt:8
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stepIntoInlineFun.StepIntoInlineFunKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 stepIntoInlineFun.kt:8
 stepIntoInlineFun.kt:13
 stepIntoInlineFun.kt:8
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/stepIntoMultiFileFacade.out b/idea/testData/debugger/tinyApp/outs/stepIntoMultiFileFacade.out
index 4ee4516cb68..2ff18d90bf4 100644
--- a/idea/testData/debugger/tinyApp/outs/stepIntoMultiFileFacade.out
+++ b/idea/testData/debugger/tinyApp/outs/stepIntoMultiFileFacade.out
@@ -1,9 +1,9 @@
 LineBreakpoint created at stepIntoMultiFileFacade.kt:5
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stepIntoMultiFileFacade.StepIntoMultiFileFacadeKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 stepIntoMultiFileFacade.kt:5
 a1.kt:6
 stepIntoMultiFileFacade.kt:5
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/stepIntoSpecificKotlinClasses.out b/idea/testData/debugger/tinyApp/outs/stepIntoSpecificKotlinClasses.out
index 412b7bc7334..716e7aaa227 100644
--- a/idea/testData/debugger/tinyApp/outs/stepIntoSpecificKotlinClasses.out
+++ b/idea/testData/debugger/tinyApp/outs/stepIntoSpecificKotlinClasses.out
@@ -1,12 +1,12 @@
 LineBreakpoint created at stepIntoSpecificKotlinClasses.kt:8
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stepIntoSpecificKotlinClasses.StepIntoSpecificKotlinClassesKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 stepIntoSpecificKotlinClasses.kt:8
 MyJavaClass.java:13
 stepIntoSpecificKotlinClasses.kt:8
 Intrinsics.!EXT!
 Intrinsics.!EXT!
 stepIntoSpecificKotlinClasses.kt:8
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/stepIntoStdLibInlineFun.out b/idea/testData/debugger/tinyApp/outs/stepIntoStdLibInlineFun.out
index fa3e3419f8f..3e6c9780175 100644
--- a/idea/testData/debugger/tinyApp/outs/stepIntoStdLibInlineFun.out
+++ b/idea/testData/debugger/tinyApp/outs/stepIntoStdLibInlineFun.out
@@ -1,9 +1,9 @@
 LineBreakpoint created at stepIntoStdLibInlineFun.kt:6
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stepIntoStdLibInlineFun.StepIntoStdLibInlineFunKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 stepIntoStdLibInlineFun.kt:6
 _Collections.!EXT!
 resuming stepIntoStdLibInlineFun.kt:5
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/stepIntoStdlib.out b/idea/testData/debugger/tinyApp/outs/stepIntoStdlib.out
index cd85589ff5b..8ba8fd5b578 100644
--- a/idea/testData/debugger/tinyApp/outs/stepIntoStdlib.out
+++ b/idea/testData/debugger/tinyApp/outs/stepIntoStdlib.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at stepIntoStdlib.kt:6
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stepIntoStdlib.StepIntoStdlibKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 stepIntoStdlib.kt:6
 _Arrays.!EXT!
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/stepIntoStdlibFacadeClass.out b/idea/testData/debugger/tinyApp/outs/stepIntoStdlibFacadeClass.out
index dcc2eb4e81f..b81af3e5b48 100644
--- a/idea/testData/debugger/tinyApp/outs/stepIntoStdlibFacadeClass.out
+++ b/idea/testData/debugger/tinyApp/outs/stepIntoStdlibFacadeClass.out
@@ -1,9 +1,9 @@
 LineBreakpoint created at stepIntoStdlibFacadeClass.kt:6
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stepIntoStdlibFacadeClass.StepIntoStdlibFacadeClassKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 stepIntoStdlibFacadeClass.kt:6
 _Arrays.!EXT!
 Iterables.!EXT!
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/stepIntoStdlibInlineFun2step.out b/idea/testData/debugger/tinyApp/outs/stepIntoStdlibInlineFun2step.out
index c2d0a1400c9..98d7b19e9e1 100644
--- a/idea/testData/debugger/tinyApp/outs/stepIntoStdlibInlineFun2step.out
+++ b/idea/testData/debugger/tinyApp/outs/stepIntoStdlibInlineFun2step.out
@@ -1,9 +1,9 @@
 LineBreakpoint created at functionInLibrary.kt:4
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stepIntoStdlibInlineFun2step.StepIntoStdlibInlineFun2stepKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 functionInLibrary.kt:4
 functionInLibrary.kt:8
 stepIntoStdlibInlineFun2step.kt:5
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/stepOutInlineFunction.out b/idea/testData/debugger/tinyApp/outs/stepOutInlineFunction.out
index 06e14d7aca8..96e8206eef6 100644
--- a/idea/testData/debugger/tinyApp/outs/stepOutInlineFunction.out
+++ b/idea/testData/debugger/tinyApp/outs/stepOutInlineFunction.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at stepOutInlineFunction.kt:12
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stepOutInlineFunction.StepOutInlineFunctionKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 stepOutInlineFunction.kt:12
 stepOutInlineFunction.kt:7
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/stepOutInlineFunctionStdlib.out b/idea/testData/debugger/tinyApp/outs/stepOutInlineFunctionStdlib.out
index 217cd10804c..e5c5df0785c 100644
--- a/idea/testData/debugger/tinyApp/outs/stepOutInlineFunctionStdlib.out
+++ b/idea/testData/debugger/tinyApp/outs/stepOutInlineFunctionStdlib.out
@@ -1,9 +1,9 @@
 LineBreakpoint created at stepOutInlineFunctionStdlib.kt:6
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stepOutInlineFunctionStdlib.StepOutInlineFunctionStdlibKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 stepOutInlineFunctionStdlib.kt:6
 _Collections.!EXT!
 stepOutInlineFunctionStdlib.kt:9
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/stepOutInlinedLambdaArgument.out b/idea/testData/debugger/tinyApp/outs/stepOutInlinedLambdaArgument.out
index f107d5bb9a9..de7c9ac9471 100644
--- a/idea/testData/debugger/tinyApp/outs/stepOutInlinedLambdaArgument.out
+++ b/idea/testData/debugger/tinyApp/outs/stepOutInlinedLambdaArgument.out
@@ -1,9 +1,9 @@
 LineBreakpoint created at stepOutInlinedLambdaArgument.kt:6
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stepOutInlinedLambdaArgument.StepOutInlinedLambdaArgumentKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 stepOutInlinedLambdaArgument.kt:6
 stepOutInlinedLambdaArgument.kt:15
 stepOutInlinedLambdaArgument.kt:9
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/stepOutInlinedLambdaArgumentOneLine.out b/idea/testData/debugger/tinyApp/outs/stepOutInlinedLambdaArgumentOneLine.out
index 687cf90e450..5124b9355f9 100644
--- a/idea/testData/debugger/tinyApp/outs/stepOutInlinedLambdaArgumentOneLine.out
+++ b/idea/testData/debugger/tinyApp/outs/stepOutInlinedLambdaArgumentOneLine.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at stepOutInlinedLambdaArgumentOneLine.kt:5 lambdaOrdinal = 1
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stepOutInlinedLambdaArgumentOneLine.StepOutInlinedLambdaArgumentOneLineKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 stepOutInlinedLambdaArgumentOneLine.kt:5
 stepOutInlinedLambdaArgumentOneLine.kt:6
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/stepOutSeveralInlineArgumentDeepest.out b/idea/testData/debugger/tinyApp/outs/stepOutSeveralInlineArgumentDeepest.out
index 4b6147305a0..19384f73d8c 100644
--- a/idea/testData/debugger/tinyApp/outs/stepOutSeveralInlineArgumentDeepest.out
+++ b/idea/testData/debugger/tinyApp/outs/stepOutSeveralInlineArgumentDeepest.out
@@ -1,10 +1,10 @@
 LineBreakpoint created at stepOutSeveralInlineArgumentDeepest.kt:6
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stepOutSeveralInlineArgumentDeepest.StepOutSeveralInlineArgumentDeepestKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 stepOutSeveralInlineArgumentDeepest.kt:6
 stepOutSeveralInlineArgumentDeepest.kt:22
 stepOutSeveralInlineArgumentDeepest.kt:16
 stepOutSeveralInlineArgumentDeepest.kt:8
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/stepOutSeveralInlineFunctions.out b/idea/testData/debugger/tinyApp/outs/stepOutSeveralInlineFunctions.out
index 3890ee6b811..ae64052e1b0 100644
--- a/idea/testData/debugger/tinyApp/outs/stepOutSeveralInlineFunctions.out
+++ b/idea/testData/debugger/tinyApp/outs/stepOutSeveralInlineFunctions.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at stepOutSeveralInlineFunctions.kt:12
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stepOutSeveralInlineFunctions.StepOutSeveralInlineFunctionsKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 stepOutSeveralInlineFunctions.kt:12
 stepOutSeveralInlineFunctions.kt:7
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/stepOutSeveralInlineFunctionsDeepest.out b/idea/testData/debugger/tinyApp/outs/stepOutSeveralInlineFunctionsDeepest.out
index 285dd15c570..f5b969ab728 100644
--- a/idea/testData/debugger/tinyApp/outs/stepOutSeveralInlineFunctionsDeepest.out
+++ b/idea/testData/debugger/tinyApp/outs/stepOutSeveralInlineFunctionsDeepest.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at stepOutSeveralInlineFunctionsDeepest.kt:20
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stepOutSeveralInlineFunctionsDeepest.StepOutSeveralInlineFunctionsDeepestKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 stepOutSeveralInlineFunctionsDeepest.kt:20
 stepOutSeveralInlineFunctionsDeepest.kt:15
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/stepOverCatchClause.out b/idea/testData/debugger/tinyApp/outs/stepOverCatchClause.out
index 97c523f5a8f..506b6c3f39b 100644
--- a/idea/testData/debugger/tinyApp/outs/stepOverCatchClause.out
+++ b/idea/testData/debugger/tinyApp/outs/stepOverCatchClause.out
@@ -1,9 +1,9 @@
 LineBreakpoint created at stepOverCatchClause.kt:14
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stepOverCatchClause.StepOverCatchClauseKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 stepOverCatchClause.kt:14
 stepOverCatchClause.kt:7
 stepOverCatchClause.kt:8
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/stepOverDeclarationInInlineFun.out b/idea/testData/debugger/tinyApp/outs/stepOverDeclarationInInlineFun.out
index 75402ef1df6..1e2e4b7c571 100644
--- a/idea/testData/debugger/tinyApp/outs/stepOverDeclarationInInlineFun.out
+++ b/idea/testData/debugger/tinyApp/outs/stepOverDeclarationInInlineFun.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at stepOverDeclarationInInlineFun.kt:9
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stepOverDeclarationInInlineFun.StepOverDeclarationInInlineFunKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 stepOverDeclarationInInlineFun.kt:9
 stepOverDeclarationInInlineFun.kt:10
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/stepOverFalseConditionInLastIfInWhile.out b/idea/testData/debugger/tinyApp/outs/stepOverFalseConditionInLastIfInWhile.out
index 7e31411b77d..93f12b286fc 100644
--- a/idea/testData/debugger/tinyApp/outs/stepOverFalseConditionInLastIfInWhile.out
+++ b/idea/testData/debugger/tinyApp/outs/stepOverFalseConditionInLastIfInWhile.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at stepOverFalseConditionInLastIfInWhile.kt:13
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stepOverFalseConditionInLastIfInWhile.StepOverFalseConditionInLastIfInWhileKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 stepOverFalseConditionInLastIfInWhile.kt:13
 stepOverFalseConditionInLastIfInWhile.kt:6
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/stepOverForWithInline.out b/idea/testData/debugger/tinyApp/outs/stepOverForWithInline.out
index f44c6ad8d87..0c96ac01bca 100644
--- a/idea/testData/debugger/tinyApp/outs/stepOverForWithInline.out
+++ b/idea/testData/debugger/tinyApp/outs/stepOverForWithInline.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at stepOverForWithInline.kt:5
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stepOverForWithInline.StepOverForWithInlineKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 stepOverForWithInline.kt:5
 stepOverForWithInline.kt:7
 stepOverForWithInline.kt:8
@@ -10,6 +10,6 @@ stepOverForWithInline.kt:8
 stepOverForWithInline.kt:9
 stepOverForWithInline.kt:7
 stepOverForWithInline.kt:11
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/stepOverIfWithInline.out b/idea/testData/debugger/tinyApp/outs/stepOverIfWithInline.out
index 482fdbf23df..4412699888b 100644
--- a/idea/testData/debugger/tinyApp/outs/stepOverIfWithInline.out
+++ b/idea/testData/debugger/tinyApp/outs/stepOverIfWithInline.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at stepOverIfWithInline.kt:5
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stepOverIfWithInline.StepOverIfWithInlineKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 stepOverIfWithInline.kt:5
 stepOverIfWithInline.kt:7
 stepOverIfWithInline.kt:11
@@ -17,6 +17,6 @@ stepOverIfWithInline.kt:32
 stepOverIfWithInline.kt:36
 stepOverIfWithInline.kt:32
 stepOverIfWithInline.kt:38
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/stepOverInlineFunWithRecursionCall.out b/idea/testData/debugger/tinyApp/outs/stepOverInlineFunWithRecursionCall.out
index d4118feb99e..8e9031afa8d 100644
--- a/idea/testData/debugger/tinyApp/outs/stepOverInlineFunWithRecursionCall.out
+++ b/idea/testData/debugger/tinyApp/outs/stepOverInlineFunWithRecursionCall.out
@@ -1,10 +1,10 @@
 LineBreakpoint created at stepOverInlineFunWithRecursionCall.kt:6
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stepOverInlineFunWithRecursionCall.StepOverInlineFunWithRecursionCallKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 stepOverInlineFunWithRecursionCall.kt:6
 stepOverInlineFunWithRecursionCall.kt:6
 stepOverInlineFunWithRecursionCall.kt:9
 stepOverInlineFunWithRecursionCall.kt:14
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/stepOverInlineFunctionInReturn.out b/idea/testData/debugger/tinyApp/outs/stepOverInlineFunctionInReturn.out
index 4d094ba93b8..148e72ecdb8 100644
--- a/idea/testData/debugger/tinyApp/outs/stepOverInlineFunctionInReturn.out
+++ b/idea/testData/debugger/tinyApp/outs/stepOverInlineFunctionInReturn.out
@@ -1,10 +1,10 @@
 LineBreakpoint created at stepOverInlineFunctionInReturn.kt:9
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stepOverInlineFunctionInReturn.StepOverInlineFunctionInReturnKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 stepOverInlineFunctionInReturn.kt:9
 stepOverInlineFunctionInReturn.kt:10
 stepOverInlineFunctionInReturn.kt:4
 stepOverInlineFunctionInReturn.kt:5
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/stepOverInlinedLambda.out b/idea/testData/debugger/tinyApp/outs/stepOverInlinedLambda.out
index 1eed1bb42fa..49f934f3346 100644
--- a/idea/testData/debugger/tinyApp/outs/stepOverInlinedLambda.out
+++ b/idea/testData/debugger/tinyApp/outs/stepOverInlinedLambda.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at stepOverInlinedLambda.kt:5
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stepOverInlinedLambda.StepOverInlinedLambdaKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 stepOverInlinedLambda.kt:5
 stepOverInlinedLambda.kt:6
 stepOverInlinedLambda.kt:7
@@ -13,6 +13,6 @@ stepOverInlinedLambda.kt:20
 stepOverInlinedLambda.kt:23
 stepOverInlinedLambda.kt:29
 stepOverInlinedLambda.kt:30
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/stepOverInlinedLambdaStdlib.out b/idea/testData/debugger/tinyApp/outs/stepOverInlinedLambdaStdlib.out
index 825f6102f9c..a95524cfed5 100644
--- a/idea/testData/debugger/tinyApp/outs/stepOverInlinedLambdaStdlib.out
+++ b/idea/testData/debugger/tinyApp/outs/stepOverInlinedLambdaStdlib.out
@@ -1,11 +1,11 @@
 LineBreakpoint created at stepOverInlinedLambdaStdlib.kt:5
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stepOverInlinedLambdaStdlib.StepOverInlinedLambdaStdlibKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 stepOverInlinedLambdaStdlib.kt:5
 stepOverInlinedLambdaStdlib.kt:6
 stepOverInlinedLambdaStdlib.kt:8
 stepOverInlinedLambdaStdlib.kt:10
 stepOverInlinedLambdaStdlib.kt:15
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/stepOverInsideInlineFun.out b/idea/testData/debugger/tinyApp/outs/stepOverInsideInlineFun.out
index adb1009c86f..c88b7a8a176 100644
--- a/idea/testData/debugger/tinyApp/outs/stepOverInsideInlineFun.out
+++ b/idea/testData/debugger/tinyApp/outs/stepOverInsideInlineFun.out
@@ -1,11 +1,11 @@
 LineBreakpoint created at stepOverInsideInlineFun.kt:11
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stepOverInsideInlineFun.StepOverInsideInlineFunKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 stepOverInsideInlineFun.kt:11
 stepOverInsideInlineFun.kt:12
 stepOverInsideInlineFun.kt:13
 stepOverInsideInlineFun.kt:14
 stepOverInsideInlineFun.kt:7
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/stepOverNonLocalReturnInLambda.out b/idea/testData/debugger/tinyApp/outs/stepOverNonLocalReturnInLambda.out
index e0c9aa1028e..544fd6847cb 100644
--- a/idea/testData/debugger/tinyApp/outs/stepOverNonLocalReturnInLambda.out
+++ b/idea/testData/debugger/tinyApp/outs/stepOverNonLocalReturnInLambda.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at stepOverNonLocalReturnInLambda.kt:20
 LineBreakpoint created at stepOverNonLocalReturnInLambda.kt:34
 LineBreakpoint created at stepOverNonLocalReturnInLambda.kt:52
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stepOverNonLocalReturnInLambda.StepOverNonLocalReturnInLambdaKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 stepOverNonLocalReturnInLambda.kt:20
 stepOverNonLocalReturnInLambda.kt:21
 stepOverNonLocalReturnInLambda.kt:27
@@ -12,6 +12,6 @@ stepOverNonLocalReturnInLambda.kt:7
 stepOverNonLocalReturnInLambda.kt:52
 stepOverNonLocalReturnInLambda.kt:53
 stepOverNonLocalReturnInLambda.kt:9
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/stepOverReifiedParam.out b/idea/testData/debugger/tinyApp/outs/stepOverReifiedParam.out
index b2c8beb4085..74c43d2ac3d 100644
--- a/idea/testData/debugger/tinyApp/outs/stepOverReifiedParam.out
+++ b/idea/testData/debugger/tinyApp/outs/stepOverReifiedParam.out
@@ -1,10 +1,10 @@
 LineBreakpoint created at stepOverReifiedParam.kt:5
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stepOverReifiedParam.StepOverReifiedParamKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 stepOverReifiedParam.kt:5
 stepOverReifiedParam.kt:6
 stepOverReifiedParam.kt:7
 stepOverReifiedParam.kt:8
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/stepOverSimpleFun.out b/idea/testData/debugger/tinyApp/outs/stepOverSimpleFun.out
index 98c79d916a5..c6d478aa142 100644
--- a/idea/testData/debugger/tinyApp/outs/stepOverSimpleFun.out
+++ b/idea/testData/debugger/tinyApp/outs/stepOverSimpleFun.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at stepOverSimpleFun.kt:11
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stepOverSimpleFun.StepOverSimpleFunKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 stepOverSimpleFun.kt:11
 stepOverSimpleFun.kt:4
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/stepOverTryCatchWithInline.out b/idea/testData/debugger/tinyApp/outs/stepOverTryCatchWithInline.out
index 9ae74534963..4daa3374dc7 100644
--- a/idea/testData/debugger/tinyApp/outs/stepOverTryCatchWithInline.out
+++ b/idea/testData/debugger/tinyApp/outs/stepOverTryCatchWithInline.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at stepOverTryCatchWithInline.kt:14
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stepOverTryCatchWithInline.StepOverTryCatchWithInlineKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 stepOverTryCatchWithInline.kt:14
 stepOverTryCatchWithInline.kt:16
 stepOverTryCatchWithInline.kt:17
@@ -16,6 +16,6 @@ stepOverTryCatchWithInline.kt:43
 stepOverTryCatchWithInline.kt:7
 stepOverTryCatchWithInline.kt:8
 stepOverTryCatchWithInline.kt:10
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/stepOverWhenInReturn.out b/idea/testData/debugger/tinyApp/outs/stepOverWhenInReturn.out
index 53607a5bbc4..64bcb6305df 100644
--- a/idea/testData/debugger/tinyApp/outs/stepOverWhenInReturn.out
+++ b/idea/testData/debugger/tinyApp/outs/stepOverWhenInReturn.out
@@ -1,11 +1,11 @@
 LineBreakpoint created at stepOverWhenInReturn.kt:10
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stepOverWhenInReturn.StepOverWhenInReturnKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 stepOverWhenInReturn.kt:10
 stepOverWhenInReturn.kt:11
 stepOverWhenInReturn.kt:10
 stepOverWhenInReturn.kt:4
 stepOverWhenInReturn.kt:5
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/stepOverWhenWithInline.out b/idea/testData/debugger/tinyApp/outs/stepOverWhenWithInline.out
index db496e41d6a..db8bc2e4ad0 100644
--- a/idea/testData/debugger/tinyApp/outs/stepOverWhenWithInline.out
+++ b/idea/testData/debugger/tinyApp/outs/stepOverWhenWithInline.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at stepOverWhenWithInline.kt:5
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stepOverWhenWithInline.StepOverWhenWithInlineKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 stepOverWhenWithInline.kt:5
 stepOverWhenWithInline.kt:8
 stepOverWhenWithInline.kt:9
@@ -29,6 +29,6 @@ stepOverWhenWithInline.kt:63
 stepOverWhenWithInline.kt:76
 stepOverWhenWithInline.kt:75
 stepOverWhenWithInline.kt:80
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/stepOverWhileWithInline.out b/idea/testData/debugger/tinyApp/outs/stepOverWhileWithInline.out
index 0a095a36dca..a94aa8f7ab1 100644
--- a/idea/testData/debugger/tinyApp/outs/stepOverWhileWithInline.out
+++ b/idea/testData/debugger/tinyApp/outs/stepOverWhileWithInline.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at stepOverWhileWithInline.kt:5
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stepOverWhileWithInline.StepOverWhileWithInlineKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 stepOverWhileWithInline.kt:5
 stepOverWhileWithInline.kt:7
 stepOverWhileWithInline.kt:8
@@ -17,6 +17,6 @@ stepOverWhileWithInline.kt:24
 stepOverWhileWithInline.kt:25
 stepOverWhileWithInline.kt:26
 stepOverWhileWithInline.kt:27
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/stopInAnonymousFunctionInInlinedCallWithCrossInline.out b/idea/testData/debugger/tinyApp/outs/stopInAnonymousFunctionInInlinedCallWithCrossInline.out
index 4eb9cea316c..2853413d9fe 100644
--- a/idea/testData/debugger/tinyApp/outs/stopInAnonymousFunctionInInlinedCallWithCrossInline.out
+++ b/idea/testData/debugger/tinyApp/outs/stopInAnonymousFunctionInInlinedCallWithCrossInline.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at stopInAnonymousFunctionInInlinedCallWithCrossInline.kt:8
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stopInAnonymousFunctionInInlinedCallWithCrossInline.StopInAnonymousFunctionInInlinedCallWithCrossInlineKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 stopInAnonymousFunctionInInlinedCallWithCrossInline.kt:8
 stopInAnonymousFunctionInInlinedCallWithCrossInline.kt:19
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/stopInAnonymousFunctionInInlinedCallWithCrossInlineDex.out b/idea/testData/debugger/tinyApp/outs/stopInAnonymousFunctionInInlinedCallWithCrossInlineDex.out
index 5005a892e6b..89b9acee5f7 100644
--- a/idea/testData/debugger/tinyApp/outs/stopInAnonymousFunctionInInlinedCallWithCrossInlineDex.out
+++ b/idea/testData/debugger/tinyApp/outs/stopInAnonymousFunctionInInlinedCallWithCrossInlineDex.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at stopInAnonymousFunctionInInlinedCallWithCrossInlineDex.kt:8
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stopInAnonymousFunctionInInlinedCallWithCrossInlineDex.StopInAnonymousFunctionInInlinedCallWithCrossInlineDexKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 stopInAnonymousFunctionInInlinedCallWithCrossInlineDex.kt:8
 stopInAnonymousFunctionInInlinedCallWithCrossInlineDex.kt:19
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/stopInCrossinlineInSuspend.out b/idea/testData/debugger/tinyApp/outs/stopInCrossinlineInSuspend.out
index bdc71ba3d98..268013facde 100644
--- a/idea/testData/debugger/tinyApp/outs/stopInCrossinlineInSuspend.out
+++ b/idea/testData/debugger/tinyApp/outs/stopInCrossinlineInSuspend.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at stopInCrossinlineInSuspend.kt:12
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stopInCrossinlineInSuspend.StopInCrossinlineInSuspendKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 stopInCrossinlineInSuspend.kt:12
 stopInCrossinlineInSuspend.kt:13
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/stopInExtensionInlineCall.out b/idea/testData/debugger/tinyApp/outs/stopInExtensionInlineCall.out
index 6e0d96384e8..a022f1a24a8 100644
--- a/idea/testData/debugger/tinyApp/outs/stopInExtensionInlineCall.out
+++ b/idea/testData/debugger/tinyApp/outs/stopInExtensionInlineCall.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at stopInExtensionInlineCall.kt:8
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stopInExtensionInlineCall.StopInExtensionInlineCallKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 stopInExtensionInlineCall.kt:8
 stopInExtensionInlineCall.kt:9
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/stopInInlineCallInField.out b/idea/testData/debugger/tinyApp/outs/stopInInlineCallInField.out
index f4a310ae011..ae24b8e3ffe 100644
--- a/idea/testData/debugger/tinyApp/outs/stopInInlineCallInField.out
+++ b/idea/testData/debugger/tinyApp/outs/stopInInlineCallInField.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at stopInInlineCallInField.kt:9
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stopInInlineCallInField.StopInInlineCallInFieldKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 stopInInlineCallInField.kt:9
 stopInInlineCallInField.kt:10
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/stopInInlineCallInFieldInClassWithNonDefaultPrimary.out b/idea/testData/debugger/tinyApp/outs/stopInInlineCallInFieldInClassWithNonDefaultPrimary.out
index cb380216249..f05f76337e7 100644
--- a/idea/testData/debugger/tinyApp/outs/stopInInlineCallInFieldInClassWithNonDefaultPrimary.out
+++ b/idea/testData/debugger/tinyApp/outs/stopInInlineCallInFieldInClassWithNonDefaultPrimary.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at stopInInlineCallInFieldInClassWithNonDefaultPrimary.kt:9
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stopInInlineCallInFieldInClassWithNonDefaultPrimary.StopInInlineCallInFieldInClassWithNonDefaultPrimaryKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 stopInInlineCallInFieldInClassWithNonDefaultPrimary.kt:9
 stopInInlineCallInFieldInClassWithNonDefaultPrimary.kt:10
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/stopInInlineCallInFieldInDelegate.out b/idea/testData/debugger/tinyApp/outs/stopInInlineCallInFieldInDelegate.out
index fcdb980757b..d61d3b30ffe 100644
--- a/idea/testData/debugger/tinyApp/outs/stopInInlineCallInFieldInDelegate.out
+++ b/idea/testData/debugger/tinyApp/outs/stopInInlineCallInFieldInDelegate.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at stopInInlineCallInFieldInDelegate.kt:11
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stopInInlineCallInFieldInDelegate.StopInInlineCallInFieldInDelegateKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 stopInInlineCallInFieldInDelegate.kt:11
 stopInInlineCallInFieldInDelegate.kt:12
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/stopInInlineCallInFieldInLocalClass.out b/idea/testData/debugger/tinyApp/outs/stopInInlineCallInFieldInLocalClass.out
index f2abd8f5f81..37581b140ec 100644
--- a/idea/testData/debugger/tinyApp/outs/stopInInlineCallInFieldInLocalClass.out
+++ b/idea/testData/debugger/tinyApp/outs/stopInInlineCallInFieldInLocalClass.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at stopInInlineCallInFieldInLocalClass.kt:12
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stopInInlineCallInFieldInLocalClass.StopInInlineCallInFieldInLocalClassKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 stopInInlineCallInFieldInLocalClass.kt:12
 stopInInlineCallInFieldInLocalClass.kt:13
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/stopInInlineCallLocalFunLambda.out b/idea/testData/debugger/tinyApp/outs/stopInInlineCallLocalFunLambda.out
index 48c861b4adc..92ede1c1354 100644
--- a/idea/testData/debugger/tinyApp/outs/stopInInlineCallLocalFunLambda.out
+++ b/idea/testData/debugger/tinyApp/outs/stopInInlineCallLocalFunLambda.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at stopInInlineCallLocalFunLambda.kt:9
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stopInInlineCallLocalFunLambda.StopInInlineCallLocalFunLambdaKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 stopInInlineCallLocalFunLambda.kt:9
 stopInInlineCallLocalFunLambda.kt:10
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/stopInInlineFunDex.out b/idea/testData/debugger/tinyApp/outs/stopInInlineFunDex.out
index 542eeb21bfe..1c831936127 100644
--- a/idea/testData/debugger/tinyApp/outs/stopInInlineFunDex.out
+++ b/idea/testData/debugger/tinyApp/outs/stopInInlineFunDex.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at stopInInlineFunDex.kt:10
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stopInInlineFunDex.StopInInlineFunDexKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 stopInInlineFunDex.kt:10
 stopInInlineFunDex.kt:11
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/stopInInlineInOtherFileDex.out b/idea/testData/debugger/tinyApp/outs/stopInInlineInOtherFileDex.out
index aa03e6ef4bb..e359f57e4de 100644
--- a/idea/testData/debugger/tinyApp/outs/stopInInlineInOtherFileDex.out
+++ b/idea/testData/debugger/tinyApp/outs/stopInInlineInOtherFileDex.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at stopInInlineInOtherFileDex.Other.kt:6
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stopInInlineInOtherFileDex.StopInInlineInOtherFileDexKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 stopInInlineInOtherFileDex.Other.kt:6
 stopInInlineInOtherFileDex.Other.kt:7
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/stopInInlineInOtherFileWithLambdaArgumentDex.out b/idea/testData/debugger/tinyApp/outs/stopInInlineInOtherFileWithLambdaArgumentDex.out
index c86b40e2ee7..5028ccaa3bf 100644
--- a/idea/testData/debugger/tinyApp/outs/stopInInlineInOtherFileWithLambdaArgumentDex.out
+++ b/idea/testData/debugger/tinyApp/outs/stopInInlineInOtherFileWithLambdaArgumentDex.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at stopInInlineInOtherFileWithLambdaArgumentDex.Other.kt:6
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stopInInlineInOtherFileWithLambdaArgumentDex.StopInInlineInOtherFileWithLambdaArgumentDexKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 stopInInlineInOtherFileWithLambdaArgumentDex.Other.kt:6
 stopInInlineInOtherFileWithLambdaArgumentDex.Other.kt:7
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/stopInInlineUnderOtherCall.out b/idea/testData/debugger/tinyApp/outs/stopInInlineUnderOtherCall.out
index 44df4ef7ba0..dadb191dd9d 100644
--- a/idea/testData/debugger/tinyApp/outs/stopInInlineUnderOtherCall.out
+++ b/idea/testData/debugger/tinyApp/outs/stopInInlineUnderOtherCall.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at stopInInlineUnderOtherCall.kt:11
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stopInInlineUnderOtherCall.StopInInlineUnderOtherCallKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 stopInInlineUnderOtherCall.kt:11
 stopInInlineUnderOtherCall.kt:12
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/stopInInlineUnderSamConversion.out b/idea/testData/debugger/tinyApp/outs/stopInInlineUnderSamConversion.out
index 792bb5c2d3b..da3ce7d9044 100644
--- a/idea/testData/debugger/tinyApp/outs/stopInInlineUnderSamConversion.out
+++ b/idea/testData/debugger/tinyApp/outs/stopInInlineUnderSamConversion.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at stopInInlineUnderSamConversion.kt:12
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stopInInlineUnderSamConversion.StopInInlineUnderSamConversionKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 stopInInlineUnderSamConversion.kt:12
 stopInInlineUnderSamConversion.kt:13
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/stopInInlinedInSpecialNamedFun.out b/idea/testData/debugger/tinyApp/outs/stopInInlinedInSpecialNamedFun.out
index b6b202db518..e81778e9a3c 100644
--- a/idea/testData/debugger/tinyApp/outs/stopInInlinedInSpecialNamedFun.out
+++ b/idea/testData/debugger/tinyApp/outs/stopInInlinedInSpecialNamedFun.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at stopInInlinedInSpecialNamedFun.kt:10
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stopInInlinedInSpecialNamedFun.StopInInlinedInSpecialNamedFunKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 stopInInlinedInSpecialNamedFun.kt:10
 stopInInlinedInSpecialNamedFun.kt:11
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/stopInInlinedInSpecialNamedFunWithGet.out b/idea/testData/debugger/tinyApp/outs/stopInInlinedInSpecialNamedFunWithGet.out
index 20c7cc73ddd..3a999efb92f 100644
--- a/idea/testData/debugger/tinyApp/outs/stopInInlinedInSpecialNamedFunWithGet.out
+++ b/idea/testData/debugger/tinyApp/outs/stopInInlinedInSpecialNamedFunWithGet.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at stopInInlinedInSpecialNamedFunWithGet.kt:10
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stopInInlinedInSpecialNamedFunWithGet.StopInInlinedInSpecialNamedFunWithGetKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 stopInInlinedInSpecialNamedFunWithGet.kt:10
 stopInInlinedInSpecialNamedFunWithGet.kt:11
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/stopInInlinedLambdaInSuspendFunctionWithSuspendPointsInObjectLiteral.out b/idea/testData/debugger/tinyApp/outs/stopInInlinedLambdaInSuspendFunctionWithSuspendPointsInObjectLiteral.out
index 687f17a062d..9ea6fcda0f4 100644
--- a/idea/testData/debugger/tinyApp/outs/stopInInlinedLambdaInSuspendFunctionWithSuspendPointsInObjectLiteral.out
+++ b/idea/testData/debugger/tinyApp/outs/stopInInlinedLambdaInSuspendFunctionWithSuspendPointsInObjectLiteral.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at stopInInlinedLambdaInSuspendFunctionWithSuspendPointsInObjectLiteral.kt:26
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stopInInlinedLambdaInSuspendFunctionWithSuspendPointsInObjectLiteral.StopInInlinedLambdaInSuspendFunctionWithSuspendPointsInObjectLiteralKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 stopInInlinedLambdaInSuspendFunctionWithSuspendPointsInObjectLiteral.kt:26
 stopInInlinedLambdaInSuspendFunctionWithSuspendPointsInObjectLiteral.kt:27
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/stopInLabdaOfCrossinlineCalledInAnonymous.out b/idea/testData/debugger/tinyApp/outs/stopInLabdaOfCrossinlineCalledInAnonymous.out
index 192fbfefec9..684b11506d5 100644
--- a/idea/testData/debugger/tinyApp/outs/stopInLabdaOfCrossinlineCalledInAnonymous.out
+++ b/idea/testData/debugger/tinyApp/outs/stopInLabdaOfCrossinlineCalledInAnonymous.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at stopInLabdaOfCrossinlineCalledInAnonymous.kt:21
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stopInLabdaOfCrossinlineCalledInAnonymous.StopInLabdaOfCrossinlineCalledInAnonymousKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 stopInLabdaOfCrossinlineCalledInAnonymous.kt:21
 stopInLabdaOfCrossinlineCalledInAnonymous.kt:22
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/stopInLambdaInInlinedCallWithCrossInline.out b/idea/testData/debugger/tinyApp/outs/stopInLambdaInInlinedCallWithCrossInline.out
index 9e86bbbb820..3e00b4fcc6b 100644
--- a/idea/testData/debugger/tinyApp/outs/stopInLambdaInInlinedCallWithCrossInline.out
+++ b/idea/testData/debugger/tinyApp/outs/stopInLambdaInInlinedCallWithCrossInline.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at stopInLambdaInInlinedCallWithCrossInline.kt:8
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stopInLambdaInInlinedCallWithCrossInline.StopInLambdaInInlinedCallWithCrossInlineKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 stopInLambdaInInlinedCallWithCrossInline.kt:8
 stopInLambdaInInlinedCallWithCrossInline.kt:19
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/stopInLambdaInInlinedCallWithCrossInlineDex.out b/idea/testData/debugger/tinyApp/outs/stopInLambdaInInlinedCallWithCrossInlineDex.out
index e958d1d6a2a..8aec031524a 100644
--- a/idea/testData/debugger/tinyApp/outs/stopInLambdaInInlinedCallWithCrossInlineDex.out
+++ b/idea/testData/debugger/tinyApp/outs/stopInLambdaInInlinedCallWithCrossInlineDex.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at stopInLambdaInInlinedCallWithCrossInlineDex.kt:8
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stopInLambdaInInlinedCallWithCrossInlineDex.StopInLambdaInInlinedCallWithCrossInlineDexKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 stopInLambdaInInlinedCallWithCrossInlineDex.kt:8
 stopInLambdaInInlinedCallWithCrossInlineDex.kt:19
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/stopInLambdaInlineCallLambda.out b/idea/testData/debugger/tinyApp/outs/stopInLambdaInlineCallLambda.out
index 899a10708a7..2dc667875da 100644
--- a/idea/testData/debugger/tinyApp/outs/stopInLambdaInlineCallLambda.out
+++ b/idea/testData/debugger/tinyApp/outs/stopInLambdaInlineCallLambda.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at stopInLambdaInlineCallLambda.kt:9
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stopInLambdaInlineCallLambda.StopInLambdaInlineCallLambdaKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 stopInLambdaInlineCallLambda.kt:9
 stopInLambdaInlineCallLambda.kt:10
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/stopInLocalFunInSecondaryConstructor.out b/idea/testData/debugger/tinyApp/outs/stopInLocalFunInSecondaryConstructor.out
index 609b9f0c286..bc7a8534e51 100644
--- a/idea/testData/debugger/tinyApp/outs/stopInLocalFunInSecondaryConstructor.out
+++ b/idea/testData/debugger/tinyApp/outs/stopInLocalFunInSecondaryConstructor.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at stopInLocalFunInSecondaryConstructor.kt:7
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stopInLocalFunInSecondaryConstructor.StopInLocalFunInSecondaryConstructorKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 stopInLocalFunInSecondaryConstructor.kt:7
 stopInLocalFunInSecondaryConstructor.kt:8
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/stopInLocalFunInlineCallLambda.out b/idea/testData/debugger/tinyApp/outs/stopInLocalFunInlineCallLambda.out
index 51bf7614524..680d64cc69a 100644
--- a/idea/testData/debugger/tinyApp/outs/stopInLocalFunInlineCallLambda.out
+++ b/idea/testData/debugger/tinyApp/outs/stopInLocalFunInlineCallLambda.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at stopInLocalFunInlineCallLambda.kt:9
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stopInLocalFunInlineCallLambda.StopInLocalFunInlineCallLambdaKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 stopInLocalFunInlineCallLambda.kt:9
 stopInLocalFunInlineCallLambda.kt:10
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/stopInNamelessFunInInlineCall.out b/idea/testData/debugger/tinyApp/outs/stopInNamelessFunInInlineCall.out
index 7faba711ed4..2306899bc9c 100644
--- a/idea/testData/debugger/tinyApp/outs/stopInNamelessFunInInlineCall.out
+++ b/idea/testData/debugger/tinyApp/outs/stopInNamelessFunInInlineCall.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at stopInNamelessFunInInlineCall.kt:9
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stopInNamelessFunInInlineCall.StopInNamelessFunInInlineCallKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 stopInNamelessFunInInlineCall.kt:9
 stopInNamelessFunInInlineCall.kt:10
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/stopInNonInlinedLambdaInInlineCallWithClosure.out b/idea/testData/debugger/tinyApp/outs/stopInNonInlinedLambdaInInlineCallWithClosure.out
index 4de293afe56..d0488da8e25 100644
--- a/idea/testData/debugger/tinyApp/outs/stopInNonInlinedLambdaInInlineCallWithClosure.out
+++ b/idea/testData/debugger/tinyApp/outs/stopInNonInlinedLambdaInInlineCallWithClosure.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at stopInNonInlinedLambdaInInlineCallWithClosure.kt:8
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stopInNonInlinedLambdaInInlineCallWithClosure.StopInNonInlinedLambdaInInlineCallWithClosureKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 stopInNonInlinedLambdaInInlineCallWithClosure.kt:8
 stopInNonInlinedLambdaInInlineCallWithClosure.kt:9
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/stopInNonInlinedLambdaInInlineCallWithoutClosure.out b/idea/testData/debugger/tinyApp/outs/stopInNonInlinedLambdaInInlineCallWithoutClosure.out
index 80a8f5c7169..7d03083dab3 100644
--- a/idea/testData/debugger/tinyApp/outs/stopInNonInlinedLambdaInInlineCallWithoutClosure.out
+++ b/idea/testData/debugger/tinyApp/outs/stopInNonInlinedLambdaInInlineCallWithoutClosure.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at stopInNonInlinedLambdaInInlineCallWithoutClosure.kt:8
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stopInNonInlinedLambdaInInlineCallWithoutClosure.StopInNonInlinedLambdaInInlineCallWithoutClosureKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 stopInNonInlinedLambdaInInlineCallWithoutClosure.kt:8
 stopInNonInlinedLambdaInInlineCallWithoutClosure.kt:9
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/stopInObjectLiteralInInlineCallNoClosure.out b/idea/testData/debugger/tinyApp/outs/stopInObjectLiteralInInlineCallNoClosure.out
index 2a28b78dcd1..728522baf16 100644
--- a/idea/testData/debugger/tinyApp/outs/stopInObjectLiteralInInlineCallNoClosure.out
+++ b/idea/testData/debugger/tinyApp/outs/stopInObjectLiteralInInlineCallNoClosure.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at stopInObjectLiteralInInlineCallNoClosure.kt:12
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stopInObjectLiteralInInlineCallNoClosure.StopInObjectLiteralInInlineCallNoClosureKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 stopInObjectLiteralInInlineCallNoClosure.kt:12
 stopInObjectLiteralInInlineCallNoClosure.kt:13
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/stopInObjectLiteralInInlineCallWithClosure.out b/idea/testData/debugger/tinyApp/outs/stopInObjectLiteralInInlineCallWithClosure.out
index a8b60b1cb79..a022cc815f1 100644
--- a/idea/testData/debugger/tinyApp/outs/stopInObjectLiteralInInlineCallWithClosure.out
+++ b/idea/testData/debugger/tinyApp/outs/stopInObjectLiteralInInlineCallWithClosure.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at stopInObjectLiteralInInlineCallWithClosure.kt:12
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stopInObjectLiteralInInlineCallWithClosure.StopInObjectLiteralInInlineCallWithClosureKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 stopInObjectLiteralInInlineCallWithClosure.kt:12
 stopInObjectLiteralInInlineCallWithClosure.kt:13
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/stopInObjectLiteralInInlineCallWithClosureInAnonymous.out b/idea/testData/debugger/tinyApp/outs/stopInObjectLiteralInInlineCallWithClosureInAnonymous.out
index 8628bec7679..9a6d6260ccb 100644
--- a/idea/testData/debugger/tinyApp/outs/stopInObjectLiteralInInlineCallWithClosureInAnonymous.out
+++ b/idea/testData/debugger/tinyApp/outs/stopInObjectLiteralInInlineCallWithClosureInAnonymous.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at stopInObjectLiteralInInlineCallWithClosureInAnonymous.kt:11
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stopInObjectLiteralInInlineCallWithClosureInAnonymous.StopInObjectLiteralInInlineCallWithClosureInAnonymousKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 stopInObjectLiteralInInlineCallWithClosureInAnonymous.kt:11
 stopInObjectLiteralInInlineCallWithClosureInAnonymous.kt:12
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/stopInSuspendFunctionWithSuspendPoints.out b/idea/testData/debugger/tinyApp/outs/stopInSuspendFunctionWithSuspendPoints.out
index 2b07dc2fd72..edde9ced88e 100644
--- a/idea/testData/debugger/tinyApp/outs/stopInSuspendFunctionWithSuspendPoints.out
+++ b/idea/testData/debugger/tinyApp/outs/stopInSuspendFunctionWithSuspendPoints.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at stopInSuspendFunctionWithSuspendPoints.kt:16
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stopInSuspendFunctionWithSuspendPoints.StopInSuspendFunctionWithSuspendPointsKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 stopInSuspendFunctionWithSuspendPoints.kt:16
 stopInSuspendFunctionWithSuspendPoints.kt:17
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/stopInSuspendFunctionWithSuspendPointsInAnonymousObject.out b/idea/testData/debugger/tinyApp/outs/stopInSuspendFunctionWithSuspendPointsInAnonymousObject.out
index 686ea08fdfa..bbb1ec9ef39 100644
--- a/idea/testData/debugger/tinyApp/outs/stopInSuspendFunctionWithSuspendPointsInAnonymousObject.out
+++ b/idea/testData/debugger/tinyApp/outs/stopInSuspendFunctionWithSuspendPointsInAnonymousObject.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at stopInSuspendFunctionWithSuspendPointsInAnonymousObject.kt:20
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stopInSuspendFunctionWithSuspendPointsInAnonymousObject.StopInSuspendFunctionWithSuspendPointsInAnonymousObjectKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 stopInSuspendFunctionWithSuspendPointsInAnonymousObject.kt:20
 stopInSuspendFunctionWithSuspendPointsInAnonymousObject.kt:21
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/stopInSuspendFunctionWithSuspendPointsInObjectLiteralInInlineCallWithClosure.out b/idea/testData/debugger/tinyApp/outs/stopInSuspendFunctionWithSuspendPointsInObjectLiteralInInlineCallWithClosure.out
index de37d48b287..791246d5e2c 100644
--- a/idea/testData/debugger/tinyApp/outs/stopInSuspendFunctionWithSuspendPointsInObjectLiteralInInlineCallWithClosure.out
+++ b/idea/testData/debugger/tinyApp/outs/stopInSuspendFunctionWithSuspendPointsInObjectLiteralInInlineCallWithClosure.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at stopInSuspendFunctionWithSuspendPointsInObjectLiteralInInlineCallWithClosure.kt:28
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stopInSuspendFunctionWithSuspendPointsInObjectLiteralInInlineCallWithClosure.StopInSuspendFunctionWithSuspendPointsInObjectLiteralInInlineCallWithClosureKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 stopInSuspendFunctionWithSuspendPointsInObjectLiteralInInlineCallWithClosure.kt:28
 stopInSuspendFunctionWithSuspendPointsInObjectLiteralInInlineCallWithClosure.kt:29
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/stopInSuspendFunctionWithoutSuspendPoints.out b/idea/testData/debugger/tinyApp/outs/stopInSuspendFunctionWithoutSuspendPoints.out
index d35e860afe4..6db9605a748 100644
--- a/idea/testData/debugger/tinyApp/outs/stopInSuspendFunctionWithoutSuspendPoints.out
+++ b/idea/testData/debugger/tinyApp/outs/stopInSuspendFunctionWithoutSuspendPoints.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at stopInSuspendFunctionWithoutSuspendPoints.kt:11
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stopInSuspendFunctionWithoutSuspendPoints.StopInSuspendFunctionWithoutSuspendPointsKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 stopInSuspendFunctionWithoutSuspendPoints.kt:11
 stopInSuspendFunctionWithoutSuspendPoints.kt:12
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/stopInlineCallInLocalFunInSecondaryConstructor.out b/idea/testData/debugger/tinyApp/outs/stopInlineCallInLocalFunInSecondaryConstructor.out
index 0afad327afd..bef1292fe15 100644
--- a/idea/testData/debugger/tinyApp/outs/stopInlineCallInLocalFunInSecondaryConstructor.out
+++ b/idea/testData/debugger/tinyApp/outs/stopInlineCallInLocalFunInSecondaryConstructor.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at stopInlineCallInLocalFunInSecondaryConstructor.kt:8
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stopInlineCallInLocalFunInSecondaryConstructor.StopInlineCallInLocalFunInSecondaryConstructorKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 stopInlineCallInLocalFunInSecondaryConstructor.kt:8
 stopInlineCallInLocalFunInSecondaryConstructor.kt:9
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/syntheticMethods.out b/idea/testData/debugger/tinyApp/outs/syntheticMethods.out
index eb1407fc9c4..d2cd63e8dca 100644
--- a/idea/testData/debugger/tinyApp/outs/syntheticMethods.out
+++ b/idea/testData/debugger/tinyApp/outs/syntheticMethods.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at syntheticMethods.kt:6
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! syntheticMethods.SyntheticMethodsKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 syntheticMethods.kt:6
 syntheticMethods.kt:17
 syntheticMethods.kt:19
@@ -27,6 +27,6 @@ syntheticMethods.kt:42
 syntheticMethods.kt:36
 syntheticMethods.kt:39
 syntheticMethods.kt:9
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/syntheticMethodsSkip.out b/idea/testData/debugger/tinyApp/outs/syntheticMethodsSkip.out
index 477e8285147..2ccb3e6e4fc 100644
--- a/idea/testData/debugger/tinyApp/outs/syntheticMethodsSkip.out
+++ b/idea/testData/debugger/tinyApp/outs/syntheticMethodsSkip.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at syntheticMethodsSkip.kt:6
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! syntheticMethodsSkip.SyntheticMethodsSkipKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 syntheticMethodsSkip.kt:6
 syntheticMethodsSkip.kt:19
 syntheticMethodsSkip.kt:20
@@ -21,6 +21,6 @@ syntheticMethodsSkip.kt:42
 syntheticMethodsSkip.kt:36
 syntheticMethodsSkip.kt:39
 syntheticMethodsSkip.kt:9
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/syntheticProvider.out b/idea/testData/debugger/tinyApp/outs/syntheticProvider.out
index 8715915a630..083f2c5bb8f 100644
--- a/idea/testData/debugger/tinyApp/outs/syntheticProvider.out
+++ b/idea/testData/debugger/tinyApp/outs/syntheticProvider.out
@@ -4,8 +4,8 @@ LineBreakpoint created at syntheticProvider.kt:46
 LineBreakpoint created at syntheticProvider.kt:50
 LineBreakpoint created at syntheticProvider.kt:54
 LineBreakpoint created at syntheticProvider.kt:58
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! syntheticProvider.SyntheticProviderKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 syntheticProvider.kt:38
 syntheticProvider.kt:5
 syntheticProvider.kt:42
@@ -18,6 +18,6 @@ syntheticProvider.kt:54
 syntheticProvider.kt:21
 syntheticProvider.kt:58
 syntheticProvider.kt:25
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/toStringRenderer.out b/idea/testData/debugger/tinyApp/outs/toStringRenderer.out
index 72eea3955db..6f6e3a9290a 100644
--- a/idea/testData/debugger/tinyApp/outs/toStringRenderer.out
+++ b/idea/testData/debugger/tinyApp/outs/toStringRenderer.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at toStringRenderer.kt:6
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! toStringRenderer.ToStringRendererKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 toStringRenderer.kt:6
 package toStringRenderer
 
@@ -20,6 +20,6 @@ Compile bytecode for args.size
    local    = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = toStringRenderer.kt, 3)
    local    = a: toStringRenderer.A = {toStringRenderer.A@uniqueID}myA (sp = toStringRenderer.kt, 4)
               - Class has no fields
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/topLevelFunFromClass.out b/idea/testData/debugger/tinyApp/outs/topLevelFunFromClass.out
index d8140b85e63..282dd1e6a94 100644
--- a/idea/testData/debugger/tinyApp/outs/topLevelFunFromClass.out
+++ b/idea/testData/debugger/tinyApp/outs/topLevelFunFromClass.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at topLevelFunFromClass.kt:6
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! topLevelFunFromClass.TopLevelFunFromClassKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 topLevelFunFromClass.kt:6
 topLevelFunFromClass.kt:11
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/topLevelFunFromTopLevel.out b/idea/testData/debugger/tinyApp/outs/topLevelFunFromTopLevel.out
index f72a482afa3..a7e67d7b5ae 100644
--- a/idea/testData/debugger/tinyApp/outs/topLevelFunFromTopLevel.out
+++ b/idea/testData/debugger/tinyApp/outs/topLevelFunFromTopLevel.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at topLevelFunFromTopLevel.kt:9
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! topLevelFunFromTopLevel.TopLevelFunFromTopLevelKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 topLevelFunFromTopLevel.kt:9
 topLevelFunFromTopLevel.kt:4
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/topLevelGetterFromClass.out b/idea/testData/debugger/tinyApp/outs/topLevelGetterFromClass.out
index cb717afa858..2804ee54e46 100644
--- a/idea/testData/debugger/tinyApp/outs/topLevelGetterFromClass.out
+++ b/idea/testData/debugger/tinyApp/outs/topLevelGetterFromClass.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at topLevelGetterFromClass.kt:6
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! topLevelGetterFromClass.TopLevelGetterFromClassKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 topLevelGetterFromClass.kt:6
 topLevelGetterFromClass.kt:12
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/topLevelGetterFromTopLevel.out b/idea/testData/debugger/tinyApp/outs/topLevelGetterFromTopLevel.out
index 8743e0e1fbf..cd64efabf84 100644
--- a/idea/testData/debugger/tinyApp/outs/topLevelGetterFromTopLevel.out
+++ b/idea/testData/debugger/tinyApp/outs/topLevelGetterFromTopLevel.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at topLevelGetterFromTopLevel.kt:11
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! topLevelGetterFromTopLevel.TopLevelGetterFromTopLevelKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 topLevelGetterFromTopLevel.kt:11
 topLevelGetterFromTopLevel.kt:5
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/traits.out b/idea/testData/debugger/tinyApp/outs/traits.out
index f4d966c57df..81644fb0752 100644
--- a/idea/testData/debugger/tinyApp/outs/traits.out
+++ b/idea/testData/debugger/tinyApp/outs/traits.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at traits.kt:5
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! traits.TraitsKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 traits.kt:5
 traits.kt:6
 traits.kt:41
@@ -29,6 +29,6 @@ traits.kt:22
 traits.kt:17
 traits.kt:22
 traits.kt:23
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/twoLambdasOnOneLineFirst.out b/idea/testData/debugger/tinyApp/outs/twoLambdasOnOneLineFirst.out
index 1bcc9fc34b0..115b298ccca 100644
--- a/idea/testData/debugger/tinyApp/outs/twoLambdasOnOneLineFirst.out
+++ b/idea/testData/debugger/tinyApp/outs/twoLambdasOnOneLineFirst.out
@@ -1,10 +1,10 @@
 LineBreakpoint created at twoLambdasOnOneLineFirst.kt:9 lambdaOrdinal = -1
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! twoLambdasOnOneLineFirst.TwoLambdasOnOneLineFirstKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 twoLambdasOnOneLineFirst.kt:9
 twoLambdasOnOneLineFirst.kt:14
 twoLambdasOnOneLineFirst.kt:9
 Compile bytecode for it
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/twoLambdasOnOneLineSecond.out b/idea/testData/debugger/tinyApp/outs/twoLambdasOnOneLineSecond.out
index a26cf8c42d5..419bb093519 100644
--- a/idea/testData/debugger/tinyApp/outs/twoLambdasOnOneLineSecond.out
+++ b/idea/testData/debugger/tinyApp/outs/twoLambdasOnOneLineSecond.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at twoLambdasOnOneLineSecond.kt:8 lambdaOrdinal = 2
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! twoLambdasOnOneLineSecond.TwoLambdasOnOneLineSecondKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 twoLambdasOnOneLineSecond.kt:8
 Compile bytecode for it
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/typeParameterRef.out b/idea/testData/debugger/tinyApp/outs/typeParameterRef.out
index 72a237a2ad2..9ea43d44489 100644
--- a/idea/testData/debugger/tinyApp/outs/typeParameterRef.out
+++ b/idea/testData/debugger/tinyApp/outs/typeParameterRef.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at typeParameterRef.kt:13
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! typeParameterRef.TypeParameterRefKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 typeParameterRef.kt:13
 Compile bytecode for foo<T>()
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/unboxParam.out b/idea/testData/debugger/tinyApp/outs/unboxParam.out
index f818a6d0267..933a7177f92 100644
--- a/idea/testData/debugger/tinyApp/outs/unboxParam.out
+++ b/idea/testData/debugger/tinyApp/outs/unboxParam.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at unboxParam.kt:12
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! unboxParam.UnboxParamKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 unboxParam.kt:12
 Compile bytecode for fooInt(nullableInt)
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/underscoreNames.out b/idea/testData/debugger/tinyApp/outs/underscoreNames.out
index 8255ec155d2..aa10dec8f83 100644
--- a/idea/testData/debugger/tinyApp/outs/underscoreNames.out
+++ b/idea/testData/debugger/tinyApp/outs/underscoreNames.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at underscoreNames.kt:18 lambdaOrdinal = 1
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! underscoreNames.UnderscoreNamesKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 underscoreNames.kt:18
 Compile bytecode for x
 Compile bytecode for y
@@ -62,7 +62,7 @@ Compile bytecode for arrayOfA
    local    = q: java.lang.String =  (sp = underscoreNames.kt, 16)
      field    = value: char[] = {char[0]@uniqueID} (sp = String.!EXT!)
      field    = hash: int = 0 (sp = String.!EXT!)
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
 
diff --git a/idea/testData/debugger/tinyApp/outs/unsafeCall.out b/idea/testData/debugger/tinyApp/outs/unsafeCall.out
index 4331ff68881..e1789ded84e 100644
--- a/idea/testData/debugger/tinyApp/outs/unsafeCall.out
+++ b/idea/testData/debugger/tinyApp/outs/unsafeCall.out
@@ -1,9 +1,9 @@
 LineBreakpoint created at unsafeCall.kt:8
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! unsafeCall.UnsafeCallKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 unsafeCall.kt:8
 Compile bytecode for s1.length
 Compile bytecode for s2.length
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/vars.out b/idea/testData/debugger/tinyApp/outs/vars.out
index d099ce4312c..97f8de0233b 100644
--- a/idea/testData/debugger/tinyApp/outs/vars.out
+++ b/idea/testData/debugger/tinyApp/outs/vars.out
@@ -1,12 +1,12 @@
 LineBreakpoint created at vars.kt:7
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! vars.VarsKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 vars.kt:7
 Compile bytecode for a
 Compile bytecode for a += 1
 a
 
 // RESULT: 3: I
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/whenEntry.out b/idea/testData/debugger/tinyApp/outs/whenEntry.out
index f6bc068143c..e7a04030f6d 100644
--- a/idea/testData/debugger/tinyApp/outs/whenEntry.out
+++ b/idea/testData/debugger/tinyApp/outs/whenEntry.out
@@ -1,14 +1,14 @@
 LineBreakpoint created at whenEntry.kt:10
 LineBreakpoint created at whenEntry.kt:18
 LineBreakpoint created at whenEntry.kt:26
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! whenEntry.WhenEntryKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 whenEntry.kt:10
 Compile bytecode for a
 whenEntry.kt:18
 Compile bytecode for a
 whenEntry.kt:26
 Compile bytecode for a
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/whenExpr.out b/idea/testData/debugger/tinyApp/outs/whenExpr.out
index ab32b6a41ed..8f65505d1de 100644
--- a/idea/testData/debugger/tinyApp/outs/whenExpr.out
+++ b/idea/testData/debugger/tinyApp/outs/whenExpr.out
@@ -1,6 +1,6 @@
 LineBreakpoint created at whenExpr.kt:5
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! whenExpr.WhenExprKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 whenExpr.kt:5
 whenExpr.kt:6
 whenExpr.kt:7
@@ -24,6 +24,6 @@ whenExpr.kt:48
 whenExpr.kt:49
 whenExpr.kt:50
 whenExpr.kt:59
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/withoutBodyFunctions.out b/idea/testData/debugger/tinyApp/outs/withoutBodyFunctions.out
index 249938a5489..7a8c18b7d2e 100644
--- a/idea/testData/debugger/tinyApp/outs/withoutBodyFunctions.out
+++ b/idea/testData/debugger/tinyApp/outs/withoutBodyFunctions.out
@@ -5,8 +5,8 @@ LineBreakpoint created at withoutBodyFunctions.kt:27
 LineBreakpoint created at withoutBodyFunctions.kt:32
 LineBreakpoint created at withoutBodyFunctions.kt:37
 LineBreakpoint created at withoutBodyFunctions.kt:43
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! withoutBodyFunctions.WithoutBodyFunctionsKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 withoutBodyFunctions.kt:9
 Compile bytecode for 1 + 1
 withoutBodyFunctions.kt:15
@@ -21,6 +21,6 @@ withoutBodyFunctions.kt:37
 Compile bytecode for i
 withoutBodyFunctions.kt:43
 Compile bytecode for test2()
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/withoutBodyProperties.out b/idea/testData/debugger/tinyApp/outs/withoutBodyProperties.out
index 8df33fbd473..055a03ea17e 100644
--- a/idea/testData/debugger/tinyApp/outs/withoutBodyProperties.out
+++ b/idea/testData/debugger/tinyApp/outs/withoutBodyProperties.out
@@ -2,8 +2,8 @@ KotlinFieldBreakpoint created at withoutBodyProperties.kt:8
 KotlinFieldBreakpoint created at withoutBodyProperties.kt:13
 LineBreakpoint created at withoutBodyProperties.kt:21
 KotlinFieldBreakpoint created at withoutBodyProperties.kt:28
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! withoutBodyProperties.WithoutBodyPropertiesKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 withoutBodyProperties.kt:8
 Compile bytecode for 1 + 1
 withoutBodyProperties.kt:13
@@ -12,6 +12,6 @@ withoutBodyProperties.kt:21
 Compile bytecode for i
 withoutBodyProperties.kt:28
 Compile bytecode for 1 + 6
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/withoutBodyProperties2.out b/idea/testData/debugger/tinyApp/outs/withoutBodyProperties2.out
index 85ba1f2821f..06256d1d927 100644
--- a/idea/testData/debugger/tinyApp/outs/withoutBodyProperties2.out
+++ b/idea/testData/debugger/tinyApp/outs/withoutBodyProperties2.out
@@ -1,11 +1,11 @@
 KotlinFieldBreakpoint created at withoutBodyProperties2.kt:8
 KotlinFieldBreakpoint created at withoutBodyProperties2.kt:13
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! withoutBodyProperties2.WithoutBodyProperties2Kt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 withoutBodyProperties2.kt:8
 Compile bytecode for 1 + 4
 withoutBodyProperties2.kt:13
 Compile bytecode for 1 + 5
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/withoutBodyTypeParameters.out b/idea/testData/debugger/tinyApp/outs/withoutBodyTypeParameters.out
index d308ee8700b..d155289507b 100644
--- a/idea/testData/debugger/tinyApp/outs/withoutBodyTypeParameters.out
+++ b/idea/testData/debugger/tinyApp/outs/withoutBodyTypeParameters.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at withoutBodyTypeParameters.kt:8
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! withoutBodyTypeParameters.WithoutBodyTypeParametersKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Run Java
+Connected to the target VM
 withoutBodyTypeParameters.kt:8
 Compile bytecode for i
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM
 
 Process finished with exit code 0
diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestCase.java b/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestCase.java
index b24a8a2ecb8..817a1636d39 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestCase.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestCase.java
@@ -277,27 +277,6 @@ public abstract class KotlinDebuggerTestCase extends DescriptorTestCase {
         return result;
     }
 
-    private static class KotlinOutputChecker extends OutputChecker {
-
-        public KotlinOutputChecker(@NotNull String appPath, @NotNull String outputPath) {
-            super(appPath, outputPath);
-        }
-
-        @Override
-        protected String replaceAdditionalInOutput(String str) {
-            //noinspection ConstantConditions
-            try {
-                return super.replaceAdditionalInOutput(
-                        str.replace(ForTestCompileRuntime.runtimeJarForTests().getCanonicalPath(), "!KOTLIN_RUNTIME!")
-                           .replace(CUSTOM_LIBRARY_JAR.getCanonicalPath(), "!CUSTOM_LIBRARY!")
-                );
-            }
-            catch (IOException e) {
-                throw new RuntimeException(e);
-            }
-        }
-    }
-
     @Override
     protected JavaParameters createJavaParameters(String mainClass) {
         JavaParameters parameters = super.createJavaParameters(mainClass);
diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinOutputChecker.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinOutputChecker.kt
new file mode 100644
index 00000000000..a5353289c42
--- /dev/null
+++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinOutputChecker.kt
@@ -0,0 +1,125 @@
+/*
+ * Copyright 2010-2017 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.idea.debugger
+
+import com.intellij.debugger.impl.OutputChecker
+import com.intellij.idea.IdeaLogger
+import com.intellij.openapi.diagnostic.Logger
+import com.intellij.openapi.projectRoots.Sdk
+import com.intellij.openapi.util.SystemInfo
+import com.intellij.openapi.util.io.FileUtil
+import com.intellij.openapi.util.io.FileUtilRt
+import com.intellij.openapi.util.text.StringUtilRt
+import com.intellij.openapi.vfs.CharsetToolkit
+import org.junit.Assert
+import java.io.File
+
+internal class KotlinOutputChecker(appPath: String, outputPath: String) : OutputChecker(appPath, outputPath) {
+    private val CONNECT_PREFIX = "Connected to the target VM"
+    private val DISCONNECT_PREFIX = "Disconnected from the target VM"
+    private val RUN_JAVA = "Run Java"
+
+    companion object {
+        @JvmStatic
+        private val LOG = Logger.getInstance(KotlinOutputChecker::class.java)
+    }
+
+    // Copied from the base OutputChecker.checkValid(). Need to intercept call to base preprocessBuffer() method
+    override fun checkValid(jdk: Sdk, sortClassPath: Boolean) {
+        if (IdeaLogger.ourErrorsOccurred != null) {
+            throw IdeaLogger.ourErrorsOccurred
+        }
+
+        val actual = preprocessBuffer(buildOutputString())
+
+        val outs = File(myAppPath + File.separator + "outs")
+        assert(outs.exists() || outs.mkdirs()) { outs }
+
+        var outFile = File(outs, myTestName + ".out")
+        if (!outFile.exists()) {
+            if (SystemInfo.isWindows) {
+                val winOut = File(outs, myTestName + ".win.out")
+                if (winOut.exists()) {
+                    outFile = winOut
+                }
+            }
+            else if (SystemInfo.isUnix) {
+                val unixOut = File(outs, myTestName + ".unx.out")
+                if (unixOut.exists()) {
+                    outFile = unixOut
+                }
+            }
+        }
+
+        if (!outFile.exists()) {
+            FileUtil.writeToFile(outFile, actual)
+            LOG.error("Test file created ${outFile.path}\n**************** Don't forget to put it into VCS! *******************")
+        }
+        else {
+            val originalText = FileUtilRt.loadFile(outFile, CharsetToolkit.UTF8)
+            val expected = StringUtilRt.convertLineSeparators(originalText)
+            if (expected != actual) {
+                println("expected:")
+                println(originalText)
+                println("actual:")
+                println(actual)
+
+                val len = Math.min(expected.length, actual.length)
+                if (expected.length != actual.length) {
+                    println("Text sizes differ: expected " + expected.length + " but actual: " + actual.length)
+                }
+                if (expected.length > len) {
+                    println("Rest from expected text is: \"" + expected.substring(len) + "\"")
+                }
+                else if (actual.length > len) {
+                    println("Rest from actual text is: \"" + actual.substring(len) + "\"")
+                }
+
+                Assert.assertEquals(originalText, actual)
+            }
+        }
+    }
+
+    private fun preprocessBuffer(buffer: String): String {
+        val lines = buffer.lines().toMutableList()
+
+        val connectedIndex = lines.indexOfFirst { it.startsWith(CONNECT_PREFIX) }
+        lines[connectedIndex] = CONNECT_PREFIX
+
+        val runCommandIndex = connectedIndex - 1
+        lines[runCommandIndex] = RUN_JAVA
+
+        val disconnectedIndex = lines.indexOfFirst { it.startsWith(DISCONNECT_PREFIX) }
+        lines[disconnectedIndex] = DISCONNECT_PREFIX
+
+        return lines.joinToString("\n")
+    }
+
+    private fun buildOutputString(): String {
+        // Call base method with reflection
+        val m = OutputChecker::class.java.getDeclaredMethod("buildOutputString")!!
+        val isAccessible = m.isAccessible
+
+        try {
+            m.isAccessible = true
+            return m.invoke(this) as String
+        }
+        finally {
+            m.isAccessible = isAccessible
+        }
+    }
+}