split out different completion types

2 files changed, 47 insertions, 26 deletions

diff --git a/lib/Reply/Plugin/Autocomplete/Keywords.pm b/lib/Reply/Plugin/Autocomplete/Keywords.pm
new file mode 100644
index 0000000..85bfe1e
--- /dev/null
+++ b/lib/Reply/Plugin/Autocomplete/Keywords.pm
@@ -0,0 +1,39 @@
+package Reply::Plugin::Autocomplete::Keywords;
+use strict;
+use warnings;
+# ABSTRACT: tab completion for perl keywords
+
+use base 'Reply::Plugin';
+
+use B::Keywords qw/@Functions @Barewords/;
+
+=head1 SYNOPSIS
+
+  ; .replyrc
+  [ReadLine]
+  [Autocomplete::Keywords]
+
+=head1 DESCRIPTION
+
+This plugin registers a tab key handler to autocomplete keywords in Perl code.
+
+=cut
+
+sub tab_handler {
+    my $self = shift;
+    my ($line) = @_;
+
+    my ($last_word) = $line =~ /(\w+)$/;
+    return unless $last_word;
+
+    my $re = qr/^\Q$last_word/;
+
+    return grep { $_ =~ $re } @Functions, @Barewords;
+}
+
+=for Pod::Coverage
+  tab_handler
+
+=cut
+
+1;
diff --git a/lib/Reply/Plugin/Autocomplete.pm b/lib/Reply/Plugin/Autocomplete/Packages.pm
index f504f0f..4f7f2a4 100644
--- a/lib/Reply/Plugin/Autocomplete.pm
+++ b/lib/Reply/Plugin/Autocomplete/Packages.pm
@@ -1,46 +1,28 @@
-package Reply::Plugin::Autocomplete;
+package Reply::Plugin::Autocomplete::Packages;
 use strict;
 use warnings;
-# ABSTRACT: tab complete your input
+# ABSTRACT: tab completion for package names
 
 use base 'Reply::Plugin';
 
-use B::Keywords qw/@Functions @Barewords/;
 use Module::Runtime '$module_name_rx';
 
 =head1 SYNOPSIS
 
   ; .replyrc
-  [Autocomplete]
+  [ReadLine]
+  [Autocomplete::Packages]
 
 =head1 DESCRIPTION
 
-This plugin registers a tab key handler to autocomplete Perl code.
+This plugin registers a tab key handler to autocomplete package names in Perl
+code.
 
 =cut
 
 sub tab_handler {
-    my ($self, $line) = @_;
-
-    return (
-        $self->_tab_keyword($line),
-        $self->_tab_package_loaded($line),
-    );
-}
-
-sub _tab_keyword {
-    my ($self, $line) = @_;
-
-    my ($last_word) = $line =~ /(\w+)$/;
-    return unless $last_word;
-
-    my $re = qr/^\Q$last_word/;
-
-    return grep { $_ =~ $re } @Functions, @Barewords;
-}
-
-sub _tab_package_loaded {
-    my ($self, $line) = @_;
+    my $self = shift;
+    my ($line) = @_;
 
     # $module_name_rx does not permit trailing ::
     my ($package_fragment) = $line =~ /($module_name_rx(?:::)?)$/;