Revert "copy adjacent files for vignette preview"

This reverts commit 47b4707.

src/cpp/session/SessionModuleContext.cpp

@@ -745,15 +745,6 @@ FilePath tempDir()
    return r::session::utils::tempDir();
 }
 
-Error copyDirectory(const FilePath& srcDir, const FilePath& targetDir)
-{
-   r::exec::RFunction copy("file.copy");
-   copy.addParam("from", string_utils::utf8ToSystem(srcDir.absolutePath()));
-   copy.addParam("to", string_utils::utf8ToSystem(targetDir.absolutePath()));
-   copy.addParam("recursive", true);
-   return copy.call();
-}
-
 FilePath findProgram(const std::string& name)
 {
    std::string which;

src/cpp/session/include/session/SessionModuleContext.hpp

@@ -79,10 +79,6 @@ core::FilePath tempFile(const std::string& prefix,
 
 core::FilePath tempDir();
 
-// copy a directory
-core::Error copyDirectory(const core::FilePath& srcDir,
-                          const core::FilePath& targetDir);
-
 // find out the location of a binary
 core::FilePath findProgram(const std::string& name);
 

src/cpp/session/modules/rmarkdown/SessionRMarkdown.cpp

@@ -796,37 +796,13 @@ Error renderRmd(const json::JsonRpcRequest& request,
 Error renderRmdSource(const json::JsonRpcRequest& request,
                      json::JsonRpcResponse* pResponse)
 {
-   std::string source, file;
-   Error error = json::readParams(request.params, &source, &file);
+   std::string source;
+   Error error = json::readParams(request.params, &source);
    if (error)
       return error;
 
-   // create temp directory
-   FilePath previewPath = module_context::tempFile("rstudio-", "dir");
-   error = previewPath.ensureDirectory();
-   if (error)
-   {
-      LOG_ERROR(error);
-      return error;
-   }
-
-   // if there is a source file then copy it's directory into the
-   // temp directory (to resolve relative paths)
-   if (!file.empty())
-   {
-      FilePath filePath = module_context::resolveAliasedPath(file);
-      FilePath srcDir = filePath.parent();
-      Error error = module_context::copyDirectory(srcDir, previewPath);
-      if (error)
-      {
-         LOG_ERROR(error);
-         return error;
-      }
-      previewPath = previewPath.childPath(srcDir.filename());
-   }
-
    // create temp file
-   FilePath rmdTempFile = previewPath.childPath("preview.Rmd");
+   FilePath rmdTempFile = module_context::tempFile("Preview-", "Rmd");
    error = core::writeStringToFile(rmdTempFile, source);
    if (error)
       return error;

src/gwt/src/org/rstudio/studio/client/rmarkdown/events/RenderRmdSourceEvent.java

@@ -25,21 +25,15 @@ public interface Handler extends EventHandler
       void onRenderRmdSource(RenderRmdSourceEvent event);
    }
 
-   public RenderRmdSourceEvent(String source, String file)
+   public RenderRmdSourceEvent(String source)
    {
       source_ = source;
-      file_ = file;
    }
 
    public String getSource()
    {
       return source_;
    }
-
-   public String getFile()
-   {
-      return file_;
-   }
 
    @Override
    public Type<Handler> getAssociatedType()
@@ -54,7 +48,6 @@ protected void dispatch(Handler handler)
    }
 
    private final String source_;
-   private final String file_;
 
    public static final Type<Handler> TYPE = new Type<Handler>();
 }

src/gwt/src/org/rstudio/studio/client/rmarkdown/model/RMarkdownServerOperations.java

@@ -33,7 +33,6 @@ void renderRmd(String file, int line, String format, String encoding,
                   ServerRequestCallback<Boolean> requestCallback);
 
    void renderRmdSource(String source,
-                        String file,
                         ServerRequestCallback<Boolean> requestCallback);
 
    void terminateRenderRmd(ServerRequestCallback<Void> requestCallback);

src/gwt/src/org/rstudio/studio/client/server/remote/RemoteServer.java

@@ -3273,13 +3273,10 @@ public void renderRmd(String file, int line, String format, String encoding,
    }
 
    @Override
-   public void renderRmdSource(String source, String file,
+   public void renderRmdSource(String source,
          ServerRequestCallback<Boolean> requestCallback)
    {
-      JSONArray params = new JSONArray();
-      params.set(0, new JSONString(source));
-      params.set(1, new JSONString(StringUtil.notNull(file)));
-      sendRequest(RPC_SCOPE, RENDER_RMD_SOURCE, params, requestCallback);
+      sendRequest(RPC_SCOPE, RENDER_RMD_SOURCE, source, requestCallback);
    }
 
 

src/gwt/src/org/rstudio/studio/client/workbench/views/output/renderrmd/RenderRmdOutputPresenter.java

@@ -133,7 +133,7 @@ public void onRenderRmd(RenderRmdEvent event)
    @Override
    public void onRenderRmdSource(RenderRmdSourceEvent event)
    {
-      server_.renderRmdSource(event.getSource(), event.getFile(),
+      server_.renderRmdSource(event.getSource(),
                               new SimpleRequestCallback<Boolean>()); 
    }
 

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

@@ -3350,8 +3350,7 @@ void renderRmd()
 
       if (renderSourceOnly)
       {
-         rmarkdownHelper_.renderRMarkdownSource(docDisplay_.getCode(), 
-                                                docUpdateSentinel_.getPath());
+         rmarkdownHelper_.renderRMarkdownSource(docDisplay_.getCode());
       }
 
       else

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

@@ -265,15 +265,14 @@ public void execute(RMarkdownContext arg)
       });
    }
 
-   public void renderRMarkdownSource(final String source,
-                                     final String file)
+   public void renderRMarkdownSource(final String source)
    {
       withRMarkdownPackage("Rendering R Markdown documents", 
             new CommandWithArg<RMarkdownContext>() {
          @Override
          public void execute(RMarkdownContext arg)
          {
-            eventBus_.fireEvent(new RenderRmdSourceEvent(source, file));
+            eventBus_.fireEvent(new RenderRmdSourceEvent(source));
          }
       });
    }