Delete temporary files

Author: sonnyp

src/langs/blueprint/blueprint.js

@@ -6,17 +6,12 @@ import LSPClient from "../../lsp/LSPClient.js";
 import { once } from "../../../troll/src/util.js";
 
 export function setup({ data_dir, document }) {
-  const { code_view } = document;
-
-  // FIXME: Blueprint language server emits a KeyError for this
-  // const { file } = document;
-  // const uri = state_file.get_uri();
-  const uri = "workbench://state.blp";
+  const { file, code_view } = document;
 
   const lspc = createLSPClient({
-    data_dir,
-    uri,
     code_view,
+    uri: file.get_uri(),
+    data_dir,
   });
 
   lspc.start().catch(logError);
@@ -94,8 +89,11 @@ function createLSPClient({ code_view, data_dir, uri }) {
 
   lspc.connect(
     "notification::textDocument/publishDiagnostics",
-    (_self, { diagnostics }) => {
-      code_view.handleDiagnostics(diagnostics);
+    (_self, params) => {
+      if (params.uri !== uri) {
+        return;
+      }
+      code_view.handleDiagnostics(params.diagnostics);
     },
   );
 

src/langs/javascript/javascript.js

@@ -3,14 +3,12 @@ import Gio from "gi://Gio";
 import LSPClient from "../../lsp/LSPClient.js";
 
 export function setup({ data_dir, document }) {
-  const { file: state_file, code_view } = document;
+  const { file, code_view } = document;
 
-  const uri = state_file.get_uri();
   const lspc = createLSPClient({
-    uri,
     code_view,
+    uri: file.get_uri(),
     data_dir,
-    state_file,
   });
 
   lspc.start().catch(logError);
@@ -20,7 +18,7 @@ export function setup({ data_dir, document }) {
   });
 }
 
-function createLSPClient({ uri, code_view, data_dir, state_file }) {
+function createLSPClient({ uri, code_view, data_dir }) {
   const lspc = new LSPClient(["rome", "lsp-proxy"], {
     rootUri: Gio.File.new_for_path(data_dir).get_uri(),
     uri,
@@ -72,11 +70,11 @@ function createLSPClient({ uri, code_view, data_dir, state_file }) {
   // https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_publishDiagnostics
   lspc.connect(
     "notification::textDocument/publishDiagnostics",
-    (_self, { diagnostics, uri }) => {
-      if (!state_file.equal(Gio.File.new_for_uri(uri))) {
+    (_self, params) => {
+      if (params.uri !== uri) {
         return;
       }
-      code_view.handleDiagnostics(diagnostics);
+      code_view.handleDiagnostics(params.diagnostics);
     },
   );
 

src/langs/vala/vala.js

@@ -4,14 +4,12 @@ import GLib from "gi://GLib";
 import LSPClient from "../../lsp/LSPClient.js";
 
 export function setup({ data_dir, document }) {
-  const { file: state_file, code_view } = document;
+  const { file, code_view } = document;
 
   const api_file = Gio.File.new_for_path(
     GLib.build_filenamev([pkg.pkgdatadir, "workbench-api.vala"]),
   );
 
-  const uri = state_file.get_uri();
-
   api_file.copy(
     Gio.File.new_for_path(data_dir).get_child("workbench.vala"),
     Gio.FileCopyFlags.OVERWRITE,
@@ -21,9 +19,8 @@ export function setup({ data_dir, document }) {
 
   const lspc = createLSPClient({
     code_view,
-    uri,
+    uri: file.get_uri(),
     data_dir,
-    state_file,
   });
 
   lspc.start().catch(logError);
@@ -33,7 +30,7 @@ export function setup({ data_dir, document }) {
   });
 }
 
-function createLSPClient({ code_view, uri, data_dir, state_file }) {
+function createLSPClient({ code_view, uri, data_dir }) {
   const lspc = new LSPClient(
     [
       // "/usr/lib/sdk/vala/bin/vala-language-server",
@@ -58,11 +55,11 @@ function createLSPClient({ code_view, uri, data_dir, state_file }) {
 
   lspc.connect(
     "notification::textDocument/publishDiagnostics",
-    (_self, { diagnostics, uri }) => {
-      if (!state_file.equal(Gio.File.new_for_uri(uri))) {
+    (_self, params) => {
+      if (params.uri !== uri) {
         return;
       }
-      code_view.handleDiagnostics(diagnostics);
+      code_view.handleDiagnostics(params.diagnostics);
     },
   );
 

src/window.js

@@ -258,9 +258,7 @@ export default function Window({ application }) {
           file_javascript,
           "replace_contents_async",
           "replace_contents_finish",
-          new GLib.Bytes(
-            langs.javascript.document.code_view.buffer.text || " ",
-          ),
+          new GLib.Bytes(document_javascript.code_view.buffer.text || " "),
           null,
           false,
           Gio.FileCreateFlags.NONE,
@@ -272,6 +270,14 @@ export default function Window({ application }) {
         } catch (err) {
           previewer.update();
           throw err;
+        } finally {
+          promiseTask(
+            file_javascript,
+            "delete_async",
+            "delete_finish",
+            GLib.PRIORITY_DEFAULT,
+            null,
+          ).catch(logError);
         }
         previewer.setSymbols(exports);
       } else if (language === "Vala") {