From 340ecdac6e34b37588a0f85e2576ff621d6818d9 Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Fri, 9 Jan 2015 18:37:03 -0800
Subject: Added end column position to pos for blocks.

---
 js/lib/blocks.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'js/lib/blocks.js')

diff --git a/js/lib/blocks.js b/js/lib/blocks.js
index fd51a4b..f6e8f87 100644
--- a/js/lib/blocks.js
+++ b/js/lib/blocks.js
@@ -136,7 +136,8 @@ var addChild = function(tag, line_number, offset) {
     }
 
     var column_number = offset + 1; // offset 0 = column 1
-    var newBlock = new Node(tag, { start: [line_number, column_number], end: [] });
+    var newBlock = new Node(tag, { start: [line_number, column_number],
+                                   end: [0, 0] });
     newBlock.strings = [];
     newBlock.string_content = undefined;
     this.tip.appendChild(newBlock);
@@ -532,6 +533,7 @@ var incorporateLine = function(ln, line_number) {
             }
         }
     }
+    this.lastLineLength = ln.length - 1; // -1 for newline
 };
 
 // Finalize a block.  Close it and do any necessary postprocessing,
@@ -547,7 +549,7 @@ var finalize = function(block, line_number) {
         return 0;
     }
     block.open = false;
-    block.pos.end = [line_number]; // TODO end column
+    block.pos.end = [line_number, this.lastLineLength + 1];
 
     switch (block.t) {
     case 'Paragraph':
@@ -637,7 +639,7 @@ var processInlines = function(block) {
 };
 
 var Document = function() {
-    var doc = new Node('Document', { start: [1, 1], end: [] });
+    var doc = new Node('Document', { start: [1, 1], end: [0, 0] });
     doc.string_content = undefined;
     doc.strings = [];
     return doc;
@@ -669,6 +671,7 @@ function DocParser(){
         doc: Document(),
         tip: this.doc,
         refmap: {},
+        lastLineLength: 0,
         inlineParser: new InlineParser(),
         breakOutOfLists: breakOutOfLists,
         addLine: addLine,
-- 
cgit v1.2.3