finish the beast

Author: psteinroe

Cargo.lock

@@ -24,6 +24,7 @@ biome_deserialize_macros = { workspace = true, optional = true }
 enumflags2.workspace     = true
 serde                    = { workspace = true, features = ["derive"], optional = true }
 text-size.workspace      = true
+schemars                 = { workspace = true, optional = true }
 
 [features]
-serde = ["dep:serde", "dep:biome_deserialize", "dep:biome_deserialize_macros"]
+serde = ["dep:serde", "dep:schemars", "dep:biome_deserialize", "dep:biome_deserialize_macros"]

crates/pg_analyse/Cargo.toml

@@ -297,12 +297,13 @@ impl schemars::JsonSchema for RuleCategories {
     }
 }
 
+
 #[derive(Debug, Default)]
 /// A convenient type create a [RuleCategories] type
 ///
 /// ```
-/// use biome_analyze::{RuleCategoriesBuilder, RuleCategory};
-/// let mut categories = RuleCategoriesBuilder::default().with_syntax().with_lint().build();
+/// use pg_analyse::{RuleCategoriesBuilder, RuleCategory};
+/// let mut categories = RuleCategoriesBuilder::default().with_lint().build();
 ///
 /// assert!(categories.contains(RuleCategory::Lint));
 /// assert!(!categories.contains(RuleCategory::Action));
@@ -328,6 +329,11 @@ impl RuleCategoriesBuilder {
         self
     }
 
+    pub fn all(mut self) -> Self {
+        self.flags = BitFlags::all();
+        self
+    }
+
     pub fn build(self) -> RuleCategories {
         RuleCategories(self.flags)
     }

crates/pg_analyse/src/categories.rs

@@ -1,13 +1,10 @@
-use std::path::Path;
-
 use crate::{
     categories::RuleCategory,
     rule::{GroupCategory, Rule, RuleGroup, RuleMetadata},
 };
 
 pub struct RuleContext<'a, R: Rule> {
     stmt: &'a pg_query_ext::NodeEnum,
-    file_path: &'a Path,
     options: &'a R::Options,
 }
 
@@ -18,12 +15,10 @@ where
     #[allow(clippy::too_many_arguments)]
     pub fn new(
         stmt: &'a pg_query_ext::NodeEnum,
-        file_path: &'a Path,
         options: &'a R::Options,
     ) -> Self {
         Self {
             stmt,
-            file_path,
             options,
         }
     }
@@ -82,9 +77,4 @@ where
     pub fn options(&self) -> &R::Options {
         self.options
     }
-
-    /// The file path of the current file
-    pub fn file_path(&self) -> &Path {
-        self.file_path
-    }
 }

crates/pg_analyse/src/context.rs

@@ -12,8 +12,8 @@ pub use pg_diagnostics::category_concat;
 use registry::RegistryRuleParams;
 
 pub use crate::categories::{
-    ActionCategory, RefactorKind, RuleCategories, RuleCategoriesBuilder, RuleCategory,
-    SourceActionKind, SUPPRESSION_ACTION_CATEGORY,
+    ActionCategory, RefactorKind, RuleCategories, RuleCategory,
+    SourceActionKind, SUPPRESSION_ACTION_CATEGORY, RuleCategoriesBuilder
 };
 pub use crate::filter::{AnalysisFilter, GroupKey, RuleFilter, RuleKey};
 pub use crate::options::{AnalyzerConfiguration, AnalyzerOptions, AnalyzerRules};
@@ -30,7 +30,7 @@ pub struct Analyzer<'analyzer> {
 }
 
 pub struct AnalyzerContext<'a> {
-    pub root: pg_query_ext::NodeEnum,
+    pub root: &'a pg_query_ext::NodeEnum,
     pub options: &'a AnalyzerOptions,
     pub registry: RuleRegistry,
 }
