Extract insert values into its own rule to get the range

sqldelight · Nov 21, 2023 · c5beaf7 · c5beaf7
1 parent fb53ff3
commit c5beaf7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/core/src/main/kotlin/com/alecstrong/sql/psi/core/psi/mixins/InsertStmtValuesMixin.kt b/core/src/main/kotlin/com/alecstrong/sql/psi/core/psi/mixins/InsertStmtValuesMixin.kt
@@ -31,7 +31,7 @@ internal abstract class InsertStmtValuesMixin(
         parent.columnNameList.mapNotNull { it.name }
       }
 
-    valuesExpressionList.forEach {
+    valuesExpressionList?.valuesExpressionList?.forEach {
       if (it.exprList.size != setColumns.size) {
         annotationHolder.createErrorAnnotation(
           it,

diff --git a/core/src/main/kotlin/com/alecstrong/sql/psi/core/sql.bnf b/core/src/main/kotlin/com/alecstrong/sql/psi/core/sql.bnf
@@ -321,10 +321,12 @@ insert_stmt ::= [ with_clause ] ( INSERT OR REPLACE | REPLACE | INSERT OR ROLLBA
   mixin = "com.alecstrong.sql.psi.core.psi.mixins.InsertStmtMixin"
   pin = 5
 }
-insert_stmt_values ::= VALUES values_expression ( COMMA values_expression ) * | compound_select_stmt | DEFAULT VALUES {
+insert_stmt_values ::= VALUES values_expression_list | compound_select_stmt | DEFAULT VALUES {
   mixin = "com.alecstrong.sql.psi.core.psi.mixins.InsertStmtValuesMixin"
   pin = 1
 }
+values_expression_list ::= values_expression ( COMMA values_expression ) *
+
 pragma_stmt ::= PRAGMA [ database_name DOT ] pragma_name [ EQ pragma_value | LP pragma_value RP ] {
   pin = 1
 }