Merge pull request #179 from DerekStride/ds/remove-unused-keyword

fix: removed unused keyword

.github/workflows/ci.yml

@@ -21,6 +21,7 @@ jobs:
           node-version: 18
       - run: npm install
       - run: npm test
+      - run: scripts/test-keywords.sh
   validate_tests:
     runs-on: ["ubuntu-latest"]
     strategy:

grammar.js

@@ -976,7 +976,7 @@ module.exports = grammar({
     ),
 
     function_language: $ => seq(
-      make_keyword('language'),
+      $.keyword_language,
       choice(
         $.keyword_sql,
         $.keyword_plpgsql,

queries/highlights.scm

@@ -9,7 +9,6 @@
   (keyword_spgist)
   (keyword_gin)
   (keyword_brin)
-  (keyword_float)
   (keyword_array)
 ] @function.call
 
@@ -68,6 +67,13 @@
  (keyword_following)
  (keyword_first)
  (keyword_current_timestamp)
+ (keyword_immutable)
+ (keyword_atomic)
+ (keyword_parallel)
+ (keyword_leakproof)
+ (keyword_safe)
+ (keyword_cost)
+ (keyword_strict)
 ] @attribute
 
 [
@@ -85,6 +91,7 @@
  (keyword_avro)
  (keyword_jsonfile)
  (keyword_sequencefile)
+ (keyword_volatile)
 ] @storageclass
 
 [
@@ -191,21 +198,44 @@
   (keyword_sort)
   (keyword_compute)
   (keyword_comment)
-  (keyword_partitioned)
   (keyword_location)
   (keyword_cached)
   (keyword_uncached)
   (keyword_lines)
   (keyword_stored)
-  (keyword_location)
   (keyword_partitioned)
-  (keyword_cached)
   (keyword_analyze)
   (keyword_rewrite)
-  (keyword_statistics)
   (keyword_optimize)
   (keyword_vacuum)
   (keyword_cache)
+  (keyword_language)
+  (keyword_sql)
+  (keyword_called)
+  (keyword_conflict)
+  (keyword_declare)
+  (keyword_filter)
+  (keyword_function)
+  (keyword_input)
+  (keyword_name)
+  (keyword_oid)
+  (keyword_options)
+  (keyword_plpgsql)
+  (keyword_precision)
+  (keyword_regclass)
+  (keyword_regnamespace)
+  (keyword_regproc)
+  (keyword_regtype)
+  (keyword_restricted)
+  (keyword_return)
+  (keyword_returns)
+  (keyword_separator)
+  (keyword_setof)
+  (keyword_stable)
+  (keyword_support)
+  (keyword_tblproperties)
+  (keyword_trigger)
+  (keyword_unsafe)
 ] @keyword
 
 [
@@ -244,10 +274,12 @@
   (keyword_serial)
   (keyword_bigserial)
   (keyword_smallint)
+  (keyword_mediumint)
   (keyword_bigint)
   (keyword_tinyint)
   (keyword_decimal)
   (keyword_float)
+  (keyword_double)
   (keyword_numeric)
   (keyword_real)
   (double)
@@ -291,6 +323,7 @@
   "/"
   "%"
   "^"
+  ":="
   "="
   "<"
   "<="

scripts/test-keywords.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+mkdir -p tmp/tree-sitter-sql/
+
+cat src/grammar.json |
+  jq '.rules | to_entries[] | select(.key | contains("keyword")) | .key' |
+  tr -d '"' |
+  sort > tmp/tree-sitter-sql/keywords.txt
+
+cat queries/highlights.scm |
+  grep -o "keyword\w\+" |
+  sort > tmp/tree-sitter-sql/highlights.txt
+
+keywords=$(comm -3 tmp/tree-sitter-sql/keywords.txt tmp/tree-sitter-sql/highlights.txt)
+
+if [[ "$keywords" ]]; then
+  echo "ERROR: keywords in grammar.json are not in sync with queries/highlights.scm"
+  echo $keywords
+  exit 1
+fi

test/corpus/functions.txt

@@ -483,6 +483,7 @@ return 1;
       (int
         (keyword_int))
       (function_language
+        (keyword_language)
         (keyword_sql))
       (function_body
         (keyword_return)
@@ -521,6 +522,7 @@ return 1;
       (int
         (keyword_int))
       (function_language
+        (keyword_language)
         (keyword_sql))
       (function_body
         (keyword_return)
@@ -557,6 +559,7 @@ return 1;
       (int
         (keyword_int))
       (function_language
+        (keyword_language)
         (keyword_sql))
       (function_volatility
         (keyword_immutable))
@@ -616,6 +619,7 @@ create or replace function public.fn()
                 value: (literal)))))
         (dollar_quote))
       (function_language
+        (keyword_language)
         (keyword_sql))
       (function_volatility
         (keyword_volatile))
@@ -661,6 +665,7 @@ as 'select 1;';
       (int
         (keyword_int))
       (function_language
+        (keyword_language)
         (keyword_sql))
       (function_body
         (keyword_as)
@@ -691,6 +696,7 @@ as 'create table x (id int) row_format=dynamic';
       (int
         (keyword_int))
       (function_language
+        (keyword_language)
         (keyword_sql))
       (function_body
         (keyword_as)
@@ -723,6 +729,7 @@ end;
       (int
         (keyword_int))
       (function_language
+        (keyword_language)
         (keyword_sql))
       (function_body
         (keyword_begin)
@@ -760,6 +767,7 @@ $function$;
       (int
         (keyword_int))
       (function_language
+        (keyword_language)
         (keyword_plpgsql))
       (function_body
         (keyword_as)
@@ -803,6 +811,7 @@ $function$;
       (int
         (keyword_int))
       (function_language
+        (keyword_language)
         (keyword_plpgsql))
       (function_body
         (keyword_as)
@@ -883,6 +892,7 @@ $function$
       (keyword_returns)
       (keyword_trigger)
       (function_language
+        (keyword_language)
         (keyword_plpgsql))
       (function_body
         (keyword_as)