much simpler

Author: juleswritescode

crates/pgls_hover/src/hoverables/table.rs

@@ -114,255 +114,39 @@ impl ToHoverMarkdown for Table {
 }
 
 fn extract_basic_default_literal(default_expr: &str) -> Option<String> {
-    let mut candidate = default_expr.trim();
+    let mut cast_parts = default_expr.split("::");
+    let mut value = cast_parts.next().unwrap_or(default_expr).trim();
 
-    loop {
-        let mut changed = false;
-
-        if let Some(unwrapped) = strip_outer_parentheses(candidate) {
-            candidate = unwrapped.trim();
-            changed = true;
-        }
-
-        if let Some(without_cast) = strip_trailing_top_level_casts(candidate) {
-            candidate = without_cast.trim();
-            changed = true;
-        }
-
-        if !changed {
-            break;
-        }
-    }
-
-    if is_basic_literal(candidate) {
-        Some(candidate.to_string())
-    } else {
-        None
-    }
-}
-
-fn strip_outer_parentheses(value: &str) -> Option<&str> {
-    let value = value.trim();
-
-    if !value.starts_with('(') || !value.ends_with(')') {
+    if cast_parts.any(|cast_part| !is_type_cast_fragment(cast_part)) {
         return None;
     }
 
-    let mut depth = 0_i32;
-    let mut in_single_quote = false;
-    let mut in_double_quote = false;
-    let bytes = value.as_bytes();
-    let mut idx = 0_usize;
-
-    while idx < bytes.len() {
-        let ch = bytes[idx] as char;
-
-        if in_single_quote {
-            if ch == '\'' {
-                if idx + 1 < bytes.len() && bytes[idx + 1] as char == '\'' {
-                    idx += 2;
-                    continue;
-                }
-
-                in_single_quote = false;
-            }
-
-            idx += 1;
-            continue;
-        }
-
-        if in_double_quote {
-            if ch == '"' {
-                in_double_quote = false;
-            }
-
-            idx += 1;
-            continue;
-        }
-
-        match ch {
-            '\'' => in_single_quote = true,
-            '"' => in_double_quote = true,
-            '(' => depth += 1,
-            ')' => {
-                depth -= 1;
-                if depth == 0 && idx != bytes.len() - 1 {
-                    return None;
-                }
-            }
-            _ => {}
-        }
-
-        idx += 1;
+    while value.starts_with('(') && value.ends_with(')') && value.len() > 1 {
+        value = value[1..value.len() - 1].trim();
     }
 
-    if depth != 0 || in_single_quote || in_double_quote {
-        return None;
+    if value.starts_with('\'') && value.ends_with('\'') && value.len() > 1 {
+        value = &value[1..value.len() - 1];
     }
 
-    Some(&value[1..value.len() - 1])
-}
-
-fn strip_trailing_top_level_casts(value: &str) -> Option<&str> {
-    let bytes = value.as_bytes();
-    let mut depth = 0_i32;
-    let mut in_single_quote = false;
-    let mut in_double_quote = false;
-    let mut idx = 0_usize;
-
-    while idx + 1 < bytes.len() {
-        let ch = bytes[idx] as char;
-
-        if in_single_quote {
-            if ch == '\'' {
-                if idx + 1 < bytes.len() && bytes[idx + 1] as char == '\'' {
-                    idx += 2;
-                    continue;
-                }
-                in_single_quote = false;
-            }
-            idx += 1;
-            continue;
-        }
-
-        if in_double_quote {
-            if ch == '"' {
-                in_double_quote = false;
-            }
-            idx += 1;
-            continue;
-        }
-
-        match ch {
-            '\'' => {
-                in_single_quote = true;
-                idx += 1;
-                continue;
-            }
-            '"' => {
-                in_double_quote = true;
-                idx += 1;
-                continue;
-            }
-            '(' => {
-                depth += 1;
-                idx += 1;
-                continue;
-            }
-            ')' => {
-                depth -= 1;
-                idx += 1;
-                continue;
-            }
-            ':' if depth == 0 && bytes[idx + 1] as char == ':' => {
-                let suffix = &value[idx..];
-                if suffix
-                    .chars()
-                    .all(|c| c.is_ascii_alphanumeric() || ":_\".()[] ,\t".contains(c))
-                {
-                    return Some(value[..idx].trim_end());
-                }
-                return None;
-            }
-            _ => {
-                idx += 1;
-                continue;
-            }
-        }
-    }
-
-    None
-}
-
-fn is_basic_literal(value: &str) -> bool {
     let value = value.trim();
-
-    if value.eq_ignore_ascii_case("true")
-        || value.eq_ignore_ascii_case("false")
-        || value.eq_ignore_ascii_case("null")
-    {
-        return true;
+    if value.is_empty() || !contains_only_basic_chars(value) {
+        return None;
     }
 
-    is_numeric_literal(value) || is_single_quoted_literal(value)
+    Some(value.to_string())
 }
 
-fn is_single_quoted_literal(value: &str) -> bool {
-    let bytes = value.as_bytes();
-
-    if bytes.len() < 2 || bytes.first() != Some(&b'\'') || bytes.last() != Some(&b'\'') {
-        return false;
-    }
-
-    let mut idx = 1_usize;
-    let end = bytes.len() - 1;
-
-    while idx < end {
-        if bytes[idx] == b'\'' {
-            if idx + 1 < end && bytes[idx + 1] == b'\'' {
-                idx += 2;
-            } else {
-                return false;
-            }
-        } else {
-            idx += 1;
-        }
-    }
-
-    true
+fn contains_only_basic_chars(value: &str) -> bool {
+    value
+        .chars()
+        .all(|c| c.is_ascii_alphanumeric() || matches!(c, ' ' | '_' | '-' | '.'))
 }
 
-fn is_numeric_literal(value: &str) -> bool {
-    let bytes = value.as_bytes();
-    if bytes.is_empty() {
-        return false;
-    }
-
-    let mut idx = 0_usize;
-
-    if matches!(bytes[idx], b'+' | b'-') {
-        idx += 1;
-        if idx >= bytes.len() {
-            return false;
-        }
-    }
-
-    let integer_start = idx;
-    while idx < bytes.len() && bytes[idx].is_ascii_digit() {
-        idx += 1;
-    }
-    let has_integer_digits = idx > integer_start;
-
-    if idx < bytes.len() && bytes[idx] == b'.' {
-        idx += 1;
-        let fractional_start = idx;
-        while idx < bytes.len() && bytes[idx].is_ascii_digit() {
-            idx += 1;
-        }
-        if !has_integer_digits && idx == fractional_start {
-            return false;
-        }
-    } else if !has_integer_digits {
-        return false;
-    }
-
-    if idx < bytes.len() && matches!(bytes[idx], b'e' | b'E') {
-        idx += 1;
-        if idx < bytes.len() && matches!(bytes[idx], b'+' | b'-') {
-            idx += 1;
-        }
-
-        let exponent_start = idx;
-        while idx < bytes.len() && bytes[idx].is_ascii_digit() {
-            idx += 1;
-        }
-
-        if idx == exponent_start {
-            return false;
-        }
-    }
-
-    idx == bytes.len()
+fn is_type_cast_fragment(value: &str) -> bool {
+    value.trim().chars().all(|c| {
+        c.is_ascii_alphanumeric() || matches!(c, ' ' | '_' | '.' | '"' | '[' | ']' | '(' | ')' | ',')
+    })
 }
 
 impl ContextualPriority for Table {
@@ -402,7 +186,7 @@ mod tests {
     fn extracts_basic_defaults_with_optional_casts() {
         assert_eq!(
             extract_basic_default_literal("'anonymous'::text"),
-            Some("'anonymous'".to_string())
+            Some("anonymous".to_string())
         );
         assert_eq!(extract_basic_default_literal("(42)::int8"), Some("42".to_string()));
         assert_eq!(
@@ -426,5 +210,9 @@ mod tests {
             extract_basic_default_literal("'a'::text || 'b'::text"),
             None
         );
+        assert_eq!(
+            extract_basic_default_literal("'with@symbol'::text"),
+            None
+        );
     }
 }

crates/pgls_hover/tests/snapshots/table_hover_nullable_and_basic_defaults.snap

@@ -13,7 +13,7 @@ select * from users
 ```plain  
 Columns:
 - id: int4 - not null
-- name: text - nullable - default: 'anonymous'
+- name: text - nullable - default: anonymous
 - score: int4 - nullable - default: 0
 - enabled: bool - nullable - default: false
 - created_at: timestamptz - nullable