Fix merging bug

Author: MakMuftic

src/lib/contract/contract-comment.es6

@@ -4,7 +4,7 @@ import CommentsGenerator from "../generators/comments-generator";
 const generator = new CommentsGenerator();
 
 export function insertComment(contract, node) {
-    let comment = generator.generate(node);
+    let comment = generator.generate(node).trim();
     if (!comment) return;
     let commentLines = comment.split('\n');
     if (updateComment(contract, commentLines, node.loc)) return;

src/lib/contract/contract.es6

@@ -86,9 +86,8 @@ export class Contract {
         let offsetAmount = 0;
         for (let offset in this.offsets) {
             if (this.offsets.hasOwnProperty(offset)) {
-                if (line >= offset) {
-                    offsetAmount += this.offsets[offset];
-                }
+                //if (line >= offset)
+                offsetAmount += this.offsets[offset];
             }
         }
         return offsetAmount;

test/lib/contract/contract.test.es6

@@ -60,14 +60,12 @@ test('Insert text before', (t) => {
 });
 
 test('Insert text before with offset', (t) => {
-  t.plan(4);
+  t.plan(3);
   let contract =new Contract(['line1', 'line2']);
   contract.insertTextBefore('test1\nbla', 0);
   t.equal(contract.getLineAt(0), 'test1');
   t.equal(contract.getLineAt(1), 'bla');
-  contract.insertLinesBefore('offset'.split(), 0);
   t.equal(contract.offset(0), 2);
-  t.equal(contract.getLineAt(2), 'offset');
 });