undo debugging changes

Author: juleswritescode

Cargo.lock

@@ -10,10 +10,6 @@ name                 = "pg_lsp_new"
 repository.workspace = true
 version              = "0.0.0"
 
-[[bin]]
-name = "pglsp_new"
-path = "src/main.rs"
-test = false
 
 [dependencies]
 anyhow              = { workspace = true }
@@ -22,7 +18,6 @@ futures             = "0.3.31"
 pg_configuration    = { workspace = true }
 pg_console          = { workspace = true }
 pg_diagnostics      = { workspace = true }
-pg_completions      = { workspace = true }
 pg_fs               = { workspace = true }
 pg_lsp_converters   = { workspace = true }
 pg_text_edit        = { workspace = true }
@@ -34,7 +29,6 @@ text-size.workspace = true
 tokio               = { workspace = true, features = ["rt", "io-std"] }
 tower-lsp           = { version = "0.20.0" }
 tracing             = { workspace = true, features = ["attributes"] }
-tracing-subscriber  = { workspace = true }
 
 [dev-dependencies]
 

crates/pg_lsp_new/Cargo.toml

@@ -163,20 +163,20 @@ impl LanguageServer for LSPServer {
         self.session.update_all_diagnostics().await;
     }
 
-    #[tracing::instrument(level = "info", skip(self))]
+    #[tracing::instrument(level = "info", skip_all)]
     async fn shutdown(&self) -> LspResult<()> {
         Ok(())
     }
 
-    #[tracing::instrument(level = "info", skip(self))]
+    #[tracing::instrument(level = "info", skip_all)]
     async fn did_change_configuration(&self, params: DidChangeConfigurationParams) {
         let _ = params;
         self.session.load_workspace_settings().await;
         self.setup_capabilities().await;
         self.session.update_all_diagnostics().await;
     }
 
-    #[tracing::instrument(level = "info", skip(self))]
+    #[tracing::instrument(level = "trace", skip(self))]
     async fn did_change_watched_files(&self, params: DidChangeWatchedFilesParams) {
         let file_paths = params
             .changes
@@ -238,7 +238,7 @@ impl LanguageServer for LSPServer {
             .ok();
     }
 
-    #[tracing::instrument(level = "info", skip(self))]
+    #[tracing::instrument(level = "trace", skip(self))]
     async fn completion(&self, params: CompletionParams) -> LspResult<Option<CompletionResponse>> {
         match handlers::completions::get_completions(&self.session, params) {
             Ok(result) => LspResult::Ok(Some(result)),

crates/pg_lsp_new/src/server.rs

@@ -363,16 +363,15 @@ impl Workspace for WorkspaceServer {
             Some(s) => s,
             None => return Ok(pg_completions::CompletionResult::default()),
         };
-        let statement_ref = &statement.ref_;
 
         // `offset` is the position in the document,
         // but we need the position within the *statement*.
         let stmt_range = doc
-            .statement_range(statement_ref)
+            .statement_range(&statement.ref_)
             .expect("Range of statement should be defined.");
         let position = params.position - stmt_range.start();
 
-        let tree = self.tree_sitter.fetch(statement_ref);
+        let tree = self.tree_sitter.fetch(&statement.ref_);
         let text = statement.text;
 
         tracing::info!("Found the statement. We're looking for position {:?}. Statement Range {:?} to {:?}. Statement: {}", position, stmt_range.start(), stmt_range.end(), text);

crates/pg_workspace_new/src/workspace/server.rs

@@ -1,4 +1,4 @@
-import { type ExtensionContext, window } from 'vscode';
+import type { ExtensionContext } from 'vscode';
 
 import {
     type Executable,
@@ -9,39 +9,37 @@ import {
 
 let client: LanguageClient;
 
-export async function activate(_context: ExtensionContext) {
+export function activate(_context: ExtensionContext) {
     // If the extension is launched in debug mode then the debug server options are used
     // Otherwise the run options are used
     const run: Executable = {
-        command: 'pglsp_new'
+        command: 'pglsp'
     };
 
+    // const outputChannel = window.createOutputChannel('postgres_lsp');
+
     const serverOptions: ServerOptions = {
         run,
         debug: run
     };
 
-    const outputChannel = window.createOutputChannel('Postgres LSP', { log: true });
-
     // Options to control the language client
     const clientOptions: LanguageClientOptions = {
         // Register the server for plain text documents
-        documentSelector: [{ scheme: 'file', language: 'sql' }],
-        outputChannel
+        documentSelector: [{ scheme: 'file', language: 'sql' }]
     };
 
     // Create the language client and start the client.
     client = new LanguageClient('postgres_lsp', 'Postgres LSP', serverOptions, clientOptions);
 
     // Start the client. This will also launch the server
-    await client.start();
+    void client.start();
 }
 
 export function deactivate(): Thenable<void> | undefined {
     console.log('Deactivating client...');
     if (!client) {
         return undefined;
     }
-
     return client.stop();
 }

editors/code/src/main.ts

@@ -12,7 +12,7 @@ impl flags::Install {
         if cfg!(target_os = "macos") {
             fix_path_for_mac(sh).context("Fix path for mac")?;
         }
-        if let Some(_) = self.server() {
+        if self.server().is_some() {
             install_server(sh).context("install server")?;
         }
         if let Some(client) = self.client() {
@@ -137,10 +137,7 @@ fn install_client(sh: &Shell, client_opt: ClientOpt) -> anyhow::Result<()> {
 }
 
 fn install_server(sh: &Shell) -> anyhow::Result<()> {
-    let cmd = cmd!(
-        sh,
-        "cargo install --path crates/pg_lsp_new --locked --force"
-    );
+    let cmd = cmd!(sh, "cargo install --path crates/pg_lsp --locked --force");
     cmd.run()?;
     Ok(())
 }