X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit%2FDevel-REPL.git;a=blobdiff_plain;f=lib%2FDevel%2FREPL%2FPlugin%2FCompletion.pm;h=ebafa2eae17fea7a567a3521b0153b0e46744d1d;hp=ad7c25f1c17e546544de667349ab8a301d687014;hb=9c4fddb350dfc5c966414fa8ce43afce323573a8;hpb=33628ecb3689f2719563d0a9ae82d3ccec1a4cbb

diff --git a/lib/Devel/REPL/Plugin/Completion.pm b/lib/Devel/REPL/Plugin/Completion.pm
index ad7c25f..ebafa2e 100644
--- a/lib/Devel/REPL/Plugin/Completion.pm
+++ b/lib/Devel/REPL/Plugin/Completion.pm
@@ -1,76 +1,102 @@
 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 { [] },
+);
+
+has match_index => (
+  is => 'rw',
+  isa => 'Int',
+  lazy => 1,
+  default => sub { 0 },
+);
+
+has no_term_class_warning => (
+  isa => "Bool",
+  is  => "rw",
+  default => 0,
+);
+
+before 'read' => sub {
+  my ($self) = @_;
 
-# 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;
+  if (!$self->term->isa("Term::ReadLine::Gnu") and !$self->no_term_class_warning) {
+    warn "Term::ReadLine::Gnu is required for the Completion plugin to work";
+    $self->no_term_class_warning(1);
+  }
+
+  my $weakself = $self;
+  weaken($weakself);
+
+  $self->term->Attribs->{attempted_completion_function} = sub {
+    $weakself->_completion(@_);
+  };
 };
 
-# return the namespace of the module given
-sub get_namespace
-{
-    my ($self, $module) = @_;
-    my $namespace;
-    eval '$namespace = \%'.$module.'::';
-    return $namespace;
-}
+sub _completion {
+  my ($self, $text, $line, $start, $end) = @_;
 
-# 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} = [];
-
-    # 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);
-}
+  # we're discarding everything after the cursor for completion purposes
+  # we can't just use $text because we want all the code before the cursor to
+  # matter, not just the current word
+  substr($line, $end) = '';
 
-# 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);
-        }
-    }
+  my $document = PPI::Document->new(\$line);
+  return unless defined($document);
+
+  $document->prune('PPI::Token::Whitespace');
 
-    # 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}};
+  my @matches = $self->complete($text, $document);
+
+  # 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 ();
+}
+
+# recursively find the last element
+sub last_ppi_element {
+  my ($self, $document, $type) = @_;
+  my $last = $document;
+  while ($last->can('last_element') && defined($last->last_element)) {
+    $last = $last->last_element;
+    return $last if $type && $last->isa($type);
+  }
+  return $last;
+}
 
 1;
+
+__END__
+
+=head1 NAME
+
+Devel::REPL::Plugin::Completion - Extensible tab completion
+
+=head1 AUTHOR
+
+Shawn M Moore, C<< <sartak at gmail dot com> >>
+
+=cut
+