fix: #65 - Fix comment after last object property getting moved around.

Author: dsherret

Cargo.toml

@@ -2,7 +2,7 @@
 name = "dprint-plugin-typescript"
 description = "TypeScript code formatting plugin for dprint."
 keywords = ["formatting", "formatter", "typescript"]
-version = "0.32.3"
+version = "0.32.4"
 authors = ["David Sherret <[email protected]>"]
 edition = "2018"
 license = "MIT"

src/parsing/parser.rs

@@ -5232,7 +5232,7 @@ fn parse_node_with_separator<'a>(value: Option<Node<'a>>, parsed_separator: Prin
         if let Some(element) = element {
             match context.token_finder.get_next_token_if_comma(element) {
                 Some(comma) => Some(comma),
-                None => context.token_finder.get_last_comma_token_within(element), // may occur for type literals
+                None => context.token_finder.get_last_token_within_if_comma(element), // may occur for type literals
             }
         } else {
             None // not a comma separated node

src/parsing/tokens.rs

@@ -76,8 +76,8 @@ impl<'a> TokenFinder<'a> {
         self.get_last_token_within(node, |token| token.token == Token::RBrace)
     }
 
-    pub fn get_last_comma_token_within(&mut self, node: &dyn Ranged) -> Option<&'a TokenAndSpan> {
-        self.get_last_token_within(node, |token| token.token == Token::Comma)
+    pub fn get_last_token_within_if_comma(&mut self, node: &dyn Ranged) -> Option<&'a TokenAndSpan> {
+        self.get_last_token_within_if(node, |token| token.token == Token::Comma)
     }
 
     pub fn get_first_open_bracket_token_within(&mut self, node: &dyn Ranged) -> Option<&'a TokenAndSpan> {
@@ -193,6 +193,13 @@ impl<'a> TokenFinder<'a> {
         let node_span_data = node.span_data();
         self.inner.get_last_token_within(node_span_data.lo, node_span_data.hi, is_match)
     }
+
+    #[inline]
+    fn get_last_token_within_if(&mut self, node: &dyn Ranged, is_match: impl Fn(&'a TokenAndSpan) -> bool) -> Option<&'a TokenAndSpan> {
+        let node_span_data = node.span_data();
+        let last_token = self.inner.get_last_token_within(node_span_data.lo, node_span_data.hi, |_| true);
+        last_token.filter(|token| is_match(&token))
+    }
 }
 
 fn get_text<'a>(file_bytes: &'a [u8], span_data: &Span) -> &'a str {

tests/specs/issues/issue0065.txt

@@ -0,0 +1,11 @@
+== should not move comment ==
+this.test.push({
+    name: test,
+    count: 5, // update 5 times
+});
+
+[expect]
+this.test.push({
+    name: test,
+    count: 5, // update 5 times
+});