Rewrite the Completion plugin using PPI. It's much more powerful and extensible.

Currently it only completes on keywords like 'while' and 'substr'.

git-svn-id: http://dev.catalyst.perl.org/repos/bast/trunk/Devel-REPL@3777 bd8105ee-0ff8-0310-8827-fb3f25b6796d

diff --git a/Makefile.PL b/Makefile.PL
index 0e5e2c1..9744007 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -19,6 +19,8 @@ requires 'Lexical::Persistence';
 requires 'Data::Dump::Streamer';
 requires 'PPI';
 requires 'Term::ANSIColor';
+requires 'B::Keywords';
+requires 'Task::Weaken';
 
 auto_install;
 WriteAll;

diff --git a/lib/Devel/REPL/Plugin/Completion.pm b/lib/Devel/REPL/Plugin/Completion.pm
index ad7c25f..ae4a8ec 100644 (file)
--- a/lib/Devel/REPL/Plugin/Completion.pm
+++ b/lib/Devel/REPL/Plugin/Completion.pm
@@ -1,76 +1,64 @@
 package Devel::REPL::Plugin::Completion;
-
-use Moose::Role;
+use Devel::REPL::Plugin;
+use Scalar::Util 'weaken';
+use PPI;
 use namespace::clean -except => [ 'meta' ];
 
+has current_matches => (
+    is => 'rw',
+    isa => 'ArrayRef',
+    lazy => 1,
+    default => sub { [] },
+);
 
-# push the given string in the completion list
-sub push_completion
-{
-    my ($self, $string) = @_;
-    $self->term->Attribs->{completion_entry_function} = 
-        $self->term->Attribs->{list_completion_function};
-    push @{$self->term->Attribs->{completion_word}}, $string;
-};
+has match_index => (
+    is => 'rw',
+    isa => 'Int',
+    lazy => 1,
+    default => sub { 0 },
+);
 
-# return the namespace of the module given
-sub get_namespace
-{
-    my ($self, $module) = @_;
-    my $namespace;
-    eval '$namespace = \%'.$module.'::';
-    return $namespace;
-}
+sub BEFORE_PLUGIN {
+  my ($self) = @_;
 
-# we wrap the run method to init the completion list 
-# with filenames found in the current dir and init 
-# the completion list.
-# yes, this is our 'init the plugin' stuff actually
-sub BEFORE_PLUGIN 
-{
-    my ($self) = @_;
-    # set the completion function
-    $self->term->Attribs->{completion_entry_function} = 
-        $self->term->Attribs->{list_completion_function};
-    $self->term->Attribs->{completion_word} = [];
+  my $weakself = $self;
+  weaken($weakself);
 
-    # now put each file in curdir in the completion list
-    my $curdir = File::Spec->curdir();
-    if (opendir(CURDIR, $curdir)) {
-        while (my $file = readdir(CURDIR)) {
-            next if $file =~ /^\.+$/; # we skip "." and ".."
-                $self->push_completion($file);
-        }
-    }
-    closedir(CURDIR);
+  $self->term->Attribs->{attempted_completion_function} = sub {
+    $weakself->_completion(@_);
+  };
 }
 
-# wrap the eval one to catch each 'use' statement in order to 
-# load the namespace in the completion list (module functions and friends)
-# we do that around the eval method cause we want the module to be actually loaded.
-around 'eval' => sub {
-    my $orig = shift;
-    my ($self, $line) = @_;
-    my @ret = $self->$orig($line);
-    
-    # the namespace of the loaded module
-    if ($line =~ /\buse\s+(\S+)/) {
-        my $module = $1;
-        foreach my $keyword (keys %{$self->get_namespace($module) || {}}) {
-            $self->push_completion($keyword);
-        }
-    }
+sub _completion {
+  my ($self, $text, $line, $start, $end) = @_;
+
+  # we're discarding everything after the cursor for completion purposes
+  substr($line, $end) = '';
+
+  my $document = PPI::Document->new(\$line);
+  return unless defined($document);
+
+  my @matches = $self->complete($text, $document);
 
-    # parses the lexical environment for new variables to add to 
-    # the completion list
-    my $lex = $self->lexical_environment;
-    foreach my $var (keys %{$lex->get_context('_')}) {
-        $var = substr($var, 1); # we drop the variable idiom as it confuses the completion
-        $self->push_completion($var) unless 
-            grep $_ eq $var, @{$self->term->Attribs->{completion_word}};
+  # iterate through the completions
+  return $self->term->completion_matches($text, sub {
+    my ($text, $state) = @_;
+
+    if (!$state) {
+      $self->current_matches(\@matches);
+      $self->match_index(0);
+    }
+    else {
+      $self->match_index($self->match_index + 1);
     }
 
-    return @ret;
-};
+    return $self->current_matches->[$self->match_index];
+  });
+}
+
+sub complete {
+  return ();
+}
 
 1;
+

diff --git a/lib/Devel/REPL/Plugin/CompletionDriver/Keywords.pm b/lib/Devel/REPL/Plugin/CompletionDriver/Keywords.pm
new file mode 100644 (file)
index 0000000..08e9f2b
--- /dev/null
+++ b/lib/Devel/REPL/Plugin/CompletionDriver/Keywords.pm
@@ -0,0 +1,26 @@
+package Devel::REPL::Plugin::CompletionDriver::Keywords;
+use Devel::REPL::Plugin;
+use B::Keywords qw/@Functions @Barewords/;
+use namespace::clean -except => [ 'meta' ];
+
+around complete => sub {
+  my $orig = shift;
+  my ($self, $text, $document) = @_;
+
+  # recursively find the last element
+  my $last = $document;
+  while ($last->can('last_element') && defined($last->last_element)) {
+      $last = $last->last_element;
+  }
+
+  return $orig->(@_)
+    unless $last->isa('PPI::Token::Word');
+
+  my $re = qr/^\Q$last/;
+
+  return $orig->(@_),
+         grep { $_ =~ $re } @Functions, @Barewords;
+};
+
+1;
+