From 3ffdd2599b0f1b5b44949c5938605682a0d32bc0 Mon Sep 17 00:00:00 2001 From: gedi Date: Sun, 15 May 2016 12:28:44 +0300 Subject: [PATCH] snippet builder fixes, closes #23 --- fmt.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fmt.go b/fmt.go index 3c7ad6e..3fba9cf 100644 --- a/fmt.go +++ b/fmt.go @@ -334,7 +334,7 @@ func (s *undefinedSnippet) Args() (ret string) { } last = arg } - return strings.TrimRight(ret, ", ") + " " + last + return strings.TrimSpace(strings.TrimRight(ret, ", ") + " " + last) } func (f *basefmt) snippets() string { @@ -346,13 +346,13 @@ func (f *basefmt) snippets() string { var snips []*undefinedSnippet // build snippets for _, u := range f.undefined { - expr := snippetExprCleanup.ReplaceAllString(u.step.Text, "\\\\$1") + expr := snippetExprCleanup.ReplaceAllString(u.step.Text, "\\$1") expr = snippetNumbers.ReplaceAllString(expr, "(\\d+)") expr = snippetExprQuoted.ReplaceAllString(expr, " \"([^\"]*)\" ") expr = "^" + strings.TrimSpace(expr) + "$" - name := snippetNumbers.ReplaceAllString(u.step.Text, "") - name = snippetExprQuoted.ReplaceAllString(name, "") + name := snippetNumbers.ReplaceAllString(u.step.Text, " ") + name = snippetExprQuoted.ReplaceAllString(name, " ") name = snippetMethodName.ReplaceAllString(name, "") var words []string for i, w := range strings.Split(name, " ") {