Rust: fix PathSegment workaround

Author: redsun82

rust/ast-generator/src/main.rs

@@ -155,12 +155,9 @@ fn write_schema(
             .iter()
             .map(|node| enum_src_to_schema_class(node, &super_types)),
     );
-    schema.classes.extend(
-        grammar
-            .nodes
-            .iter()
-            .map(|node| node_src_to_schema_class(node, &super_types)),
-    );
+    schema
+        .classes
+        .extend(get_nodes(grammar).map(|node| node_src_to_schema_class(node, &super_types)));
     let template = mustache_ctx.compile_path("schema")?;
     let res = template.render_to_string(&schema)?;
     Ok(fix_blank_lines(&res))
@@ -295,7 +292,7 @@ fn get_fields(node: &AstNodeSrc) -> Vec<FieldInfo> {
         let name = field.method_name();
         match (node.name.as_str(), name.as_str()) {
             ("ArrayExpr", "expr") // The ArrayExpr type also has an 'exprs' field
-            | ("PathSegment", "ty" | "path_type")  // these are broken, handling them manually
+            | ("PathSegment", "type_anchor")  // we flatten TypeAnchor into PathSegment in the extractor
             | ("Param", "pat") | ("MacroCall", "token_tree") // handled manually to use `body`
             => continue,
             _ => {}
@@ -384,6 +381,11 @@ struct ExtractorInfo {
     nodes: Vec<ExtractorNodeInfo>,
 }
 
+fn get_nodes(grammar: &AstSrc) -> impl Iterator<Item = &AstNodeSrc> {
+    // we flatten TypeAnchor into PathSegment in the extractor
+    grammar.nodes.iter().filter(|n| n.name != "TypeAnchor")
+}
+
 fn enum_to_extractor_info(node: &AstEnumSrc) -> Option<ExtractorEnumInfo> {
     if node.name == "VariantDef" {
         // currently defined but unused
@@ -470,7 +472,7 @@ fn write_extractor(grammar: &AstSrc, mustache_ctx: &mustache::Context) -> mustac
             .iter()
             .filter_map(enum_to_extractor_info)
             .collect(),
-        nodes: grammar.nodes.iter().map(node_to_extractor_info).collect(),
+        nodes: get_nodes(grammar).map(node_to_extractor_info).collect(),
     };
     let template = mustache_ctx.compile_path("extractor")?;
     let res = template.render_to_string(&extractor_info)?;

rust/extractor/src/generated/.generated.list

@@ -667,11 +667,11 @@ impl<'a> Translator<'a> {
     ) {
         // work around a bug in rust-analyzer AST generation machinery
         // this code was inspired by rust-analyzer's own workaround for this:
-        // https://github.com/rust-lang/rust-analyzer/blob/1f86729f29ea50e8491a1516422df4fd3d1277b0/crates/syntax/src/ast/node_ext.rs#L268-L277
-        if item.l_angle_token().is_some() {
+        // https://github.com/rust-lang/rust-analyzer/blob/a642aa8023be11d6bc027fc6a68c71c2f3fc7f72/crates/syntax/src/ast/node_ext.rs#L290-L297
+        if let Some(anchor) = item.type_anchor() {
             // <T> or <T as Trait>
             // T is any TypeRef, Trait has to be a PathType
-            let mut type_refs = item
+            let mut type_refs = anchor
                 .syntax()
                 .children()
                 .filter(|node| ast::Type::can_cast(node.kind()));