Fix: strip " and ' from the lisp variable names

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "string-template-plus"
-version = "0.4.1"
+version = "0.4.2"
 edition = "2021"
 authors = ["Gaurav Atreya"]
 description = "Render string template with more options"

PKGBUILD

@@ -1,6 +1,6 @@
 # Maintainer: Gaurav Atreya <allmanpride@gmail.com>
 pkgname=string-template-plus
-pkgver=0.4.1
+pkgver=0.4.2
 pkgrel=1
 pkgdesc="String Template with extra functionalities"
 arch=('x86_64')

src/bin/stp-visualize.rs

@@ -1,5 +1,5 @@
+use std::env;
 use std::error::Error;
-use std::{collections::HashSet, env};
 use string_template_plus::{Render, Template};
 
 fn main() -> Result<(), Box<dyn Error>> {
@@ -14,11 +14,11 @@ fn main() -> Result<(), Box<dyn Error>> {
         let templ = Template::parse_template(&contents)?;
         templ.print();
         println!();
-        println!("--------");
-        let vars: HashSet<&str> = templ.parts().iter().flat_map(|p| p.variables()).collect();
-        println!("Variables: {:?}", vars);
-        println!("--------");
-        println!("{:?}", templ.parts());
+        // println!("--------");
+        // let vars: HashSet<&str> = templ.parts().iter().flat_map(|p| p.variables()).collect();
+        // println!("Variables: {:?}", vars);
+        // println!("--------");
+        // println!("{:#?}", templ.parts());
     }
     Ok(())
 }

src/lib.rs

@@ -370,8 +370,17 @@ impl TemplatePart {
         let variables = part
             .match_indices("(st+")
             .filter_map(|(loc, _)| {
-                let end = Self::find_end(')', &part, loc).ok()? - 1;
-                part[loc..end].find(' ').map(|s| (s + 1 + loc, end))
+                let end = Self::find_end(')', &part, loc + 1).ok()?;
+                part[loc..end].find(' ').map(|s| {
+                    let p = &part[(s + 1 + loc)..end];
+                    if p.starts_with('"') {
+                        (s + 2 + loc, end - 1)
+                    } else if p.starts_with('\'') {
+                        (s + 2 + loc, end)
+                    } else {
+                        (s + 1 + loc, end)
+                    }
+                })
             })
             .collect();
         Self::Lisp(part, fstr, variables)

templates/test5

@@ -1 +1 @@
-see $(some-command --flag "and the value" {problem}) =(+ 1 2 (st+num hithere)) {otherhi?=(1+ pi):f(4)}
+see $(some-command --flag "and the value" {problem}) =(+ 1 2 (st+num 'hithere) (st+num "otherhi")) {otherhi?=(1+ pi):f(4)}