Merge pull request #58 from tombi-toml/add_hover_hint

feat: add Hover Hint.
tombi-toml · Feb 27, 2025 · 2921529 · 2921529
2 parents 54a576b + 3cc85d7
commit 2921529
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 0 deletions.
diff --git a/crates/schema-store/src/schema/array_schema.rs b/crates/schema-store/src/schema/array_schema.rs
@@ -25,6 +25,15 @@ pub enum ArrayValuesOrderBy {
     Descending,
 }
 
+impl std::fmt::Display for ArrayValuesOrderBy {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Self::Ascending => write!(f, "ascending"),
+            Self::Descending => write!(f, "descending"),
+        }
+    }
+}
+
 impl ArraySchema {
     pub fn new(object: &serde_json::Map<String, serde_json::Value>) -> Self {
         Self {

diff --git a/crates/schema-store/src/schema/table_schema.rs b/crates/schema-store/src/schema/table_schema.rs
@@ -30,6 +30,16 @@ pub enum TableKeysOrderBy {
     Schema,
 }
 
+impl std::fmt::Display for TableKeysOrderBy {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Self::Ascending => write!(f, "ascending"),
+            Self::Descending => write!(f, "descending"),
+            Self::Schema => write!(f, "schema"),
+        }
+    }
+}
+
 impl TableSchema {
     pub fn new(object: &serde_json::Map<String, serde_json::Value>) -> Self {
         let mut properties = AHashMap::new();

diff --git a/crates/server/src/hover/constraints.rs b/crates/server/src/hover/constraints.rs
@@ -1,3 +1,5 @@
+use schema_store::{ArrayValuesOrderBy, TableKeysOrderBy};
+
 use super::default_value::DefaultValue;
 
 #[derive(Debug, Default)]
@@ -21,13 +23,15 @@ pub struct DataConstraints {
     pub min_items: Option<usize>,
     pub max_items: Option<usize>,
     pub unique_items: Option<bool>,
+    pub values_order_by: Option<ArrayValuesOrderBy>,
 
     // Table
     pub required_keys: Option<Vec<String>>,
     pub min_keys: Option<usize>,
     pub max_keys: Option<usize>,
     pub key_patterns: Option<Vec<String>>,
     pub additional_keys: Option<bool>,
+    pub keys_order_by: Option<TableKeysOrderBy>,
 }
 
 impl std::fmt::Display for DataConstraints {
@@ -88,6 +92,10 @@ impl std::fmt::Display for DataConstraints {
             write!(f, "Unique Items: `true`\n\n")?;
         }
 
+        if let Some(values_order_by) = &self.values_order_by {
+            write!(f, "Values Order By: `{}`\n\n", values_order_by)?;
+        }
+
         if let Some(required_keys) = &self.required_keys {
             write!(f, "Required Keys:\n\n")?;
             for key in required_keys.iter() {
@@ -114,6 +122,10 @@ impl std::fmt::Display for DataConstraints {
             write!(f, "Additional Keys: `true`\n\n")?;
         }
 
+        if let Some(keys_order_by) = &self.keys_order_by {
+            write!(f, "Keys Order By: `{}`\n\n", keys_order_by)?;
+        }
+
         Ok(())
     }
 }
diff --git a/crates/server/src/hover/value/array.rs b/crates/server/src/hover/value/array.rs
@@ -256,6 +256,7 @@ impl GetHoverContent for ArraySchema {
                     min_items: self.min_items,
                     max_items: self.max_items,
                     unique_items: self.unique_items,
+                    values_order_by: self.values_order_by.clone(),
                     ..Default::default()
                 }),
                 schema_url: schema_url.cloned(),

diff --git a/crates/server/src/hover/value/table.rs b/crates/server/src/hover/value/table.rs
@@ -456,6 +456,7 @@ impl GetHoverContent for TableSchema {
                     // NOTE: key_patterns are output for keys, not this tables.
                     key_patterns: None,
                     additional_keys: Some(self.additional_properties),
+                    keys_order_by: self.keys_order_by.clone(),
                     ..Default::default()
                 }),
                 schema_url: schema_url.cloned(),