github/textmate
1
1
Fork 0
mirror of https://github.com/textmate/textmate.git synced 2026-04-28 03:00:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Move some logic to the FFResultNode type

Browse Source
This commit is contained in:
Allan Odgaard
2014-08-23 16:49:24 +02:00
parent 846c220b6b
commit aa27ccced5
3 changed files with 100 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

195
Frameworks/Find/src/Find.mm
View File

@@ -36,6 +36,69 @@ enum FindActionTag
FindActionReplaceSelected,
};
static NSAttributedString* AttributedStringForMatch (std::string const& text, size_t from, size_t to, size_t n)
{
ns::attr_string_t str;
str.add(ns::style::line_break(NSLineBreakByTruncatingTail));
str.add([NSColor darkGrayColor]);
str.add([NSFont systemFontOfSize:11]);
str.add(text::pad(++n, 4) + ": ");
bool inMatch = false;
size_t last = text.size();
for(size_t it = 0; it != last; )
{
size_t eol = std::find(text.begin() + it, text.end(), '\n') - text.begin();
if(oak::cap(it, from, eol) == from)
{
str.add(text.substr(it, from-it));
it = from;
inMatch = true;
}
if(inMatch)
{
str.add([NSFont boldSystemFontOfSize:11]);
str.add([NSColor blackColor]);
}
if(inMatch && oak::cap(it, to, eol) == to)
{
str.add(text.substr(it, to-it));
it = to;
inMatch = false;
str.add([NSColor darkGrayColor]);
str.add([NSFont systemFontOfSize:11]);
}
str.add(text.substr(it, eol-it));
if(eol != last)
{
str.add("¬");
if(inMatch)
{
str.add([NSFont systemFontOfSize:11]);
str.add([NSColor darkGrayColor]);
}
if(++eol == to)
inMatch = false;
if(eol != last)
str.add("\n" + text::pad(++n, 4) + ": ");
}
it = eol;
}
return str;
}
@interface FFResultNode : NSObject <NSCopying>
{
document::document_t::callback_t* _callback;
@@ -95,6 +158,37 @@ enum FindActionTag
- (NSString*)path { return [NSString stringWithCxxString:self.document->path()]; }
- (NSString*)identifier { return [NSString stringWithCxxString:self.document->identifier()]; }
- (NSUInteger)lineSpan
{
return ([_match match].range.to.line - [_match match].range.from.line) + ([_match match].range.to.column != 0 ? 1 : 0);
}
- (NSAttributedString*)excerptWithReplacement:(NSString*)replacementString
{
find::match_t const& m = [_match match];
size_t from = m.first - m.excerpt_offset;
size_t to = m.last - m.excerpt_offset;
std::string prefix = m.excerpt.substr(0, from);
std::string middle = m.excerpt.substr(from, to - from);
std::string suffix = m.excerpt.substr(to);
if(replacementString)
middle = m.captures.empty() ? to_s(replacementString) : format_string::expand(to_s(replacementString), m.captures);
if(!utf8::is_valid(prefix.begin(), prefix.end()) && utf8::is_valid(middle.begin(), middle.end()) && utf8::is_valid(suffix.begin(), suffix.end()))
{
ns::attr_string_t res;
res = ns::attr_string_t([NSColor darkGrayColor])
<< ns::style::line_break(NSLineBreakByTruncatingTail)
<< text::format("%zu-%zu: Range is not valid UTF-8, please contact: http://macromates.com/support", m.first, m.last);
return res.get();
}
return AttributedStringForMatch(prefix + middle + suffix, prefix.size(), prefix.size() + middle.size(), m.line_number);
}
- (NSImage*)icon
{
struct document_callback_t : document::document_t::callback_t
@@ -549,7 +643,7 @@ NSString* const FFFindWasTriggeredByEnter = @"FFFindWasTriggeredByEnter";
FFResultNode* node = [FFResultNode resultNodeWithMatch:match];
if(!parent || parent.document->identifier() != node.document->identifier())
[_results addResultNode:(parent = [FFResultNode resultNodeWithMatch:[[FFMatch alloc] initWithMatch:find::match_t([match match].document)]])];
[_results addResultNode:(parent = [FFResultNode resultNodeWithMatch:match])];
[parent addResultNode:node];
}
_countOfMatches += [matches count];
@@ -640,103 +734,14 @@ NSString* const FFFindWasTriggeredByEnter = @"FFFindWasTriggeredByEnter";
return [(item ?: _results).matches objectAtIndex:childIndex];
}
static NSAttributedString* AttributedStringForMatch (std::string const& text, size_t from, size_t to, size_t n)
{
ns::attr_string_t str;
str.add(ns::style::line_break(NSLineBreakByTruncatingTail));
str.add([NSColor darkGrayColor]);
str.add([NSFont systemFontOfSize:11]);
str.add(text::pad(++n, 4) + ": ");
bool inMatch = false;
size_t last = text.size();
for(size_t it = 0; it != last; )
{
size_t eol = std::find(text.begin() + it, text.end(), '\n') - text.begin();
if(oak::cap(it, from, eol) == from)
{
str.add(text.substr(it, from-it));
it = from;
inMatch = true;
}
if(inMatch)
{
str.add([NSFont boldSystemFontOfSize:11]);
str.add([NSColor blackColor]);
}
if(inMatch && oak::cap(it, to, eol) == to)
{
str.add(text.substr(it, to-it));
it = to;
inMatch = false;
str.add([NSColor darkGrayColor]);
str.add([NSFont systemFontOfSize:11]);
}
str.add(text.substr(it, eol-it));
if(eol != last)
{
str.add("¬");
if(inMatch)
{
str.add([NSFont systemFontOfSize:11]);
str.add([NSColor darkGrayColor]);
}
if(++eol == to)
inMatch = false;
if(eol != last)
str.add("\n" + text::pad(++n, 4) + ": ");
}
it = eol;
}
return str;
}
- (id)outlineView:(NSOutlineView*)outlineView objectValueForTableColumn:(NSTableColumn*)tableColumn byItem:(FFResultNode*)item
{
if([self outlineView:outlineView isGroupItem:item])
return item;
if([[tableColumn identifier] isEqualToString:@"checkbox"])
{
else if([[tableColumn identifier] isEqualToString:@"checkbox"])
return @(!item.exclude);
}
else if([[tableColumn identifier] isEqualToString:@"match"])
{
find::match_t const& m = [item.match match];
size_t from = m.first - m.excerpt_offset;
size_t to = m.last - m.excerpt_offset;
std::string prefix = m.excerpt.substr(0, from);
std::string middle = m.excerpt.substr(from, to - from);
std::string suffix = m.excerpt.substr(to);
if(!utf8::is_valid(prefix.begin(), prefix.end()) && utf8::is_valid(middle.begin(), middle.end()) && utf8::is_valid(suffix.begin(), suffix.end()))
{
ns::attr_string_t res;
res = ns::attr_string_t([NSColor darkGrayColor])
<< ns::style::line_break(NSLineBreakByTruncatingTail)
<< text::format("%zu-%zu: Range is not valid UTF-8, please contact: http://macromates.com/support", m.first, m.last);
return res.get();
}
if(item.replacementDone || !item.exclude && self.windowController.showReplacementPreviews)
middle = self.windowController.regularExpression ? format_string::expand(to_s(self.replaceString), m.captures) : to_s(self.replaceString);
return AttributedStringForMatch(prefix + middle + suffix, prefix.size(), prefix.size() + middle.size(), m.line_number);
}
return [item excerptWithReplacement:(item.replacementDone || !item.exclude && self.windowController.showReplacementPreviews) ? self.replaceString : nil];
return nil;
}
@@ -795,11 +800,7 @@ static NSAttributedString* AttributedStringForMatch (std::string const& text, si
- (CGFloat)outlineView:(NSOutlineView*)outlineView heightOfRowByItem:(FFResultNode*)item
{
if([self outlineView:outlineView isGroupItem:item])
return 22;
find::match_t const& m = [item.match match];
return m.line_span() * [outlineView rowHeight];
return [self outlineView:outlineView isGroupItem:item] ? 22 : item.lineSpan * [outlineView rowHeight];
}
- (NSCell*)outlineView:(NSOutlineView*)outlineView dataCellForTableColumn:(NSTableColumn*)tableColumn item:(FFResultNode*)item

5
Frameworks/Find/src/scan_path.cc
View File

@@ -12,11 +12,6 @@ namespace find
namespace find
{
size_t match_t::line_span () const
{
return (range.to.line - range.from.line) + (range.to.column != 0 ? 1 : 0);
}
scan_path_t::scan_path_t ()
{
pthread_mutex_init(&_mutex, NULL);

8
Frameworks/Find/src/scan_path.h
View File

@@ -24,19 +24,15 @@ namespace find
WATCH_LEAKS(find::match_t);
match_t () { }
match_t (document::document_ptr document) : document(document) { }
match_t (document::document_ptr document, size_t first, size_t last, text::range_t const& range, std::map<std::string, std::string> const& captures) : document(document), first(first), last(last), range(range), captures(captures) { }
size_t line_span () const;
document::document_ptr document;
size_t first = 0, last = 0;
text::range_t range = text::range_t::undefined;
size_t first, last;
text::range_t range;
std::map<std::string, std::string> captures;
std::string excerpt;
size_t excerpt_offset = 0;
size_t line_number = 0;
bool binary = false;
};
struct scan_path_t