correctly handle multiline console input in presentation log

rstudio · Mar 29, 2013 · 6c89fad · 6c89fad
1 parent ff7c87a
commit 6c89fad
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/src/cpp/r/include/r/session/RSessionUtils.hpp b/src/cpp/r/include/r/session/RSessionUtils.hpp
@@ -30,6 +30,8 @@ namespace utils {
 // check for R 3.0
 bool isR3();
 
+bool isDefaultPrompt(const std::string& prompt);
+
 // user home path
 const core::FilePath& userHomePath();  
 
@@ -39,6 +41,7 @@ core::FilePath tempFile(const std::string& prefix,
                         const std::string& extension);
 
 core::FilePath tempDir();
+
 
 // suppress output in scope
 class SuppressOutputInScope

diff --git a/src/cpp/r/session/RSession.cpp b/src/cpp/r/session/RSession.cpp
@@ -1594,6 +1594,11 @@ bool isR3()
    return s_isR3;
 }
 
+bool isDefaultPrompt(const std::string& prompt)
+{
+   return prompt == r::options::getOption<std::string>("prompt");
+}
+
 const FilePath& userHomePath()
 {
    return s_options.userHomePath;

diff --git a/src/cpp/session/modules/presentation/PresentationLog.cpp b/src/cpp/session/modules/presentation/PresentationLog.cpp
@@ -30,6 +30,7 @@
 
 #include <r/RSexp.hpp>
 #include <r/RExec.hpp>
+#include <r/session/RSessionUtils.hpp>
 
 #include "PresentationState.hpp"
 
@@ -109,6 +110,10 @@ void Log::onConsolePrompt(const std::string& prompt)
    if (!presentation::state::isActive())
       return;
 
+   // ignore if this isn't the default prompt
+   if (!r::session::utils::isDefaultPrompt(prompt))
+      return;
+
    if (!consoleInputBuffer_.empty())
    {
       std::string input = boost::algorithm::trim_copy(