New wordwrap #9649
New wordwrap #9649
Conversation
| proc `$`*(rune: Rune): string = | ||
| ## Converts a Rune to a string | ||
| rune.toUTF8 | ||
|
|
||
| proc `$`*(runes: seq[Rune]): string = | ||
| ## Converts a sequence of Runes to a string | ||
| result = "" | ||
| for rune in runes: result.add(rune.toUTF8) | ||
| for rune in runes: | ||
| result.add rune |
|
|
||
| proc wordWrap*(s: string, maxLineWidth = 80, | ||
| splitLongWords = true, | ||
| newLine = "\n"): string = |
| ## whitespace is treated equally. Non-breaking whitespace is | ||
| ## ignored. | ||
|
|
||
| var currentWordLength: int = 0 |
There was a problem hiding this comment.
Use type inference, ': int' is annoying.
| ## ignored. | ||
|
|
||
| var currentWordLength: int = 0 | ||
| var currentWord: string = newStringOfCap(32) |
| var currentWordLengthAtLineEnd: int = -1 | ||
| var longWordMode = false | ||
|
|
||
| template handleWhitespace(): untyped = |
There was a problem hiding this comment.
that should be better named addWord.
| currentLineLength = 0 | ||
|
|
||
| if currentLineLength > 0: | ||
| result.add ' ' |
There was a problem hiding this comment.
Well, don't nuke the whitespace replacing it by a single space.
| @@ -0,0 +1,67 @@ | |||
| import unicode | |||
|
|
|||
| proc wordWrap*(s: string, maxLineWidth = 80, | |||
There was a problem hiding this comment.
procs use verbs, so the name should be wrapWords.
There was a problem hiding this comment.
That doesn't make sense. "wordwrap" can be a verb too. Using your argument, we'd then have "echoes", "aligns", "adds", etc.
Sorry, I went bonkers because I thought you suggested "wordwraps" instead of "wrapwords".
I agree that "wrapwords" is better (not because of thr verb argument; wordwraps can be read as a verb too), but because of correctness.. we are wrapping many "words" across lines, not just a single word.
| if currentWord.len > 0: | ||
|
|
||
| if currentLineLength + 1 + currentWordLength > maxLineWidth: | ||
| result.add newLine |
There was a problem hiding this comment.
| result.add newLine | |
| if len(result) > 0: | |
| result.add newLine |
otherwise you are inserting an empty line, if the length of the first word on the first line is >= maxLineWidth.
|
This wordwrap.wordWrap("abc\ndef") == "abc def"while strutils.wordWrap("abc\ndef") == "abc\ndef"is this intentional? |
|
@skilchen for me this change is intentional, but it seems Araq disagrees on it. |
|
Did it my way based on your work. |
this is supposed to fix #3196. I have a question about the name though. The function does more than just wrapping words, it fills up the lines so that you don't end up with lines with just a single word in them when a newline is inserted. In emacs uses function names such as
fill-paragraphandfill-region.