[gnome-builder] auto-indent: handle indent after "else"

[Christian Hergert <chergert src gnome org>]

commit 481feb37aa446aefedec6f1ba3445297b030caa0
Author: Christian Hergert <christian hergert me>
Date:   Thu Sep 18 22:01:12 2014 -0700

    auto-indent: handle indent after "else"

 src/editor/gb-source-auto-indenter-c.c |   47 +++++++++++++++++++++++++++-----
 1 files changed, 40 insertions(+), 7 deletions(-)
---
diff --git a/src/editor/gb-source-auto-indenter-c.c b/src/editor/gb-source-auto-indenter-c.c
index 0ef0f0c..3c5e801 100644
--- a/src/editor/gb-source-auto-indenter-c.c
+++ b/src/editor/gb-source-auto-indenter-c.c
@@ -91,6 +91,13 @@ build_indent (GbSourceAutoIndenterC *c,
 }
 
 static gboolean
+non_space_predicate (gunichar ch,
+                     gpointer user_data)
+{
+  return !g_unichar_isspace (ch);
+}
+
+static gboolean
 backward_find_keyword (GtkTextIter *iter,
                        const gchar *keyword,
                        GtkTextIter *limit)
@@ -142,6 +149,26 @@ backward_find_condition_keyword (GtkTextIter *iter)
   return FALSE;
 }
 
+static gchar *
+backward_last_word (GtkTextIter *iter,
+                    GtkTextIter *begin)
+{
+  gtk_text_iter_assign (begin, iter);
+
+  if (gtk_text_iter_backward_word_start (begin))
+    {
+      GtkTextIter end;
+
+      gtk_text_iter_assign (&end, begin);
+
+      if (gtk_text_iter_ends_word (&end) ||
+          gtk_text_iter_forward_word_end (&end))
+        return gtk_text_iter_get_slice (begin, &end);
+    }
+
+  return NULL;
+}
+
 static gboolean
 backward_find_matching_char (GtkTextIter *iter,
                              gunichar     ch)
@@ -260,13 +287,6 @@ backward_to_line_first_char (GtkTextIter *iter)
 }
 
 static gboolean
-non_space_predicate (gunichar ch,
-                     gpointer user_data)
-{
-  return !g_unichar_isspace (ch);
-}
-
-static gboolean
 backward_before_c89_comment (GtkTextIter *iter)
 {
   GtkTextIter copy;
@@ -354,6 +374,7 @@ gb_source_auto_indenter_c_indent (GbSourceAutoIndenterC *c,
   gunichar ch;
   GString *str;
   gchar *ret = NULL;
+  gchar *last_word = NULL;
 
   ENTRY;
 
@@ -543,8 +564,20 @@ gb_source_auto_indenter_c_indent (GbSourceAutoIndenterC *c,
         }
     }
 
+  last_word = backward_last_word (iter, &match_begin);
+
+  if (g_strcmp0 (last_word, "else") == 0)
+    {
+      guint offset;
+
+      offset = gtk_text_iter_get_line_offset (&match_begin);
+      build_indent (c, offset + priv->scope_indent, iter, str);
+      GOTO (cleanup);
+    }
+
 cleanup:
   gtk_text_iter_assign (iter, &cur);
+  g_free (last_word);
 
   ret = g_string_free (str, FALSE);