Merged changes for creating a single plugin for both AS and IDEA.