don't add startup library call to history

rstudio · Jul 9, 2012 · 9787220 · 9787220
1 parent f32b7af
commit 9787220
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 5 deletions.
diff --git a/src/gwt/src/org/rstudio/studio/client/workbench/views/buildtools/BuildPresenter.java b/src/gwt/src/org/rstudio/studio/client/workbench/views/buildtools/BuildPresenter.java
@@ -127,8 +127,8 @@ public void initializeAfterRestart(BuildRestartContext context)
       view_.buildCompleted();
 
       String loadPackage = "library(" + context.getPackageName() + ")";
-      SendToConsoleEvent event = new SendToConsoleEvent(loadPackage, true);
-      eventBus_.fireEvent(event);
+      eventBus_.fireEvent(
+              new SendToConsoleEvent(loadPackage, true, true));
    }
 
 

diff --git a/src/gwt/src/org/rstudio/studio/client/workbench/views/console/events/SendToConsoleEvent.java b/src/gwt/src/org/rstudio/studio/client/workbench/views/console/events/SendToConsoleEvent.java
@@ -20,9 +20,17 @@ public class SendToConsoleEvent extends GwtEvent<SendToConsoleHandler>
       new GwtEvent.Type<SendToConsoleHandler>();
 
    public SendToConsoleEvent(String code, boolean execute)
+   {
+      this(code, execute, false);
+   }
+
+   public SendToConsoleEvent(String code, 
+                             boolean execute, 
+                             boolean suppressAddToHistory)
    {
       code_ = code;
       execute_ = execute;
+      suppressAddToHistory_ = suppressAddToHistory;
    }
 
    public String getCode()
@@ -34,6 +42,11 @@ public boolean shouldExecute()
    {
       return execute_;
    }
+
+   public boolean suppressAddToHistory()
+   {
+      return suppressAddToHistory_;
+   }
 
    @Override
    public Type<SendToConsoleHandler> getAssociatedType()
@@ -49,4 +62,5 @@ protected void dispatch(SendToConsoleHandler sendToConsoleHandler)
 
    private final String code_;
    private final boolean execute_;
+   private final boolean suppressAddToHistory_;
 }
diff --git a/src/gwt/src/org/rstudio/studio/client/workbench/views/console/shell/Shell.java b/src/gwt/src/org/rstudio/studio/client/workbench/views/console/shell/Shell.java
@@ -281,11 +281,17 @@ public void onConsoleResetHistory(ConsoleResetHistoryEvent event)
    {
       setHistory(event.getHistory());
    }
-
+   
    private void processCommandEntry()
    {
+      processCommandEntry(false);
+   }
+
+   private void processCommandEntry(boolean suppressAddToHistory)
+   {
+      boolean addToHistory = addToHistory_ && !suppressAddToHistory;
       String commandText = view_.processCommandEntry() ;
-      if (addToHistory_ && (commandText.length() > 0))
+      if (addToHistory && (commandText.length() > 0))
          historyManager_.addToHistory(commandText);
 
       // fire event 
@@ -298,7 +304,7 @@ public void onSendToConsole(SendToConsoleEvent event)
       display.clear();
       display.setText(event.getCode());
       if (event.shouldExecute())
-         processCommandEntry();
+         processCommandEntry(event.suppressAddToHistory());
       else
       {
          display.setFocus(true);