parser: improve error recovery for list items (#684)

Author: sbdchd

crates/squawk_ide/src/expand_selection.rs

@@ -33,12 +33,34 @@ use squawk_syntax::{
     ast::{self, AstToken},
 };
 
+const ALL_LIST_KINDS: &[SyntaxKind] = &[
+    SyntaxKind::ARG_LIST,
+    SyntaxKind::ATTRIBUTE_LIST,
+    SyntaxKind::COLUMN_LIST,
+    SyntaxKind::CONSTRAINT_EXCLUSION_LIST,
+    // only separated by whitespace
+    // SyntaxKind::FUNC_OPTION_LIST,
+    SyntaxKind::JSON_TABLE_COLUMN_LIST,
+    SyntaxKind::OPTIONS_LIST,
+    SyntaxKind::PARAM_LIST,
+    // only separated by whitespace
+    // SyntaxKind::SEQUENCE_OPTION_LIST,
+    SyntaxKind::SET_OPTIONS_LIST,
+    SyntaxKind::TABLE_ARG_LIST,
+    SyntaxKind::TABLE_LIST,
+    SyntaxKind::TARGET_LIST,
+    SyntaxKind::TRANSACTION_MODE_LIST,
+    SyntaxKind::VACUUM_OPTION_LIST,
+    // only separated by whitespace
+    // SyntaxKind::XML_COLUMN_OPTION_LIST,
+    SyntaxKind::XML_TABLE_COLUMN_LIST,
+];
+
 pub fn extend_selection(root: &SyntaxNode, range: TextRange) -> TextRange {
     try_extend_selection(root, range).unwrap_or(range)
 }
 
 fn try_extend_selection(root: &SyntaxNode, range: TextRange) -> Option<TextRange> {
-    // TODO: more list_kinds, and add the strings that rust analyzer has
     let string_kinds = [
         SyntaxKind::COMMENT,
         SyntaxKind::STRING,
@@ -48,28 +70,6 @@ fn try_extend_selection(root: &SyntaxNode, range: TextRange) -> Option<TextRange
         SyntaxKind::ESC_STRING,
     ];
 
-    // anything that has a separater and whitespace
-    let list_kinds = [
-        SyntaxKind::ARG_LIST,
-        SyntaxKind::ATTRIBUTE_LIST,
-        SyntaxKind::COLUMN_LIST,
-        // only separated by whitespace
-        // SyntaxKind::FUNC_OPTION_LIST,
-        SyntaxKind::JSON_TABLE_COLUMN_LIST,
-        SyntaxKind::OPTIONS_LIST,
-        SyntaxKind::PARAM_LIST,
-        // only separated by whitespace
-        // SyntaxKind::SEQUENCE_OPTION_LIST,
-        SyntaxKind::SET_OPTIONS_LIST,
-        SyntaxKind::TABLE_ARG_LIST,
-        SyntaxKind::TABLE_LIST,
-        SyntaxKind::TARGET_LIST,
-        SyntaxKind::TRANSACTION_MODE_LIST,
-        // only separated by whitespace
-        // SyntaxKind::XML_COLUMN_OPTION_LIST,
-        SyntaxKind::XML_TABLE_COLUMN_LIST,
-    ];
-
     if range.is_empty() {
         let offset = range.start();
         let mut leaves = root.token_at_offset(offset);
@@ -116,7 +116,7 @@ fn try_extend_selection(root: &SyntaxNode, range: TextRange) -> Option<TextRange
 
     if node
         .parent()
-        .is_some_and(|n| list_kinds.contains(&n.kind()))
+        .is_some_and(|n| ALL_LIST_KINDS.contains(&n.kind()))
     {
         if let Some(range) = extend_list_item(&node) {
             return Some(range);
@@ -540,4 +540,46 @@ $0
         ]
         "#);
     }
+
+    #[test]
+    fn list_variants() {
+        // only separated by whitespace
+        const EXCLUDED_LIST_KINDS: &[SyntaxKind] = &[
+            SyntaxKind::FUNC_OPTION_LIST,
+            SyntaxKind::SEQUENCE_OPTION_LIST,
+            SyntaxKind::XML_COLUMN_OPTION_LIST,
+        ];
+
+        let generated_list_kinds: Vec<SyntaxKind> = (0..SyntaxKind::__LAST as u16)
+            .map(SyntaxKind::from)
+            .filter(|kind| {
+                format!("{:?}", kind).ends_with("_LIST") && !EXCLUDED_LIST_KINDS.contains(kind)
+            })
+            .collect();
+
+        assert_debug_snapshot!(generated_list_kinds, @r"
+        [
+            ARG_LIST,
+            ATTRIBUTE_LIST,
+            COLUMN_LIST,
+            CONSTRAINT_EXCLUSION_LIST,
+            JSON_TABLE_COLUMN_LIST,
+            OPTIONS_LIST,
+            PARAM_LIST,
+            SET_OPTIONS_LIST,
+            TABLE_ARG_LIST,
+            TABLE_LIST,
+            TARGET_LIST,
+            TRANSACTION_MODE_LIST,
+            VACUUM_OPTION_LIST,
+            XML_TABLE_COLUMN_LIST,
+        ]
+        ");
+
+        assert_eq!(
+            ALL_LIST_KINDS,
+            generated_list_kinds.as_slice(),
+            "ALL_LIST_KINDS constant is out of sync with actual _LIST variants"
+        );
+    }
 }