Merge branch 'refactor/comments-infrastructure' into feat/assert-comm…

…ents-formatting

.cargo/config.toml

@@ -27,6 +27,7 @@ bench_analyzer = "run -p xtask_bench --release -- --feature analyzer"
 coverage = "run -p xtask_coverage --profile=release-with-debug --"
 rome-cli = "run -p rome_cli --release --"
 rome-cli-dev = "run -p rome_cli --"
+contributors = "run -p xtask_contributors --"
 
 [profile.release]
 lto = true

Cargo.toml

@@ -9,6 +9,7 @@ members = [
 	"xtask/coverage",
 	"xtask/lintdoc",
 	"xtask/libs_bench",
+	"xtask/contributors",
 ]
 
 [profile.release-with-debug]

crates/rome_formatter/Cargo.toml

@@ -20,6 +20,7 @@ countme = "3.0.1"
 [dev-dependencies]
 rome_js_parser = { path = "../rome_js_parser"}
 rome_js_syntax = { path = "../rome_js_syntax" }
+rome_diagnostics = { path = "../rome_diagnostics" }
 
 [features]
 serde = ["dep:serde", "schemars", "rome_rowan/serde"]

crates/rome_formatter/src/comments.rs

@@ -251,7 +251,7 @@ pub struct DecoratedComment<L: Language> {
     enclosing: SyntaxNode<L>,
     preceding: Option<SyntaxNode<L>>,
     following: Option<SyntaxNode<L>>,
-    following_token: SyntaxToken<L>,
+    following_token: Option<SyntaxToken<L>>,
     text_position: CommentTextPosition,
     lines_before: u32,
     lines_after: u32,
@@ -379,7 +379,7 @@ impl<L: Language> DecoratedComment<L> {
         self.following.take()
     }
 
-    /// The number of lines between this comment and the **previous** token or comment.
+    /// The number of line breaks between this comment and the **previous** token or comment.
     ///
     /// # Examples
     ///
@@ -448,8 +448,8 @@ impl<L: Language> DecoratedComment<L> {
     /// ```
     ///
     /// The `following_token` for both comments is `b` because it's the token coming after the comments.
-    pub fn following_token(&self) -> &SyntaxToken<L> {
-        &self.following_token
+    pub fn following_token(&self) -> Option<&SyntaxToken<L>> {
+        self.following_token.as_ref()
     }
 }