From ad14fa098b2f0c0eca4e2064547d13f5830d5855 Mon Sep 17 00:00:00 2001
From: Alan Knowles <alan@roojs.com>
Date: Mon, 30 May 2016 16:22:08 +0800
Subject: [PATCH] src/JsRender/Node.vala

---
 src/JsRender/Node.vala | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/JsRender/Node.vala b/src/JsRender/Node.vala
index 76d2ceb2f..4d72b22d4 100644
--- a/src/JsRender/Node.vala
+++ b/src/JsRender/Node.vala
@@ -132,7 +132,7 @@ public class JsRender.Node : Object {
 	
 	public void setNodeLine(int line, Node node) {
 		//print("Add node @ %d\n", line);
-		if (this.node_line_map.has_key(line)) {
+		if (this.node_lines_map.has_key(line)) {
 			return;
 		}
 		this.node_lines.add(line);
@@ -141,6 +141,9 @@ public class JsRender.Node : Object {
 	}
 	
 	public void setLine(int line, string type, string prop) {
+		if (this.line_map.has_key(line) && this.line_map.get(line) != ":e"  ) {
+			return;
+		}
 		this.lines.add(line);
 		this.line_map.set(line, type + ":" + prop);
 		GLib.debug("setLine %d, %s", line, type + ":" + prop);
@@ -148,7 +151,7 @@ public class JsRender.Node : Object {
 	public void sortLines() {
 		//print("sortLines\n");
 		this.lines.sort((a,b) => {   
-			return (int)b-(int)a;
+			return (int)a-(int)b;
 		});
 		this.node_lines.sort((a,b) => {   
 			return (int)a-(int)b;
@@ -177,15 +180,24 @@ public class JsRender.Node : Object {
 				break;
 			}
 			if (l > -1) {
+				var ret = this.node_lines_map.get(l);
+				if (line > ret.line_end) {
+					return null;
+				}
 				//print("RETURNING NODE ON LINE %d", l);
-				return this.node_lines_map.get(l);
+				return ret;
 			}
 			return null;
 			
 		}
 		if (l > -1) {
+			var ret = this.node_lines_map.get(l);
+			if (line > ret.line_end) {
+				return null;
+			}
 			//print("RETURNING NODE ON LINE %d", l);
-			return this.node_lines_map.get(l);
+			return ret;
+
 		}
 		return null;
 		
-- 
2.39.2