Merge 1e42061 into 6337fb9

Author: benfdking

crates/lib-core/src/parser/segments/base.rs

@@ -41,6 +41,10 @@ impl SegmentBuilder {
         SegmentBuilder::token(id, raw, SyntaxKind::Symbol).finish()
     }
 
+    pub fn raw(id: u32, raw: &str) -> ErasedSegment {
+        SegmentBuilder::token(id, raw, SyntaxKind::Raw).finish()
+    }
+
     pub fn node(
         id: u32,
         syntax_kind: SyntaxKind,
@@ -139,6 +143,11 @@ impl ErasedSegment {
         }
     }
 
+    /// Return true if this segment has no children
+    pub fn is_raw(&self) -> bool {
+        self.segments().is_empty()
+    }
+
     pub fn segments(&self) -> &[ErasedSegment] {
         match &self.value.kind {
             NodeOrTokenKind::Node(node) => &node.segments,

crates/lib-core/src/templaters/base.rs

@@ -233,6 +233,10 @@ impl TemplatedFileInner {
         self.templated_str.is_some()
     }
 
+    pub fn raw_sliced_iter(&self) -> impl Iterator<Item = &RawFileSlice> {
+        self.raw_sliced.iter()
+    }
+
     /// Get the line number and position of a point in the source file.
     /// Args:
     ///  - char_pos: The character position in the relevant file.
@@ -540,8 +544,8 @@ pub enum RawFileSliceType {
 #[derive(Debug, PartialEq, Eq, Clone, Hash)]
 pub struct RawFileSlice {
     /// Source string
-    raw: String,
-    pub(crate) slice_type: String,
+    pub raw: String,
+    pub slice_type: String,
     /// Offset from beginning of source string
     pub source_idx: usize,
     slice_subtype: Option<RawFileSliceType>,

crates/lib/Cargo.toml

@@ -38,6 +38,7 @@ name = "depth_map"
 harness = false
 
 [features]
+default = ["python"]
 python = ["pyo3", "sqruff-lib-core/serde"]
 
 [dependencies]

crates/lib/src/core/linter/linted_file.rs

@@ -7,7 +7,7 @@ use sqruff_lib_core::errors::{SQLBaseError, SqlError};
 use sqruff_lib_core::parser::segments::fix::FixPatch;
 use sqruff_lib_core::templaters::base::{RawFileSlice, TemplatedFile};
 
-#[derive(Debug, Default)]
+#[derive(Debug, Default, Clone)]
 pub struct LintedFile {
     pub path: String,
     pub patches: Vec<FixPatch>,

crates/lib/src/core/rules/base.rs

@@ -34,6 +34,7 @@ pub enum RuleGroups {
     Ambiguous,
     Capitalisation,
     Convention,
+    Jinja,
     Layout,
     References,
     Structure,
@@ -180,7 +181,8 @@ pub trait Rule: CloneRule + dyn_clone::DynClone + Debug + 'static + Send + Sync
         tree: ErasedSegment,
         config: &FluffConfig,
     ) -> Vec<SQLLintError> {
-        let mut root_context = RuleContext::new(tables, dialect, config, tree.clone());
+        let mut root_context =
+            RuleContext::new(tables, dialect, config, tree.clone(), &templated_file);
         let mut vs = Vec::new();
 
         // TODO Will to return a note that rules were skipped

crates/lib/src/core/rules/context.rs

@@ -13,7 +13,7 @@ use crate::core::config::FluffConfig;
 pub struct RuleContext<'a> {
     pub tables: &'a Tables,
     pub dialect: &'a Dialect,
-    pub templated_file: Option<TemplatedFile>,
+    pub templated_file: &'a TemplatedFile,
     pub path: Option<String>,
     pub config: &'a FluffConfig,
 
@@ -41,13 +41,14 @@ impl<'a> RuleContext<'a> {
         dialect: &'a Dialect,
         config: &'a FluffConfig,
         segment: ErasedSegment,
+        templated_file: &'a TemplatedFile,
     ) -> Self {
         Self {
             tables,
             dialect,
             config,
             segment,
-            templated_file: <_>::default(),
+            templated_file,
             path: <_>::default(),
             parent_stack: <_>::default(),
             raw_stack: <_>::default(),

crates/lib/src/rules.rs

@@ -7,6 +7,7 @@ pub mod aliasing;
 pub mod ambiguous;
 pub mod capitalisation;
 pub mod convention;
+pub mod jinja;
 pub mod layout;
 pub mod references;
 pub mod structure;
@@ -19,7 +20,8 @@ pub fn rules() -> Vec<ErasedRule> {
         convention::rules(),
         layout::rules(),
         references::rules(),
-        structure::rules()
+        structure::rules(),
+        jinja::rules(),
     )
     .collect_vec()
 }

crates/lib/src/rules/jinja.rs

@@ -0,0 +1,9 @@
+use crate::core::rules::base::ErasedRule;
+
+pub mod jj01;
+
+pub fn rules() -> Vec<ErasedRule> {
+    use crate::core::rules::base::Erased as _;
+
+    vec![jj01::RuleJJ01.erased()]
+}