[prism] Fix extra newline after require kwarg (#765)

* Fixtures

* Emit method names as their own token type

* Add require assignment

Author: reese

fixtures/small/other_requires_actual.rb

@@ -0,0 +1,21 @@
+ThingToCall.call(
+  require: "not a regular require",
+  other: "value"
+)
+
+require = bees!
+foo(require: bar)
+
+{
+  :require => foo,
+  :other => 1
+}
+
+"require#{foo}"
+
+x = {require: 1, other: 2}
+y = {require:, other:}
+
+def thing(require:)
+  require
+end

fixtures/small/other_requires_expected.rb

@@ -0,0 +1,21 @@
+ThingToCall.call(
+  require: "not a regular require",
+  other: "value"
+)
+
+require = bees!
+foo(require: bar)
+
+{
+  :require => foo,
+  :other => 1
+}
+
+"require#{foo}"
+
+x = {require: 1, other: 2}
+y = {require:, other:}
+
+def thing(require:)
+  require
+end

librubyfmt/src/format.rs

@@ -834,6 +834,19 @@ pub fn format_ident(ps: &mut ParserState, ident: Ident) {
     }
 }
 
+pub fn format_method_ident(ps: &mut ParserState, ident: Ident) {
+    if ps.at_start_of_line() {
+        ps.emit_indent();
+    }
+
+    ps.on_line(ident.2.0);
+    ps.emit_method_name(ident.1);
+
+    if ps.at_start_of_line() {
+        ps.emit_newline();
+    }
+}
+
 pub fn format_const(ps: &mut ParserState, c: Const) {
     if ps.at_start_of_line() {
         ps.emit_indent();
@@ -2496,7 +2509,7 @@ fn format_call_chain_elements(
                 if ident.1 == ".()" {
                     ps.emit_ident(".");
                 } else {
-                    format_ident(ps, ident);
+                    format_method_ident(ps, ident);
                 }
                 ps.shift_comments();
             }

librubyfmt/src/format_prism.rs

@@ -1747,11 +1747,8 @@ fn format_call_node<'src>(
             } else {
                 method_name
             };
-            handle_string_at_offset(
-                ps,
-                method_ident,
-                start_loc_for_call_node_in_chain(&call_node),
-            );
+            ps.at_offset(start_loc_for_call_node_in_chain(&call_node));
+            ps.emit_method_name(method_ident);
         }
 
         // Calls with only empty parens (`foo ()`) are treated as calls without args

librubyfmt/src/intermediary.rs

@@ -130,8 +130,8 @@ impl<'src> Intermediary<'src> {
                     prev.set_gets_indented()
                 }
             }
-            ConcreteLineToken::DirectPart { part } => {
-                if part == "require" && self.tokens.last().map(|t| t.is_indent()).unwrap_or(false) {
+            ConcreteLineToken::MethodName { name } => {
+                if name == "require" && self.tokens.last().map(|t| t.is_indent()).unwrap_or(false) {
                     self.current_line_metadata.set_has_require();
                 }
             }

librubyfmt/src/line_tokens.rs

@@ -38,6 +38,7 @@ pub enum ConcreteLineToken<'src> {
     ModKeyword { contents: &'static str },
     ConditionalKeyword { contents: &'static str },
     DirectPart { part: Cow<'src, str> },
+    MethodName { name: Cow<'src, str> },
     CommaSpace,
     Comma,
     Space,
@@ -81,6 +82,7 @@ impl<'src> ConcreteLineToken<'src> {
             Self::DefKeyword => Cow::Borrowed("def"),
             Self::ModuleKeyword => Cow::Borrowed("module"),
             Self::DirectPart { part } => part,
+            Self::MethodName { name } => name,
             Self::CommaSpace => Cow::Borrowed(", "),
             Self::Comma => Cow::Borrowed(","),
             Self::Space => Cow::Borrowed(" "),
@@ -126,7 +128,9 @@ impl<'src> ConcreteLineToken<'src> {
             Keyword { keyword: contents }
             | ModKeyword { contents }
             | ConditionalKeyword { contents } => contents.len(),
-            Op { op: contents } | DirectPart { part: contents } => contents.len(),
+            Op { op: contents } | DirectPart { part: contents } | MethodName { name: contents } => {
+                contents.len()
+            }
             LTStringContent { content: contents }
             | Comment { contents }
             | HeredocClose { symbol: contents } => contents.len(),

librubyfmt/src/parser_state.rs

@@ -455,6 +455,10 @@ impl<'src> ParserState<'src> {
         self.push_concrete_token(ConcreteLineToken::DirectPart { part: ident.into() });
     }
 
+    pub(crate) fn emit_method_name(&mut self, name: impl Into<Cow<'src, str>>) {
+        self.push_concrete_token(ConcreteLineToken::MethodName { name: name.into() });
+    }
+
     pub(crate) fn emit_newline(&mut self) {
         self.shift_comments();
         self.push_concrete_token(ConcreteLineToken::HardNewLine);