Merge pull request #22693 from asgerf/unified/supertype-fields-clean

Unified: Declare exposed fields on supertypes (v2)

Author: asgerf

shared/tree-sitter-extractor/src/extractor/mod.rs

@@ -908,7 +908,8 @@ impl<'a> Visitor<'a> {
                 if tp == single_type {
                     return true;
                 }
-                if let EntryKind::Union { members } = &self.schema.get(single_type).unwrap().kind
+                if let EntryKind::Union { members, .. } =
+                    &self.schema.get(single_type).unwrap().kind
                     && self.type_matches_set(tp, members)
                 {
                     return true;
@@ -930,7 +931,7 @@ impl<'a> Visitor<'a> {
             return true;
         }
         for other in types.iter() {
-            if let EntryKind::Union { members } = &self.schema.get(other).unwrap().kind
+            if let EntryKind::Union { members, .. } = &self.schema.get(other).unwrap().kind
                 && self.type_matches_set(tp, members)
             {
                 return true;

shared/tree-sitter-extractor/src/generator/mod.rs

@@ -399,7 +399,9 @@ fn convert_nodes(
         .collect();
     for node in nodes.values() {
         match &node.kind {
-            node_types::EntryKind::Union { members: n_members } => {
+            node_types::EntryKind::Union {
+                members: n_members, ..
+            } => {
                 // It's a tree-sitter supertype node, for which we create a union
                 // type.
                 let members: Set<&str> = n_members

shared/tree-sitter-extractor/src/generator/ql.rs

@@ -109,7 +109,7 @@ impl fmt::Display for Class<'_> {
                     is_final: false,
                     return_type: None,
                     formal_parameters: vec![],
-                    body: Some(charpred.clone()),
+                    body: charpred.clone(),
                     overlay: None,
                 }
             )?;
@@ -307,9 +307,7 @@ pub struct Predicate<'a> {
     pub is_final: bool,
     pub return_type: Option<Type<'a>>,
     pub formal_parameters: Vec<FormalParameter<'a>>,
-    /// The body of the predicate, or `None` if this is an `abstract`
-    /// predicate declaration with no body.
-    pub body: Option<Expression<'a>>,
+    pub body: Expression<'a>,
     pub overlay: Option<OverlayAnnotation>,
 }
 
@@ -332,9 +330,6 @@ impl fmt::Display for Predicate<'_> {
         if self.is_final {
             write!(f, "final ")?;
         }
-        if self.body.is_none() {
-            write!(f, "abstract ")?;
-        }
         if self.overridden {
             write!(f, "override ")?;
         }
@@ -349,10 +344,7 @@ impl fmt::Display for Predicate<'_> {
             }
             write!(f, "{param}")?;
         }
-        match &self.body {
-            Some(body) => write!(f, ") {{ {body} }}")?,
-            None => write!(f, ");")?,
-        }
+        write!(f, ") {{ {} }}", self.body)?;
 
         Ok(())
     }