GNOME.org
 

[gnome-builder/wip/slaf/colored-build-output: 27/36] xml-tree-builder: create internal nodes

commit 4462466daaa0e41d38fe7de7c018d384a0270976
Author: Sebastien Lafargue <slafargue gnome org>
Date:   Tue Jan 31 18:21:01 2017 +0100

    xml-tree-builder: create internal nodes
    
    We create internal nodes and inject the collected
    informations in the visible parent.

 plugins/xml-pack/ide-xml-tree-builder-generic.c |   11 +-
 plugins/xml-pack/ide-xml-tree-builder-generic.h |   10 +-
 plugins/xml-pack/ide-xml-tree-builder-ui.c      |  348 ++++++++++++++++++-----
 plugins/xml-pack/ide-xml-tree-builder-ui.h      |   10 +-
 plugins/xml-pack/ide-xml-tree-builder.c         |   14 +-
 5 files changed, 303 insertions(+), 90 deletions(-)
---
diff --git a/plugins/xml-pack/ide-xml-tree-builder-generic.c b/plugins/xml-pack/ide-xml-tree-builder-generic.c
index 69ba991..7ed2f72 100644
--- a/plugins/xml-pack/ide-xml-tree-builder-generic.c
+++ b/plugins/xml-pack/ide-xml-tree-builder-generic.c
@@ -37,13 +37,14 @@ create_node_from_reader (XmlReader *reader)
 }
 
 IdeXmlSymbolNode *
