Changeset 4170

Timestamp:

04/26/09 12:09:59 (3 years ago)

Author:

azawawi

Message:

Added support for Perl 6 attributes. No traits though.

File:

• trunk/Padre-Plugin-Perl6/lib/Padre/Task/Outline/Perl6.pm (modified) (8 diffs)

trunk/Padre-Plugin-Perl6/lib/Padre/Task/Outline/Perl6.pm

@@ -56 +56 @@
         my $symbol_name = '';
         my $symbol_line = -1;
+        my $symbol_suffix = '';
         my $symbol_context = '';
         my $context = 'GLOBAL';
@@ -81 +82 @@
                 } elsif($tree =~ /routine_declarator__\w+_\d+method method_def (longname|$)/) {
                     # a method
+                    if($buffer eq '!') {
+                        # private method...
+                        $symbol_suffix = " (private)";
+                    }
                     $symbol_type = "methods";
                     $symbol_name .= $buffer;
@@ -99 +104 @@
                     $symbol_name .= $buffer;
                     $symbol_line = $lineno;
+                } elsif($tree =~ /scope_declarator__\w+_\d+(our|my|has|state|constant) scoped declarator variable_declarator variable/) {
+                    # a start for an attribute declaration
+                    $symbol_type = "attributes";
+                    $symbol_name .= $buffer;
+                    $symbol_line = $lineno;
+                    $symbol_suffix = $1;
                 } else {
                     if($symbol_name ne '') {
@@ -116 +127 @@
                             $cur_pkg->{line} = $symbol_line;
                         } else {
-                            if($symbol_type eq 'methods' && $symbol_name =~ /^!/) {
-                                # private method...
-                                $symbol_name .= " (private)";
+                            if($symbol_type eq 'attributes') {
+                                if($symbol_name !~ /\./) {
+                                    $symbol_suffix = " (private, $symbol_suffix)";
+                                } else {
+                                    $symbol_suffix = " ($symbol_suffix)";
+                                }
                             }
+                            $symbol_name .= $symbol_suffix;
                             push @{ $cur_pkg->{$symbol_type} }, {
                                 name => $symbol_name, 
@@ -128 +143 @@
                         $symbol_name = '';
                         $symbol_line = -1;
+                        $symbol_suffix = '';
                     }
                 }
@@ -241 +257 @@
             )
         );
-        foreach my $type (qw(modules subroutines methods submethods macros regexes)) {
+        foreach my $type (qw(modules subroutines methods submethods macros regexes attributes)) {
             _add_subtree( $outlinebar, $pkg, $type, $branch );
         }
@@ -264 +280 @@
 
         my @sorted_entries = ();
-        if ( $type eq 'subroutines' || $type eq 'methods' || $type eq 'submethods' || $type eq 'macros') {
+        if ( $type eq 'subroutines' || $type eq 'methods' || $type eq 'submethods' || $type eq 'macros' || $type eq 'attributes') {
             my $config = Padre->ide->config;
             if ( $config->main_functions_order eq 'original' ) {
@@ -304 +320 @@
             $type eq 'submethods' || 
             $type eq 'macros' || 
-            $type eq 'regexes') 
+            $type eq 'regexes' ||
+            $type eq 'attributes') 
         {
             $outlinebar->Expand($type_elem);