You are correct that we currently only support the first option.
You can add these suggestions to the <a href="http://htmldb.oracle.com/pls/otn/f?p=42626:46:4116974063009082::NO:::">Feature Requests</a> at the <a href="http://htmldb.oracle.com/pls/otn/f?p=42626:16:4116974063009082">SQL Developer Exchange</a>. This not only makes sure we don't forget, but also gives other users a chance to add their vote for the feature and provides a forum for you (the user base) to brainstorm on how you prefer it to work.
Thank you for confirming, Joyce. I will add these to the Feature Request. Since I also use another tool for Oracle database development, I just thought I had been overlooking the feature in SQL Developer. I'm a bit surprised that these features hadn't been requested before or at least implemented, since they have been missing since I started using the product as of v3.0.