Tree-sitter extractor: extract shared dbscheme fragments into 'prefix.dbscheme'

Author: aibaars

config/dbscheme-fragments.json

@@ -1,15 +1,26 @@
 {
   "files": [
     "javascript/ql/lib/semmlecode.javascript.dbscheme",
+    "ruby/ql/lib/ruby.dbscheme",
+    "ql/ql/src/ql.dbscheme"
   ],
   "fragments": [
     "/*- External data -*/",
     "/*- Files and folders -*/",
+    "/*- Diagnostic messages -*/",
+    "/*- Diagnostic messages: severity -*/",
     "/*- Source location prefix -*/",
     "/*- Lines of code -*/",
     "/*- Configuration files with key value pairs -*/",
     "/*- YAML -*/",
     "/*- XML Files -*/",
-    "/*- JavaScript-specific part -*/"
+    "/*- JavaScript-specific part -*/",
+    "/*- Ruby dbscheme -*/",
+    "/*- Erb dbscheme -*/",
+    "/*- QL dbscheme -*/",
+    "/*- Dbscheme dbscheme -*/",
+    "/*- Yaml dbscheme -*/",
+    "/*- Blame dbscheme -*/",
+    "/*- JSON dbscheme -*/"
   ]
 }

ql/ql/src/codeql/Locations.qll

@@ -8,7 +8,7 @@ import files.FileSystem
  *
  * For more information about locations see [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
  */
-class Location extends @location {
+class Location extends @location_default {
   /** Gets the file for this location. */
   File getFile() { locations_default(this, result, _, _, _, _) }
 

ql/ql/src/ql.dbscheme

@@ -1,15 +1,22 @@
 // CodeQL database schema for QL
 // Automatically generated from the tree-sitter grammar; do not edit
 
-@location = @location_default
-
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
 locations_default(
   unique int id: @location_default,
   int file: @file ref,
-  int start_line: int ref,
-  int start_column: int ref,
-  int end_line: int ref,
-  int end_column: int ref
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
 );
 
 files(
@@ -29,9 +36,14 @@ containerparent(
   unique int child: @container ref
 );
 
-sourceLocationPrefix(
-  string prefix: string ref
-);
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Diagnostic messages -*/
 
 diagnostics(
   unique int id: @diagnostic,
@@ -42,14 +54,15 @@ diagnostics(
   int location: @location_default ref
 );
 
+/*- Diagnostic messages: severity -*/
+
 case @diagnostic.severity of
   10 = @diagnostic_debug
 | 20 = @diagnostic_info
 | 30 = @diagnostic_warning
 | 40 = @diagnostic_error
 ;
-
-
+/*- QL dbscheme -*/
 @ql_add_expr_left_type = @ql_add_expr | @ql_aggregate | @ql_call_or_unqual_agg_expr | @ql_comp_term | @ql_conjunction | @ql_disjunction | @ql_expr_annotation | @ql_if_term | @ql_implication | @ql_in_expr | @ql_instance_of | @ql_literal | @ql_mul_expr | @ql_negation | @ql_par_expr | @ql_prefix_cast | @ql_qualified_expr | @ql_quantified | @ql_range | @ql_set_literal | @ql_special_call | @ql_super_ref | @ql_unary_expr | @ql_variable
 
 @ql_add_expr_right_type = @ql_add_expr | @ql_aggregate | @ql_call_or_unqual_agg_expr | @ql_comp_term | @ql_conjunction | @ql_disjunction | @ql_expr_annotation | @ql_if_term | @ql_implication | @ql_in_expr | @ql_instance_of | @ql_literal | @ql_mul_expr | @ql_negation | @ql_par_expr | @ql_prefix_cast | @ql_qualified_expr | @ql_quantified | @ql_range | @ql_set_literal | @ql_special_call | @ql_super_ref | @ql_unary_expr | @ql_variable
@@ -926,9 +939,10 @@ ql_ast_node_info(
   unique int node: @ql_ast_node ref,
   int parent: @ql_ast_node_parent ref,
   int parent_index: int ref,
-  int loc: @location ref
+  int loc: @location_default ref
 );
 
+/*- Dbscheme dbscheme -*/
 dbscheme_annotation_args_annotation(
   unique int dbscheme_annotation: @dbscheme_annotation ref,
   unique int args_annotation: @dbscheme_args_annotation ref
@@ -1112,9 +1126,10 @@ dbscheme_ast_node_info(
   unique int node: @dbscheme_ast_node ref,
   int parent: @dbscheme_ast_node_parent ref,
   int parent_index: int ref,
-  int loc: @location ref
+  int loc: @location_default ref
 );
 
+/*- Yaml dbscheme -*/
 yaml_comment_def(
   unique int id: @yaml_comment,
   int child: @yaml_token_value ref
@@ -1184,9 +1199,10 @@ yaml_ast_node_info(
   unique int node: @yaml_ast_node ref,
   int parent: @yaml_ast_node_parent ref,
   int parent_index: int ref,
-  int loc: @location ref
+  int loc: @location_default ref
 );
 
+/*- Blame dbscheme -*/
 #keyset[blame_blame_entry, index]
 blame_blame_entry_line(
   int blame_blame_entry: @blame_blame_entry ref,
@@ -1246,9 +1262,10 @@ blame_ast_node_info(
   unique int node: @blame_ast_node ref,
   int parent: @blame_ast_node_parent ref,
   int parent_index: int ref,
-  int loc: @location ref
+  int loc: @location_default ref
 );
 
+/*- JSON dbscheme -*/
 #keyset[json_array, index]
 json_array_child(
   int json_array: @json_array ref,
@@ -1327,6 +1344,6 @@ json_ast_node_info(
   unique int node: @json_ast_node ref,
   int parent: @json_ast_node_parent ref,
   int parent_index: int ref,
-  int loc: @location ref
+  int loc: @location_default ref
 );