Merge branch 'master' into dany/groovy-resolve
authorpeter <peter@jetbrains.com>
Tue, 2 Feb 2016 12:43:34 +0000 (13:43 +0100)
committerpeter <peter@jetbrains.com>
Tue, 2 Feb 2016 12:43:34 +0000 (13:43 +0100)
Conflicts:
plugins/groovy/src/META-INF/plugin.xml

1  2 
plugins/groovy/src/META-INF/plugin.xml

index d66707b2254df15f8cb6fae13dba4b6eb3146fca,6051655dedf639884ac25da2af055d2dba133b06..e9a7ce044577ec6b0c314f05b52593a5e15e2043
      <convertToJava.customMethodInvocator
          implementation="org.jetbrains.plugins.groovy.refactoring.convertToJava.invocators.MapGetterSetterInvocator"/>
      <customAnnotationChecker implementation="org.jetbrains.plugins.groovy.annotator.checkers.TypeCheckedAnnotationChecker"/>
+     <mvc.runCommandHandler implementation="org.jetbrains.plugins.groovy.mvc.actions.DefaultMvcRunCommandActionHandler" order="last"/>
 +    <methodComparator implementation="org.jetbrains.plugins.groovy.lang.resolve.GrDefaultMethodComparator" order="last"/>
    </extensions>
  
    <extensions defaultExtensionNs="com.intellij.properties">