X-Git-Url: http://nitlanguage.org

diff --git a/src/nitls.nit b/src/nitls.nit
index 54320cc..64131b7 100644
--- a/src/nitls.nit
+++ b/src/nitls.nit
@@ -17,13 +17,16 @@
 # Simple tool to list Nit source files
 module nitls
 
-intrude import modelbuilder
+import modelbuilder
+intrude import loader
 import ordered_tree
+import console
 
 class ProjTree
 	super OrderedTree[Object]
 
 	var opt_paths = false
+	var tc: ToolContext
 
 	redef fun display(o)
 	do
@@ -31,13 +34,37 @@ class ProjTree
 			if opt_paths then
 				return o.filepath.as(not null)
 			else
-				return "{o.name} ({o.filepath.to_s})"
+				var d = ""
+				if o.mdoc != null then
+					if tc.opt_no_color.value then
+						d = ": {o.mdoc.content.first}"
+					else
+						d = ": {o.mdoc.content.first.green}"
+					end
+				end
+				if tc.opt_no_color.value then
+					return "{o.name}{d} ({o.filepath.to_s})"
+				else
+					return "{o.name}{d} ({o.filepath.yellow})"
+				end
 			end
 		else if o isa ModulePath then
 			if opt_paths then
 				return o.filepath
 			else
-				return "{o.name} ({o.filepath})"
+				var d = ""
+				if o.mmodule != null and o.mmodule.mdoc != null then
+					if tc.opt_no_color.value then
+						d = ": {o.mmodule.mdoc.content.first}"
+					else
+						d = ": {o.mmodule.mdoc.content.first.green}"
+					end
+				end
+				if tc.opt_no_color.value then
+					return "{o.name.bold}{d} ({o.filepath.to_s})"
+				else
+					return "{o.name.bold}{d} ({o.filepath.yellow})"
+				end
 			end
 		else
 			abort
@@ -73,48 +100,46 @@ if sum > 1 then
 	exit 1
 end
 
+tc.keep_going = opt_keep.value
+
 var model = new Model
 var mb = new ModelBuilder(model, tc)
 
-if opt_depends.value then
-	if opt_recursive.value then
-		print "-M incompatible with -r"
-		exit 1
-	end
-
-	mb.parse(tc.option_context.rest)
-else
-	var files
-	if opt_recursive.value then
-		files = new Array[String]
-		for d in tc.option_context.rest do
-			var pipe = new IProcess("find", d, "-name", "*.nit")
-			while not pipe.eof do
-				var l = pipe.read_line
-				if l == "" then break # last line
-				l = l.substring(0,l.length-1) # strip last oef
-				files.add l
-			end
-			pipe.close
-			pipe.wait
-			if pipe.status != 0 and not opt_keep.value then exit 1
+var files
+if opt_recursive.value then
+	files = new Array[String]
+	for d in tc.option_context.rest do
+		var pipe = new IProcess("find", d, "-name", "*.nit")
+		while not pipe.eof do
+			var l = pipe.read_line
+			if l == "" then break # last line
+			l = l.substring(0,l.length-1) # strip last oef
+			files.add l
 		end
-	else
-		files = tc.option_context.rest
+		pipe.close
+		pipe.wait
+		if pipe.status != 0 and not opt_keep.value then exit 1
 	end
+else
+	files = tc.option_context.rest
+end
 
-	for a in files do
-		var mp = mb.identify_file(a)
-		if mp == null then
-			if not opt_keep.value then tc.check_errors
+for a in files do
+	var mp = mb.identify_file(a)
+	tc.check_errors
+	if mp != null and not opt_paths.value then
+		var mm = mb.load_module(mp.filepath)
+		if mm != null and opt_depends.value then
+			mb.build_module_importation(mm)
 		end
+		tc.check_errors
 	end
 end
 
 if sum == 0 then opt_project.value = true
 
+var ot = new ProjTree(tc)
 if opt_tree.value then
-	var ot = new ProjTree
 	ot.opt_paths = opt_paths.value
 	for p in model.mprojects do
 		for g in p.mgroups do
@@ -136,7 +161,7 @@ if opt_source.value then
 				if opt_paths.value then
 					list.add(mp.filepath)
 				else
-					list.add("{g.full_name}/{mp.name} ({mp.filepath})")
+					list.add("{g.full_name}/{ot.display(mp)}")
 				end
 			end
 		end
@@ -152,7 +177,11 @@ if opt_project.value then
 		if opt_paths.value then
 			list.add(path)
 		else
-			list.add("{p.name} ({path})")
+			if tc.opt_no_color.value then
+				list.add("{p.name} ({path})")
+			else
+				list.add("{p.name} ({path.yellow})")
+			end
 		end
 	end
 	alpha_comparator.sort(list)