github/textmate
1
1
Fork 0
mirror of https://github.com/textmate/textmate.git synced 2026-01-20 20:27:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Provide utf16::advance with range end

Browse Source 
There are several crashes reported from firstRectForCharacterRange: which indicate that the system may ask for indexes “out of range”, hence why we now effectively just cap such request.
This commit is contained in:
Allan Odgaard
2012-09-21 01:31:50 +02:00
parent 56ec46e1f9
commit 6afa7601c0
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Frameworks/OakTextView/src/OakTextView.mm
View File

@@ -653,8 +653,8 @@ static std::string shell_quote (std::vector<std::string> paths)
{
std::string const str = document->buffer().substr(range->min().index, range->max().index);
char const* base = str.data();
size_t from = utf16::advance(base, aRange.location) - base;
size_t to = utf16::advance(base, aRange.location + aRange.length) - base;
size_t from = utf16::advance(base, aRange.location, base + str.size()) - base;
size_t to = utf16::advance(base, aRange.location + aRange.length, base + str.size()) - base;
sel.push_back(ng::range_t(range->min() + from, range->min() + to));
}
editor->set_selections(sel);
@@ -760,7 +760,7 @@ static std::string shell_quote (std::vector<std::string> paths)
{
std::string const text = editor->as_string();
size_t index = utf16::advance(text.data(), theRange.location) - text.data();
size_t index = utf16::advance(text.data(), theRange.location, text.data() + text.size()) - text.data();
NSRect rect = [self convertRect:layout->rect_at_index(index) toView:nil];
rect.origin = [[self window] convertBaseToScreen:rect.origin];
D(DBF_OakTextView_TextInput, bug("%s → %s\n", [NSStringFromRange(theRange) UTF8String], [NSStringFromRect(rect) UTF8String]););

4
Frameworks/ns/src/spellcheck.mm
View File

@@ -27,8 +27,8 @@ namespace ns
while(range.location != NSNotFound && range.length)
{
char const* from = utf16::advance(first, range.location);
char const* to = utf16::advance(from, range.length);
char const* from = utf16::advance(first, range.location, last);
char const* to = utf16::advance(from, range.length, last);
*out++ = ns::range_t(offset + from - first, offset + to - first);
range = [spellChecker checkSpellingOfString:str startingAt:range.location + range.length language:lang wrap:NO inSpellDocumentWithTag:tag wordCount:NULL];
}