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

diff --git a/src/nitls.nit b/src/nitls.nit
index b1598ac..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})"
+				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
@@ -46,41 +73,37 @@ class ProjTree
 end
 
 var tc = new ToolContext
-var model = new Model
-var mb = new ModelBuilder(model, tc)
 
 var opt_keep = new OptionBool("Ignore errors and files that are not a Nit source file", "-k", "--keep")
 var opt_recursive = new OptionBool("Process directories recussively", "-r", "--recursive")
 var opt_tree = new OptionBool("List source files in their groups and projects", "-t", "--tree")
 var opt_source = new OptionBool("List source files", "-s", "--source")
-var opt_project = new OptionBool("List projects paths (default)", "-p", "--project")
-var opt_depends = new OptionBool("List dependencies of given modules", "-M", "--depends")
+var opt_project = new OptionBool("List projects paths (default)", "-P", "--project")
+var opt_depends = new OptionBool("List dependencies of given modules", "-d", "--depends")
+var opt_make = new OptionBool("List dependencies suitable for a rule in a Makefile. Alias for -d, -p and -s", "-M")
 var opt_paths = new OptionBool("List only path (instead of name + path)", "-p", "--path")
 
-tc.option_context.add_option(opt_keep, opt_recursive, opt_tree, opt_source, opt_project, opt_depends, opt_paths)
+tc.option_context.add_option(opt_keep, opt_recursive, opt_tree, opt_source, opt_project, opt_depends, opt_paths, opt_make)
 tc.tooldescription = "Usage: nitls [OPTION]... <file.nit|directory>...\nLists the projects and/or paths of Nit sources files."
 tc.process_options(args)
 
-var sum = opt_tree.value.to_i + opt_source.value.to_i + opt_project.value.to_i + opt_depends.value.to_i
+if opt_make.value then
+	opt_depends.value = true
+	opt_paths.value = true
+	opt_source.value = true
+end
+
+var sum = opt_tree.value.to_i + opt_source.value.to_i + opt_project.value.to_i
 if sum > 1 then
 	print "Error: options --tree, --source, and --project are exclusives."
 	print tc.tooldescription
 	exit 1
 end
 
-if opt_depends.value then
-	if opt_recursive.value then
-		print "-M incompatible with -r"
-		exit 1
-	end
-
-	mb.parse(tc.option_context.rest)
-	for x in model.mmodules do
-		print x.location.file.filename
-	end
-end
+tc.keep_going = opt_keep.value
 
-if sum == 0 then opt_project.value = true
+var model = new Model
+var mb = new ModelBuilder(model, tc)
 
 var files
 if opt_recursive.value then
@@ -103,13 +126,20 @@ 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
+	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
@@ -131,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
@@ -147,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)