This should be solved in Webstorm (to be released this month). We are planning a minor release with this enhancement in Eclipse also. The team is working on it right now