Use default colouring for stdout/stderr, and add java stacktrace linking (#2147)

Author: briandealwis

plugins/com.google.cloud.tools.eclipse.appengine.deploy.ui/META-INF/MANIFEST.MF

@@ -50,6 +50,8 @@ Import-Package: com.google.api.client.auth.oauth2;version="[1.22.0,1.23.0)",
  org.eclipse.core.runtime,
  org.eclipse.core.runtime.jobs,
  org.eclipse.core.runtime.preferences,
+ org.eclipse.debug.ui,
+ org.eclipse.debug.ui.console,
  org.eclipse.jface.action,
  org.eclipse.jface.databinding.dialog,
  org.eclipse.jface.databinding.preference,

plugins/com.google.cloud.tools.eclipse.appengine.deploy.ui/src/com/google/cloud/tools/eclipse/appengine/deploy/ui/DeployCommandHandler.java

@@ -52,6 +52,8 @@
 import org.eclipse.core.runtime.jobs.IJobChangeEvent;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.core.runtime.jobs.JobChangeAdapter;
+import org.eclipse.debug.ui.IDebugUIConstants;
+import org.eclipse.debug.ui.console.ConsoleColorProvider;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.window.Window;
 import org.eclipse.swt.widgets.Shell;
@@ -134,23 +136,28 @@ private void launchDeployJob(IProject project, Credential credential)
     AnalyticsPingManager.getInstance().sendPing(
         AnalyticsEvents.APP_ENGINE_DEPLOY, AnalyticsEvents.APP_ENGINE_DEPLOY_STANDARD, null);
 
+    IPath workDirectory = createWorkDirectory();
     DeployPreferences deployPreferences = new DeployPreferences(project);
+    DefaultDeployConfiguration deployConfiguration = toDeployConfiguration(deployPreferences);
+    boolean includeOptionalConfigurationFiles =
+        deployPreferences.isIncludeOptionalConfigurationFiles();
+
     DeployConsole messageConsole =
         MessageConsoleUtilities.createConsole(getConsoleName(deployPreferences.getProjectId()),
                                               new DeployConsole.Factory());
     IConsoleManager consoleManager = ConsolePlugin.getDefault().getConsoleManager();
     consoleManager.showConsoleView(messageConsole);
-
-    IPath workDirectory = createWorkDirectory();
+    ConsoleColorProvider colorProvider = new ConsoleColorProvider();
     MessageConsoleStream outputStream = messageConsole.newMessageStream();
-    DefaultDeployConfiguration deployConfiguration = toDeployConfiguration(deployPreferences);
-    boolean includeOptionalConfigurationFiles =
-        deployPreferences.isIncludeOptionalConfigurationFiles();
+    MessageConsoleStream errorStream = messageConsole.newMessageStream();
+    outputStream.setColor(colorProvider.getColor(IDebugUIConstants.ID_STANDARD_OUTPUT_STREAM));
+    errorStream.setColor(colorProvider.getColor(IDebugUIConstants.ID_STANDARD_ERROR_STREAM));
+    
     StagingDelegate stagingDelegate = getStagingDelegate(project);
 
     DeployJob deploy = new DeployJob(project, credential, workDirectory,
         new MessageConsoleWriterOutputLineListener(outputStream),
-        new MessageConsoleWriterOutputLineListener(outputStream),
+        new MessageConsoleWriterOutputLineListener(errorStream),
         deployConfiguration, includeOptionalConfigurationFiles, stagingDelegate);
     messageConsole.setJob(deploy);
     deploy.addJobChangeListener(new JobChangeAdapter() {

plugins/com.google.cloud.tools.eclipse.appengine.localserver/src/com/google/cloud/tools/eclipse/appengine/localserver/server/LocalAppEngineServerBehaviour.java

@@ -301,7 +301,7 @@ public String getDescription() {
    * @param console the stream (Eclipse console) to send development server process output to
    */
   void startDevServer(DefaultRunConfiguration devServerRunConfiguration,
-      Path javaHomePath, MessageConsoleStream console)
+      Path javaHomePath, MessageConsoleStream outputStream, MessageConsoleStream errorStream)
       throws CoreException {
 
     PortChecker portInUse = new PortChecker() {
@@ -335,7 +335,7 @@ public boolean isInUse(InetAddress addr, int port) {
     setServerState(IServer.STATE_STARTING);
 
     // Create dev app server instance
-    initializeDevServer(console, javaHomePath);
+    initializeDevServer(outputStream, errorStream, javaHomePath);
 
     // Run server
     try {
@@ -350,15 +350,17 @@ private static int ifNull(Integer value, int defaultValue) {
     return value != null ? value : defaultValue;
   }
 
-  private void initializeDevServer(MessageConsoleStream console, Path javaHomePath) {
-    MessageConsoleWriterOutputLineListener outputListener =
-        new MessageConsoleWriterOutputLineListener(console);
+  private void initializeDevServer(MessageConsoleStream stdout, MessageConsoleStream stderr,
+      Path javaHomePath) {
+    MessageConsoleWriterOutputLineListener stdoutListener =
+        new MessageConsoleWriterOutputLineListener(stdout);
+    MessageConsoleWriterOutputLineListener stderrListener =
+        new MessageConsoleWriterOutputLineListener(stderr);
 
     // dev_appserver output goes to stderr
     cloudSdk = new CloudSdk.Builder()
         .javaHome(javaHomePath)
-        .addStdOutLineListener(outputListener)
-        .addStdErrLineListener(outputListener)
+        .addStdOutLineListener(stdoutListener).addStdErrLineListener(stderrListener)
         .addStdErrLineListener(serverOutputListener)
         .startListener(localAppEngineStartListener)
         .exitListener(localAppEngineExitListener)

plugins/com.google.cloud.tools.eclipse.appengine.localserver/src/com/google/cloud/tools/eclipse/appengine/localserver/server/LocalAppEngineServerLaunchConfigurationDelegate.java

@@ -76,6 +76,8 @@
 import org.eclipse.debug.core.model.IMemoryBlock;
 import org.eclipse.debug.core.model.IProcess;
 import org.eclipse.debug.core.model.IThread;
+import org.eclipse.debug.ui.IDebugUIConstants;
+import org.eclipse.debug.ui.console.ConsoleColorProvider;
 import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.jdt.launching.AbstractJavaLaunchConfigurationDelegate;
@@ -84,6 +86,7 @@
 import org.eclipse.jdt.launching.IVMInstall;
 import org.eclipse.jdt.launching.JavaRuntime;
 import org.eclipse.jdt.launching.SocketUtil;
+import org.eclipse.ui.console.MessageConsoleStream;
 import org.eclipse.wst.server.core.IModule;
 import org.eclipse.wst.server.core.IServer;
 import org.eclipse.wst.server.core.IServerListener;
@@ -416,11 +419,17 @@ public void launch(ILaunchConfiguration configuration, String mode, final ILaunc
       runnables.add(deployPath.toFile());
     }
 
+    // configure the console for output
+    ConsoleColorProvider colorProvider = new ConsoleColorProvider();
     LocalAppEngineConsole console =
         MessageConsoleUtilities.findOrCreateConsole(configuration.getName(),
             new LocalAppEngineConsole.Factory(serverBehaviour));
     console.clearConsole();
     console.activate();
+    MessageConsoleStream outputStream = console.newMessageStream();
+    MessageConsoleStream errorStream = console.newMessageStream();
+    outputStream.setColor(colorProvider.getColor(IDebugUIConstants.ID_STANDARD_OUTPUT_STREAM));
+    errorStream.setColor(colorProvider.getColor(IDebugUIConstants.ID_STANDARD_ERROR_STREAM));
 
     // A launch must have at least one debug target or process, or it becomes a zombie
     CloudSdkDebugTarget target = new CloudSdkDebugTarget(launch, serverBehaviour);
@@ -445,7 +454,7 @@ public void launch(ILaunchConfiguration configuration, String mode, final ILaunc
 
       String javaHome = vmInstall.getInstallLocation().getAbsolutePath();
       serverBehaviour.startDevServer(devServerRunConfiguration, Paths.get(javaHome),
-          console.newMessageStream());
+          outputStream, errorStream);
     } catch (CoreException ex) {
       launch.terminate();
       throw ex;

plugins/com.google.cloud.tools.eclipse.appengine.localserver/src/com/google/cloud/tools/eclipse/appengine/localserver/ui/LocalAppEngineConsole.java

@@ -18,6 +18,7 @@
 
 import com.google.cloud.tools.eclipse.appengine.localserver.Messages;
 import com.google.cloud.tools.eclipse.appengine.localserver.server.LocalAppEngineServerBehaviour;
+import com.google.cloud.tools.eclipse.appengine.ui.AppEngineImages;
 import com.google.cloud.tools.eclipse.ui.util.MessageConsoleUtilities.ConsoleFactory;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
@@ -42,7 +43,10 @@ public void serverChanged(ServerEvent event) {
   };
 
   private LocalAppEngineConsole(String name, LocalAppEngineServerBehaviour serverBehaviour) {
-    super(name, null);
+    // https://github.com/GoogleCloudPlatform/google-cloud-eclipse/issues/2140
+    // todo: setting "javaStackTraceConsole" as the console type seems distasteful
+    // but is required to get stack-trace linking to work
+    super(name, "javaStackTraceConsole", AppEngineImages.appEngine(16), true);
     this.unprefixedName = name;
     this.serverBehaviour = serverBehaviour;
   }