|
29 | 29 | return {from: start, to: end}; |
30 | 30 | } |
31 | 31 |
|
32 | | - function findBreakPoint(text, column, wrapOn, killTrailingSpace) { |
| 32 | + function findBreakPoint(text, column, wrapOn, killTrailingSpace, forceBreak) { |
33 | 33 | var at = column |
34 | 34 | while (at < text.length && text.charAt(at) == " ") at++ |
35 | 35 | for (; at > 0; --at) |
36 | 36 | if (wrapOn.test(text.slice(at - 1, at + 1))) break; |
| 37 | + |
| 38 | + if ((at == 0) && (!forceBreak)) { |
| 39 | + // didn't find a break point before column, in non-forceBreak mode try to |
| 40 | + // find one after 'column'. |
| 41 | + for (at = column+1; at < text.length-1; ++at) { |
| 42 | + if (wrapOn.test(text.slice(at - 1, at + 1))) break; |
| 43 | + } |
| 44 | + } |
| 45 | + |
37 | 46 | for (var first = true;; first = false) { |
38 | 47 | var endOfText = at; |
39 | 48 | if (killTrailingSpace) |
|
47 | 56 | from = cm.clipPos(from); to = cm.clipPos(to); |
48 | 57 | var column = options.column || 80; |
49 | 58 | var wrapOn = options.wrapOn || /\s\S|-[^\.\d]/; |
| 59 | + var forceBreak = options.forceBreak !== false; |
50 | 60 | var killTrailing = options.killTrailingSpace !== false; |
51 | 61 | var changes = [], curLine = "", curNo = from.line; |
52 | 62 | var lines = cm.getRange(from, to, false); |
|
68 | 78 | curLine += text; |
69 | 79 | if (i) { |
70 | 80 | var firstBreak = curLine.length > column && leadingSpace == spaceTrimmed && |
71 | | - findBreakPoint(curLine, column, wrapOn, killTrailing); |
| 81 | + findBreakPoint(curLine, column, wrapOn, killTrailing, forceBreak); |
72 | 82 | // If this isn't broken, or is broken at a different point, remove old break |
73 | 83 | if (!firstBreak || firstBreak.from != oldLen || firstBreak.to != oldLen + spaceInserted) { |
74 | 84 | changes.push({text: [spaceInserted ? " " : ""], |
|
80 | 90 | } |
81 | 91 | } |
82 | 92 | while (curLine.length > column) { |
83 | | - var bp = findBreakPoint(curLine, column, wrapOn, killTrailing); |
84 | | - changes.push({text: ["", leadingSpace], |
85 | | - from: Pos(curNo, bp.from), |
86 | | - to: Pos(curNo, bp.to)}); |
87 | | - curLine = leadingSpace + curLine.slice(bp.to); |
88 | | - ++curNo; |
| 93 | + var bp = findBreakPoint(curLine, column, wrapOn, killTrailing, forceBreak); |
| 94 | + if ((bp.from != bp.to) || (forceBreak)) { |
| 95 | + changes.push({text: ["", leadingSpace], |
| 96 | + from: Pos(curNo, bp.from), |
| 97 | + to: Pos(curNo, bp.to)}); |
| 98 | + curLine = leadingSpace + curLine.slice(bp.to); |
| 99 | + ++curNo; |
| 100 | + } else { |
| 101 | + break; |
| 102 | + } |
89 | 103 | } |
90 | 104 | } |
91 | 105 | if (changes.length) cm.operation(function() { |
|
0 commit comments