Merge branch 'master' of github.com:rstudio/rstudio

Author: jjallaire

src/gwt/src/org/rstudio/studio/client/workbench/views/console/events/ConsoleHistoryAddedEvent.java

@@ -0,0 +1,62 @@
+/*
+ * ConsoleHistoryAddedEvent.java
+ *
+ * Copyright (C) 2009-16 by RStudio, Inc.
+ *
+ * Unless you have received this program directly from RStudio pursuant
+ * to the terms of a commercial license agreement with RStudio, then
+ * this program is licensed to you under the terms of version 3 of the
+ * GNU Affero General Public License. This program is distributed WITHOUT
+ * ANY EXPRESS OR IMPLIED WARRANTY, INCLUDING THOSE OF NON-INFRINGEMENT,
+ * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Please refer to the
+ * AGPL (http://www.gnu.org/licenses/agpl-3.0.txt) for more details.
+ *
+ */
+package org.rstudio.studio.client.workbench.views.console.events;
+
+import org.rstudio.core.client.js.JavaScriptSerializable;
+import org.rstudio.studio.client.application.events.CrossWindowEvent;
+
+import com.google.gwt.event.shared.EventHandler;
+import com.google.gwt.event.shared.GwtEvent;
+
+@JavaScriptSerializable
+public class ConsoleHistoryAddedEvent 
+   extends CrossWindowEvent<ConsoleHistoryAddedEvent.Handler>
+{
+   public static final GwtEvent.Type<ConsoleHistoryAddedEvent.Handler> TYPE =
+      new GwtEvent.Type<ConsoleHistoryAddedEvent.Handler>();
+  
+   public interface Handler extends EventHandler
+   {
+      void onConsoleHistoryAdded(ConsoleHistoryAddedEvent event);
+   }
+   
+   public ConsoleHistoryAddedEvent()
+   {
+   }
+
+   public ConsoleHistoryAddedEvent(String code)
+   {
+      code_ = code;
+   }
+   
+   public String getCode()
+   {
+      return code_;
+   }
+         
+   @Override
+   public Type<ConsoleHistoryAddedEvent.Handler> getAssociatedType()
+   {
+      return TYPE;
+   }
+
+   @Override
+   protected void dispatch(Handler handler)
+   {
+      handler.onConsoleHistoryAdded(this);
+   }
+   
+   private String code_;
+}

src/gwt/src/org/rstudio/studio/client/workbench/views/console/shell/Shell.java

@@ -63,7 +63,8 @@
 
 import java.util.ArrayList;
 
-public class Shell implements ConsoleInputHandler,
+public class Shell implements ConsoleHistoryAddedEvent.Handler,
+                              ConsoleInputHandler,
                               ConsoleWriteOutputHandler,
                               ConsoleWriteErrorHandler,
                               ConsoleWritePromptHandler,
@@ -135,6 +136,7 @@ public void execute(String value)
       view_.addCapturingKeyDownHandler(handler) ;
       view_.addKeyPressHandler(handler) ;
 
+      eventBus.addHandler(ConsoleHistoryAddedEvent.TYPE, this);
       eventBus.addHandler(ConsoleInputEvent.TYPE, this); 
       eventBus.addHandler(ConsoleWriteOutputEvent.TYPE, this);
       eventBus.addHandler(ConsoleWriteErrorEvent.TYPE, this);
@@ -336,7 +338,7 @@ private void processCommandEntry()
    {
       String commandText = view_.processCommandEntry() ;
       if (addToHistory_ && (commandText.length() > 0))
-         addToHistory(commandText);
+         eventBus_.fireEvent(new ConsoleHistoryAddedEvent(commandText));
 
       // fire event 
       eventBus_.fireEvent(new ConsoleInputEvent(commandText, ""));
@@ -436,6 +438,15 @@ public void onError(ServerError error)
             }); 
    }
 
