chore: WIP

Author: jeffreyguenther

Cargo.lock

@@ -1,5 +1,5 @@
 [package]
-name = "zed_postgresql_lsp"
+name = "zed_postgres_lsp"
 version = "0.0.1"
 edition = "2021"
 publish = false

Cargo.toml

@@ -1,10 +1,10 @@
 id = "postgres-lsp"
-name = "Postgresql LSP"
+name = "Postgres LSP"
 version = "0.0.1"
 schema_version = 1
 authors = ["jeffreyguenther"]
-description = "Postgresql LSP"
-repository = "https://github.com/LoamStudios/zed-postgresql-lsp"
+description = "Postgres LSP"
+repository = "https://github.com/LoamStudios/zed-postgres-lsp"
 
 [language_servers.sql]
 name = "Postgresql LSP"

extension.toml

@@ -0,0 +1,25 @@
+{
+  "$schema": "https://pgtools.dev/schemas/0.0.0/schema.json",
+  "vcs": {
+    "enabled": false,
+    "clientKind": "git",
+    "useIgnoreFile": false
+  },
+  "files": {
+    "ignore": []
+  },
+  "linter": {
+    "enabled": true,
+    "rules": {
+      "recommended": true
+    }
+  },
+  "db": {
+    "host": "localhost",
+    "port": 5432,
+    "username": null,
+    "password": null,
+    "database": "keep_dev",
+    "connTimeoutSecs": 10
+  }
+}

postgrestools.jsonc

@@ -2,17 +2,17 @@ use std::fs;
 use zed::settings::LspSettings;
 use zed_extension_api::{self as zed, serde_json, LanguageServerId, Result};
 
-struct PostresqlLspExtension {
+struct PostgresLspExtension {
     cached_binary_path: Option<String>,
 }
 
-impl PostresqlLspExtension {
+impl PostgresLspExtension {
     fn language_server_binary_path(
         &mut self,
         language_server_id: &LanguageServerId,
         worktree: &zed::Worktree,
     ) -> Result<String> {
-        if let Some(path) = worktree.which("glsl_analyzer") {
+        if let Some(path) = worktree.which("postgrestools") {
             return Ok(path);
         }
 
@@ -27,7 +27,7 @@ impl PostresqlLspExtension {
             &zed::LanguageServerInstallationStatus::CheckingForUpdate,
         );
         let release = zed::latest_github_release(
-            "nolanderc/glsl_analyzer",
+            "supabase-community/postgres-language-server",
             zed::GithubReleaseOptions {
                 require_assets: true,
                 pre_release: false,
@@ -36,16 +36,16 @@ impl PostresqlLspExtension {
 
         let (platform, arch) = zed::current_platform();
         let asset_name = format!(
-            "{arch}-{os}.zip",
+            "postgrestools_{arch}-{os}",
             arch = match arch {
                 zed::Architecture::Aarch64 => "aarch64",
                 zed::Architecture::X86 => "x86",
                 zed::Architecture::X8664 => "x86_64",
             },
             os = match platform {
-                zed::Os::Mac => "macos",
-                zed::Os::Linux => "linux-musl",
-                zed::Os::Windows => "windows",
+                zed::Os::Mac => "apple-darwin",
+                zed::Os::Linux => "unknown-linux-gnu",
+                zed::Os::Windows => "ps-windows-msvc",
             }
         );
 
@@ -55,23 +55,27 @@ impl PostresqlLspExtension {
             .find(|asset| asset.name == asset_name)
             .ok_or_else(|| format!("no asset found matching {:?}", asset_name))?;
 
-        let version_dir = format!("glsl_analyzer-{}", release.version);
+        let version_dir = format!("postgrestools-{}", release.version);
         fs::create_dir_all(&version_dir)
             .map_err(|err| format!("failed to create directory '{version_dir}': {err}"))?;
-        let binary_path = format!("{version_dir}/bin/glsl_analyzer");
+        let binary_path = format!("{version_dir}/bin/postgrestools");
+
+        eprintln!("{}", &asset.download_url);
 
         if !fs::metadata(&binary_path).map_or(false, |stat| stat.is_file()) {
             zed::set_language_server_installation_status(
                 language_server_id,
                 &zed::LanguageServerInstallationStatus::Downloading,
             );
 
+            eprintln!("{}", &asset.download_url);
+
             zed::download_file(
                 &asset.download_url,
                 &version_dir,
                 match platform {
-                    zed::Os::Mac | zed::Os::Linux => zed::DownloadedFileType::Zip,
-                    zed::Os::Windows => zed::DownloadedFileType::Zip,
+                    zed::Os::Mac | zed::Os::Linux => zed::DownloadedFileType::Uncompressed,
+                    zed::Os::Windows => zed::DownloadedFileType::Uncompressed,
                 },
             )
             .map_err(|e| format!("failed to download file: {e}"))?;
@@ -93,7 +97,7 @@ impl PostresqlLspExtension {
     }
 }
 
-impl zed::Extension for PostresqlLspExtension {
+impl zed::Extension for PostgresLspExtension {
     fn new() -> Self {
         Self {
             cached_binary_path: None,
@@ -107,7 +111,7 @@ impl zed::Extension for PostresqlLspExtension {
     ) -> Result<zed::Command> {
         Ok(zed::Command {
             command: self.language_server_binary_path(language_server_id, worktree)?,
-            args: vec![],
+            args: vec!["lsp-proxy".to_string()],
             env: Default::default(),
         })
     }
@@ -117,15 +121,15 @@ impl zed::Extension for PostresqlLspExtension {
         _language_server_id: &zed::LanguageServerId,
         worktree: &zed::Worktree,
     ) -> Result<Option<serde_json::Value>> {
-        let settings = LspSettings::for_worktree("postgresql_lsp", worktree)
+        let settings = LspSettings::for_worktree("postgres_lsp", worktree)
             .ok()
             .and_then(|lsp_settings| lsp_settings.settings.clone())
             .unwrap_or_default();
 
         Ok(Some(serde_json::json!({
-            "postgresql_lsp": settings
+            "postgres_lsp": settings
         })))
     }
 }
 
-zed::register_extension!(PostresqlLspExtension);
+zed::register_extension!(PostgresLspExtension);

src/postgres_lsp.rs

@@ -1 +1 @@
-SELECT * FROM table;
+select * from haven;