progress

Author: psteinroe

crates/pgt_lsp/tests/server.rs

@@ -1365,20 +1365,28 @@ async fn extends_config() -> Result<()> {
         .await
         .expect("Failed to setup test database");
 
+    tracing::info!(
+        "writing to {:?}",
+        url!("postgrestools.jsonc").to_file_path().unwrap(),
+    );
+
     // shared config with default db connection
     let conf_with_db = PartialConfiguration::init();
     fs.insert(
         url!("postgrestools.jsonc").to_file_path().unwrap(),
         serde_json::to_string_pretty(&conf_with_db).unwrap(),
     );
 
+    let relative_path = if cfg!(windows) {
+        "..\\postgrestools.jsonc"
+    } else {
+        "../postgrestools.jsonc"
+    };
+
     // test_one extends the shared config but sets our test db
     let mut conf_with_db = PartialConfiguration::init();
     conf_with_db.merge_with(PartialConfiguration {
-        extends: Some(StringSet::from_iter([Path::new("..")
-            .join("postgrestools.jsonc")
-            .to_string_lossy()
-            .to_string()])),
+        extends: Some(StringSet::from_iter([relative_path.to_string()])),
         db: Some(PartialDatabaseConfiguration {
             database: Some(
                 test_db
@@ -1391,6 +1399,7 @@ async fn extends_config() -> Result<()> {
         }),
         ..Default::default()
     });
+
     fs.insert(
         url!("test_one/postgrestools.jsonc").to_file_path().unwrap(),
         serde_json::to_string_pretty(&conf_with_db).unwrap(),
@@ -1399,10 +1408,7 @@ 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([Path::new("..")
-            .join("postgrestools.jsonc")
-            .to_string_lossy()
-            .to_string()])),
+        extends: Some(StringSet::from_iter([relative_path.to_string()])),
         ..Default::default()
     });
     fs.insert(

crates/pgt_workspace/src/configuration.rs

@@ -130,6 +130,12 @@ fn load_config(
         ConfigurationPathHint::None => file_system.working_directory().unwrap_or_default(),
     };
 
+    // REMOVE
+    tracing::info!(
+        "Searching for configuration files in {}",
+        configuration_directory.display()
+    );
+
     // We first search for `postgrestools.jsonc` files
     if let Some(auto_search_result) = file_system.auto_search(
         &configuration_directory,