equal
deleted
inserted
replaced
278 var next_x = start |
278 var next_x = start |
279 for { |
279 for { |
280 (command, command_start) <- |
280 (command, command_start) <- |
281 snapshot.node.command_range(snapshot.revert(start), snapshot.revert(stop)) |
281 snapshot.node.command_range(snapshot.revert(start), snapshot.revert(stop)) |
282 markup <- snapshot.state(command).highlight.flatten |
282 markup <- snapshot.state(command).highlight.flatten |
283 val abs_start = snapshot.convert(command_start + markup.range.start) |
283 val Text.Range(abs_start, abs_stop) = snapshot.convert(markup.range + command_start) |
284 val abs_stop = snapshot.convert(command_start + markup.range.stop) |
|
285 if (abs_stop > start) |
284 if (abs_stop > start) |
286 if (abs_start < stop) |
285 if (abs_start < stop) |
287 val token_start = (abs_start - start) max 0 |
286 val token_start = (abs_start - start) max 0 |
288 val token_length = |
287 val token_length = |
289 (abs_stop - abs_start) - |
288 (abs_stop - abs_start) - |