bugfiks

Author: njbotkin

cli.js

@@ -5,8 +5,6 @@ const cli = require(`commander`)
 
 const { readFileSync } = require('fs')
 
-
-
 async function main() {
 
 	cli
@@ -17,7 +15,7 @@ async function main() {
 			console.log(`  Example:`)
 			console.log(``)
 			console.log(`    $ splitdiff file1 file2`)
-			console.log(`    $ git diff file1 file2 | splitdiff`)
+			console.log(`    $ git diff --no-pager file1 file2 | splitdiff`)
 			console.log(``)
 		})
 		.parse(process.argv)

index.js

@@ -29,12 +29,16 @@ class Pair {
 			this.left.padLines(-misalignmentDelta)
 		}
 	}
+	padLines(n) {
+		this.left.padLines(n)
+		this.right.padLines(n)
+	}
 	drawLines() {
 		this.left.drawLine()
 		this.right.drawLine()
 	}
 	combine() {
-		this.drawLines()
+		// this.drawLines()
 
 		if(this.left.sanctioned && this.left.sanctioned.length > 0 && !this.left.sanctioned[this.left.lineLength]) this.left.ellipses()
 		if(this.right.sanctioned && this.right.sanctioned.length > 0 && !this.right.sanctioned[this.right.lineLength]) this.right.ellipses()
@@ -255,8 +259,7 @@ module.exports = {
 			)
 
 			pair.drawLines()
-			pair.left.currentSourceLine = ''
-			pair.right.currentSourceLine = ''
+			pair.padLines(1)
 			output.push(pair.combine())
 
 			for(let hunk of patch.hunks) {
@@ -285,8 +288,7 @@ module.exports = {
 						pair.align()
 						pair.left.currentSourceLine = line
 						pair.right.currentSourceLine = line
-						pair.left.drawLine()
-						pair.right.drawLine()
+						pair.drawLines()
 					}
 
 					if(symbol === '-') {