colby/cappuccino
1
0
Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-08-25 21:17:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed: warnings from objj were displayed several times

Browse Source
This commit is contained in:
Alexandre Wilhelm
2014-11-06 13:29:16 -08:00
parent 26223bb383
commit 1ce6a630d2
1 changed files with 33 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tools/XcodeCapp/XcodeCapp/XcodeCapp.m
+33 -6
View File
@@ -1573,8 +1573,8 @@ void fsevents_callback(ConstFSEventStreamRef streamRef,
{
id info = self.errorListController.selection;
NSString *path = [info valueForKey:@"path"];
NSString *path = [info valueForKey:@"realPath"] ? [info valueForKey:@"realPath"] : [info valueForKey:@"path"];
if (path == NSNoSelectionMarker)
return;
@@ -1890,7 +1890,6 @@ void fsevents_callback(ConstFSEventStreamRef streamRef,
NSMutableArray *errors = [NSMutableArray arrayWithArray:[response componentsSeparatedByString:@"\n\n"]];
NSInteger numberOfErrors = [errors count];
i = 0;
NSMutableArray *dicts = [NSMutableArray array];
// When checking of the entire project, we have to be ready to find errors
@@ -1901,6 +1900,8 @@ void fsevents_callback(ConstFSEventStreamRef streamRef,
if ([paths count] == 1)
filePath = [paths firstObject];
i = 0;
for (i = 0; i < numberOfErrors; i++)
{
NSMutableString *error = (NSMutableString*)[errors objectAtIndex:i];
@@ -1965,10 +1966,36 @@ void fsevents_callback(ConstFSEventStreamRef streamRef,
path , @"realPath",
nil];
// Compiler can show several times the same errors
if (![dicts containsObject:dict] && ![self.errorList containsObject:dict])
[dicts addObject:dict];
// Block to compare dicts
BOOL (^dictComparaison)(id obj, NSUInteger idx, BOOL *stop) = ^(id obj, NSUInteger idx, BOOL *stop){
if ([obj valueForKey:@"line"] == [dict valueForKey:@"line"])
{
// For an unknown reason, trim doesn't work
NSString *messsageObj = [obj valueForKey:@"message"];
NSString *messsageDict = [dict valueForKey:@"message"];
messsageDict = [messsageDict stringByReplacingOccurrencesOfString:@" " withString:@""];
messsageDict = [messsageDict stringByReplacingOccurrencesOfString:@"\n" withString:@""];
messsageObj = [messsageObj stringByReplacingOccurrencesOfString:@" " withString:@""];
messsageObj = [messsageObj stringByReplacingOccurrencesOfString:@"\n" withString:@""];
if ([messsageDict isEqualToString:messsageObj])
{
*stop = YES;
return YES;
}
}
return NO;
};
NSUInteger isInDict = [dicts indexOfObjectPassingTest:dictComparaison];
NSUInteger isInList = [self.errorList indexOfObjectPassingTest:dictComparaison];
// Compiler can show several times the same errors
if (isInDict == NSNotFound && isInList == NSNotFound)
[dicts addObject:dict];
}
[self performSelectorOnMainThread:@selector(objjCompilerDidGenerateError:) withObject:dicts waitUntilDone:YES];