Changeset 3024

Timestamp:

02/06/09 14:54:38 (3 years ago)

Author:

hjansen

Message:

Implemented feature request #236 (bracket autocompletion)

There might be some need for refactoring already included in this patch:
I am not overly content with the preferences option position in the
"Perl" menu and the config option might need a "perl_" prefix?

Location:

trunk/Padre/lib/Padre

Files:

• Config.pm (modified) (1 diff)
• Document/Perl.pm (modified) (1 diff)
• Wx/Editor.pm (modified) (2 diffs)
• Wx/Menu/Perl.pm (modified) (2 diffs)

trunk/Padre/lib/Padre/Config.pm

@@ -338 +338 @@
 );
 setting(
+    name    => 'autocomplete_brackets',
+    type    => BOOLEAN,
+    store   => HUMAN,
+    default => 0,
+);
+setting(
     # By default use background threads unless profiling
     # TODO - Make the default actually change

trunk/Padre/lib/Padre/Document/Perl.pm

@@ -552 +552 @@
 }
 
+sub event_on_char {
+    my ( $self, $editor, $event ) = @_;
+
+    my $key = $event->GetUnicodeKey;
+
+    if ( Padre->ide->config->autocomplete_brackets ) {
+        my %table = ( 40 => 41, 60 => 62, 91 => 93, ); # <> would be: 123 => 125, );
+        my $pos = $editor->GetCurrentPos;
+        foreach my $code ( keys %table ) {
+            if ( $key == $code ) {
+                my $nextChar;
+                if ( $editor->GetTextLength > $pos ) {
+                    $nextChar = $editor->GetTextRange( $pos, $pos + 1 );
+                }
+                unless (
+                    defined($nextChar)
+                    && ord($nextChar) == $table{$code}
+                ) {
+                    $editor->AddText( chr( $table{$code} ) );
+                    $editor->CharLeft;
+                    last;
+                }
+            }
+        }
+    }
+
+    return;
+}
+
 1;
 

trunk/Padre/lib/Padre/Wx/Editor.pm

@@ -46 +46 @@
     Wx::Event::EVT_RIGHT_DOWN( $self, \&on_right_down );
     Wx::Event::EVT_LEFT_UP(    $self, \&on_left_up    );
+    Wx::Event::EVT_CHAR(       $self, \&on_char       );
 
     if ( Padre->ide->config->editor_wordwrap ) {
@@ -738 +739 @@
 }
 
+sub on_char {
+    my ( $self, $event ) = @_;
+
+    my $doc = $self->{Document};
+    if ( $doc->can('event_on_char') ) {
+        $doc->event_on_char( $self, $event );
+    }
+
+    $event->Skip;
+    return;
+}
+
 sub on_left_up {
     my ($self, $event) = @_;

trunk/Padre/lib/Padre/Wx/Menu/Perl.pm

@@ -275 +275 @@
     );
 
+    $self->{autocomplete_brackets} = $self->AppendCheckItem(
+        -1,
+        Wx::gettext("Automatic bracket completion")
+    );
+    Wx::Event::EVT_MENU( $main, $self->{autocomplete_brackets},
+        sub {
+            # Update the saved config setting
+            my $config = Padre->ide->config;
+            $config->set( autocomplete_brackets => $_[1]->IsChecked ? 1 : 0 );
+        }
+    );
+
     return $self;
 }
@@ -284 +296 @@
     $self->{ppi_highlight}->Check( $config->ppi_highlight );
     $self->{run_stacktrace}->Check( $config->run_stacktrace );
+    $self->{autocomplete_brackets}->Check( $config->autocomplete_brackets );
 
     no warnings 'once'; # TODO eliminate?