+   @Override
+   public void onConsoleHistoryAdded(ConsoleHistoryAddedEvent event)
+   {
+      if (isBrowsePrompt())
+         browseHistoryManager_.addToHistory(event.getCode());
+      else
+         historyManager_.addToHistory(event.getCode());
+   }
+
    private final class InputKeyDownHandler implements KeyDownHandler,
                                                       KeyPressHandler
    {
@@ -580,14 +591,6 @@ private void resetHistoryPosition()
       browseHistoryManager_.resetPosition();
    }
 
-   private void addToHistory(String commandText)
-   {
-      if (isBrowsePrompt())
-         browseHistoryManager_.addToHistory(commandText);
-      else
-         historyManager_.addToHistory(commandText);
-   }
-   
    private String getHistoryEntry(int offset)
    {
       if (isBrowsePrompt())

src/gwt/src/org/rstudio/studio/client/workbench/views/source/editors/EditingTargetCodeExecution.java

@@ -209,7 +209,24 @@ public void executeLastCode()
          String code = lastExecutedCode_.getValue();
          if (code != null && code.trim().length() > 0)
          {
-            events_.fireEvent(new SendToConsoleEvent(code, true));
+            // if in notebook mode, we want to execute the code inside the 
+            // chunk rather than at the console
+            Scope scope = null;
+            if (docDisplay_.showChunkOutputInline())
+            {
+               scope = docDisplay_.getCurrentChunk(
+                  lastExecutedCode_.getRange().getStart());
+            }
+
+            if (scope == null)
+            {
+               events_.fireEvent(new SendToConsoleEvent(code, true));
+            }
+            else
+            {
+               events_.fireEvent(new SendToChunkConsoleEvent(docId_, 
+                     scope, code));
+            }
          }
       }
    }

src/gwt/src/org/rstudio/studio/client/workbench/views/source/editors/text/rmd/TextEditingTargetNotebook.java

@@ -52,6 +52,7 @@
 import org.rstudio.studio.client.workbench.model.Session;
 import org.rstudio.studio.client.workbench.prefs.model.UIPrefs;
 import org.rstudio.studio.client.workbench.views.console.ConsoleResources;
+import org.rstudio.studio.client.workbench.views.console.events.ConsoleHistoryAddedEvent;
 import org.rstudio.studio.client.workbench.views.console.events.ConsoleWriteInputEvent;
 import org.rstudio.studio.client.workbench.views.console.events.ConsoleWriteInputHandler;
 import org.rstudio.studio.client.workbench.views.console.model.ConsoleServerOperations;
@@ -652,8 +653,7 @@ public void onSendToChunkConsole(final SendToChunkConsoleEvent event)
          public void onResponseReceived(RmdChunkOptions options)
          {
             // execute the input
-            console_.consoleInput(event.getCode(), chunkDef.getChunkId(), 
-                  new VoidServerRequestCallback());
+            executeCodeChunk(event.getCode(), chunkDef.getChunkId());
          }
          @Override
          public void onError(ServerError error)
@@ -1241,8 +1241,7 @@ public void onResponseReceived(RmdChunkOptions options)
                      {
                         outputs_.get(unit.chunkId).setOptions(options);
                      }
-                     console_.consoleInput(unit.code, unit.chunkId, 
-                           new VoidServerRequestCallback());
+                     executeCodeChunk(unit.code, unit.chunkId);
                   }
                }
 
@@ -1824,6 +1823,27 @@ public void run()
       }
    };
 
+   private void executeCodeChunk(final String code, final String chunkId)
+   {
+      console_.consoleInput(code, chunkId, 
+            new ServerRequestCallback<Void>()
+            {
+               @Override
+               public void onResponseReceived(Void v)
+               {
+                  // add the code into the history once it's been successfully
+                  // sent to the server
+                  events_.fireEvent(new ConsoleHistoryAddedEvent(code));
+               }
+
+               @Override
+               public void onError(ServerError error)
+               {
+                  Debug.logError(error);
+               }
+            });
+   }
+   
    private JsArray<ChunkDefinition> initialChunkDefs_;
    private HashMap<String, ChunkOutputUi> outputs_;
    private LinkedList<ChunkExecQueueUnit> chunkExecQueue_;