only one line after expand button (#15)

* Trim code to prevent creating new line

* More fixes

* fix tests

* Debugging

* Debug for travis

* This test only

* Checkout without the fix

* Update the fix to make the build pass

* Fix changes

* Just use trim

* Pared down the markdown test file

* Reduce markdown test file

Author: cherifGsoul

index.js

@@ -66,14 +66,14 @@ var getConfig = function(lineString, lineCount) {
 					return typeof val === 'number' && !isNaN(val);
 				})
 			;
-			
+
 			if (range[0] > current + padding) {
 				var collapseEnd = (range[0] - 1 - padding);
 				if (collapseEnd !== current) {
 					collapse.push(current + '-' + collapseEnd);
 				}
 			}
-			
+
 			current = (range[1] || range[0]) + padding + 1;
 		}
 
@@ -115,8 +115,11 @@ module.exports = function() {
 
 		var preBlock = findPreviousSibling(highlight, 'pre');
 		var codeBlock = preBlock.childNodes.item(0);
-
-		var total = codeBlock.innerHTML.split('\n').length - 1;
+		//Without trimming, additional characters can create new lines
+		//this happens when PrismJS is not applied (in testing)
+		//setting total to length - 1 makes the last not collapsed
+		codeBlock.textContent = codeBlock.textContent.trim();
+		var total = codeBlock.innerHTML.split('\n').length;
 		var config = getConfig(highlight.getAttribute('line-highlight'), total);
 
 		if (preBlock) {

prism-collapse.js

@@ -100,7 +100,7 @@ function collapseLines(pre, config) {
 	});
 
 	for (var i = 0; i < inserts.length; i++) {
-		var line = Math.min(code.length - 1, inserts[i][0] - 1);
+		var line = Math.min(code.length, inserts[i][0] - 1);
 
 		code.splice(line, 0, inserts[i][1]);
 		numbers[line] += inserts[i][2];

test-collapse-last-line.md

@@ -0,0 +1,15 @@
+```js
+Todo.List = DefineList.extend("TodoList",{
+    "#": Todo,
+    completeAll(){
+        return this.forEach((todo) => { todo.complete = true; });
+    }
+});
+
+const todoConnection = restModel({
+    Map: Todo,
+    List: Todo.List,
+    url: "/api/todos/{id}"
+});
+```
+<span line-highlight='5-7,only'/>

test.js

@@ -89,7 +89,40 @@ describe("bit-docs-html-highlight-line", function() {
 				close();
 				done();
 			}, done);
-		}, done)
+		}, done);
+
+	});
+
+	it("Collapse last line", function(done) {
+		this.timeout(60000);
 
+		var docMap = Promise.resolve({
+			index: {
+				name: "index",
+				demo: "path/to/demo.html",
+				body: fs.readFileSync(__dirname+"/test-collapse-last-line.md", "utf8")
+			}
+		});
+
+		generate(docMap, {
+			html: {
+				dependencies: {
+					"bit-docs-html-highlight-line": __dirname
+				}
+			},
+			dest: path.join(__dirname, "temp"),
+			parent: "index",
+			forceBuild: true,
+			debug: true,
+			minifyBuild: false
+		}).then(function() {
+			open("index.html",function(browser, close) {
+				var doc = browser.window.document;
+				var collapseCode = doc.querySelectorAll('pre[data-collapse="11-12"]');
+				assert.ok(collapseCode);
+				close();
+				done();
+			}, done);
+		}, done);
 	});
 });