-ide_xml_tree_builder_generic_create (IdeXmlSax   *parser,
-                                     GFile       *file,
-                                     const gchar *data,
-                                     gsize        size)
+ide_xml_tree_builder_generic_create (IdeXmlTreeBuilder *self,
+                                     IdeXmlSax         *parser,
+                                     GFile             *file,
+                                     const gchar       *data,
+                                     gsize              size)
 {
   IdeXmlStack *stack;
-  IdeXmlSymbolNode *root_node;
+  IdeXmlSymbolNode *root_node = NULL;
   IdeXmlSymbolNode *parent_node;
   IdeXmlSymbolNode *current_node;
   IdeXmlSymbolNode *previous_node = NULL;
diff --git a/plugins/xml-pack/ide-xml-tree-builder-generic.h b/plugins/xml-pack/ide-xml-tree-builder-generic.h
index b490fb4..70b57c3 100644
--- a/plugins/xml-pack/ide-xml-tree-builder-generic.h
+++ b/plugins/xml-pack/ide-xml-tree-builder-generic.h
@@ -23,14 +23,16 @@
 
 #include "ide-xml-sax.h"
 #include "ide-xml-symbol-node.h"
+#include "ide-xml-tree-builder.h"
 #include "xml-reader.h"
 
 G_BEGIN_DECLS
 
-IdeXmlSymbolNode *ide_xml_tree_builder_generic_create (IdeXmlSax   *parser,
-                                                       GFile       *file,
-                                                       const gchar *data,
-                                                       gsize        size);
+IdeXmlSymbolNode *ide_xml_tree_builder_generic_create (IdeXmlTreeBuilder *self,
+                                                       IdeXmlSax         *parser,
+                                                       GFile             *file,
+                                                       const gchar       *data,
+                                                       gsize              size);
 
 G_END_DECLS
 
diff --git a/plugins/xml-pack/ide-xml-tree-builder-ui.c b/plugins/xml-pack/ide-xml-tree-builder-ui.c
index a81f29d..dcf921e 100644
--- a/plugins/xml-pack/ide-xml-tree-builder-ui.c
+++ b/plugins/xml-pack/ide-xml-tree-builder-ui.c
@@ -22,15 +22,24 @@
 
 #include "ide-xml-tree-builder-ui.h"
 
+typedef enum _BuildState
+{
+  BUILD_STATE_NORMAL,
+  BUILD_STATE_WAIT_END_ELEMENT,
+  BUILD_STATE_GET_CONTENT,
+} BuildState;
+
 typedef struct _ParserState
 {
-  IdeXmlSax        *parser;
-  IdeXmlStack      *stack;
-  GFile            *file;
-  IdeXmlSymbolNode *root_node;
-  IdeXmlSymbolNode *parent_node;
-  IdeXmlSymbolNode *current_node;
-  gint              current_depth;
+  IdeXmlTreeBuilder *self;
+  IdeXmlSax         *parser;
+  IdeXmlStack       *stack;
+  GFile             *file;
+  IdeXmlSymbolNode  *root_node;
+  IdeXmlSymbolNode  *parent_node;
+  IdeXmlSymbolNode  *current_node;
+  BuildState         build_state;
+  gint               current_depth;
 } ParserState;
 
 static void
@@ -45,7 +54,8 @@ static void
 state_processing (ParserState           *state,
                   const gchar           *element_name,
                   IdeXmlSymbolNode      *node,
-                  IdeXmlSaxCallbackType  callback_type)
+                  IdeXmlSaxCallbackType  callback_type,
+                  gboolean               is_internal)
 {
   IdeXmlSymbolNode *parent_node;
   IdeXmlSymbolNode *popped_node;
@@ -54,17 +64,20 @@ state_processing (ParserState           *state,
   gint line_offset;
   gint depth;
 
+  g_assert (IDE_IS_XML_SYMBOL_NODE (node) || node == NULL);
+
+  if (callback_type == IDE_XML_SAX_CALLBACK_TYPE_CHAR)
+    {
+      ide_xml_symbol_node_set_value (state->current_node, element_name);
+      return;
+    }
+
   depth = ide_xml_sax_get_depth (state->parser);
-  printf ("[name:%s depth:%i] ", element_name, depth);
 
   if (node == NULL)
     {
       if (callback_type == IDE_XML_SAX_CALLBACK_TYPE_START_ELEMENT)
-        {
-          ide_xml_stack_push (state->stack, element_name, NULL, state->parent_node, depth);
-
-          printf ("no node PUSH %i->%i\n", state->current_depth, depth);
-        }
+        ide_xml_stack_push (state->stack, element_name, NULL, state->parent_node, depth);
       else if (callback_type == IDE_XML_SAX_CALLBACK_TYPE_END_ELEMENT)
         {
           /* TODO: compare current with popped */
@@ -77,9 +90,6 @@ state_processing (ParserState           *state,
           popped_node = ide_xml_stack_pop (state->stack, &popped_element_name, &parent_node, &depth);
           state->parent_node = parent_node;
           g_assert (state->parent_node != NULL);
-
-          printf ("no node POP %i->%i name:%s parent:%p\n",
-                  state->current_depth, depth, popped_element_name, state->parent_node);
         }
 
       state->current_depth = depth;
@@ -102,10 +112,10 @@ state_processing (ParserState           *state,
   if (callback_type == IDE_XML_SAX_CALLBACK_TYPE_START_ELEMENT)
     {
       ide_xml_stack_push (state->stack, element_name, node, state->parent_node, depth);
-      ide_xml_symbol_node_take_child (state->parent_node, node);
-
-      printf ("PUSH %i->%i current:%p parent:%p\n",
-              state->current_depth, depth, node, state->parent_node);
+      if (is_internal)
+        ide_xml_symbol_node_take_internal_child (state->parent_node, node);
+      else
+        ide_xml_symbol_node_take_child (state->parent_node, node);
 
       state->parent_node = node;
     }
@@ -121,15 +131,9 @@ state_processing (ParserState           *state,
       popped_node = ide_xml_stack_pop (state->stack, &popped_element_name, &parent_node, &depth);
       state->parent_node = parent_node;
       g_assert (state->parent_node != NULL);
-
-      printf ("POP %i->%i name:%s parent node:%p\n",
-              state->current_depth, depth, popped_element_name, parent_node);
     }
   else
-    {
-      printf ("---- %i->%i\n", state->current_depth, depth);
-      ide_xml_symbol_node_take_child (state->parent_node, node);
-    }
+    ide_xml_symbol_node_take_child (state->parent_node, node);
 
   state->current_depth = depth;
   state->current_node = node;
@@ -150,145 +154,351 @@ get_attribute (const guchar **list,
 static void
 start_element_sax_cb (ParserState    *state,
                       const xmlChar  *name,
-                      const xmlChar **atttributes)
+                      const xmlChar **attributes)
 {
+  IdeXmlTreeBuilder *self = (IdeXmlTreeBuilder *)state->self;
   g_autoptr (GString) string = NULL;
+  g_autofree gchar *label = NULL;
   const gchar *value = NULL;
   IdeXmlSymbolNode *node = NULL;
+  const gchar *parent_name;
+  gboolean is_internal = FALSE;
+
+  g_assert (IDE_IS_XML_TREE_BUILDER (self));
+
+  if (state->build_state == BUILD_STATE_GET_CONTENT)
+    {
+      g_warning ("Wrong xml element, waiting for content\n");
+      return;
+    }
 
   string = g_string_new (NULL);
+  parent_name = ide_xml_symbol_node_get_element_name (state->parent_node);
 
-  if (ide_str_equal0 (name, "child"))
+  if (ide_str_equal0 (name, "property"))
+    {
+      if (ide_str_equal0 (parent_name, "object") ||
+          ide_str_equal0 (parent_name, "template"))
+        {
+          value = get_attribute (attributes, "name", NULL);
+          node = ide_xml_symbol_node_new (value, NULL, "property",
+                                          IDE_SYMBOL_UI_PROPERTY, NULL, 0, 0);
+          is_internal = TRUE;
+          state->build_state = BUILD_STATE_GET_CONTENT;
+        }
+    }
+  else if (ide_str_equal0 (name, "attribute"))
+    {
+      if (ide_str_equal0 (parent_name, "section") ||
+          ide_str_equal0 (parent_name, "submenu") ||
+          ide_str_equal0 (parent_name, "item"))
+        {
+          value = get_attribute (attributes, "name", NULL);
+          node = ide_xml_symbol_node_new (value, NULL, "attribute",
+                                          IDE_SYMBOL_UI_MENU_ATTRIBUTE, NULL, 0, 0);
+          is_internal = TRUE;
+          state->build_state = BUILD_STATE_GET_CONTENT;
+        }
+    }
+  else if (ide_str_equal0 (name, "class") && ide_str_equal0 (parent_name, "style"))
+    {
+      value = get_attribute (attributes, "name", NULL);
+      node = ide_xml_symbol_node_new (value, NULL, "class",
+                                      IDE_SYMBOL_UI_STYLE_CLASS, NULL, 0, 0);
+      is_internal = TRUE;
+    }
+  else if (ide_str_equal0 (name, "child"))
     {
       g_string_append (string, "child");
 
-      if (NULL != (value = get_attribute (atttributes, "type", NULL)))
+      if (NULL != (value = get_attribute (attributes, "type", NULL)))
         {
-          g_string_append (string, " type: ");
+          label = ide_xml_tree_builder_get_color_tag (self, "type", COLOR_TAG_TYPE, TRUE, TRUE, TRUE);
+          g_string_append (string, label);
           g_string_append (string, value);
         }
 
-      if (NULL != (value = get_attribute (atttributes, "internal-child", NULL)))
+      if (NULL != (value = get_attribute (attributes, "internal-child", NULL)))
         {
-          g_string_append (string, " internal: ");
+          label = ide_xml_tree_builder_get_color_tag (self, "internal", COLOR_TAG_TYPE, TRUE, TRUE, TRUE);
+          g_string_append (string, label);
           g_string_append (string, value);
         }
 
-      node = ide_xml_symbol_node_new (string->str, "child",
+      node = ide_xml_symbol_node_new (string->str, NULL, "child",
                                       IDE_SYMBOL_UI_CHILD, NULL, 0, 0);
+      g_object_set (node, "use-markup", TRUE, NULL);
     }
   else if (ide_str_equal0 (name, "object"))
     {
-      value = get_attribute (atttributes, "class", "?");
+      value = get_attribute (attributes, "class", "?");
+      label = ide_xml_tree_builder_get_color_tag (self, "class", COLOR_TAG_CLASS, TRUE, TRUE, TRUE);
+      g_string_append (string, label);
       g_string_append (string, value);
 
-      if (NULL != (value = list_get_attribute (atttributes, "id")))
+      if (NULL != (value = list_get_attribute (attributes, "id")))
         {
-          g_string_append (string, " id: ");
+          g_free (label);
+          label = ide_xml_tree_builder_get_color_tag (self, "id", COLOR_TAG_ID, TRUE, TRUE, TRUE);
+          g_string_append (string, label);
           g_string_append (string, value);
         }
 
-      node = ide_xml_symbol_node_new (string->str, "object",
+      node = ide_xml_symbol_node_new (string->str, NULL, "object",
                                       IDE_SYMBOL_UI_OBJECT, NULL, 0, 0);
+      g_object_set (node, "use-markup", TRUE, NULL);
     }
   else if (ide_str_equal0 (name, "template"))
     {
-      value = get_attribute (atttributes, "class", "?");
+      value = get_attribute (attributes, "class", "?");
+      label = ide_xml_tree_builder_get_color_tag (self, "class", COLOR_TAG_CLASS, TRUE, TRUE, TRUE);
+      g_string_append (string, label);
       g_string_append (string, value);
+      g_free (label);
 
-      value = get_attribute (atttributes, "parent", "?");
-      g_string_append (string, " parent: ");
+      value = get_attribute (attributes, "parent", "?");
+      label = ide_xml_tree_builder_get_color_tag (self, "parent", COLOR_TAG_PARENT, TRUE, TRUE, TRUE);
+      g_string_append (string, label);
       g_string_append (string, value);
 
-      node = ide_xml_symbol_node_new (string->str, (const gchar *)name,
+      node = ide_xml_symbol_node_new (string->str, NULL, (const gchar *)name,
                                       IDE_SYMBOL_UI_TEMPLATE, NULL, 0, 0);
+      g_object_set (node, "use-markup", TRUE, NULL);
     }
   else if (ide_str_equal0 (name, "packing"))
     {
-      node = ide_xml_symbol_node_new ("packing", "packing",
+      node = ide_xml_symbol_node_new ("packing", NULL, "packing",
                                       IDE_SYMBOL_UI_PACKING, NULL, 0, 0);
     }
   else if (ide_str_equal0 (name, "style"))
     {
-      /* TODO: collect style classes names */
-      node = ide_xml_symbol_node_new ("style", "style",
+      node = ide_xml_symbol_node_new ("style", NULL, "style",
                                       IDE_SYMBOL_UI_STYLE, NULL, 0, 0);
     }
   else if (ide_str_equal0 (name, "menu"))
     {
-      value = get_attribute (atttributes, "id", "?");
+      value = get_attribute (attributes, "id", "?");
+      label = ide_xml_tree_builder_get_color_tag (self, "id", COLOR_TAG_ID, TRUE, TRUE, TRUE);
+      g_string_append (string, label);
       g_string_append (string, value);
 
-      node = ide_xml_symbol_node_new (string->str, "menu",
+      node = ide_xml_symbol_node_new (string->str, NULL, "menu",
                                       IDE_SYMBOL_UI_MENU, NULL, 0, 0);
+      g_object_set (node, "use-markup", TRUE, NULL);
     }
   else if (ide_str_equal0 (name, "submenu"))
     {
-      /* TODO: show content of attribute name="label" */
-      value = get_attribute (atttributes, "id", "?");
+      value = get_attribute (attributes, "id", "?");
+      label = ide_xml_tree_builder_get_color_tag (self, "id", COLOR_TAG_ID, TRUE, TRUE, TRUE);
+      g_string_append (string, label);
       g_string_append (string, value);
 
-      node = ide_xml_symbol_node_new (string->str, "submenu",
+      node = ide_xml_symbol_node_new (string->str, NULL, "submenu",
                                       IDE_SYMBOL_UI_SUBMENU, NULL, 0, 0);
+      g_object_set (node, "use-markup", TRUE, NULL);
     }
   else if (ide_str_equal0 (name, "section"))
     {
-      value = get_attribute (atttributes, "id", "?");
+      value = get_attribute (attributes, "id", "?");
+      label = ide_xml_tree_builder_get_color_tag (self, "id", COLOR_TAG_ID, TRUE, TRUE, TRUE);
+      g_string_append (string, label);
       g_string_append (string, value);
 
-      node = ide_xml_symbol_node_new (string->str, "section",
+      node = ide_xml_symbol_node_new (string->str, NULL, "section",
                                       IDE_SYMBOL_UI_SECTION, NULL, 0, 0);
+      g_object_set (node, "use-markup", TRUE, NULL);
     }
   else if (ide_str_equal0 (name, "item"))
     {
-      /* TODO: show content of attribute name="label" */
-      node = ide_xml_symbol_node_new ("item", "item",
+      node = ide_xml_symbol_node_new ("item", NULL, "item",
                                       IDE_SYMBOL_UI_ITEM, NULL, 0, 0);
     }
 
-  state_processing (state, (const gchar *)name, node, IDE_XML_SAX_CALLBACK_TYPE_START_ELEMENT);
+  state_processing (state, (const gchar *)name, node, IDE_XML_SAX_CALLBACK_TYPE_START_ELEMENT, is_internal);
 }
 
 static void
 end_element_sax_cb (ParserState    *state,
                     const xmlChar  *name)
 {
-  printf ("end element:%s\n", name);
+  IdeXmlTreeBuilder *self = (IdeXmlTreeBuilder *)state->self;
+
+  g_assert (IDE_IS_XML_TREE_BUILDER (self));
+
+  state_processing (state, (const gchar *)name, NULL, IDE_XML_SAX_CALLBACK_TYPE_END_ELEMENT, FALSE);
+}
+
+static void
+characters_sax_cb (ParserState    *state,
+                   const xmlChar  *name,
+                   gint            len)
+{
+  IdeXmlTreeBuilder *self = (IdeXmlTreeBuilder *)state->self;
+  g_autofree gchar *element_value = NULL;
+
+  g_assert (IDE_IS_XML_TREE_BUILDER (self));
 
-  state_processing (state, (const gchar *)name, NULL, IDE_XML_SAX_CALLBACK_TYPE_END_ELEMENT);
+  if (state->build_state != BUILD_STATE_GET_CONTENT)
+    return;
+
+  element_value = g_strndup ((gchar *)name, len);
+  state->build_state = BUILD_STATE_NORMAL;
+
+  state_processing (state, element_value, NULL, IDE_XML_SAX_CALLBACK_TYPE_CHAR, FALSE);
+}
+
+const gchar *
+get_menu_attribute_value (IdeXmlSymbolNode *node,
+                          const gchar      *name)
+{
+  IdeXmlSymbolNode *child;
+  gint n_children;
+
+  g_assert (IDE_IS_XML_SYMBOL_NODE (node));
+
+  n_children = ide_xml_symbol_node_get_n_internal_children (node);
+  for (gint i = 0; i < n_children; ++i)
+    {
+      child = IDE_XML_SYMBOL_NODE (ide_xml_symbol_node_get_nth_internal_child (node, i));
+      if (ide_symbol_node_get_kind (IDE_SYMBOL_NODE (child)) == IDE_SYMBOL_UI_MENU_ATTRIBUTE &&
+          ide_str_equal0 (ide_symbol_node_get_name (IDE_SYMBOL_NODE (child)), name))
+        {
+          return ide_xml_symbol_node_get_value (child);
+        }
+    }
+
+  return NULL;
+}
+
+static void
+node_post_processing_collect_style_classes (IdeXmlTreeBuilder *self,
+                                            IdeXmlSymbolNode  *node)
+{
+  IdeXmlSymbolNode *child;
+  g_autoptr (GString) label = NULL;
+  gint n_children;
+
+  g_assert (IDE_IS_XML_SYMBOL_NODE (node));
+
+  label = g_string_new (NULL);
+  n_children = ide_xml_symbol_node_get_n_internal_children (node);
+  for (gint i = 0; i < n_children; ++i)
+    {
+      g_autofree gchar *class_tag = NULL;
+
+      child = IDE_XML_SYMBOL_NODE (ide_xml_symbol_node_get_nth_internal_child (node, i));
+      if (ide_symbol_node_get_kind (IDE_SYMBOL_NODE (child)) == IDE_SYMBOL_UI_STYLE_CLASS)
+        {
+          class_tag = ide_xml_tree_builder_get_color_tag (self, ide_symbol_node_get_name (IDE_SYMBOL_NODE 
(child)),
+                                                          COLOR_TAG_STYLE_CLASS, TRUE, TRUE, TRUE);
+          g_string_append (label, class_tag);
+          g_string_append (label, " ");
+        }
+    }
+
+  g_object_set (node,
+                "name", label->str,
+                "use-markup", TRUE,
+                NULL);
+}
+
+static void
+node_post_processing_add_label (IdeXmlTreeBuilder *self,
+                                IdeXmlSymbolNode  *node)
+{
+  const gchar *value;
+  g_autoptr (GString) name = NULL;
+  g_autofree gchar *label = NULL;
+
+  g_assert (IDE_IS_XML_SYMBOL_NODE (node));
+
+  if (NULL != (value = get_menu_attribute_value (node, "label")))
+    {
+      name = g_string_new (NULL);
+      label = ide_xml_tree_builder_get_color_tag (self, "label", COLOR_TAG_LABEL, TRUE, TRUE, TRUE);
+
+      g_string_append (name, label);
+      g_string_append (name, value);
+      g_object_set (node,
+                    "name", name->str,
+                    "use-markup", TRUE,
+                    NULL);
+    }
+}
+
+static gboolean
+ide_xml_tree_builder_post_processing (IdeXmlTreeBuilder *self,
+                                      IdeXmlSymbolNode  *root_node)
+{
+  g_autoptr(GPtrArray) ar = NULL;
+  IdeXmlSymbolNode *node;
+  const gchar *element_name;
+  gint n_children;
+
+  g_assert (IDE_IS_XML_SYMBOL_NODE (root_node));
+
+  ar = g_ptr_array_new ();
+  g_ptr_array_add (ar, root_node);
+
+  while (ar->len > 0)
+    {
+      node = g_ptr_array_remove_index (ar, ar->len - 1);
+
+      n_children = ide_xml_symbol_node_get_n_children (node);
+      for (gint i = 0; i < n_children; ++i)
+        g_ptr_array_add (ar, ide_xml_symbol_node_get_nth_child (node, i));
+
+      element_name = ide_xml_symbol_node_get_element_name (node);
+
+      if (ide_str_equal0 (element_name, "style"))
+        node_post_processing_collect_style_classes (self, node);
+      else if (ide_str_equal0 (element_name, "item"))
+        node_post_processing_add_label (self, node);
+      else if (ide_str_equal0 (element_name, "submenu"))
+        node_post_processing_add_label (self, node);
+    }
+
+  return TRUE;
 }
 
 IdeXmlSymbolNode *
-ide_xml_tree_builder_ui_create (IdeXmlSax   *parser,
-                                GFile       *file,
-                                const gchar *data,
-                                gsize        length)
+ide_xml_tree_builder_ui_create (IdeXmlTreeBuilder *self,
+                                IdeXmlSax         *parser,
+                                GFile             *file,
+                                const gchar       *data,
+                                gsize              length)
 {
   ParserState *state;
+  IdeXmlSymbolNode *root_node;
   g_autofree gchar *uri = NULL;
 
-  g_assert (IDE_IS_XML_SAX (parser));
+  g_return_val_if_fail (IDE_IS_XML_SAX (parser), NULL);
+  g_return_val_if_fail (G_IS_FILE (file), NULL);
+  g_return_val_if_fail (data != NULL, NULL);
+  g_return_val_if_fail (length > 0, NULL);
 
   state = g_slice_new0 (ParserState);
+  state->self = self;
   state->parser = g_object_ref (parser);
   state->stack = ide_xml_stack_new ();
   state->file = g_object_ref (file);
+  state->build_state = BUILD_STATE_NORMAL;
 
   ide_xml_sax_clear (parser);
   ide_xml_sax_set_callback (parser, IDE_XML_SAX_CALLBACK_TYPE_START_ELEMENT, start_element_sax_cb);
   ide_xml_sax_set_callback (parser, IDE_XML_SAX_CALLBACK_TYPE_END_ELEMENT, end_element_sax_cb);
+  ide_xml_sax_set_callback (parser, IDE_XML_SAX_CALLBACK_TYPE_CHAR, characters_sax_cb);
 
-  state->root_node = ide_xml_symbol_node_new ("root", "root", IDE_SYMBOL_NONE, NULL, 0, 0);
-  ide_xml_stack_push (state->stack, "root", state->root_node, NULL, 0);
-
+  state->root_node = ide_xml_symbol_node_new ("root", NULL, "root", IDE_SYMBOL_NONE, NULL, 0, 0);
   state->parent_node = state->root_node;
-  printf ("root node:%p\n", state->root_node);
+  ide_xml_stack_push (state->stack, "root", state->root_node, NULL, 0);
 
   uri = g_file_get_uri (file);
   ide_xml_sax_parse (parser, data, length, uri, state);
-  printf ("stack size:%li\n", ide_xml_stack_get_size (state->stack));
 
+  root_node = state->root_node;
   parser_state_free (state);
 
-  return state->root_node;
+  ide_xml_tree_builder_post_processing (self, root_node);
+  return root_node;
 }
diff --git a/plugins/xml-pack/ide-xml-tree-builder-ui.h b/plugins/xml-pack/ide-xml-tree-builder-ui.h
index 6d6ae51..1bb71c2 100644
--- a/plugins/xml-pack/ide-xml-tree-builder-ui.h
+++ b/plugins/xml-pack/ide-xml-tree-builder-ui.h
@@ -23,14 +23,16 @@
 
 #include "ide-xml-sax.h"
 #include "ide-xml-symbol-node.h"
+#include "ide-xml-tree-builder.h"
 #include "xml-reader.h"
 
 G_BEGIN_DECLS
 
-IdeXmlSymbolNode *ide_xml_tree_builder_ui_create (IdeXmlSax   *parser,
-                                                  GFile       *file,
-                                                  const gchar *data,
-                                                  gsize        length);
+IdeXmlSymbolNode *ide_xml_tree_builder_ui_create (IdeXmlTreeBuilder *self,
+                                                  IdeXmlSax         *parser,
+                                                  GFile             *file,
+                                                  const gchar       *data,
+                                                  gsize              length);
 
 G_END_DECLS
 
diff --git a/plugins/xml-pack/ide-xml-tree-builder.c b/plugins/xml-pack/ide-xml-tree-builder.c
index c5fb1f7..d4d02aa 100644
--- a/plugins/xml-pack/ide-xml-tree-builder.c
+++ b/plugins/xml-pack/ide-xml-tree-builder.c
@@ -80,8 +80,8 @@ builder_state_free (BuilderState *state)
 G_DEFINE_TYPE (IdeXmlTreeBuilder, ide_xml_tree_builder, IDE_TYPE_OBJECT)
 
 static GBytes *
-ide_xml_service_get_file_content (IdeXmlTreeBuilder *self,
-                                  GFile             *file)
+ide_xml_tree_builder_get_file_content (IdeXmlTreeBuilder *self,
+                                       GFile             *file)
 {
   IdeContext *context;
   IdeBufferManager *manager;
@@ -148,7 +148,6 @@ build_tree_worker (GTask        *task,
   BuilderState *state = (BuilderState *)task_data;
   IdeXmlSymbolNode *root_node = NULL;
   const gchar *data;
-  g_autofree gchar *uri;
   gsize size;
 
   g_assert (IDE_IS_XML_TREE_BUILDER (self));
@@ -157,12 +156,11 @@ build_tree_worker (GTask        *task,
   g_assert (!cancellable || G_IS_CANCELLABLE (cancellable));
 
   data = g_bytes_get_data (state->content, &size);
-  uri = g_file_get_uri (state->file);
 
-  if (ide_xml_tree_builder_file_is_ui (state->file,data, size))
-    root_node = ide_xml_tree_builder_ui_create (state->parser, state->file, data, size);
+  if (ide_xml_tree_builder_file_is_ui (state->file, data, size))
+    root_node = ide_xml_tree_builder_ui_create (self, state->parser, state->file, data, size);
   else
-    root_node = ide_xml_tree_builder_generic_create (state->parser, state->file, data, size);
+    root_node = ide_xml_tree_builder_generic_create (self, state->parser, state->file, data, size);
 
   if (root_node == NULL)
     {
@@ -194,7 +192,7 @@ ide_xml_tree_builder_build_tree_async (IdeXmlTreeBuilder   *self,
   task = g_task_new (self, cancellable, callback, user_data);
   g_task_set_source_tag (task, ide_xml_tree_builder_build_tree_async);
 
-  if (NULL == (content = ide_xml_service_get_file_content (self, file)))
+  if (NULL == (content = ide_xml_tree_builder_get_file_content (self, file)))
     {
       g_task_return_new_error (task,
                                G_IO_ERROR,
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]