X-Git-Url: http://nitlanguage.org diff --git a/src/doc/vim_autocomplete.nit b/src/doc/vim_autocomplete.nit index 4f19dbc..1e8a9fb 100644 --- a/src/doc/vim_autocomplete.nit +++ b/src/doc/vim_autocomplete.nit @@ -53,7 +53,7 @@ redef class MEntity private fun field_separator: String do return "#====#" private fun line_separator: String do return "#nnnn#" - private fun write_doc(mainmodule: MModule, stream: Writer) + private fun write_doc(model: Model, mainmodule: MModule, stream: Writer) do # 1. Short name for autocompletion stream.write complete_name @@ -79,7 +79,10 @@ redef class MEntity for i in 2.times do stream.write line_separator stream.write mdoc.content.join(line_separator) end - write_extra_doc(mainmodule, stream) + + write_location(mainmodule, stream) + + write_extra_doc(model, mainmodule, stream) stream.write "\n" end @@ -93,7 +96,16 @@ redef class MEntity private fun complete_mdoc: nullable MDoc do return mdoc # Extra auto documentation to append to the `stream` - private fun write_extra_doc(mainmodule: MModule, stream: Writer) do end + private fun write_extra_doc(model: Model, mainmodule: MModule, stream: Writer) do end + + # Location (file and line when available) of related declarations + private fun write_location(mainmodule: MModule, stream: Writer) + do + for i in 2.times do stream.write line_separator + stream.write "## Location" + stream.write line_separator + stream.write "* {location}" + end end redef class MMethodDef @@ -104,6 +116,26 @@ redef class MMethodDef stream.write msignature.to_s end end + + redef fun write_location(mainmodule, stream) + do + for i in 2.times do stream.write line_separator + stream.write "## Location of introduction and refinements" + + # Group locations in the same file + var file_to_location = new MultiHashMap[nullable SourceFile, Location] + for c in mproperty.mpropdefs do + file_to_location[c.location.file].add c.location + end + + # Write one file per location + for file, locations in file_to_location do + var l = locations.first + stream.write line_separator + stream.write "* {l}" + if locations.length > 1 then stream.write " ({locations.length-1} more)" + end + end end redef class MAttributeDef @@ -154,7 +186,7 @@ redef class MClassDef end redef class MClassType - redef fun write_extra_doc(mainmodule, stream) + redef fun write_extra_doc(model, mainmodule, stream) do # Super classes stream.write line_separator*2 @@ -198,7 +230,7 @@ redef class MClassType stream.write line_separator*2 stream.write "## Properties" stream.write line_separator - var props = mclass.collect_accessible_mproperties(protected_visibility).to_a + var props = mclass.collect_accessible_mproperties(mainmodule).to_a alpha_comparator.sort props for prop in props do if mclass.name == "Object" or prop.intro.mclassdef.mclass.name != "Object" then @@ -208,6 +240,16 @@ redef class MClassType end redef fun complete_mdoc do return mclass.intro.mdoc + + redef fun write_location(mainmodule, stream) + do + for i in 2.times do stream.write line_separator + stream.write "## Location of introduction and refinements" + for c in mclass.mclassdefs do + stream.write line_separator + stream.write "* {c.location}" + end + end end private class AutocompletePhase @@ -230,7 +272,7 @@ private class AutocompletePhase # Got all known modules var model = mainmodule.model for mmodule in model.mmodules do - mmodule.write_doc(mainmodule, modules_stream) + mmodule.write_doc(model, mainmodule, modules_stream) end # TODO list other modules from the Nit lib @@ -243,18 +285,18 @@ private class AutocompletePhase # Can it be instantiated? if mclass.kind != interface_kind and mclass.kind != abstract_kind then - for prop in mclass.collect_accessible_mproperties(public_visibility) do + for prop in mclass.collect_accessible_mproperties(mainmodule) do if prop isa MMethod and prop.is_init then mclass_intro.target_constructor = prop.intro - mclass_intro.write_doc(mainmodule, constructors_stream) + mclass_intro.write_doc(model, mainmodule, constructors_stream) end end mclass_intro.target_constructor = null end # Always add to types and classes - mclass.mclass_type.write_doc(mainmodule, classes_stream) - mclass.mclass_type.write_doc(mainmodule, types_stream) + mclass.mclass_type.write_doc(model, mainmodule, classes_stream) + mclass.mclass_type.write_doc(model, mainmodule, types_stream) end # Get all known properties @@ -264,7 +306,7 @@ private class AutocompletePhase # Is it a virtual type? if mproperty isa MVirtualTypeProp then - mproperty.intro.write_doc(mainmodule, types_stream) + mproperty.intro.write_doc(model, mainmodule, types_stream) continue end @@ -272,7 +314,7 @@ private class AutocompletePhase var first_letter = mproperty.name.chars.first if first_letter == '@' or first_letter == '_' then continue - mproperty.intro.write_doc(mainmodule, properties_stream) + mproperty.intro.write_doc(model, mainmodule, properties_stream) end # Close streams @@ -289,10 +331,10 @@ private class AutocompletePhase end redef class MModule - redef fun write_extra_doc(mainmodule, stream) + redef fun write_extra_doc(model, mainmodule, stream) do # Introduced classes - var class_intros = collect_intro_mclasses(protected_visibility).to_a + var class_intros = collect_intro_mclasses.to_a if class_intros.not_empty then alpha_comparator.sort class_intros stream.write line_separator*2 @@ -309,7 +351,7 @@ redef class MModule # Introduced properties var prop_intros = new Array[MPropDef] for c in mclassdefs do - prop_intros.add_all c.collect_intro_mpropdefs(protected_visibility) + prop_intros.add_all c.collect_intro_mpropdefs end if prop_intros.not_empty then @@ -345,7 +387,10 @@ redef class MProperty if self isa MMethod then var intro = intro assert intro isa MMethodDef - stream.write intro.msignature.to_s + var msignature = intro.msignature + if msignature != null then + stream.write msignature.to_s + end end var mdoc = intro.mdoc