Changeset 9576

Timestamp:

12/09/09 15:59:58 (2 years ago)

Author:

garu

Message:

Fixing template functions for Catalyst Plugin (SeWi?++)

Location:

trunk/Padre-Plugin-Catalyst/lib/Padre

Files:

• Plugin/Catalyst.pm (modified) (1 diff)
• Wx/Menu/Catalyst.pm (modified) (2 diffs)

trunk/Padre-Plugin-Catalyst/lib/Padre/Plugin/Catalyst.pm

@@ -583 +583 @@
 sub editor_changed {
     my $self = shift;
-
-    return; # TODO: remove this line as soon as the following are working.
-
-    my $document = undef; # TODO: Fill with the current document
-    
+    my $document = $self->main->current->document || return;
+
     $document->{menu} = [] if (!defined($document->{menu})) or (ref($document->{menu}) ne 'ARRAY');
-    $document ->{menu} = [grep (!/^menu\.catalyst$/,@{$document->{menu}}) ];
-    if (my $document_is_from_catalyst_project) {
-        push @{$document->{menu}},'menu.catalyst';
+    $document->{menu} = [grep (!/^menu\.Catalyst$/,@{$document->{menu}}) ];
+
+    require Padre::Plugin::Catalyst::Util;
+    if (Padre::Plugin::Catalyst::Util::in_catalyst_project($document->filename)) {
+        push @{$document->{menu}}, 'menu.Catalyst';
     }
 }

trunk/Padre-Plugin-Catalyst/lib/Padre/Wx/Menu/Catalyst.pm

@@ -8 +8 @@
 use Padre::Wx       ();
 use Padre::Wx::Menu ();
+use Params::Util '_INSTANCE';
+use Padre::Current '_CURRENT';
 
 our $VERSION = '0.51';
@@ -57 +59 @@
     # Disable document-specific entries if we are in a Perl project
     # but not in a Perl document.
-    $self->{beginner_check}->Enable($perl);
+# FIXME: the two commands below crash unless they are defined. Should they
+# ALWAYS be defined or should we leave them like so? (garu)
+    $self->{beginner_check}->Enable($perl) if defined $self->{beginner_check};
 
     # Apply config-driven state
-    $self->{autocomplete_brackets}->Check( $config->autocomplete_brackets );
+    $self->{autocomplete_brackets}->Check( $config->autocomplete_brackets )
+        if defined $self->{autocomplete_brackets};
 
     return;