progress

Author: psteinroe

.sqlx/query-b0163e58e9c646e3af524174081b74ab7e7938e9516ea21513265c49d304b6ea.json renamed to .sqlx/query-1cc58ddce2b52b5d6f6519cde339f258bce50342c2d5cce036dba4f9062cf811.json

@@ -23,6 +23,7 @@ biome_js_syntax          = "0.5.7"
 biome_rowan              = "0.5.7"
 biome_string_case        = "0.5.8"
 bpaf                     = { version = "0.9.15", features = ["derive"] }
+criterion                = "0.5"
 crossbeam                = "0.8.4"
 enumflags2               = "0.7.11"
 ignore                   = "0.4.23"

Cargo.lock

@@ -45,7 +45,7 @@ impl AnalyserRules {
 /// A set of information useful to the analyser infrastructure
 #[derive(Debug, Default)]
 pub struct AnalyserOptions {
-    /// A data structured derived from the [`postgrestools.jsonc`] file
+    /// A data structured derived from the [`postgres-language-server.jsonc`] file
     pub rules: AnalyserRules,
 }
 

Cargo.toml

@@ -81,7 +81,7 @@ Let's assume that the rule we implement support the following options:
 - `threshold`: an integer between 0 and 255;
 - `behaviorExceptions`: an array of strings.
 
-We would like to set the options in the `postgrestools.jsonc` configuration file:
+We would like to set the options in the `postgres-language-server.jsonc` configuration file:
 
 ```json
 {
@@ -143,9 +143,9 @@ We currently require implementing _serde_'s traits `Deserialize`/`Serialize`.
 
 Also, we use other `serde` macros to adjust the JSON configuration:
 
-- `rename_all = "camelCase"`: it renames all fields in camel-case, so they are in line with the naming style of the `postgrestools.jsonc`.
+- `rename_all = "camelCase"`: it renames all fields in camel-case, so they are in line with the naming style of the `postgres-language-server.jsonc`.
 - `deny_unknown_fields`: it raises an error if the configuration contains extraneous fields.
-- `default`: it uses the `Default` value when the field is missing from `postgrestools.jsonc`. This macro makes the field optional.
+- `default`: it uses the `Default` value when the field is missing from `postgres-language-server.jsonc`. This macro makes the field optional.
 
 You can simply use a derive macros:
 

crates/pgt_analyse/src/options.rs

@@ -22,7 +22,7 @@ pub struct CliOptions {
     #[bpaf(long("verbose"), switch, fallback(false))]
     pub verbose: bool,
 
-    /// Set the file path to the configuration file, or the directory path to find `postgrestools.jsonc`.
+    /// Set the file path to the configuration file, or the directory path to find `postgres-language-server.jsonc`.
     /// If used, it disables the default configuration file resolution.
     #[bpaf(long("config-path"), argument("PATH"), optional)]
     pub config_path: Option<String>,

crates/pgt_analyser/CONTRIBUTING.md

@@ -8,10 +8,10 @@ pub(crate) fn init(mut session: CliSession) -> Result<(), CliDiagnostic> {
     let fs = &mut session.app.fs;
     let config = &mut PartialConfiguration::init();
     create_config(fs, config)?;
-    let file_created = ConfigName::pgt_jsonc();
+    let file_created = ConfigName::pgls_jsonc();
     session.app.console.log(markup! {
 "
-Welcome to the Postgres Language Tools! Let's get you started...
+Welcome to the Postgres Language Server! Let's get you started...
 
 "<Info><Emphasis>"Files created "</Emphasis></Info>"
 

crates/pgt_cli/src/cli_options.rs

@@ -7,8 +7,8 @@ use crate::{
 };
 use bpaf::Bpaf;
 use pgt_configuration::{PartialConfiguration, partial_configuration};
-use pgt_console::Console;
-use pgt_fs::FileSystem;
+use pgt_console::{Console, ConsoleExt, markup};
+use pgt_fs::{ConfigName, FileSystem};
 use pgt_workspace::PartialConfigurationExt;
 use pgt_workspace::configuration::{LoadedConfiguration, load_configuration};
 use pgt_workspace::workspace::{RegisterProjectFolderParams, UpdateSettingsParams};
@@ -58,7 +58,7 @@ pub enum PgtCommand {
         changed: bool,
 
         /// Use this to specify the base branch to compare against when you're using the --changed
-        /// flag and the `defaultBranch` is not set in your `postgrestools.jsonc`
+        /// flag and the `defaultBranch` is not set in your `postgres-language-server.jsonc`
         #[bpaf(long("since"), argument("REF"))]
         since: Option<String>,
 
@@ -93,7 +93,7 @@ pub enum PgtCommand {
         )]
         log_path: PathBuf,
         /// Allows to set a custom file path to the configuration file,
-        /// or a custom directory path to find `postgrestools.jsonc`
+        /// or a custom directory path to find `postgres-language-server.jsonc`
         #[bpaf(
             env("PGT_LOG_PREFIX_NAME"),
             env("PGLS_LOG_PREFIX_NAME"),
@@ -136,7 +136,7 @@ pub enum PgtCommand {
         )]
         log_path: PathBuf,
         /// Allows to set a custom file path to the configuration file,
-        /// or a custom directory path to find `postgrestools.jsonc`
+        /// or a custom directory path to find `postgres-language-server.jsonc`
         #[bpaf(
             env("PGT_CONFIG_PATH"),
             env("PGLS_CONFIG_PATH"),
@@ -201,7 +201,7 @@ pub enum PgtCommand {
         #[bpaf(long("stop-on-disconnect"), hide_usage)]
         stop_on_disconnect: bool,
         /// Allows to set a custom file path to the configuration file,
-        /// or a custom directory path to find `postgrestools.jsonc`
+        /// or a custom directory path to find `postgres-language-server.jsonc`
         #[bpaf(
             env("PGT_CONFIG_PATH"),
             env("PGLS_CONFIG_PATH"),
@@ -318,6 +318,19 @@ pub(crate) trait CommandRunner: Sized {
         let loaded_configuration =
             load_configuration(fs, cli_options.as_configuration_path_hint())?;
 
+        // Check for deprecated config filename
+        if let Some(config_path) = &loaded_configuration.file_path {
+            if let Some(file_name) = config_path.file_name().and_then(|n| n.to_str()) {
+                if ConfigName::is_deprecated(file_name) {
+                    console.log(markup! {
+                        <Warn>"Warning: "</Warn>"You are using the deprecated config filename '"<Emphasis>"postgrestools.jsonc"</Emphasis>"'. \
+                        Please rename it to '"<Emphasis>"postgres-language-server.jsonc"</Emphasis>"'. \
+                        Support for the old filename will be removed in a future version.\n"
+                    });
+                }
+            }
+        }
+
         let configuration_path = loaded_configuration.directory_path.clone();
         let configuration = self.merge_configuration(loaded_configuration, fs, console)?;
         let vcs_base_path = configuration_path.or(fs.working_directory());