progress

Author: psteinroe

crates/pgls_cli/src/service/mod.rs

@@ -189,7 +189,7 @@ impl WorkspaceTransport for SocketTransport {
 
  self.pending_requests.insert(request.id, send);
 
- let is_shutdown = request.method == "pgt/shutdown";
+ let is_shutdown = request.method == "pgls/shutdown";
 
  let request = JsonRpcRequest {
  jsonrpc: Cow::Borrowed("2.0"),

crates/pgls_lsp/src/server.rs

@@ -334,9 +334,9 @@ type Sessions = Arc<Mutex<FxHashMap<SessionKey, SessionHandle>>>;
 macro_rules! workspace_method {
  ( $builder:ident, $method:ident ) => {
  $builder = $builder.custom_method(
- concat!("pgt/", stringify!($method)),
+ concat!("pgls/", stringify!($method)),
  |server: &LSPServer, params| {
- let span = tracing::trace_span!(concat!("pgt/", stringify!($method)), params = ?params).or_current();
+ let span = tracing::trace_span!(concat!("pgls/", stringify!($method)), params = ?params).or_current();
  tracing::info!("Received request: {}", stringify!($method));
 
  let workspace = server.session.workspace.clone();
@@ -445,7 +445,7 @@ impl ServerFactory {
  });
 
  // "shutdown" is not part of the Workspace API
- builder = builder.custom_method("pgt/shutdown", |server: &LSPServer, (): ()| {
+ builder = builder.custom_method("pgls/shutdown", |server: &LSPServer, (): ()| {
  info!("Sending shutdown signal");
  server.session.broadcast_shutdown();
  ready(Ok(Some(())))

crates/pgls_lsp/tests/server.rs

@@ -323,11 +323,11 @@ impl Server {
  .await
  }
 
- /// Basic implementation of the `pgt/shutdown` request for tests
+ /// Basic implementation of the `pgls/shutdown` request for tests
  async fn pgls_shutdown(&mut self) -> Result<()> {
- self.request::<_, ()>("pgt/shutdown", "_pgls_shutdown", ())
+ self.request::<_, ()>("pgls/shutdown", "_pgls_shutdown", ())
  .await?
- .context("pgt/shutdown returned None")?;
+ .context("pgls/shutdown returned None")?;
  Ok(())
  }
 }

crates/pgls_workspace/src/workspace/client.rs

@@ -84,7 +84,7 @@ where
  }
 
  pub fn shutdown(self) -> Result<(), WorkspaceError> {
- self.request("pgt/shutdown", ())
+ self.request("pgls/shutdown", ())
  }
 }
 
@@ -96,83 +96,83 @@ where
  &self,
  params: crate::features::code_actions::CodeActionsParams,
  ) -> Result<crate::features::code_actions::CodeActionsResult, WorkspaceError> {
- self.request("pgt/code_actions", params)
+ self.request("pgls/code_actions", params)
  }
 
  fn execute_statement(
  &self,
  params: crate::features::code_actions::ExecuteStatementParams,
  ) -> Result<crate::features::code_actions::ExecuteStatementResult, WorkspaceError> {
- self.request("pgt/execute_statement", params)
+ self.request("pgls/execute_statement", params)
  }
 
  fn register_project_folder(
  &self,
  params: RegisterProjectFolderParams,
  ) -> Result<ProjectKey, WorkspaceError> {
- self.request("pgt/register_project_folder", params)
+ self.request("pgls/register_project_folder", params)
  }
 
  fn unregister_project_folder(
  &self,
  params: UnregisterProjectFolderParams,
  ) -> Result<(), WorkspaceError> {
- self.request("pgt/unregister_project_folder", params)
+ self.request("pgls/unregister_project_folder", params)
  }
 
  fn open_file(&self, params: OpenFileParams) -> Result<(), WorkspaceError> {
- self.request("pgt/open_file", params)
+ self.request("pgls/open_file", params)
  }
 
  fn close_file(&self, params: CloseFileParams) -> Result<(), WorkspaceError> {
- self.request("pgt/close_file", params)
+ self.request("pgls/close_file", params)
  }
 
  fn change_file(&self, params: super::ChangeFileParams) -> Result<(), WorkspaceError> {
- self.request("pgt/change_file", params)
+ self.request("pgls/change_file", params)
  }
 
  fn update_settings(&self, params: super::UpdateSettingsParams) -> Result<(), WorkspaceError> {
- self.request("pgt/update_settings", params)
+ self.request("pgls/update_settings", params)
  }
 
  fn is_path_ignored(&self, params: IsPathIgnoredParams) -> Result<bool, WorkspaceError> {
- self.request("pgt/is_path_ignored", params)
+ self.request("pgls/is_path_ignored", params)
  }
 
  fn server_info(&self) -> Option<&ServerInfo> {
  self.server_info.as_ref()
  }
 
  fn get_file_content(&self, params: GetFileContentParams) -> Result<String, WorkspaceError> {
- self.request("pgt/get_file_content", params)
+ self.request("pgls/get_file_content", params)
  }
 
  fn pull_file_diagnostics(
  &self,
  params: crate::features::diagnostics::PullFileDiagnosticsParams,
  ) -> Result<crate::features::diagnostics::PullDiagnosticsResult, WorkspaceError> {
- self.request("pgt/pull_diagnostics", params)
+ self.request("pgls/pull_diagnostics", params)
  }
 
  fn pull_db_diagnostics(
  &self,
  params: crate::features::diagnostics::PullDatabaseDiagnosticsParams,
  ) -> Result<crate::features::diagnostics::PullDiagnosticsResult, WorkspaceError> {
- self.request("pgt/pull_db_diagnostics", params)
+ self.request("pgls/pull_db_diagnostics", params)
  }
 
  fn get_completions(
  &self,
  params: super::GetCompletionsParams,
  ) -> Result<crate::features::completions::CompletionsResult, WorkspaceError> {
- self.request("pgt/get_completions", params)
+ self.request("pgls/get_completions", params)
  }
 
  fn on_hover(
  &self,
  params: crate::features::on_hover::OnHoverParams,
  ) -> Result<crate::features::on_hover::OnHoverResult, WorkspaceError> {
- self.request("pgt/on_hover", params)
+ self.request("pgls/on_hover", params)
  }
 }

packages/@postgres-language-server/backend-jsonrpc/src/workspace.ts

@@ -631,31 +631,31 @@ export interface Workspace {
 export function createWorkspace(transport: Transport): Workspace {
 return {
 isPathIgnored(params) {
-return transport.request("pgt/is_path_ignored", params);
+return transport.request("pgls/is_path_ignored", params);
 },
 registerProjectFolder(params) {
-return transport.request("pgt/register_project_folder", params);
+return transport.request("pgls/register_project_folder", params);
 },
 getFileContent(params) {
-return transport.request("pgt/get_file_content", params);
+return transport.request("pgls/get_file_content", params);
 },
 pullFileDiagnostics(params) {
-return transport.request("pgt/pull_file_diagnostics", params);
+return transport.request("pgls/pull_file_diagnostics", params);
 },
 getCompletions(params) {
-return transport.request("pgt/get_completions", params);
+return transport.request("pgls/get_completions", params);
 },
 updateSettings(params) {
-return transport.request("pgt/update_settings", params);
+return transport.request("pgls/update_settings", params);
 },
 openFile(params) {
-return transport.request("pgt/open_file", params);
+return transport.request("pgls/open_file", params);
 },
 changeFile(params) {
-return transport.request("pgt/change_file", params);
+return transport.request("pgls/change_file", params);
 },
 closeFile(params) {
-return transport.request("pgt/close_file", params);
+return transport.request("pgls/close_file", params);
 },
 destroy() {
 transport.destroy();

packages/@postgrestools/backend-jsonrpc/src/workspace.ts

@@ -631,31 +631,31 @@ export interface Workspace {
 export function createWorkspace(transport: Transport): Workspace {
 return {
 isPathIgnored(params) {
-return transport.request("pgt/is_path_ignored", params);
+return transport.request("pgls/is_path_ignored", params);
 },
 registerProjectFolder(params) {
-return transport.request("pgt/register_project_folder", params);
+return transport.request("pgls/register_project_folder", params);
 },
 getFileContent(params) {
-return transport.request("pgt/get_file_content", params);
+return transport.request("pgls/get_file_content", params);
 },
 pullFileDiagnostics(params) {
-return transport.request("pgt/pull_file_diagnostics", params);
+return transport.request("pgls/pull_file_diagnostics", params);
 },
 getCompletions(params) {
-return transport.request("pgt/get_completions", params);
+return transport.request("pgls/get_completions", params);
 },
 updateSettings(params) {
-return transport.request("pgt/update_settings", params);
+return transport.request("pgls/update_settings", params);
 },
 openFile(params) {
-return transport.request("pgt/open_file", params);
+return transport.request("pgls/open_file", params);
 },
 changeFile(params) {
-return transport.request("pgt/change_file", params);
+return transport.request("pgls/change_file", params);
 },
 closeFile(params) {
-return transport.request("pgt/close_file", params);
+return transport.request("pgls/close_file", params);
 },
 destroy() {
 transport.destroy();

xtask/codegen/src/generate_bindings.rs

@@ -128,7 +128,7 @@ pub fn generate_bindings(mode: Mode) -> Result<()> {
  [
  AnyJsCallArgument::AnyJsExpression(
  AnyJsExpression::AnyJsLiteralExpression(
- AnyJsLiteralExpression::JsStringLiteralExpression(make::js_string_literal_expression(make::js_string_literal(&format!("pgt/{}", method.name)))),
+ AnyJsLiteralExpression::JsStringLiteralExpression(make::js_string_literal_expression(make::js_string_literal(&format!("pgls/{}", method.name)))),
  ),
  ),
  AnyJsCallArgument::AnyJsExpression(