Fix #22, break rename/move files, fix Control + S

Author: pankgeorg

julia-runtime/run.jl

@@ -98,7 +98,7 @@ pluto_server_options = Pluto.Configuration.from_flat_kwargs(;
     launch_browser = false,
     # show_file_system=false,
     dismiss_update_notification = true,
-    auto_reload_from_file = true,
+    auto_reload_from_file = false,
     (Symbol(k) => v for (k, v) in JSON.parse(pluto_launch_params))...)
 pluto_server_session = Pluto.ServerSession(;
     secret = secret,
@@ -113,9 +113,9 @@ extensionData = PlutoExtensionSessionData(
     joinpath(asset_output_dir, "jlfiles/")
 )
 
-function whenNotebookUpdates(jlfile, newString)
-    filename = splitpath(jlfile)[end]
-    sendCommand(filename, newString)
+function whenNotebookUpdates(path, newString)
+    write(path, newString)
+    sendCommand(path, newString)
 end
 
 ###
@@ -168,7 +168,7 @@ try ## Note: This is to assist with co-developing Pluto & this Extension
 catch
 end
 
-function registerOnFileSaveListener(notebook::Pluto.notebook)
+function registerOnFileSaveListener(notebook::Pluto.Notebook)
     function onfilechange(pe::Pluto.PlutoEvent)
         if pe isa Pluto.FileSaveEvent
             whenNotebookUpdates(pe.path, pe.fileContent)
@@ -200,28 +200,15 @@ command_task = Pluto.@asynclog while true
         end
         frontend_params = get(detail, "frontend_params", Dict())
 
-
-        jlpath = joinpath(extensionData.jlfilesroot, detail["jlfile"])
-        extensionData.textRepresentations[detail["jlfile"]] = detail["text"]
-        open(jlpath, "w") do f
-            write(f, detail["text"])
-        end
+        jlpath = detail["fsPath"]  # joinpath(extensionData.jlfilesroot, detail["jlfile"])
         nb = Pluto.SessionActions.open(pluto_server_session, jlpath; notebook_id = UUID(detail["notebook_id"]))
-
         registerOnFileSaveListener(nb)
-
         filenbmap[detail["jlfile"]] = nb
         generate_output(nb, editor_html_filename, vscode_proxy_root, frontend_params)
 
     elseif type == "update"
         nb = filenbmap[detail["jlfile"]]
-        jlpath = joinpath(extensionData.jlfilesroot, detail["jlfile"])
-        open(jlpath, "w") do f
-            write(f, detail["text"])
-        end
         Pluto.update_from_file(pluto_server_session, nb)
-        extensionData.textRepresentations[detail["jlfile"]] = detail["text"]
-
     elseif type == "shutdown"
         nb = get(filenbmap, detail["jlfile"], nothing)
         !isnothing(nb) && Pluto.SessionActions.shutdown(

src/PlutoEditor.ts

@@ -21,7 +21,7 @@ export class PlutoEditor implements vscode.CustomTextEditorProvider {
         statusbar.show()
     }
 
-    constructor(private readonly context: vscode.ExtensionContext) {}
+    constructor(private readonly context: vscode.ExtensionContext) { }
 
     /**
      * Called when our custom editor is opened.
@@ -41,6 +41,7 @@ export class PlutoEditor implements vscode.CustomTextEditorProvider {
 
         const editor_html_filename = `editor_bespoke_${notebook_id}.html`
         const jlfile = `editor_bespoke_${notebook_id}.jl`
+        const fsPath = document.uri.fsPath
 
         this.webviews.add(document, notebook_id, panel)
 
@@ -103,7 +104,7 @@ export class PlutoEditor implements vscode.CustomTextEditorProvider {
             console.log("didsave", panel.active)
             if (doc.uri.toString() === document.uri.toString()) {
                 // When VSCode updates the document, notify pluto from here
-                backend.send_command("update", { jlfile, text: doc.getText() })
+                backend.send_command("update", { jlfile })
             }
             this.renderStatusBar()
         }, disposables)
@@ -188,6 +189,7 @@ export class PlutoEditor implements vscode.CustomTextEditorProvider {
                         notebook_id,
                         text,
                         jlfile,
+                        fsPath,
                         frontend_params: {
                             // disable_ui: true,
                         },

src/extension.ts

@@ -6,7 +6,7 @@ import { TextDecoder, TextEncoder } from "util"
 import { v4 as uuid } from "uuid"
 
 // this is a commit on the vscode-webview-proxy branch, see https://github.com/fonsp/Pluto.jl/pull/1493
-export const PLUTO_BRANCH_NAME = "091769c3df1d1c29bb1d640b62bb18cfc183a78d"
+export const PLUTO_BRANCH_NAME = "376b08851906afc9e52e2c09e823de8d7e656675"
 
 /*
 HELLO