From 2e7b9dfa73590496fb56473e345262f56c8f4714 Mon Sep 17 00:00:00 2001
From: Jean Privat <jean@pryen.org>
Date: Wed, 8 Apr 2015 12:21:31 +0700
Subject: [PATCH] highlight: factorize the creation of tags

Signed-off-by: Jean Privat <jean@pryen.org>
---
 src/highlight.nit |   41 ++++++++++++++++++++++++-----------------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/src/highlight.nit b/src/highlight.nit
index 39a042a..2017ae7 100644
--- a/src/highlight.nit
+++ b/src/highlight.nit
@@ -57,6 +57,26 @@ class HighlightVisitor
 		htmlize(s.first_token.as(not null), s.last_token.as(not null))
 	end
 
+	private fun full_tag(anode: ANode, hv: HighlightVisitor): nullable HTMLTag
+	do
+		var tag = anode.make_tag(hv)
+		if tag == null then return null
+		var infobox = anode.infobox(hv)
+		if infobox == null and anode isa Token then
+			var pa = anode.parent
+			if pa != null then
+				var c = anode
+				if c isa TId or c isa TClassid or c isa TAttrid or c isa TokenLiteral or c isa TokenOperator or c isa TComment and pa isa ADoc then
+					infobox = pa.decorate_tag(hv, tag, anode)
+				end
+			end
+		end
+		if infobox != null then
+			tag.attach_infobox(infobox)
+		end
+		return tag
+	end
+
 	# Produce HTML between two tokens
 	protected fun htmlize(first_token, last_token: Token)
 	do
@@ -79,11 +99,9 @@ class HighlightVisitor
 				if c0 != null then starting = c0.starting_prods
 				if starting != null then for p in starting do
 					if not p.is_block then continue
-					var tag = p.make_tag(hv)
+					var tag = full_tag(p, hv)
 					if tag == null then continue
 					tag.add_class("foldable")
-					var infobox = p.infobox(hv)
-					if infobox != null then tag.attach_infobox(infobox)
 					stack2.add(html)
 					html.add tag
 					html = tag
@@ -108,10 +126,8 @@ class HighlightVisitor
 			starting = c.starting_prods
 			if starting != null then for p in starting do
 				if not p.is_span then continue
-				var tag = p.make_tag(hv)
+				var tag = full_tag(p, hv)
 				if tag == null then continue
-				var infobox = p.infobox(hv)
-				if infobox != null then tag.attach_infobox(infobox)
 				stack2.add(html)
 				html.add tag
 				html = tag
@@ -122,17 +138,8 @@ class HighlightVisitor
 			if c isa TEol then 
 				html.append "\n"
 			else
-				var tag = c.make_tag(hv)
-				var pa = c.parent
-				var infobox = null
-				if c isa TId or c isa TClassid or c isa TAttrid or c isa TokenLiteral or c isa TokenOperator then
-					assert c != null
-					if pa != null then infobox = pa.decorate_tag(hv, tag, c)
-				else if c isa TComment and pa isa ADoc then
-					infobox = pa.decorate_tag(hv, tag, c)
-				end
-				if infobox != null then tag.attach_infobox(infobox)
-				html.add tag
+				var tag = full_tag(c, hv)
+				if tag != null then html.add tag
 			end
 
 			# Handle ending span productions
-- 
1.7.9.5