Этот коммит содержится в:
gedi 2016-05-15 12:28:44 +03:00
родитель 60f8b3340e
коммит 3ffdd2599b

8
fmt.go
Просмотреть файл

@ -334,7 +334,7 @@ func (s *undefinedSnippet) Args() (ret string) {
} }
last = arg last = arg
} }
return strings.TrimRight(ret, ", ") + " " + last return strings.TrimSpace(strings.TrimRight(ret, ", ") + " " + last)
} }
func (f *basefmt) snippets() string { func (f *basefmt) snippets() string {
@ -346,13 +346,13 @@ func (f *basefmt) snippets() string {
var snips []*undefinedSnippet var snips []*undefinedSnippet
// build snippets // build snippets
for _, u := range f.undefined { 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 = snippetNumbers.ReplaceAllString(expr, "(\\d+)")
expr = snippetExprQuoted.ReplaceAllString(expr, " \"([^\"]*)\" ") expr = snippetExprQuoted.ReplaceAllString(expr, " \"([^\"]*)\" ")
expr = "^" + strings.TrimSpace(expr) + "$" expr = "^" + strings.TrimSpace(expr) + "$"
name := snippetNumbers.ReplaceAllString(u.step.Text, "") name := snippetNumbers.ReplaceAllString(u.step.Text, " ")
name = snippetExprQuoted.ReplaceAllString(name, "") name = snippetExprQuoted.ReplaceAllString(name, " ")
name = snippetMethodName.ReplaceAllString(name, "") name = snippetMethodName.ReplaceAllString(name, "")
var words []string var words []string
for i, w := range strings.Split(name, " ") { for i, w := range strings.Split(name, " ") {