Fix Monaco URI handling

thorpelawrence · Jul 23, 2017 · 52b0796 · 52b0796
1 parent ddfdbdc
commit 52b0796
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "spectrum-editor",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "main": "main.js",
   "scripts": {
     "start": "electron .",

diff --git a/renderer.js b/renderer.js
@@ -86,23 +86,25 @@ loader().then((monaco) => {
 
     ipcRenderer.on('open-file', (e, path) => {
         if (path) {
-            if (monaco.editor.getModel(path)) {
-                editor.setModel(monaco.editor.getModel(path))
+            let uri = monaco.Uri.file(path)
+            if (monaco.editor.getModel(uri)) {
+                editor.setModel(monaco.editor.getModel(uri))
             }
             else {
                 fs.readFile(path, 'utf8', (err, data) => {
                     if (err) console.error(err)
-                    editor.setModel(monaco.editor.createModel(data, null, path))
+                    editor.setModel(monaco.editor.createModel(data, null, uri))
                 })
             }
         }
     })
 
     ipcRenderer.on('save-file', (e, saveAs) => {
-        let path = editor.getModel().uri
-        if (saveAs || typeof path !== "string") {
+        let uri = editor.getModel().uri
+        let path = uri.scheme !== "inmemory" ? uri.fsPath : null
+        if (saveAs || !path) {
             path = dialog.showSaveDialog(win, {
-                defaultPath: typeof path === "string" ? path : null
+                defaultPath: path
             })
         }
         if (path) {