Remove broken SQL pattern

CHANGELOG.rst

@@ -20,6 +20,7 @@ Fixed
 - Common Lisp query: duplicate extmarks on some delimiters
 - Luadoc query: Remove broken pattern for dictionary key type
 - Ruby query: duplicate extmarks on some delimiters
+- SQL query: Remove broken patterns
 - Zig query: duplicate extmarks on some delimiters
 - Make a better effort to make parentheses in Vim script expressions work (there
   is only so much that can be done though)

queries/sql/rainbow-delimiters.scm

@@ -10,19 +10,23 @@
     "(" @delimiter
     ")" @delimiter @sentinel) @container
 
-(where
-  "(" @delimiter
-  ")" @delimiter @sentinel) @container
+;;; The following queries do not work because all parentheses are on the same
+;;; level.
+;;;
+;;; See https://github.com/DerekStride/tree-sitter-sql/issues/274
 
-(binary_expression
-  "(" @delimiter
-  ")" @delimiter @sentinel
-  ) @container
+; (where
+;   "(" @delimiter
+;   ")" @delimiter @sentinel) @container
 
-; The following can cause problems with (((())))
-(term
-  "(" @delimiter
-  ; ("(" ")")* ; to fix _some_ problems, this can be uncommented
-  ")" @delimiter @sentinel
-  ) @container
+; (binary_expression
+;   "(" @delimiter
+;   ")" @delimiter @sentinel
+;   ) @container
 
+; ; The following can cause problems with (((())))
+; (term
+;   "(" @delimiter
+;   ; ("(" ")")* ; to fix _some_ problems, this can be uncommented
+;   ")" @delimiter @sentinel
+;   ) @container

test/highlight/samples/sql/regular.sql

@@ -1,9 +1,7 @@
 SELECT (1 + (2 + (3 + (4 + (5 + (6 + (7 + (8 + ((9) + (0))))))))));
 
 SELECT
-    (1 + ((2)((())) - 3)) AS "expression",
-    (()) AS "list",
-    -- ((((())))) AS "list" -- this will cause problems with the highlighting!
+    (1 + ((2) - ((((3)))))) AS "expression",
     "users"."id" AS "user_id",
     SUM("orders"."sum_prices") AS "user_orders_amount"
 FROM "users"

test/highlight/spec/sql/rainbow-delimiters/regular.sql.lua

