Support multiple insertions at the same line

Author: jkschneider

README.md

@@ -36,7 +36,7 @@ It assists a centralized build tools team in gently introducing and maintaining
 To apply this plugin:
 
     plugins {
-      id 'nebula.lint' version '0.4.0'
+      id 'nebula.lint' version '0.10.0'
     }
 
 Alternatively:

src/main/groovy/com/netflix/nebula/lint/analyzer/CorrectableStringSource.groovy

@@ -9,7 +9,7 @@ class CorrectableStringSource extends AbstractSourceCode {
 
     Map<ASTNode, String> replacements = [:]
     List<ASTNode> deletions = []
-    Map<ASTNode, String> additions = [:]
+    Map<ASTNode, List<String>> additions = [:].withDefault {[]}
 
     CorrectableStringSource(String source) {
         assert source != null
@@ -25,19 +25,22 @@ class CorrectableStringSource extends AbstractSourceCode {
 
             def replacement = replacements.find { it.key.lineNumber-1 == i }
             def deletion = deletions.find { it.lineNumber-1 == i }
-            def addition = additions.find { it.key.lineNumber-1 == i }
+            def additions = additions.find { it.key.lineNumber-1 == i }
 
             if(replacement) {
+                // FIXME multiple replacements on the same line
                 corrections.append(doReplacement(replacement.key, replacement.value))
-                i += replacement.key.lastLineNumber-replacement.key.lineNumber
+                i += replacement.key.lastLineNumber - replacement.key.lineNumber
             } else if(deletion) {
                 i += deletion.lastLineNumber-deletion.lineNumber
             } else {
                 corrections.append(lines[i])
             }
 
-            if(addition) {
-                corrections.append(addition.value)
+            if(additions) {
+                additions.value.each {
+                    corrections.append(it)
+                }
             }
         }
         corrections.toString()
@@ -65,7 +68,7 @@ class CorrectableStringSource extends AbstractSourceCode {
     }
 
     void add(ASTNode node, String addition) {
-        this.additions[node] = addition
+        this.additions[node] += addition
     }
 
     @Override

src/test/groovy/com/netflix/nebula/lint/rule/GradleLintRuleSpec.groovy

@@ -86,7 +86,7 @@ class GradleLintRuleSpec extends AbstractRuleSpec {
         correct(rule) == ''
     }
 
-    def 'add violation with insertion'() {
+    def 'add violation with multiple insertions'() {
         when:
         project.buildFile << """
             apply plugin: 'java'
@@ -106,6 +106,7 @@ class GradleLintRuleSpec extends AbstractRuleSpec {
             void visitGradleDependency(MethodCallExpression call, String conf, GradleDependency dep) {
                 if(bookmark('lastApplyPlugin')) {
                     addViolationInsert(call, 'should generate source jar', "\napply plugin: 'nebula.source-jar'", bookmark('lastApplyPlugin'))
+                    addViolationInsert(call, 'should generate javadoc jar', "\napply plugin: 'nebula.javadoc-jar'", bookmark('lastApplyPlugin'))
                 }
             }
         }
@@ -114,6 +115,7 @@ class GradleLintRuleSpec extends AbstractRuleSpec {
         correct(rule) == """
             apply plugin: 'java'
             apply plugin: 'nebula.source-jar'
+            apply plugin: 'nebula.javadoc-jar'
 
             dependencies {
                 compile 'com.google.guava:guava:18.0'