From da08570e9b46e0d29085e185fc76a82b04e0ae6e Mon Sep 17 00:00:00 2001
From: Kevin Newton <kddnewton@gmail.com>
Date: Sat, 4 Feb 2023 16:40:23 -0500
Subject: [PATCH] EmbDoc fixes

---
 lib/syntax_tree/node.rb  | 31 +++++++++++++++++++++++++++++--
 test/fixtures/call.rb    |  5 +++++
 test/fixtures/def.rb     | 16 ++++++++++++++++
 test/fixtures/symbols.rb |  5 +++++
 4 files changed, 55 insertions(+), 2 deletions(-)

diff --git a/lib/syntax_tree/node.rb b/lib/syntax_tree/node.rb
index fc5517cf..55b381c3 100644
--- a/lib/syntax_tree/node.rb
+++ b/lib/syntax_tree/node.rb
@@ -4090,7 +4090,8 @@ def deconstruct_keys(_keys)
     def format(q)
       q.group do
         q.group do
-          q.text("def ")
+          q.text("def")
+          q.text(" ") if target || name.comments.empty?
 
           if target
             q.format(target)
@@ -4872,6 +4873,25 @@ class EmbDoc < Node
     def initialize(value:, location:)
       @value = value
       @location = location
+
+      @leading = false
+      @trailing = false
+    end
+
+    def leading!
+      @leading = true
+    end
+
+    def leading?
+      @leading
+    end
+
+    def trailing!
+      @trailing = true
+    end
+
+    def trailing?
+      @trailing
     end
 
     def inline?
@@ -4908,7 +4928,13 @@ def deconstruct_keys(_keys)
     end
 
     def format(q)
-      q.trim
+      if (q.parent.is_a?(DefNode) && q.parent.endless?) ||
+           q.parent.is_a?(Statements)
+        q.trim
+      else
+        q.breakable_return
+      end
+
       q.text(value)
     end
 
@@ -10465,6 +10491,7 @@ def deconstruct_keys(_keys)
 
     def format(q)
       q.text(":")
+      q.text("\\") if value.comments.any?
       q.format(value)
     end
 
diff --git a/test/fixtures/call.rb b/test/fixtures/call.rb
index c41ee4ac..d35c6036 100644
--- a/test/fixtures/call.rb
+++ b/test/fixtures/call.rb
@@ -60,3 +60,8 @@
 %
 a b do
 end.c d
+%
+self.
+=begin
+=end
+  to_s
diff --git a/test/fixtures/def.rb b/test/fixtures/def.rb
index a827adfe..1441bf04 100644
--- a/test/fixtures/def.rb
+++ b/test/fixtures/def.rb
@@ -23,3 +23,19 @@ def foo() # comment
 def foo( # comment
 )
 end
+%
+def
+=begin
+=end
+a
+end
+%
+def a()
+=begin
+=end
+=1
+-
+def a() =
+=begin
+=end
+  1
diff --git a/test/fixtures/symbols.rb b/test/fixtures/symbols.rb
index 5e2673f3..12f0a22f 100644
--- a/test/fixtures/symbols.rb
+++ b/test/fixtures/symbols.rb
@@ -19,3 +19,8 @@
 %I[foo] # comment
 %
 %I{foo[]}
+%
+:\
+=begin
+=end
+symbol