Merge pull request #3 from NodeFactoryIo/bugfix/bad-comment-position-on-long-contracts

Bugfix/bad comment position on long contracts

Author: mpetrunic

package.json

@@ -36,13 +36,17 @@
   ],
   "license": "MIT",
   "devDependencies": {
+    "@babel/core": "^7.1.2",
+    "@babel/register": "^7.0.0",
+    "@babel/polyfill": "^7.0.0",
     "babel-cli": "^6.26.0",
     "babel-eslint": "^8.2.5",
     "babel-plugin-istanbul": "^4.1.6",
     "babel-preset-env": "^1.7.0",
     "babel-register": "^6.26.0",
     "babel-tape-runner": "^2.0.1",
     "coveralls": "^3.0.2",
+    "electron": "^3.0.2",
     "eslint": "^5.0.1",
     "eslint-config-strongloop": "^2.1.0",
     "istanbul": "^0.4.5",

src/index.es6

@@ -57,7 +57,7 @@ function hasComment(contract, line) {
 }
 
 function insertComment(contract, node) {
-  let comment = generator.generate(node);
+  let comment = generator.generate(node).trim();
   if (!comment) return;
   if (hasComment(contract, node.loc.start.line)) return;
   let commentLines = comment.split('\n');

src/lib/contract/contract.es6

@@ -42,7 +42,8 @@ export class Contract {
   }
 
   insertLinesBefore(lines, line) {
-    line += this.offset(line);
+    let currentOffset = this.offset(line);
+    line += this.offset(line + currentOffset);
     this.addOffset(line, lines.length);
     this.lines.splice(line, 0, ...lines);
   }
@@ -72,11 +73,10 @@ 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,13 +60,15 @@ test('Insert text before', (t) => {
 });
 
 test('Insert text before with offset', (t) => {
-  t.plan(4);
+  t.plan(6);
   let contract =new Contract(['line1', 'line2']);
   contract.insertTextBefore('test1\nbla', 0);
   t.equal(contract.getLineAt(0), 'test1');
   t.equal(contract.getLineAt(1), 'bla');
+  t.equal(contract.offset(0), 2);
   contract.insertTextBefore('offset', 0);
   t.equal(contract.offset(0), 2);
+  t.equal(contract.offset(2), 3);
   t.equal(contract.getLineAt(2), 'offset');
 });