distinguish standard output and error

rstudio · Nov 14, 2012 · 647b7bc · 647b7bc
1 parent e50b2d2
commit 647b7bc
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/cpp/session/modules/build/SessionSourceCpp.cpp b/src/cpp/session/modules/build/SessionSourceCpp.cpp
@@ -97,9 +97,9 @@ class SourceCppContext : boost::noncopyable
       // collect all build output
       std::string buildOutput;
       if (!succeeded || showOutput_)
-         buildOutput = consoleOutputBuffer_;
+         buildOutput = consoleOutputBuffer_ + consoleErrorBuffer_;
       else
-         buildOutput = output + consoleOutputBuffer_;
+         buildOutput = output + consoleErrorBuffer_;
 
       // reset state
       reset();
@@ -113,14 +113,18 @@ class SourceCppContext : boost::noncopyable
    void onConsoleOutput(module_context::ConsoleOutputType type,
                         const std::string& output)
    {
-      consoleOutputBuffer_.append(output);
+      if (type == module_context::ConsoleOutputNormal)
+         consoleOutputBuffer_.append(output);
+      else
+         consoleErrorBuffer_.append(output);
    }
 
    void reset()
    {
       sourceFile_ = FilePath();
       showOutput_ = false;
       consoleOutputBuffer_.clear();
+      consoleErrorBuffer_.clear();
       module_context::events().onConsoleOutput.disconnect(
          boost::bind(&SourceCppContext::onConsoleOutput, this, _1, _2));
       previousPath_.clear();
@@ -131,6 +135,7 @@ class SourceCppContext : boost::noncopyable
    FilePath sourceFile_;
    bool showOutput_;
    std::string consoleOutputBuffer_;
+   std::string consoleErrorBuffer_;
    std::string previousPath_;
    std::string rToolsWarning_;
 };