src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.processor/src/org/graalvm/compiler/replacements/processor/PluginGenerator.java

rev 52509 : [mq]: graal

@@ -122,16 +122,15 @@
                 out.printf("// GENERATORS: %s, %s\n", ReplacementsAnnotationProcessor.class.getName(), PluginGenerator.class.getName());
                 out.printf("package %s;\n", pkg.getQualifiedName());
                 out.printf("\n");
                 createImports(out, plugins);
                 out.printf("\n");
-                out.printf("public class %s implements NodeIntrinsicPluginFactory {\n", genClassName);
                 for (GeneratedPlugin plugin : plugins) {
-                    out.printf("\n");
                     plugin.generate(processor, out);
-                }
                 out.printf("\n");
+                }
+                out.printf("public class %s implements NodeIntrinsicPluginFactory {\n", genClassName);
                 createPluginFactoryMethod(out, plugins);
                 out.printf("}\n");
             }
         } catch (IOException e) {
             processor.env().getMessager().printMessage(Diagnostic.Kind.ERROR, e.getMessage());

@@ -162,11 +161,11 @@
         }
     }
 
     private static void createPluginFactoryMethod(PrintWriter out, List<GeneratedPlugin> plugins) {
         out.printf("    @Override\n");
-        out.printf("    public void registerPlugins(InvocationPlugins plugins, InjectionProvider injection) {\n");
+        out.printf("    public void registerPlugins(InvocationPlugins plugins, NodeIntrinsicPluginFactory.InjectionProvider injection) {\n");
         for (GeneratedPlugin plugin : plugins) {
             plugin.register(out);
         }
         out.printf("    }\n");
     }