[gedit-code-assistance/wip/indent] [indent] Fall back to auto-indent



commit 15a0554236a9e8cac0e1438d13610745b20fd117
Author: Jesse van den Kieboom <jessevdk gmail com>
Date:   Fri Apr 11 18:07:54 2014 +0200

    [indent] Fall back to auto-indent

 indentbackends/c/gca-c-backend.vala |   17 +++++------------
 1 files changed, 5 insertions(+), 12 deletions(-)
---
diff --git a/indentbackends/c/gca-c-backend.vala b/indentbackends/c/gca-c-backend.vala
index 567638f..f44d431 100644
--- a/indentbackends/c/gca-c-backend.vala
+++ b/indentbackends/c/gca-c-backend.vala
@@ -161,14 +161,11 @@ class Backend : Object, Gca.IndentBackend
 
        IndentLevel get_indent(Gedit.Document document, Gtk.TextIter place)
        {
-               var amount = IndentLevel() {
-                       indent = 0,
-                       alignment = 0
-               };
-
+               // Copy indents by default
+               var amount = get_line_indents(place);
                var iter = place;
 
-               // if we are in the first line then 0 is fine
+               // if we are in the first line then do nothing
                if (iter.get_line() == 0)
                {
                        return amount;
@@ -178,11 +175,12 @@ class Backend : Object, Gca.IndentBackend
                if (document.iter_has_context_class(iter, "comment"))
                {
                        // FIXME: leave it as it is for now :)
-                       return get_line_indents(iter);
+                       return amount;
                }
 
                // move to the end of the previous line to get some context from previous lines
                iter.set_line_offset(0);
+
                if (!iter.backward_char())
                {
                        return amount;
@@ -199,11 +197,6 @@ class Backend : Object, Gca.IndentBackend
                        {
                                return amount;
                        }
-                       else
-                       {
-                               // align with the start of the comment
-                               amount = get_line_indents(iter);
-                       }
                }
 
                var c = iter.get_char();


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