@@ -1,483 +1,87 @@
 return {
   sql = { {
       end_col = 8,
-      end_row = 0,
+      end_row = 5,
       hl_group = "RainbowDelimiterRed",
       start_col = 7,
-      start_row = 0
-    }, {
-      end_col = 13,
-      end_row = 0,
-      hl_group = "RainbowDelimiterYellow",
-      start_col = 12,
-      start_row = 0
-    }, {
-      end_col = 18,
-      end_row = 0,
-      hl_group = "RainbowDelimiterBlue",
-      start_col = 17,
-      start_row = 0
-    }, {
-      end_col = 23,
-      end_row = 0,
-      hl_group = "RainbowDelimiterOrange",
-      start_col = 22,
-      start_row = 0
-    }, {
-      end_col = 28,
-      end_row = 0,
-      hl_group = "RainbowDelimiterGreen",
-      start_col = 27,
-      start_row = 0
-    }, {
-      end_col = 33,
-      end_row = 0,
-      hl_group = "RainbowDelimiterViolet",
-      start_col = 32,
-      start_row = 0
-    }, {
-      end_col = 38,
-      end_row = 0,
-      hl_group = "RainbowDelimiterCyan",
-      start_col = 37,
-      start_row = 0
-    }, {
-      end_col = 43,
-      end_row = 0,
-      hl_group = "RainbowDelimiterRed",
-      start_col = 42,
-      start_row = 0
-    }, {
-      end_col = 48,
-      end_row = 0,
-      hl_group = "RainbowDelimiterYellow",
-      start_col = 47,
-      start_row = 0
-    }, {
-      end_col = 49,
-      end_row = 0,
-      hl_group = "RainbowDelimiterBlue",
-      start_col = 48,
-      start_row = 0
-    }, {
-      end_col = 49,
-      end_row = 0,
-      hl_group = "RainbowDelimiterOrange",
-      start_col = 48,
-      start_row = 0
-    }, {
-      end_col = 51,
-      end_row = 0,
-      hl_group = "RainbowDelimiterGreen",
-      start_col = 50,
-      start_row = 0
-    }, {
-      end_col = 55,
-      end_row = 0,
-      hl_group = "RainbowDelimiterOrange",
-      start_col = 54,
-      start_row = 0
-    }, {
-      end_col = 57,
-      end_row = 0,
-      hl_group = "RainbowDelimiterBlue",
-      start_col = 56,
-      start_row = 0
-    }, {
-      end_col = 57,
-      end_row = 0,
-      hl_group = "RainbowDelimiterOrange",
-      start_col = 56,
-      start_row = 0
-    }, {
-      end_col = 58,
-      end_row = 0,
-      hl_group = "RainbowDelimiterYellow",
-      start_col = 57,
-      start_row = 0
-    }, {
-      end_col = 59,
-      end_row = 0,
-      hl_group = "RainbowDelimiterRed",
-      start_col = 58,
-      start_row = 0
-    }, {
-      end_col = 60,
-      end_row = 0,
-      hl_group = "RainbowDelimiterCyan",
-      start_col = 59,
-      start_row = 0
-    }, {
-      end_col = 61,
-      end_row = 0,
-      hl_group = "RainbowDelimiterViolet",
-      start_col = 60,
-      start_row = 0
-    }, {
-      end_col = 62,
-      end_row = 0,
-      hl_group = "RainbowDelimiterGreen",
-      start_col = 61,
-      start_row = 0
-    }, {
-      end_col = 63,
-      end_row = 0,
-      hl_group = "RainbowDelimiterOrange",
-      start_col = 62,
-      start_row = 0
-    }, {
-      end_col = 64,
-      end_row = 0,
-      hl_group = "RainbowDelimiterBlue",
-      start_col = 63,
-      start_row = 0
-    }, {
-      end_col = 65,
-      end_row = 0,
-      hl_group = "RainbowDelimiterYellow",
-      start_col = 64,
-      start_row = 0
-    }, {
-      end_col = 66,
-      end_row = 0,
-      hl_group = "RainbowDelimiterRed",
-      start_col = 65,
-      start_row = 0
-    }, {
-      end_col = 5,
-      end_row = 3,
-      hl_group = "RainbowDelimiterRed",
-      start_col = 4,
-      start_row = 3
-    }, {
-      end_col = 10,
-      end_row = 3,
-      hl_group = "RainbowDelimiterYellow",
-      start_col = 9,
-      start_row = 3
-    }, {
-      end_col = 11,
-      end_row = 3,
-      hl_group = "RainbowDelimiterBlue",
-      start_col = 10,
-      start_row = 3
-    }, {
-      end_col = 13,
-      end_row = 3,
-      hl_group = "RainbowDelimiterBlue",
-      start_col = 12,
-      start_row = 3
-    }, {
-      end_col = 14,
-      end_row = 3,
-      hl_group = "RainbowDelimiterBlue",
-      start_col = 13,
-      start_row = 3
-    }, {
-      end_col = 14,
-      end_row = 3,
-      hl_group = "RainbowDelimiterGreen",
-      start_col = 13,
-      start_row = 3
-    }, {
-      end_col = 15,
-      end_row = 3,
-      hl_group = "RainbowDelimiterViolet",
-      start_col = 14,
-      start_row = 3
-    }, {
-      end_col = 15,
-      end_row = 3,
-      hl_group = "RainbowDelimiterViolet",
-      start_col = 14,
-      start_row = 3
-    }, {
-      end_col = 16,
-      end_row = 3,
-      hl_group = "RainbowDelimiterCyan",
-      start_col = 15,
-      start_row = 3
-    }, {
-      end_col = 17,
-      end_row = 3,
-      hl_group = "RainbowDelimiterCyan",
-      start_col = 16,
-      start_row = 3
-    }, {
-      end_col = 18,
-      end_row = 3,
-      hl_group = "RainbowDelimiterGreen",
-      start_col = 17,
-      start_row = 3
-    }, {
-      end_col = 18,
-      end_row = 3,
-      hl_group = "RainbowDelimiterViolet",
-      start_col = 17,
-      start_row = 3
-    }, {
-      end_col = 19,
-      end_row = 3,
-      hl_group = "RainbowDelimiterBlue",
-      start_col = 18,
-      start_row = 3
-    }, {
-      end_col = 19,
-      end_row = 3,
-      hl_group = "RainbowDelimiterOrange",
-      start_col = 18,
-      start_row = 3
-    }, {
-      end_col = 24,
-      end_row = 3,
-      hl_group = "RainbowDelimiterYellow",
-      start_col = 23,
-      start_row = 3
-    }, {
-      end_col = 25,
-      end_row = 3,
-      hl_group = "RainbowDelimiterRed",
-      start_col = 24,
-      start_row = 3
-    }, {
-      end_col = 5,
-      end_row = 4,
-      hl_group = "RainbowDelimiterRed",
-      start_col = 4,
-      start_row = 4
-    }, {
-      end_col = 6,
-      end_row = 4,
-      hl_group = "RainbowDelimiterYellow",
-      start_col = 5,
-      start_row = 4
-    }, {
-      end_col = 7,
-      end_row = 4,
-      hl_group = "RainbowDelimiterYellow",
-      start_col = 6,
-      start_row = 4
-    }, {
-      end_col = 8,
-      end_row = 4,
-      hl_group = "RainbowDelimiterRed",
-      start_col = 7,
-      start_row = 4
-    }, {
-      end_col = 8,
-      end_row = 7,
-      hl_group = "RainbowDelimiterRed",
-      start_col = 7,
-      start_row = 7
+      start_row = 5
     }, {
       end_col = 30,
-      end_row = 7,
+      end_row = 5,
       hl_group = "RainbowDelimiterRed",
       start_col = 29,
-      start_row = 7
+      start_row = 5
     }, {
       end_col = 6,
-      end_row = 9,
+      end_row = 7,
       hl_group = "RainbowDelimiterRed",
       start_col = 5,
-      start_row = 9
+      start_row = 7
     }, {
       end_col = 12,
-      end_row = 13,
+      end_row = 11,
       hl_group = "RainbowDelimiterYellow",
       start_col = 11,
-      start_row = 13
+      start_row = 11
     }, {
       end_col = 30,
-      end_row = 13,
+      end_row = 11,
       hl_group = "RainbowDelimiterYellow",
       start_col = 29,
-      start_row = 13
+      start_row = 11
     }, {
       end_col = 1,
+      end_row = 16,
+      hl_group = "RainbowDelimiterRed",
+      start_col = 0,
+      start_row = 16
+    }, {
+      end_col = 25,
       end_row = 18,
       hl_group = "RainbowDelimiterRed",
-      start_col = 0,
+      start_col = 24,
       start_row = 18
-    }, {
-      end_col = 23,
-      end_row = 19,
-      hl_group = "RainbowDelimiterRed",
-      start_col = 22,
-      start_row = 19
-    }, {
-      end_col = 28,
-      end_row = 19,
-      hl_group = "RainbowDelimiterYellow",
-      start_col = 27,
-      start_row = 19
-    }, {
-      end_col = 34,
-      end_row = 19,
-      hl_group = "RainbowDelimiterYellow",
-      start_col = 33,
-      start_row = 19
-    }, {
-      end_col = 35,
-      end_row = 19,
-      hl_group = "RainbowDelimiterRed",
-      start_col = 34,
-      start_row = 19
-    }, {
-      end_col = 41,
-      end_row = 19,
-      hl_group = "RainbowDelimiterRed",
-      start_col = 40,
-      start_row = 19
-    }, {
-      end_col = 41,
-      end_row = 19,
-      hl_group = "RainbowDelimiterYellow",
-      start_col = 40,
-      start_row = 19
-    }, {
-      end_col = 46,
-      end_row = 19,
-      hl_group = "RainbowDelimiterOrange",
-      start_col = 45,
-      start_row = 19
-    }, {
-      end_col = 52,
-      end_row = 19,
-      hl_group = "RainbowDelimiterOrange",
-      start_col = 51,
-      start_row = 19
-    }, {
-      end_col = 53,
-      end_row = 19,
-      hl_group = "RainbowDelimiterBlue",
-      start_col = 52,
-      start_row = 19
-    }, {
-      end_col = 57,
-      end_row = 19,
-      hl_group = "RainbowDelimiterYellow",
-      start_col = 56,
-      start_row = 19
-    }, {
-      end_col = 62,
-      end_row = 19,
-      hl_group = "RainbowDelimiterBlue",
-      start_col = 61,
-      start_row = 19
-    }, {
-      end_col = 71,
-      end_row = 19,
-      hl_group = "RainbowDelimiterOrange",
-      start_col = 70,
-      start_row = 19
-    }, {
-      end_col = 73,
-      end_row = 19,
-      hl_group = "RainbowDelimiterOrange",
-      start_col = 72,
-      start_row = 19
-    }, {
-      end_col = 74,
-      end_row = 19,
-      hl_group = "RainbowDelimiterBlue",
-      start_col = 73,
-      start_row = 19
-    }, {
-      end_col = 75,
-      end_row = 19,
-      hl_group = "RainbowDelimiterRed",
-      start_col = 74,
-      start_row = 19
-    }, {
-      end_col = 75,
-      end_row = 19,
-      hl_group = "RainbowDelimiterYellow",
-      start_col = 74,
-      start_row = 19
-    }, {
-      end_col = 25,
-      end_row = 20,
-      hl_group = "RainbowDelimiterRed",
-      start_col = 24,
-      start_row = 20
     }, {
       end_col = 36,
-      end_row = 20,
+      end_row = 18,
       hl_group = "RainbowDelimiterRed",
       start_col = 35,
-      start_row = 20
-    }, {
-      end_col = 7,
-      end_row = 26,
-      hl_group = "RainbowDelimiterRed",
-      start_col = 6,
-      start_row = 26
+      start_row = 18
     }, {
       end_col = 25,
-      end_row = 28,
-      hl_group = "RainbowDelimiterBlue",
+      end_row = 26,
+      hl_group = "RainbowDelimiterRed",
       start_col = 24,
-      start_row = 28
+      start_row = 26
     }, {
       end_col = 54,
-      end_row = 28,
-      hl_group = "RainbowDelimiterBlue",
-      start_col = 53,
-      start_row = 28
-    }, {
-      end_col = 1,
-      end_row = 29,
-      hl_group = "RainbowDelimiterYellow",
-      start_col = 0,
-      start_row = 29
-    }, {
-      end_col = 2,
-      end_row = 31,
+      end_row = 26,
       hl_group = "RainbowDelimiterRed",
-      start_col = 1,
-      start_row = 31
+      start_col = 53,
+      start_row = 26
     }, {
       end_col = 23,
-      end_row = 31,
-      hl_group = "RainbowDelimiterYellow",
+      end_row = 29,
+      hl_group = "RainbowDelimiterRed",
       start_col = 22,
-      start_row = 31
+      start_row = 29
     }, {
       end_col = 39,
-      end_row = 31,
-      hl_group = "RainbowDelimiterYellow",
-      start_col = 38,
-      start_row = 31
-    }, {
-      end_col = 66,
-      end_row = 31,
+      end_row = 29,
       hl_group = "RainbowDelimiterRed",
-      start_col = 65,
-      start_row = 31
+      start_col = 38,
+      start_row = 29
     }, {
       end_col = 31,
-      end_row = 33,
+      end_row = 31,
       hl_group = "RainbowDelimiterRed",
       start_col = 30,
-      start_row = 33
+      start_row = 31
     }, {
       end_col = 37,
-      end_row = 33,
+      end_row = 31,
       hl_group = "RainbowDelimiterRed",
       start_col = 36,
-      start_row = 33
-    }, {
-      end_col = 45,
-      end_row = 33,
-      hl_group = "RainbowDelimiterRed",
-      start_col = 44,
-      start_row = 33
-    }, {
-      end_col = 50,
-      end_row = 33,
-      hl_group = "RainbowDelimiterRed",
-      start_col = 49,
-      start_row = 33
+      start_row = 31
     } }
 }