vala: Setup Vala project before starting the language server

Closes #913
workbenchdev · Jul 12, 2024 · a61df96 · a61df96
1 parent 24ac6d3
commit a61df96
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 14 deletions.
diff --git a/src/PanelCode.js b/src/PanelCode.js
@@ -4,7 +4,6 @@ import GObject from "gi://GObject";
 import { makeDropdownFlat, settings as global_settings } from "./util.js";
 import { setupRustProject } from "./langs/rust/rust.js";
 import { setupTypeScriptProject } from "./langs/typescript/typescript.js";
-import { setupValaProject } from "./langs/vala/vala.js";
 
 export default function PanelCode({
   builder,
@@ -56,10 +55,6 @@ export default function PanelCode({
     stack_code.visible_child_name = panel.language;
     previewer.useInternal().catch(console.error);
 
-    if (panel.language.toLowerCase() === "vala") {
-      setupValaProject(file).catch(console.error);
-    }
-
     if (panel.language.toLowerCase() === "rust") {
       setupRustProject(file).catch(console.error);
     }

diff --git a/src/langs/vala/vala.js b/src/langs/vala/vala.js
@@ -9,15 +9,9 @@ export function setup({ document }) {
 
   const { file, buffer, code_view } = document;
 
-  const api_file = Gio.File.new_for_path(pkg.pkgdatadir).get_child(
-    "workbench.vala",
-  );
-  api_file.copy(
-    file.get_parent().get_child("workbench.vala"),
-    Gio.FileCopyFlags.OVERWRITE,
-    null,
-    null,
-  );
+  // VLS needs the project to be already setup once it starts,
+  // otherwise it won't pick it up later.
+  setupValaProject(file.get_parent()).catch(console.error);
 
   const lspc = createLSPClient({
     lang: getLanguage("vala"),