[valadoc/wip/tintou/version-support] WIP



commit 78368c712cba02b2dcd68a8425f94257ed72fe64
Author: Rico Tzschichholz <ricotz ubuntu com>
Date:   Mon Feb 20 16:01:03 2017 +0100

    WIP

 src/libvaladoc/html/basicdoclet.vala |   19 ++++++++-----------
 1 files changed, 8 insertions(+), 11 deletions(-)
---
diff --git a/src/libvaladoc/html/basicdoclet.vala b/src/libvaladoc/html/basicdoclet.vala
index e2ab932..dd993d6 100644
--- a/src/libvaladoc/html/basicdoclet.vala
+++ b/src/libvaladoc/html/basicdoclet.vala
@@ -459,18 +459,10 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
 
        private void write_documentation (Api.Node element , Api.Node? pos) {
                Content.Comment? doctree = element.documentation;
-               Attribute? version = (element is Symbol) ? ((Symbol) element).get_attribute ("Version") : 
null;
-               Attribute? deprecated = (element is Symbol) ? ((Symbol) element).get_attribute ("Deprecated") 
: null;
-               bool is_deprecated = false;
-               if (version != null) {
-                       AttributeArgument? deprecated_arg = version.get_argument ("deprecated");
-                       is_deprecated = (deprecated_arg != null) ? deprecated_arg.get_value_as_boolean () : 
is_deprecated;
-               } else {
-                       is_deprecated = deprecated != null;
-               }
+               bool is_deprecated = (element is Symbol) ? ((Symbol) element).is_deprecated : false;
 
                // avoid empty divs
-               if (doctree == null && deprecated == null) {
+               if (doctree == null && !is_deprecated) {
                        return;
                }
 
@@ -480,14 +472,19 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
 
                // deprecation warning:
                if (is_deprecated) {
+                       Symbol symbol = (Symbol) element;
+                       Attribute? version = symbol.get_attribute ("Version");
+                       Attribute? deprecated = symbol.get_attribute ("Deprecated");
                        AttributeArgument? replacement = null;
                        AttributeArgument? since = null;
                        if (version != null) {
                                replacement = version.get_argument ("replacement");
                                since = version.get_argument ("deprecated_since");
-                       } else {
+                       } else if (deprecated != null) {
                                replacement = deprecated.get_argument ("replacement");
                                since = deprecated.get_argument ("version");
+                       } else {
+                               assert_not_reached ();
                        }
 
                        writer.start_tag ("p");


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]