Tree-sitter: Emit empty_location relation to avoid scan

github · May 27, 2024 · 82bbef2 · 82bbef2
1 parent e1a959c
commit 82bbef2
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 2 deletions.
diff --git a/ql/ql/src/ql.dbscheme b/ql/ql/src/ql.dbscheme
@@ -19,6 +19,10 @@ locations_default(
   int endColumn: int ref
 );
 
+empty_location(
+  int location: @location_default ref
+);
+
 files(
   unique int id: @file,
   string name: string ref

diff --git a/ruby/ql/lib/codeql/Locations.qll b/ruby/ql/lib/codeql/Locations.qll
@@ -64,5 +64,5 @@ class Location extends @location_default {
 
 /** An entity representing an empty location. */
 class EmptyLocation extends Location {
-  EmptyLocation() { this.hasLocationInfo("", 0, 0, 0, 0) }
+  EmptyLocation() { empty_location(this) }
 }
diff --git a/ruby/ql/lib/ruby.dbscheme b/ruby/ql/lib/ruby.dbscheme
@@ -19,6 +19,10 @@ locations_default(
   int endColumn: int ref
 );
 
+empty_location(
+  int location: @location_default ref
+);
+
 files(
   unique int id: @file,
   string name: string ref

diff --git a/shared/tree-sitter-extractor/src/extractor/mod.rs b/shared/tree-sitter-extractor/src/extractor/mod.rs
@@ -75,7 +75,7 @@ fn populate_empty_file(writer: &mut trap::Writer) -> trap::Label {
 
 pub fn populate_empty_location(writer: &mut trap::Writer) {
     let file_label = populate_empty_file(writer);
-    global_location(
+    let loc_label = global_location(
         writer,
         file_label,
         trap::Location {
@@ -85,6 +85,7 @@ pub fn populate_empty_location(writer: &mut trap::Writer) {
             end_column: 0,
         },
     );
+    writer.add_tuple("empty_location", vec![trap::Arg::Label(loc_label)]);
 }
 
 pub fn populate_parent_folders(

diff --git a/shared/tree-sitter-extractor/src/generator/prefix.dbscheme b/shared/tree-sitter-extractor/src/generator/prefix.dbscheme
@@ -16,6 +16,10 @@ locations_default(
   int endColumn: int ref
 );
 
+empty_location(
+  int location: @location_default ref
+);
+
 files(
   unique int id: @file,
   string name: string ref