refactor: ast node range doesn't include trivia

Author: tchupp

Cargo.lock

@@ -12,6 +12,7 @@ alloy_workspace = { path = "../workspace" }
 salsa = { workspace = true }
 ordered-float = { workspace = true }
 text-size = { workspace = true }
+rowan = { workspace = true }
 
 [dev-dependencies]
 alloy_test_harness = {path = "../test_harness"}

compiler/ast/Cargo.toml

@@ -19,6 +19,10 @@ macro_rules! ast_token {
             fn syntax(&self) -> SyntaxElement {
                 self.0.clone().into()
             }
+
+            fn range(&self) -> TextRange {
+                self.syntax().text_range()
+            }
         }
 
         impl fmt::Debug for $kind {
@@ -49,6 +53,30 @@ macro_rules! ast_node {
             fn syntax(&self) -> SyntaxElement {
                 self.0.clone().into()
             }
+
+            fn range(&self) -> TextRange {
+                let total_range = self.syntax().text_range();
+
+                self.0
+                    .preorder_with_tokens()
+                    .filter_map(|event| match event {
+                        rowan::WalkEvent::Enter(element) => {
+                            match element {
+                                SyntaxElement::Node(_) => None, // Skip nodes in this pass
+                                SyntaxElement::Token(t) => Some(t),
+                            }
+                        },
+                        _ => None,
+                    })
+                    .filter_map(|token| {
+                        if !token.kind().is_trivia() {
+                            return Some(token.text_range());
+                        }
+                        None
+                    })
+                    .reduce(|acc, range| acc.cover(range))
+                    .unwrap_or(total_range)
+            }
         }
 
         impl fmt::Debug for $kind {
@@ -82,6 +110,12 @@ macro_rules! ast_union_node {
 					$( Self::$kind(s) => s.syntax(), )+
 				}
 			}
+
+            fn range(&self) -> TextRange {
+				match self {
+					$( Self::$kind(kind) => kind.range(), )+
+				}
+            }
 		}
 	};
 
@@ -107,6 +141,13 @@ macro_rules! ast_union_node {
 					$( Self::$kind(s) => s.syntax(), )+
 				}
 			}
+
+            fn range(&self) -> TextRange {
+				match self {
+                       Self::$else(kind) => kind.range(),
+					$( Self::$kind(kind) => kind.range(), )+
+				}
+            }
 		}
 	};
 }
@@ -165,9 +206,7 @@ pub trait AstElement: Sized {
         }
     }
 
-    fn range(&self) -> TextRange {
-        self.syntax().text_range()
-    }
+    fn range(&self) -> TextRange;
 }
 
 #[derive(Debug)]

compiler/ast/src/ast.rs

@@ -63,6 +63,10 @@ impl AstElement for BinaryOp {
     fn syntax(&self) -> SyntaxElement {
         self.0.clone().into()
     }
+
+    fn range(&self) -> TextRange {
+        self.syntax().text_range()
+    }
 }
 
 ast_node!(VariableRef, fields: [name]);

compiler/ast/src/ast/expression.rs

@@ -1,8 +1,8 @@
 import std::{functor, debug}
 
 trait TestTrait1 where
-    self = functor::Functor
-    self = debug::Debug
+    self = functor::Functor -- first
+    self = debug::Debug     -- second
 end
 ===
 HirModule {
@@ -44,7 +44,7 @@ HirModule {
                 members: [],
             },
             "name": "TestTrait1",
-            "range": 30..108,
+            "range": 30..131,
             "scope_id": Idx::<Scope>(0),
         },
     },
@@ -94,11 +94,11 @@ HirModule {
             kind: MultipleSelfTypeVariablesInTraitDefinition {
                 trait_name: "TestTrait1",
                 ranges: [
-                    57..85,
-                    85..105,
+                    57..94,
+                    94..128,
                 ],
             },
-            range: 30..108,
+            range: 30..131,
         },
     ],
 }

compiler/hir/hir_def/src/tests/repl_line_lowering_errors/trait__error_multiple_self_typevars.test

@@ -0,0 +1,58 @@
+import std::{functor, debug}
+
+trait TestTrait1 where
+    self = functor::Functor -- first
+    self = debug::Debug     -- second
+end
+===
+SourceFile@0..131
+  ImportDef@0..30
+    ImportKw@0..6 "import"
+    Whitespace@6..7 " "
+    ImportDefSegment@7..10
+      Ident@7..10 "std"
+    DoubleColon@10..12 "::"
+    ImportDefGroup@12..30
+      LBrace@12..13 "{"
+      ImportDefSegment@13..20
+        Ident@13..20 "functor"
+      Comma@20..21 ","
+      Whitespace@21..22 " "
+      ImportDefSegment@22..27
+        Ident@22..27 "debug"
+      RBrace@27..28 "}"
+      Whitespace@28..30 "\n\n"
+  TraitDef@30..131
+    TraitKw@30..35 "trait"
+    Whitespace@35..36 " "
+    Ident@36..46 "TestTrait1"
+    Whitespace@46..47 " "
+    WhereKw@47..52 "where"
+    Whitespace@52..57 "\n    "
+    SelfTypeVariable@57..94
+      SelfKw@57..61 "self"
+      Whitespace@61..62 " "
+      Equals@62..63 "="
+      Whitespace@63..64 " "
+      TypeVariableTraitConstraint@64..94
+        Path@64..94
+          Ident@64..71 "functor"
+          DoubleColon@71..73 "::"
+          Ident@73..80 "Functor"
+          Whitespace@80..81 " "
+          Comment@81..89 "-- first"
+          Whitespace@89..94 "\n    "
+    SelfTypeVariable@94..128
+      SelfKw@94..98 "self"
+      Whitespace@98..99 " "
+      Equals@99..100 "="
+      Whitespace@100..101 " "
+      TypeVariableTraitConstraint@101..128
+        Path@101..128
+          Ident@101..106 "debug"
+          DoubleColon@106..108 "::"
+          Ident@108..113 "Debug"
+          Whitespace@113..118 "     "
+          Comment@118..127 "-- second"
+          Whitespace@127..128 "\n"
+    EndKw@128..131 "end"