Issues with how Make Case and Make With commands insert code

[jmanuel1]

When I do a make-case, the next clause of the function definition can end up on the same line as the new case block. For example:

step (Pair x y) = ?v_1
step (First x) = ?v_2

Turns into this:

step (Pair x y) = case _ of
                       case_val => ?v_1step (First x) = ?v_2

When I try make-with instead, the new code is inserted in the wrong place, depending on where my cursor was. For example, if I have my cursor between the ? and v_1, I get:

step (First x) = ?vstep (Pair x y) with (_)
  step (Pair x y) | with_pat = ?v_1_rhs_2

If I move my cursor to the beginning of the line, I get a better result, but I still miss the newline between the definition clauses:

step (Pair x y) with (_)
  step (Pair x y) | with_pat = ?step_rhsstep (First x) = ?v_2