progress

Author: psteinroe

crates/pgt_lsp/tests/server.rs

@@ -1,23 +1,23 @@
+use anyhow::bail;
 use anyhow::Context;
 use anyhow::Error;
 use anyhow::Result;
-use anyhow::bail;
 use biome_deserialize::Merge;
 use biome_deserialize::StringSet;
+use futures::channel::mpsc::{channel, Sender};
 use futures::Sink;
 use futures::SinkExt;
 use futures::Stream;
 use futures::StreamExt;
-use futures::channel::mpsc::{Sender, channel};
-use pgt_configuration::PartialConfiguration;
 use pgt_configuration::database::PartialDatabaseConfiguration;
+use pgt_configuration::PartialConfiguration;
 use pgt_fs::MemoryFileSystem;
 use pgt_lsp::LSPServer;
 use pgt_lsp::ServerFactory;
 use pgt_test_utils::test_database::get_new_test_db;
 use pgt_workspace::DynRef;
-use serde::Serialize;
 use serde::de::DeserializeOwned;
+use serde::Serialize;
 use serde_json::Value;
 use serde_json::{from_value, to_value};
 use sqlx::Executor;
@@ -26,7 +26,6 @@ use std::fmt::Display;
 use std::time::Duration;
 use tower::timeout::Timeout;
 use tower::{Service, ServiceExt};
-use tower_lsp::LspService;
 use tower_lsp::jsonrpc;
 use tower_lsp::jsonrpc::Response;
 use tower_lsp::lsp_types as lsp;
@@ -48,6 +47,7 @@ use tower_lsp::lsp_types::{
     PublishDiagnosticsParams, TextDocumentContentChangeEvent, TextDocumentIdentifier,
     TextDocumentItem, Url, VersionedTextDocumentIdentifier,
 };
+use tower_lsp::LspService;
 use tower_lsp::{jsonrpc::Request, lsp_types::InitializeParams};
 
 /// Statically build an [Url] instance that points to the file at `$path`
@@ -1393,7 +1393,9 @@ async fn extends_config() -> Result<()> {
     // test_two extends it but keeps the default one
     let mut conf_without_db = PartialConfiguration::init();
     conf_without_db.merge_with(PartialConfiguration {
-        extends: Some(StringSet::from_iter(["../postgrestools.jsonc".to_string()])),
+        extends: Some(StringSet::from_iter([Path::new("..")
+            .join("postgrestools.jsonc")
+            .to_string()])),
         ..Default::default()
     });
     fs.insert(

crates/pgt_workspace/src/workspace/server.rs

@@ -10,15 +10,15 @@ use async_helper::run_async;
 use connection_manager::ConnectionManager;
 use dashmap::DashMap;
 use document::Document;
-use futures::{StreamExt, stream};
+use futures::{stream, StreamExt};
 use parsed_document::{
     AsyncDiagnosticsMapper, CursorPositionFilter, DefaultMapper, ExecuteStatementMapper,
     ParsedDocument, SyncDiagnosticsMapper,
 };
 use pgt_analyse::{AnalyserOptions, AnalysisFilter};
 use pgt_analyser::{Analyser, AnalyserConfig, AnalyserContext};
 use pgt_diagnostics::{
-    Diagnostic, DiagnosticExt, Error, Severity, serde::Diagnostic as SDiagnostic,
+    serde::Diagnostic as SDiagnostic, Diagnostic, DiagnosticExt, Error, Severity,
 };
 use pgt_fs::{ConfigName, PgTPath};
 use pgt_typecheck::{IdentifierType, TypecheckParams, TypedIdentifier};
@@ -27,17 +27,17 @@ use sqlx::{Executor, PgPool};
 use tracing::{debug, info};
 
 use crate::{
-    WorkspaceError,
     configuration::to_analyser_rules,
     features::{
         code_actions::{
             self, CodeAction, CodeActionKind, CodeActionsResult, CommandAction,
             CommandActionCategory, ExecuteStatementParams, ExecuteStatementResult,
         },
-        completions::{CompletionsResult, GetCompletionsParams, get_statement_for_completions},
+        completions::{get_statement_for_completions, CompletionsResult, GetCompletionsParams},
         diagnostics::{PullDiagnosticsParams, PullDiagnosticsResult},
     },
     settings::{WorkspaceSettings, WorkspaceSettingsHandle, WorkspaceSettingsHandleMut},
+    WorkspaceError,
 };
 
 use super::{

justfile

@@ -6,6 +6,7 @@ alias r := ready
 alias l := lint
 alias t := test
 alias rg := reset-git
+alias qm := quick-modify
 
 # Installs the tools needed to develop
 install-tools:
@@ -139,6 +140,11 @@ quick-create branch commit:
     git push
     gh pr create --fill
 
+quick-modify:
+    git add -A
+    git commit -m "progress"
+    git push
+
 # Make sure to set your PGT_LOG_PATH in your shell profile.
 # You can use the PGT_LOG_LEVEL to set your log level.
 # We recommend to install `bunyan` (npm i -g bunyan) and pipe the output through there for color-coding: