[SQL] add boolean sub-scopes

sublimehq · Jul 14, 2024 · 1c49ea3 · 1c49ea3
1 parent 827b729
commit 1c49ea3
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 10 deletions.
diff --git a/SQL/Cassandra.sublime-syntax b/SQL/Cassandra.sublime-syntax
@@ -215,6 +215,10 @@ contexts:
 
 ###[ LITERALS ]################################################################
 
+  constants:
+    - meta_prepend: true
+    - include: booleans
+
   literals-and-variables:
     - meta_prepend: true
     - include: variables

diff --git a/SQL/MySQL.sublime-syntax b/SQL/MySQL.sublime-syntax
@@ -1520,6 +1520,7 @@ contexts:
       scope: constant.language.sql
 
   bool-constants:
+    - include: booleans
     - match: \b(?i:yes|no)\b
       scope: constant.language.boolean.sql
 

diff --git a/SQL/SQL (basic).sublime-syntax b/SQL/SQL (basic).sublime-syntax
@@ -1405,11 +1405,15 @@ contexts:
     - include: strings
 
   constants:
-    - match: \b(?i:true|false)\b
-      scope: constant.language.boolean.sql
     - match: \b(?i:null)\b
       scope: constant.language.null.sql
 
+  booleans:
+    - match: \b(?i:true)\b
+      scope: constant.language.boolean.true.sql
+    - match: \b(?i:false)\b
+      scope: constant.language.boolean.false.sql
+
   numbers:
     - match: \b\d+(\.)\d+\b
       scope: meta.number.float.decimal.sql constant.numeric.value.sql

diff --git a/SQL/tests/syntax/syntax_test_cassandra.cql b/SQL/tests/syntax/syntax_test_cassandra.cql
@@ -399,7 +399,7 @@ WITH HEADER=true;
 -- ^ keyword.other
 --   ^^^^^^ string.unquoted
 --         ^ keyword.operator
---          ^^^^ constant.language.boolean
+--          ^^^^ constant.language.boolean.true
 --              ^ punctuation.terminator.statement
 
 TRUNCATE table1;

diff --git a/SQL/tests/syntax/syntax_test_mysql.sql b/SQL/tests/syntax/syntax_test_mysql.sql
@@ -82,9 +82,9 @@
 --      ^ - constant
 --       ^^^^ constant.language.null.sql
 --           ^ - constant
---            ^^^^ constant.language.boolean.sql
+--            ^^^^ constant.language.boolean.true.sql
 --                ^ - constant
---                 ^^^^^ constant.language.boolean.sql
+--                 ^^^^^ constant.language.boolean.false.sql
 --                      ^ - constant
 
     all default maxvalue
@@ -791,14 +791,14 @@ BEGIN
 --  ^^ keyword.control.conditional.sql
 --     ^^^^ variable.other.sql
 --          ^ keyword.operator.comparison.sql
---            ^^^^ constant.language.boolean.sql
+--            ^^^^ constant.language.boolean.true.sql
 --                 ^^^^ keyword.control.conditional.sql
 
     ELSEIF @var = FALSE THEN
 --  ^^^^^^ keyword.control.conditional.sql
 --         ^^^^ variable.other.sql
 --              ^ keyword.operator.comparison.sql
---                ^^^^^ constant.language.boolean.sql
+--                ^^^^^ constant.language.boolean.false.sql
 --                      ^^^^ keyword.control.conditional.sql
 
     ELSE
@@ -821,7 +821,7 @@ BEGIN
 
     WHILE TRUE
 --  ^^^^^ keyword.control.loop.sql
---        ^^^^ constant.language.boolean.sql
+--        ^^^^ constant.language.boolean.true.sql
 
     END WHILE
 --  ^^^^^^^^^ keyword.control.loop.sql
@@ -1275,7 +1275,7 @@ create table IF NOT EXISTS `testing123` (
     `col` bool DEFAULT FALSE,
 --        ^^^^ storage.type.sql
 --             ^^^^^^^ storage.modifier.sql
---                     ^^^^^ constant.language.boolean.sql
+--                     ^^^^^ constant.language.boolean.false.sql
 --                          ^ punctuation.separator.sequence
     `fkey` INT UNSIGNED NULL REFERENCES test2(id),
 --                           ^^^^^^^^^^ storage.modifier.sql
@@ -1315,6 +1315,8 @@ create table fancy_table (
 --             ^^^^^^^ storage.type.sql
     myflag boolean DEFAULT false,
 --         ^^^^^^^ storage.type.sql
+--                 ^^^^^^^ storage.modifier.sql
+--                         ^^^^^ constant.language.boolean.false.sql
     mycount double  precision DEFAULT 1,
 --          ^^^^^^^^^^^^^^^^^ storage.type.sql
     fancy_column character  varying(42) DEFAULT 'nice'::character varying,
@@ -4167,7 +4169,7 @@ INNER JOIN {ON tbl_name LEFT OUTER JOIN other1 other2 ON TRUE}
 --                                      ^^^^^^ meta.table-name.sql
 --                                             ^^^^^^ meta.alias.table.sql
 --                                                    ^^ keyword.control.conditional.sql
---                                                       ^^^^ constant.language.boolean.sql
+--                                                       ^^^^ constant.language.boolean.true.sql
 --                                                           ^ punctuation.section.braces.end.mysql
 
 -- ----------------------------------------------------------------------------