Well I must admit that the guy has a point. If it was a proper ending, it would be like ESB when they set on something (she would not meet Luke in this film), or we should at least have some (small) conclusion from the scene in terms of dialogue. The way it is now is really bad, especially it makes it awkward for the sequel.
Is she not “set” on giving him the saber? Did you want her to explicitly state “I am going to give you this saber back.” and Luke reply “Well, gee, thanks! I’ve been missing that for a while. Glad that’s concluded.” Would that dialogue count for you?