andi/krowlog
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

fix word selection when clicking into line with multi byte chars

Browse Source
This commit is contained in:
Andreas Huber
2021-11-01 15:37:07 +01:00
parent 9916965792
commit 7ffc524175
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
logFileModel.py
View File

@@ -88,18 +88,18 @@ class LogFileModel:
current_char = line.line()[line.byte_index_to_char_index(offset_in_line)] current_char = line.line()[line.byte_index_to_char_index(offset_in_line)]
if not self._is_word_char(current_char): if not self._is_word_char(current_char):
return (current_char, byte_offset, byte_offset + 1) return (current_char, byte_offset, byte_offset + 1)
start_in_line = byte_offset - line.byte_offset() start_in_line = line.byte_index_to_char_index(byte_offset - line.byte_offset())
while start_in_line - 1 >= 0 and self._is_word_char(line.line()[start_in_line - 1]): while start_in_line - 1 >= 0 and self._is_word_char(line.line()[start_in_line - 1]):
start_in_line = start_in_line - 1 start_in_line = start_in_line - 1
end_in_line = byte_offset - line.byte_offset() end_in_line = line.byte_index_to_char_index(byte_offset - line.byte_offset())
while end_in_line < len(line.line()) and self._is_word_char(line.line()[end_in_line]): while end_in_line < len(line.line()) and self._is_word_char(line.line()[end_in_line]):
end_in_line = end_in_line + 1 end_in_line = end_in_line + 1
start_byte = start_in_line + line.byte_offset() start_byte = line.char_index_to_byte(start_in_line) + line.byte_offset()
end_byte = end_in_line + line.byte_offset() end_byte = line.char_index_to_byte(end_in_line) + line.byte_offset()
return (line.line()[start_in_line:end_in_line], start_byte, end_byte) return (line.line()[start_in_line:end_in_line], start_byte, end_byte)
def _is_word_char(self, char: str) -> bool: def _is_word_char(self, char: str) -> bool:
return re.match("\w", char) return re.match(r"\w", char) is not None
def data(self, byte_offset: int, scroll_lines: int, lines: int) -> List[Line]: def data(self, byte_offset: int, scroll_lines: int, lines: int) -> List[Line]:
# print("data(%s, %s, %s)" % (byte_offset, scroll_lines, lines)) # print("data(%s, %s, %s)" % (byte_offset, scroll_lines, lines))