Fix Hinter implementations

kkawakam · Aug 3, 2021 · dbf7fd0 · dbf7fd0
1 parent 6e5a7c6
commit dbf7fd0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/examples/diy_hints.rs b/examples/diy_hints.rs
@@ -52,7 +52,7 @@ impl Hinter for DIYHinter {
     type Hint = CommandHint;
 
     fn hint(&self, line: &str, pos: usize, _ctx: &Context<'_>) -> Option<CommandHint> {
-        if pos < line.len() {
+        if line.is_empty() || pos < line.len() {
             return None;
         }
 
@@ -61,7 +61,7 @@ impl Hinter for DIYHinter {
             .filter_map(|hint| {
                 // expect hint after word complete, like redis cli, add condition:
                 // line.ends_with(" ")
-                if pos > 0 && hint.display.starts_with(&line[..pos]) {
+                if hint.display.starts_with(line) {
                     Some(hint.suffix(pos))
                 } else {
                     None

diff --git a/src/hint.rs b/src/hint.rs
@@ -56,7 +56,7 @@ impl Hinter for HistoryHinter {
     type Hint = String;
 
     fn hint(&self, line: &str, pos: usize, ctx: &Context<'_>) -> Option<String> {
-        if pos < line.len() {
+        if line.is_empty() || pos < line.len() {
             return None;
         }
         let start = if ctx.history_index() == ctx.history().len() {
@@ -66,9 +66,9 @@ impl Hinter for HistoryHinter {
         };
         if let Some(sr) = ctx
             .history
-            .starts_with(&line[..pos], start, SearchDirection::Reverse)
+            .starts_with(line, start, SearchDirection::Reverse)
         {
-            if sr.entry == line || sr.entry == &line[..pos] {
+            if sr.entry == line {
                 return None;
             }
             return Some(sr.entry[pos..].to_owned());