@@ -43,7 +43,7 @@ impl<'analyzer> Analyzer<'analyzer> {
 
     pub fn run(self, ctx: AnalyzerContext) -> Vec<RuleDiagnostic> {
         let params = RegistryRuleParams {
-            root: &ctx.root,
+            root: ctx.root,
             options: ctx.options,
         };
 

crates/pg_analyse/src/diagnostics.rs

@@ -1,5 +1,3 @@
-use pg_diagnostics::Category;
-
 /// This macro is used to declare an analyzer rule type, and implement the
 //  [RuleMeta] trait for it
 ///  # Example

crates/pg_analyse/src/lib.rs

@@ -3,7 +3,6 @@ use rustc_hash::FxHashMap;
 use crate::{Rule, RuleKey};
 use std::any::{Any, TypeId};
 use std::fmt::Debug;
-use std::path::PathBuf;
 
 /// A convenient new type data structure to store the options that belong to a rule
 #[derive(Debug)]
@@ -43,7 +42,7 @@ impl AnalyzerRules {
     }
 }
 
-/// A data structured derived from the `biome.json` file
+/// A data structured derived from the `pglsp.toml` file
 #[derive(Debug, Default)]
 pub struct AnalyzerConfiguration {
     /// A list of rules and their options
@@ -53,11 +52,8 @@ pub struct AnalyzerConfiguration {
 /// A set of information useful to the analyzer infrastructure
 #[derive(Debug, Default)]
 pub struct AnalyzerOptions {
-    /// A data structured derived from the [`biome.json`] file
+    /// A data structured derived from the [`pglsp.toml`] file
     pub configuration: AnalyzerConfiguration,
-
-    /// The file that is being analyzed
-    pub file_path: PathBuf,
 }
 
 impl AnalyzerOptions {

crates/pg_analyse/src/macros.rs

@@ -174,7 +174,7 @@ impl RegistryRule {
             R: Rule<Options: Default> + 'static,
         {
             let options = params.options.rule_options::<R>().unwrap_or_default();
-            let ctx = RuleContext::new(params.root, &params.options.file_path, &options);
+            let ctx = RuleContext::new(params.root, &options);
             R::run(&ctx)
         }
 

crates/pg_analyse/src/options.rs

@@ -95,6 +95,7 @@ pub trait Rule: RuleMeta + Sized {
 
 /// Diagnostic object returned by a single analysis rule
 #[derive(Debug, Diagnostic)]
+#[diagnostic(severity = Warning)]
 pub struct RuleDiagnostic {
     #[category]
     pub(crate) category: &'static Category,

crates/pg_analyse/src/registry.rs

@@ -20,6 +20,7 @@ hdrhistogram       = { version = "7.5.4", default-features = false }
 path-absolutize    = { version = "3.1.1", optional = false, features = ["use_unix_paths_on_wasm"] }
 pg_configuration   = { workspace = true }
 pg_console         = { workspace = true }
+pg_analyse         = { workspace = true }
 pg_diagnostics     = { workspace = true }
 pg_flags           = { workspace = true }
 pg_fs              = { workspace = true }

crates/pg_analyse/src/rule.rs

@@ -1,3 +1,4 @@
+use pg_analyse::RuleCategoriesBuilder;
 use pg_diagnostics::{category, Error};
 
 use crate::execute::diagnostics::ResultExt;
@@ -24,10 +25,19 @@ pub(crate) fn check_with_guard<'ctx>(
             let input = workspace_file.input()?;
             let changed = false;
 
+            let (only, skip) = (Vec::new(), Vec::new());
+
             let max_diagnostics = ctx.remaining_diagnostics.load(Ordering::Relaxed);
             let pull_diagnostics_result = workspace_file
                 .guard()
-                .pull_diagnostics(max_diagnostics)
+                .pull_diagnostics(
+                    RuleCategoriesBuilder::default()
+                        .all()
+                        .build(),
+                    max_diagnostics,
+                    only,
+                    skip,
+                )
                 .with_file_path_and_code(
                     workspace_file.path.display().to_string(),
                     category!("check"),

crates/pg_cli/Cargo.toml

@@ -19,7 +19,7 @@ use crate::vcs::{partial_vcs_configuration, PartialVcsConfiguration, VcsConfigur
 pub use analyser::{
     partial_linter_configuration, LinterConfiguration, PartialLinterConfiguration,
     RuleConfiguration, RuleFixConfiguration, RulePlainConfiguration, RuleWithFixOptions,
-    RuleWithOptions, Rules,
+    RuleWithOptions, Rules, RuleSelector
 };
 use biome_deserialize_macros::Partial;
 use bpaf::Bpaf;

crates/pg_cli/src/execute/process_file/check.rs

@@ -25,7 +25,7 @@ pub fn lint(
     let analyser = pg_analyse::Analyzer::new(METADATA.deref());
 
     analyser.run(pg_analyse::AnalyzerContext {
-        root: root.clone(),
+        root,
         options,
         registry,
     })