MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-273852 removed leading whitespace in tasks execution log

Browse Source 
GitOrigin-RevId: 3c8dd9849edfc90568caa6fbc1b2afbe0b0b6c72
This commit is contained in:
Sergei Vorobyov
2021-07-22 16:53:18 +00:00
committed by intellij-monorepo-bot
parent 7e1daddfde
commit 770a3c4ee7
3 changed files with 15 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/external-system-api/resources/messages/ExternalSystemBundle.properties
+2 -4
View File
@@ -100,10 +100,8 @@ run.configuration.settings.label.project={0} project:
run.configuration.settings.label.tasks=Tasks:
run.configuration.settings.label.vmoptions=VM options:
run.configuration.settings.label.arguments=Arguments:
run.text.starting.multiple.task={0}: Executing tasks{1}...
run.text.starting.single.task={0}: Executing task{1}...
run.text.ended.multiple.task={0}: Tasks execution finished{1}.
run.text.ended.single.task={0}: Task execution finished{1}.
run.text.starting.task={0}: Executing{1}...
run.text.ended.task={0}: Execution finished{1}.
run.invalid.jvm.agent.configuration=Invalid JVM agent configuration used ''{0}''
external.system.java.in.resolving=Resolving...
platform/external-system-api/src/com/intellij/openapi/externalSystem/model/execution/ExternalSystemTaskExecutionSettings.java
+9 -3
View File
@@ -207,8 +207,14 @@ public class ExternalSystemTaskExecutionSettings implements Cloneable {
@Override
public String toString() {
return StringUtil.join(myTaskNames, " ") +
(StringUtil.isEmpty(myScriptParameters) ? "" : " " + myScriptParameters) +
(StringUtil.isEmpty(myVmOptions) ? "" : " " + myVmOptions);
StringJoiner joiner = new StringJoiner(" ");
myTaskNames.forEach(it -> joiner.add(it));
if (StringUtil.isNotEmpty(myScriptParameters)) {
joiner.add(myScriptParameters);
}
if (StringUtil.isNotEmpty(myVmOptions)) {
joiner.add(myVmOptions);
}
return joiner.toString();
}
}
platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/execution/ExternalSystemRunnableState.java
+4 -15
View File
@@ -218,15 +218,10 @@ public class ExternalSystemRunnableState extends UserDataHolderBase implements R
ApplicationManager.getApplication().executeOnPooledThread(() -> {
final String startDateTime = DateFormatUtil.formatTimeWithSeconds(System.currentTimeMillis());
final String greeting;
final String settingsDescription = StringUtil.isEmpty(mySettings.toString()) ? "" : String.format(" '%s'", mySettings.toString());
if (mySettings.getTaskNames().size() > 1) {
greeting = ExternalSystemBundle.message("run.text.starting.multiple.task", startDateTime, settingsDescription) + "\n";
}
else {
greeting = ExternalSystemBundle.message("run.text.starting.single.task", startDateTime, settingsDescription) + "\n";
}
final String settingsDescription = StringUtil.isEmpty(mySettings.toString()) ? "" : String.format(" '%s'", mySettings);
final String greeting = ExternalSystemBundle.message("run.text.starting.task", startDateTime, settingsDescription) + "\n";
processHandler.notifyTextAvailable(greeting + "\n", ProcessOutputTypes.SYSTEM);
try (BuildEventDispatcher eventDispatcher = new ExternalSystemEventDispatcher(task.getId(), progressListener, false)) {
ExternalSystemTaskNotificationListenerAdapter taskListener = new ExternalSystemTaskNotificationListenerAdapter() {
@Override
@@ -303,13 +298,7 @@ public class ExternalSystemRunnableState extends UserDataHolderBase implements R
@Override
public void onEnd(@NotNull ExternalSystemTaskId id) {
final String endDateTime = DateFormatUtil.formatTimeWithSeconds(System.currentTimeMillis());
final String farewell;
if (mySettings.getTaskNames().size() > 1) {
farewell = ExternalSystemBundle.message("run.text.ended.multiple.task", endDateTime, settingsDescription);
}
else {
farewell = ExternalSystemBundle.message("run.text.ended.single.task", endDateTime, settingsDescription);
}
final String farewell = ExternalSystemBundle.message("run.text.ended.task", endDateTime, settingsDescription);
processHandler.notifyTextAvailable(farewell + "\n", ProcessOutputTypes.SYSTEM);
ExternalSystemRunConfiguration.foldGreetingOrFarewell(consoleView, farewell, false);
processHandler.notifyProcessTerminated(0);