From ac6a6de8e389f49b5aa18e944cdce8e0daab9fbe Mon Sep 17 00:00:00 2001
From: LynithDev <61880709+LynithDev@users.noreply.github.com>
Date: Sun, 2 Jun 2024 13:58:44 +0200
Subject: [PATCH] fix: Rust analyzer not working properly

---
 desktop/src-tauri/Cargo.toml          |  3 ---
 desktop/src-tauri/src/api/commands.rs | 10 ----------
 desktop/src-tauri/src/lib.rs          |  3 +--
 desktop/src/index.tsx                 |  3 +++
 4 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/desktop/src-tauri/Cargo.toml b/desktop/src-tauri/Cargo.toml
index 60c8bb32..f6953db5 100644
--- a/desktop/src-tauri/Cargo.toml
+++ b/desktop/src-tauri/Cargo.toml
@@ -56,9 +56,6 @@ uuid = { workspace = true }
 tracing = { workspace = true }
 tracing-error = { workspace = true }
 
-[dev-dependencies]
-tauri = { workspace = true, features = [ "test" ] }
-
 [target.'cfg(target_os = "macos")'.dependencies]
 cocoa = "0.25.0"
 objc = "0.2.7"
diff --git a/desktop/src-tauri/src/api/commands.rs b/desktop/src-tauri/src/api/commands.rs
index 4c3e5382..505de3b3 100644
--- a/desktop/src-tauri/src/api/commands.rs
+++ b/desktop/src-tauri/src/api/commands.rs
@@ -1,4 +1,3 @@
-use tauri_specta::{Builder, ExportLanguage};
 use crate::api;
 
 #[macro_export]
@@ -15,15 +14,6 @@ macro_rules! collect_commands {
     };
 }
 
-pub fn test() -> Builder {
-    use crate::api::commands::*;
-    tauri_specta::ts::builder()
-        .commands(tauri_specta::collect_commands![
-            initialize_state,
-            is_dev
-        ])
-}
-
 #[specta::specta]
 #[tracing::instrument(skip_all)]
 #[tauri::command]
diff --git a/desktop/src-tauri/src/lib.rs b/desktop/src-tauri/src/lib.rs
index 93a699ea..09e14eb9 100644
--- a/desktop/src-tauri/src/lib.rs
+++ b/desktop/src-tauri/src/lib.rs
@@ -1,5 +1,4 @@
 use tauri::Manager;
-use crate::api::commands;
 
 pub mod api;
 pub mod error;
@@ -49,7 +48,7 @@ pub async fn run_app<F: FnOnce(&mut tauri::App) + Send + 'static>(
 	let builder = builder
 		.plugin(api::init())
 		.invoke_handler({
-            let builder = commands::test();
+            let builder = collect_commands!();
 
             #[cfg(debug_assertions)]
             let builder = builder.path("../src/bindings.ts");
diff --git a/desktop/src/index.tsx b/desktop/src/index.tsx
index 64b1e647..505f8b3a 100644
--- a/desktop/src/index.tsx
+++ b/desktop/src/index.tsx
@@ -2,6 +2,7 @@
 import { render } from 'solid-js/web';
 
 import './imports';
+import * as bridge from "./bindings";
 
 import { Route, Router } from '@solidjs/router';
 import App from './ui/App';
@@ -11,6 +12,8 @@ import UpdatesPage from './ui/pages/Updates';
 import ClusterRoot from '~ui/pages/cluster/ClusterRoot';
 import SettingsRoot from '~ui/pages/settings/SettingsRoot';
 
+bridge.commands.initializeState()
+
 render(() => (
 	<Router root={App}>
 		<Route path="/" component={HomePage} />