Changeset 11105 for trunk/Padre/lib/Padre/Action/Edit.pm

Timestamp:

03/13/10 10:45:22 (2 years ago)

Author:

karl.forner

Message:

Development related to the braces highlighting and matching.

Added some methods to enforce a uniform definition of what is a brace (so currently it is {}[](). All features using braces share this same definition :

• highlighting
• goto matching brace
• select to matching brace

Moved all related code into Editor.pm.

Modified goto matching brace (CTRL+1) and select to matching brace in order to:

• use the defined braces
• respect the inside/outsideness of starting point, meaning that is the cursor is inside the braces; its detination point is also inside
• the select to matching brace should also now work properly if there is an existing selection to the right of a closing brace

File:

• trunk/Padre/lib/Padre/Action/Edit.pm (modified) (1 diff)

trunk/Padre/lib/Padre/Action/Edit.pm

@@ -324 +324 @@
         need_editor => 1,
         label       => Wx::gettext('&Select to matching brace'),
-        comment     => Wx::gettext('Select to the matching opening or closing brace: { }, ( ), [ ], < >'),
+        comment     => Wx::gettext('Select to the matching opening or closing brace'),
         shortcut    => 'Ctrl-4',
-        menu_event  => sub {
-            my $self = shift;
-            my $INVALID_POSITION = Wx::wxSTC_INVALID_POSITION;
-            my $page = $self->current->editor;
-            my $pos1 = $page->GetCurrentPos;
-            my $pos2 = $page->BraceMatch($pos1);
-            if ( $pos2 == $INVALID_POSITION ) { #Wx::wxSTC_INVALID_POSITION
-                if ( $pos1 > 0 ) {
-                    $pos1--;
-                    $pos2 = $page->BraceMatch($pos1);
-                }
-            }
-
-            if ( $pos2 != $INVALID_POSITION ) { #Wx::wxSTC_INVALID_POSITION
-                my $start = $page->GetSelectionStart();
-                $page->SetSelection($start, $pos2+1);
-            }
-
-            return;         
-        },
+        menu_event  => sub { shift->current->editor->select_to_matching_brace }
     );