cmd/commands_http: parse filter options from HttpRequest

[nit.git] / src / doc / vim_autocomplete.nit

diff --git a/src/doc/vim_autocomplete.nit b/src/doc/vim_autocomplete.nit
index 0846e85..1e8a9fb 100644 (file)
--- a/src/doc/vim_autocomplete.nit
+++ b/src/doc/vim_autocomplete.nit
@@ -49,21 +49,11 @@ redef class ToolContext
        end
 end
 
-redef class Model
-
-       # Get a custom view for vimautocomplete.
-       private fun vim_view: ModelView do
-               var view = new ModelView(self)
-               view.min_visibility = protected_visibility
-               return view
-       end
-end
-
 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
@@ -92,7 +82,7 @@ redef class MEntity
 
                write_location(mainmodule, stream)
 
-               write_extra_doc(mainmodule, stream)
+               write_extra_doc(model, mainmodule, stream)
 
                stream.write "\n"
        end
@@ -106,7 +96,7 @@ 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)
@@ -196,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
@@ -240,7 +230,7 @@ redef class MClassType
                stream.write line_separator*2
                stream.write "## Properties"
                stream.write line_separator
-               var props = mclass.collect_accessible_mproperties(model.protected_view).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
@@ -282,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
@@ -295,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(model.public_view) 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
@@ -316,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
 
@@ -324,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
@@ -341,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(model.protected_view).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
@@ -361,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(model.protected_view)
+                       prop_intros.add_all c.collect_intro_mpropdefs
                end
 
                if prop_intros.not_empty then