Tokenized autocompletion (#10)

* tokenizer autocompletion * fix * readme * fix Co-authored-by: chenyan-dfinity <[email protected]>
dfinity · May 23, 2021 · fdb6aad · fdb6aad
1 parent 69405a1
commit fdb6aad
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 49 deletions.
diff --git a/README.md b/README.md
@@ -141,8 +141,7 @@ If you are writing your own `.did` file, you can also supply the did file via th
 
 * Acess to service init type
 * `IDLValue::Blob` for efficient blob serialization
-* Tokenization for partial parser (variable needs a preceding space for autocompletion)
-* Autocompletion within Candid value; autocompletion for decode method
+* Autocompletion within Candid value
 * Robust support for `~=`, requires inferring principal types
 * Loop detection for `load`
 * Assert upgrade correctness
diff --git a/src/exp.rs b/src/exp.rs
@@ -269,7 +269,7 @@ impl std::str::FromStr for Exp {
         super::grammar::ExpParser::new().parse(lexer)
     }
 }
-fn str_to_principal(id: &str, helper: &MyHelper) -> Result<Principal> {
+pub fn str_to_principal(id: &str, helper: &MyHelper) -> Result<Principal> {
     let try_id = Principal::from_text(id);
     Ok(match try_id {
         Ok(id) => id,

diff --git a/src/helper.rs b/src/helper.rs
@@ -1,4 +1,5 @@
-use crate::exp::Exp;
+use crate::exp::{str_to_principal, Exp};
+use crate::token::{Token, Tokenizer};
 use ansi_term::Color;
 use candid::{
     check_prog,
@@ -145,52 +146,62 @@ enum Partial {
 
 fn partial_parse(line: &str, pos: usize, helper: &MyHelper) -> Option<(usize, Partial)> {
     let (start, _) = extract_word(line, pos, None, b" ");
-    let prev = &line[..start].trim_end();
-    let (_, prev) = extract_word(prev, prev.len(), None, b" ");
-    let is_call = matches!(prev, "call" | "encode");
-    if is_call {
-        let pos_tail = line[start..pos]
-            .rfind('.')
-            .map(|v| start + v)
-            .unwrap_or(pos);
-        let tail = if pos_tail < pos {
-            line[pos_tail + 1..pos].to_string()
+    let iter = Tokenizer::new(&line[start..pos]);
+    let mut tokens = Vec::new();
+    let mut pos_start = 0;
+    for v in iter {
+        let v = v.ok()?;
+        if pos_start == 0
+            && matches!(
+                v.1,
+                Token::Equals | Token::TestEqual | Token::SubEqual | Token::NotEqual
+            )
+        {
+            pos_start = v.2;
+        }
+        let tok = if let Token::Text(id) = v.1 {
+            Token::Id(id)
         } else {
-            String::new()
+            v.1
         };
-        let id = &line[start..pos_tail];
-        if id.starts_with('"') {
-            if id.len() >= 7 {
-                let id = Principal::from_text(&id[1..id.len() - 1]).ok()?;
-                Some((pos_tail, Partial::Call(id, tail)))
-            } else {
-                None
-            }
-        } else {
-            match helper.env.0.get(id)? {
-                IDLValue::Principal(id) => Some((pos_tail, Partial::Call(id.clone(), tail))),
-                _ => None,
+        tokens.push((v.0, tok));
+    }
+    match tokens.as_slice() {
+        [(_, Token::Id(id))] => match str_to_principal(id, helper) {
+            Ok(id) => Some((pos, Partial::Call(id, "".to_string()))),
+            Err(_) => parse_value(&line[..pos], start, pos, helper),
+        },
+        [(_, Token::Id(id)), (pos_tail, Token::Dot)]
+        | [(_, Token::Id(id)), (pos_tail, Token::Dot), (_, _)] => {
+            match str_to_principal(id, helper) {
+                Ok(id) => Some((
+                    start + pos_tail,
+                    Partial::Call(id, line[start + pos_tail + 1..pos].to_string()),
+                )),
+                Err(_) => parse_value(&line[..pos], start + pos_start, start + pos_tail, helper),
             }
         }
-    } else {
-        let pos_tail = if line[..pos].ends_with(']') {
-            pos
-        } else {
-            line[start..pos]
-                .rfind(|c| c == '.' || c == '[' || c == ']')
-                .map(|v| start + v)
-                .unwrap_or(pos)
-        };
-        let v = line[start..pos_tail].parse::<Exp>().ok()?;
-        let v = v.eval(helper).ok()?;
-        let tail = if pos_tail < pos {
-            line[pos_tail..pos].to_string()
-        } else {
-            String::new()
-        };
-        Some((pos_tail, Partial::Val(v, tail)))
+        [.., (_, Token::RSquare)] | [.., (_, Token::Question)] => {
+            parse_value(&line[..pos], start + pos_start, pos, helper)
+        }
+        [.., (pos_tail, Token::Dot)]
+        | [.., (pos_tail, Token::Dot), (_, _)]
+        | [.., (pos_tail, Token::LSquare)]
+        | [.., (pos_tail, Token::LSquare), (_, Token::Decimal(_))] => {
+            parse_value(&line[..pos], start + pos_start, start + pos_tail, helper)
+        }
+        _ => None,
     }
 }
+fn parse_value(
+    line: &str,
+    start: usize,
+    end: usize,
+    helper: &MyHelper,
+) -> Option<(usize, Partial)> {
+    let v = line[start..end].parse::<Exp>().ok()?.eval(helper).ok()?;
+    Some((end, Partial::Val(v, line[end..].to_string())))
+}
 fn match_selector(v: &IDLValue, prefix: &str) -> Vec<Pair> {
     match v {
         IDLValue::Opt(_) => vec![Pair {
@@ -399,7 +410,7 @@ fn test_partial_parse() -> anyhow::Result<()> {
         .env
         .0
         .insert("ic0".to_string(), IDLValue::Principal(ic0.clone()));
-    assert_eq!(partial_parse("call a", 6, &helper), None);
+    assert_eq!(partial_parse("call x", 6, &helper), None);
     assert_eq!(
         partial_parse("let id = call \"aaaaa-aa\"", 24, &helper).unwrap(),
         (24, Partial::Call(ic0.clone(), "".to_string()))
@@ -437,19 +448,19 @@ fn test_partial_parse() -> anyhow::Result<()> {
     );
     assert_eq!(partial_parse("let id = a.f1.", 14, &helper), None);
     assert_eq!(
-        partial_parse("let id = a?", 11, &helper).unwrap(),
+        partial_parse("let id =a?", 10, &helper).unwrap(),
         (
-            11,
+            10,
             Partial::Val(
                 "record { variant {b=vec{1;2;3}}; 42; f1=42;42=35;a1=30}".parse::<IDLValue>()?,
                 "".to_string()
             )
         )
     );
     assert_eq!(
-        partial_parse("let id = a?.", 12, &helper).unwrap(),
+        partial_parse("let id=a?.", 10, &helper).unwrap(),
         (
-            11,
+            9,
             Partial::Val(
                 "record { variant {b=vec{1;2;3}}; 42; f1=42;42=35;a1=30}".parse::<IDLValue>()?,
                 ".".to_string()