Remove uri

Author: renkun-ken

R/notebook2.R

@@ -48,7 +48,7 @@ r$run(function() {
         identical(dev.size(), null_dev_size)
     }
 
-    evaluate <- function(id, uri, expr) {
+    evaluate <- function(id, expr) {
       viewer_file <<- NULL
       browser_url <<- NULL
       res <- tryCatch({
@@ -62,38 +62,44 @@ r$run(function() {
           replayPlot(record)
           graphics.off()
           list(
+            id = id,
             type = "plot",
             result = plot_file
           )
         } else if (!is.null(viewer_file)) {
           list(
+            id = id,
             type = "viewer",
             result = viewer_file
           )
         } else if (!is.null(browser_url)) {
           list(
+            id = id,
             type = "browser",
             result = browser_url
           )
         } else if (out$visible) {
           list(
+            id = id,
             type = "text",
             result = paste0(text, collapse = "\n")
           )
         } else {
           list(
+            id = id,
             type = "text",
             result = ""
           )
         }
       }, error = function(e) {
         list(
+          id = id,
           type  = "error",
           result = conditionMessage(e)
         )
       })
 
-      c(id = id, uri = uri, res)
+      res
     }
 
     environment()
@@ -118,15 +124,14 @@ while (TRUE) {
     request <- jsonlite::fromJSON(content, simplifyVector = FALSE)
     if (request$type == "eval") {
       response <- tryCatch({
-        r$call(function(id, uri, expr) {
-          .vscNotebook$evaluate(id, uri, expr)
-        }, list(id = request$id, uri = request$uri, expr = request$expr))
+        r$call(function(id, expr) {
+          .vscNotebook$evaluate(id, expr)
+        }, list(id = request$id, expr = request$expr))
         running_request <- request
         NULL
       }, error = function(e) {
         list(
           id = request$id,
-          uri = request$uri,
           type = "error",
           result = conditionMessage(e)
         )
@@ -146,14 +151,12 @@ while (TRUE) {
         if (is.null(result$error)) {
           response <- list(
             id = running_request$id,
-            uri = running_request$uri,
             type = "text",
             result = result$message
           )
         } else {
           response <- list(
             id = running_request$id,
-            uri = running_request$uri,
             type = "error",
             result = conditionMessage(result$error)
           )

src/notebook.ts

@@ -5,14 +5,12 @@ import { dirname } from 'path';
 
 interface RSessionRequest {
   id: number;
-  uri: string;
   type: 'eval' | 'cancel';
   expr?: any;
 }
 
 interface RSessionResponse {
   id: number;
-  uri: string;
   type: 'text' | 'plot' | 'viewer' | 'browser' | 'error';
   result: string;
 }
@@ -59,7 +57,7 @@ class RKernel {
             cell.metadata.runState = vscode.NotebookCellRunState.Success;
             cell.metadata.lastRunDuration = +new Date() - cell.metadata.runStartTime;
 
-            console.log(`id: ${response.id}, uri: ${response.uri}, type: ${response.type}, result: ${response.result}`);
+            console.log(`uri: ${cell.uri}, id: ${response.id}, type: ${response.type}, result: ${response.result}`);
             switch (response.type) {
               case 'text':
                 cell.outputs = [{
@@ -150,7 +148,6 @@ class RKernel {
     if (this.socket) {
       this.request({
         id: cell.metadata.executionOrder,
-        uri: cell.uri.toString(),
         type: 'eval',
         expr: cell.document.getText(),
       });
@@ -161,7 +158,6 @@ class RKernel {
     if (this.socket) {
       this.request({
         id: cell.metadata.executionOrder,
-        uri: cell.uri.toString(),
         type: 'cancel',
       });
     }