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

Show a tool tip when searching wraps around

Browse Source 
Closes #1049, although the visual feedback could be improved (see issue).
This commit is contained in:
Allan Odgaard
2013-07-23 22:50:29 +02:00
parent 06f349507a
commit 70411fa11a
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -342,12 +342,17 @@ static std::string shell_quote (std::vector<std::string> paths)
- (void)didFind:(NSUInteger)aNumber occurrencesOf:(NSString*)aFindString atPosition:(text::pos_t const&)aPosition wrapped:(BOOL)didWrap
{
static NSString* const formatStrings[2][3] = {
{ @"No more occurrences of “%@”.", nil, @"%2$ld occurrences of “%@”." },
{ @"No more matches for “%@”.", nil, @"%2$ld matches for “%@”." },
};
if(NSString* format = formatStrings[(self.findOptions & find::regular_expression) ? 1 : 0][aNumber > 2 ? 2 : aNumber])
OakShowToolTip([NSString stringWithFormat:format, aFindString, aNumber], [self.textView positionForWindowUnderCaret]);
NSString* format = nil;
switch(aNumber)
{
case 0: format = @"No more %@ “%@”."; break;
case 1: format = didWrap ? @"Search wrapped." : nil; break;
default: format = @"%2$ld %@ “%@”."; break;
}
NSString* classifier = (self.findOptions & find::regular_expression) ? @"matches for" : @"occurrences of";
if(format)
OakShowToolTip([NSString stringWithFormat:format, classifier, aFindString, aNumber], [self.textView positionForWindowUnderCaret]);
}
- (void)didReplace:(NSUInteger)aNumber occurrencesOf:(NSString*)aFindString with:(NSString*)aReplacementString