@ 261102.1

260307.2 · 280a011f02cf10033f164fe039c07fbf9e25e606

With a non-default --delimiter, --{accept,with}-nth should not remove trailing whitespaces

reading declarations

Changes to src/tokenizer.go. All files

src/tokenizer.go

@@ -218,11 +218,12 @@ func Tokenize(text string, delimiter Delimiter) []Token { 	return withPrefixLengths(tokens, 0) } -// StripLastDelimiter removes the trailing delimiter and whitespaces+// StripLastDelimiter removes the trailing delimiter func StripLastDelimiter(str string, delimiter Delimiter) string { 	if delimiter.str != nil {-		str = strings.TrimSuffix(str, *delimiter.str)-	} else if delimiter.regex != nil {+		return strings.TrimSuffix(str, *delimiter.str)+	}+	if delimiter.regex != nil { 		locs := delimiter.regex.FindAllStringIndex(str, -1) 		if len(locs) > 0 { 			lastLoc := locs[len(locs)-1]@@ -230,6 +231,7 @@ func StripLastDelimiter(str string, delimiter Delimiter) string { 				str = str[:lastLoc[0]] 			} 		}+		return str 	} 	return strings.TrimRightFunc(str, unicode.IsSpace) }