From 210f386ca9f497c309220a945d780debc03d5b1d Mon Sep 17 00:00:00 2001 From: Artem Starosvetskiy Date: Sun, 14 Jul 2019 00:44:34 +0300 Subject: [PATCH 1/7] Add missing import --- Classes/CPSearchController.m | 1 + 1 file changed, 1 insertion(+) diff --git a/Classes/CPSearchController.m b/Classes/CPSearchController.m index cfc5e60..c7cf318 100755 --- a/Classes/CPSearchController.m +++ b/Classes/CPSearchController.m @@ -19,6 +19,7 @@ #import "CPStatusLabel.h" #import "CPSymbol.h" #import "CPResult.h" +#import "AMIndeterminateProgressIndicatorCell.h" @implementation CPSearchController - (id)init From 58092fa3734e6f95a62d5de1a0b4429e938d1638 Mon Sep 17 00:00:00 2001 From: Artem Starosvetskiy Date: Sun, 14 Jul 2019 00:45:47 +0300 Subject: [PATCH 2/7] Add missing `@synthesize` --- Classes/CPSelectedObjectCell.m | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Classes/CPSelectedObjectCell.m b/Classes/CPSelectedObjectCell.m index 6964f53..811bbe9 100644 --- a/Classes/CPSelectedObjectCell.m +++ b/Classes/CPSelectedObjectCell.m @@ -11,6 +11,8 @@ #import "NSView+RoundedFrame.h" @implementation CPSelectedObjectCell +@synthesize cellSize = _cellSize; + - (id)init { self = [super init]; From ee8584c0b6602611b9dd8a3c997994073582d416 Mon Sep 17 00:00:00 2001 From: Artem Starosvetskiy Date: Sun, 14 Jul 2019 00:46:54 +0300 Subject: [PATCH 3/7] Fix a condition --- Classes/CPSearchFieldTextView.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Classes/CPSearchFieldTextView.m b/Classes/CPSearchFieldTextView.m index 336a09a..0cf36d2 100644 --- a/Classes/CPSearchFieldTextView.m +++ b/Classes/CPSearchFieldTextView.m @@ -39,7 +39,7 @@ - (void)keyDown:(NSEvent *)theEvent // we record key as pressed unless it has cmd pressed with it as well. // cmd-backspace for example doesn't cause keyUp to be called later on, // so we're left with someKeyIsDown set for the true until the next KeyDown - if (![theEvent modifierFlags] & NSCommandKeyMask) { + if (!([theEvent modifierFlags] & NSCommandKeyMask)) { self.someKeyIsDown = YES; } From 4e59c43cad74248919b2c930a83384859a3f6f84 Mon Sep 17 00:00:00 2001 From: Artem Starosvetskiy Date: Sun, 14 Jul 2019 00:47:40 +0300 Subject: [PATCH 4/7] Fix method signature --- Classes/CPWindow.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Classes/CPWindow.m b/Classes/CPWindow.m index 4f40d46..2c7c8db 100644 --- a/Classes/CPWindow.m +++ b/Classes/CPWindow.m @@ -23,7 +23,7 @@ - (id)initWithDefaultSettings defer:0]; } -- (id)initWithContentRect:(NSRect)contentRect styleMask:(NSUInteger)aStyle backing:(NSBackingStoreType)bufferingType defer:(BOOL)flag +- (id)initWithContentRect:(NSRect)contentRect styleMask:(NSWindowStyleMask)aStyle backing:(NSBackingStoreType)bufferingType defer:(BOOL)flag { self = [super initWithContentRect:contentRect styleMask:NSBorderlessWindowMask From 19bd6492e8d271d755dccbe8c5e5e394f6ea3188 Mon Sep 17 00:00:00 2001 From: Artem Starosvetskiy Date: Sun, 14 Jul 2019 00:49:22 +0300 Subject: [PATCH 5/7] Modernize syntax --- Classes/AMIndeterminateProgressIndicatorCell.m | 2 +- Classes/CPCodePilotPlugin.m | 2 +- Classes/CPCodePilotWindowDelegate.h | 2 +- Classes/CPCodePilotWindowDelegate.m | 2 +- Classes/CPFirstRunWindowView.m | 2 +- Classes/CPInfoWindowView.m | 2 +- Classes/CPNoProjectOpenWindowView.m | 2 +- Classes/CPPluginInstaller.m | 2 +- Classes/CPPreferencesToolbarDelegate.h | 2 +- Classes/CPPreferencesToolbarDelegate.m | 2 +- Classes/CPPreferencesView.h | 2 +- Classes/CPPreferencesView.m | 4 ++-- Classes/CPPreferencesViewController.m | 2 +- Classes/CPResultTableView.m | 2 +- Classes/CPResultTableViewColumn.m | 2 +- Classes/CPSearchController.m | 2 +- Classes/CPSearchFieldTextView.m | 2 +- Classes/CPSelectedObjectCell.m | 2 +- Classes/CPStatusLabel.m | 2 +- Classes/CPSymbolCache.m | 2 +- Classes/CPWindow.h | 2 +- Classes/CPWindow.m | 4 ++-- Classes/CPXcodeVersionUnsupportedWindowView.m | 2 +- Classes/CPXcodeWrapper.m | 2 +- 24 files changed, 26 insertions(+), 26 deletions(-) diff --git a/Classes/AMIndeterminateProgressIndicatorCell.m b/Classes/AMIndeterminateProgressIndicatorCell.m index 90f4087..babb12f 100644 --- a/Classes/AMIndeterminateProgressIndicatorCell.m +++ b/Classes/AMIndeterminateProgressIndicatorCell.m @@ -26,7 +26,7 @@ @implementation AMIndeterminateProgressIndicatorCell -- (id)init +- (instancetype)init { if ((self = [super initImageCell:nil])) { [self setAnimationDelay:5.0/60.0]; diff --git a/Classes/CPCodePilotPlugin.m b/Classes/CPCodePilotPlugin.m index 46ebcbb..9bfb7d5 100644 --- a/Classes/CPCodePilotPlugin.m +++ b/Classes/CPCodePilotPlugin.m @@ -30,7 +30,7 @@ + (void)load } } -- (id)init +- (instancetype)init { self = [super init]; diff --git a/Classes/CPCodePilotWindowDelegate.h b/Classes/CPCodePilotWindowDelegate.h index 41da694..5a2956f 100644 --- a/Classes/CPCodePilotWindowDelegate.h +++ b/Classes/CPCodePilotWindowDelegate.h @@ -18,7 +18,7 @@ @property (nonatomic, assign) BOOL ourWindowIsOpen; @property (nonatomic, strong) CPSearchFieldTextView *searchFieldTextEditor; -- (id)initWithXcodeWrapper:(CPXcodeWrapper *)xcodeWrapper; +- (instancetype)initWithXcodeWrapper:(CPXcodeWrapper *)xcodeWrapper; - (void)openWindow; - (void)hideWindow; diff --git a/Classes/CPCodePilotWindowDelegate.m b/Classes/CPCodePilotWindowDelegate.m index c19659a..5e26bd3 100644 --- a/Classes/CPCodePilotWindowDelegate.m +++ b/Classes/CPCodePilotWindowDelegate.m @@ -18,7 +18,7 @@ #import "CPSearchFieldTextView.h" @implementation CPCodePilotWindowDelegate -- (id)initWithXcodeWrapper:(CPXcodeWrapper *)xcodeWrapper +- (instancetype)initWithXcodeWrapper:(CPXcodeWrapper *)xcodeWrapper { self = [super init]; diff --git a/Classes/CPFirstRunWindowView.m b/Classes/CPFirstRunWindowView.m index b1246f9..06b5ef4 100644 --- a/Classes/CPFirstRunWindowView.m +++ b/Classes/CPFirstRunWindowView.m @@ -10,7 +10,7 @@ #import "CPCodePilotConfig.h" @implementation CPFirstRunWindowView -- (id)initWithFrame:(NSRect)frame +- (instancetype)initWithFrame:(NSRect)frame { self = [super initWithFrame:frame]; diff --git a/Classes/CPInfoWindowView.m b/Classes/CPInfoWindowView.m index 07829ad..e42ea5e 100644 --- a/Classes/CPInfoWindowView.m +++ b/Classes/CPInfoWindowView.m @@ -13,7 +13,7 @@ #import @implementation CPInfoWindowView -- (id)initWithFrame:(NSRect)frame +- (instancetype)initWithFrame:(NSRect)frame { self = [super initWithFrame:frame]; diff --git a/Classes/CPNoProjectOpenWindowView.m b/Classes/CPNoProjectOpenWindowView.m index 1175a32..a5a99bd 100644 --- a/Classes/CPNoProjectOpenWindowView.m +++ b/Classes/CPNoProjectOpenWindowView.m @@ -10,7 +10,7 @@ #import "CPCodePilotConfig.h" @implementation CPNoProjectOpenWindowView -- (id)initWithFrame:(NSRect)frame +- (instancetype)initWithFrame:(NSRect)frame { self = [super initWithFrame:frame]; diff --git a/Classes/CPPluginInstaller.m b/Classes/CPPluginInstaller.m index fe381e0..bb02aca 100644 --- a/Classes/CPPluginInstaller.m +++ b/Classes/CPPluginInstaller.m @@ -23,7 +23,7 @@ - (void)installPlugin:(CPCodePilotPlugin *)plugin LOG(@"%@ %@ Plugin successfully installed.", PRODUCT_NAME, PRODUCT_CURRENT_VERSION); } -- (id)init +- (instancetype)init { self = [super init]; diff --git a/Classes/CPPreferencesToolbarDelegate.h b/Classes/CPPreferencesToolbarDelegate.h index 80a5224..1d0e6b8 100644 --- a/Classes/CPPreferencesToolbarDelegate.h +++ b/Classes/CPPreferencesToolbarDelegate.h @@ -13,7 +13,7 @@ @interface CPPreferencesToolbarDelegate : NSObject + (CPPreferencesToolbarDelegate *)preferencesToolbarDelegateByInterceptingDelegateOfToolbar:(NSToolbar *)toolbar; -- (id)initWithOriginalToolbarDelegate:(IDEPreferencesController *)_originalDelegate toolbar:(NSToolbar *)toolbar; +- (instancetype)initWithOriginalToolbarDelegate:(IDEPreferencesController *)_originalDelegate toolbar:(NSToolbar *)toolbar; - (void)prepareToolbarItem; - (void)ourItemWasSelected:(id)sender; @end diff --git a/Classes/CPPreferencesToolbarDelegate.m b/Classes/CPPreferencesToolbarDelegate.m index aff8039..70fccb6 100644 --- a/Classes/CPPreferencesToolbarDelegate.m +++ b/Classes/CPPreferencesToolbarDelegate.m @@ -39,7 +39,7 @@ + (CPPreferencesToolbarDelegate *)preferencesToolbarDelegateByInterceptingDelega return toolbarDelegate; } -- (id)initWithOriginalToolbarDelegate:(IDEPreferencesController *)originalDelegate toolbar:(NSToolbar *)toolbar +- (instancetype)initWithOriginalToolbarDelegate:(IDEPreferencesController *)originalDelegate toolbar:(NSToolbar *)toolbar { self = [super init]; diff --git a/Classes/CPPreferencesView.h b/Classes/CPPreferencesView.h index eb4dd9e..a966426 100755 --- a/Classes/CPPreferencesView.h +++ b/Classes/CPPreferencesView.h @@ -13,7 +13,7 @@ @property (nonatomic, strong) NSButton *autocopyingSelectionCheckbox; @property (nonatomic, strong) NSButton *externalEditorCheckbox; -- (id)initWithPreferredFrame; +- (instancetype)initWithPreferredFrame; + (CGFloat)preferredWidth; + (CGFloat)preferredHeight; diff --git a/Classes/CPPreferencesView.m b/Classes/CPPreferencesView.m index 1f3497f..7180308 100755 --- a/Classes/CPPreferencesView.m +++ b/Classes/CPPreferencesView.m @@ -17,12 +17,12 @@ static const CGFloat TextHeight = 16; @implementation CPPreferencesView -- (id)initWithPreferredFrame +- (instancetype)initWithPreferredFrame { return [self initWithFrame:NSMakeRect(0.0f, 0.0f, PreferredViewWidth, PreferredViewHeight)]; } -- (id)initWithFrame:(NSRect)frame +- (instancetype)initWithFrame:(NSRect)frame { self = [super initWithFrame:frame]; diff --git a/Classes/CPPreferencesViewController.m b/Classes/CPPreferencesViewController.m index b3ba229..96c64d1 100755 --- a/Classes/CPPreferencesViewController.m +++ b/Classes/CPPreferencesViewController.m @@ -10,7 +10,7 @@ #import "CPPreferencesView.h" @implementation CPPreferencesViewController -- (id)init +- (instancetype)init { self = [super init]; diff --git a/Classes/CPResultTableView.m b/Classes/CPResultTableView.m index 8223029..55e5dbf 100644 --- a/Classes/CPResultTableView.m +++ b/Classes/CPResultTableView.m @@ -12,7 +12,7 @@ #import "CPResultTableViewColumn.h" @implementation CPResultTableView -- (id)initWithFrame:(NSRect)frameRect +- (instancetype)initWithFrame:(NSRect)frameRect { self = [super initWithFrame:frameRect]; diff --git a/Classes/CPResultTableViewColumn.m b/Classes/CPResultTableViewColumn.m index c14db50..d2198fd 100644 --- a/Classes/CPResultTableViewColumn.m +++ b/Classes/CPResultTableViewColumn.m @@ -15,7 +15,7 @@ #import "CPSymbol.h" @implementation CPResultTableViewColumn -- (id)init +- (instancetype)init { self = [super init]; diff --git a/Classes/CPSearchController.m b/Classes/CPSearchController.m index c7cf318..8fff04e 100755 --- a/Classes/CPSearchController.m +++ b/Classes/CPSearchController.m @@ -22,7 +22,7 @@ #import "AMIndeterminateProgressIndicatorCell.h" @implementation CPSearchController -- (id)init +- (instancetype)init { self = [super init]; diff --git a/Classes/CPSearchFieldTextView.m b/Classes/CPSearchFieldTextView.m index 0cf36d2..57e116a 100644 --- a/Classes/CPSearchFieldTextView.m +++ b/Classes/CPSearchFieldTextView.m @@ -17,7 +17,7 @@ }; @implementation CPSearchFieldTextView -- (id)init +- (instancetype)init { self = [super init]; diff --git a/Classes/CPSelectedObjectCell.m b/Classes/CPSelectedObjectCell.m index 811bbe9..56c0009 100644 --- a/Classes/CPSelectedObjectCell.m +++ b/Classes/CPSelectedObjectCell.m @@ -13,7 +13,7 @@ @implementation CPSelectedObjectCell @synthesize cellSize = _cellSize; -- (id)init +- (instancetype)init { self = [super init]; diff --git a/Classes/CPStatusLabel.m b/Classes/CPStatusLabel.m index 34c5d97..7c12e2b 100644 --- a/Classes/CPStatusLabel.m +++ b/Classes/CPStatusLabel.m @@ -9,7 +9,7 @@ #import "CPStatusLabel.h" @implementation CPStatusLabel -- (id)initWithFrame:(NSRect)frameRect +- (instancetype)initWithFrame:(NSRect)frameRect { self = [super initWithFrame:frameRect]; diff --git a/Classes/CPSymbolCache.m b/Classes/CPSymbolCache.m index ff88a02..89ad36c 100644 --- a/Classes/CPSymbolCache.m +++ b/Classes/CPSymbolCache.m @@ -26,7 +26,7 @@ + (CPSymbolCache *)sharedInstance return symbolCacheSharedInstance; } -- (id)init +- (instancetype)init { self = [super init]; diff --git a/Classes/CPWindow.h b/Classes/CPWindow.h index ac9d182..a09014b 100644 --- a/Classes/CPWindow.h +++ b/Classes/CPWindow.h @@ -18,7 +18,7 @@ - (void)updateFrameWithViewRequirementsWithAnimation:(BOOL)animation; - (void)updateFrameWithViewRequirements; -- (id)initWithDefaultSettings; +- (instancetype)initWithDefaultSettings; - (void)firstRunOrderFront; - (NSScreen *)destinationScreen; @end \ No newline at end of file diff --git a/Classes/CPWindow.m b/Classes/CPWindow.m index 2c7c8db..f2797b3 100644 --- a/Classes/CPWindow.m +++ b/Classes/CPWindow.m @@ -15,7 +15,7 @@ #import "CPXcodeWrapper.h" @implementation CPWindow -- (id)initWithDefaultSettings +- (instancetype)initWithDefaultSettings { return [[CPWindow alloc] initWithContentRect:NSMakeRect(100, 100, WINDOW_WIDTH, 500) styleMask:NSTitledWindowMask @@ -23,7 +23,7 @@ - (id)initWithDefaultSettings defer:0]; } -- (id)initWithContentRect:(NSRect)contentRect styleMask:(NSWindowStyleMask)aStyle backing:(NSBackingStoreType)bufferingType defer:(BOOL)flag +- (instancetype)initWithContentRect:(NSRect)contentRect styleMask:(NSWindowStyleMask)aStyle backing:(NSBackingStoreType)bufferingType defer:(BOOL)flag { self = [super initWithContentRect:contentRect styleMask:NSBorderlessWindowMask diff --git a/Classes/CPXcodeVersionUnsupportedWindowView.m b/Classes/CPXcodeVersionUnsupportedWindowView.m index b049cb0..cbb6f4c 100644 --- a/Classes/CPXcodeVersionUnsupportedWindowView.m +++ b/Classes/CPXcodeVersionUnsupportedWindowView.m @@ -10,7 +10,7 @@ #import "CPCodePilotConfig.h" @implementation CPXcodeVersionUnsupportedWindowView -- (id)initWithFrame:(NSRect)frame +- (instancetype)initWithFrame:(NSRect)frame { self = [super initWithFrame:frame]; diff --git a/Classes/CPXcodeWrapper.m b/Classes/CPXcodeWrapper.m index 5b45ed7..dffa4a5 100755 --- a/Classes/CPXcodeWrapper.m +++ b/Classes/CPXcodeWrapper.m @@ -23,7 +23,7 @@ static NSString * const IDEIndexDidIndexWorkspaceNotification = @"IDEIndexDidIndexWorkspaceNotification"; @implementation CPXcodeWrapper -- (id)init +- (instancetype)init { self = [super init]; From bbad5f46603c6bb4c5eaf1b39bae446e34a2a1aa Mon Sep 17 00:00:00 2001 From: Artem Starosvetskiy Date: Sun, 14 Jul 2019 00:53:06 +0300 Subject: [PATCH 6/7] Fix EOF --- Classes/CPCodePilotPlugin.h | 2 +- Classes/CPCodePilotWindowDelegate.m | 2 +- Classes/CPFileReference.h | 2 +- Classes/CPFileReference.m | 2 +- Classes/CPFileReferenceCell.m | 2 +- Classes/CPPluginInstaller.h | 2 +- Classes/CPPreferencesToolbarDelegate.m | 2 +- Classes/CPPreferencesView.m | 2 +- Classes/CPPreferencesViewController.m | 2 +- Classes/CPResultCell.h | 2 +- Classes/CPResultCell.m | 2 +- Classes/CPSearchController.h | 2 +- Classes/CPSearchController.m | 2 +- Classes/CPSearchField.h | 2 +- Classes/CPSearchField.m | 2 +- Classes/CPSearchFieldTextView.m | 2 +- Classes/CPSearchWindowView.m | 2 +- Classes/CPStatusLabel.m | 2 +- Classes/CPSymbol.h | 2 +- Classes/CPSymbol.m | 2 +- Classes/CPSymbolCell.h | 2 +- Classes/CPSymbolCell.m | 2 +- Classes/CPWindow.h | 2 +- Classes/CPXcodeWrapper.h | 2 +- Classes/NSAppleEventDescriptor+ToObject.m | 1 - Classes/NSMutableArray+MiscExtensions.h | 2 +- Classes/NSMutableArray+MiscExtensions.m | 2 +- Classes/NSString+Abbreviation.m | 2 +- Classes/NSString+MiscExtensions.h | 2 +- Classes/NSString+MiscExtensions.m | 2 +- Classes/NSView+RoundedFrame.h | 2 +- Classes/NSView+RoundedFrame.m | 2 +- MCCommons/MCLog.m | 2 +- 33 files changed, 32 insertions(+), 33 deletions(-) diff --git a/Classes/CPCodePilotPlugin.h b/Classes/CPCodePilotPlugin.h index 1e78084..f5b803b 100644 --- a/Classes/CPCodePilotPlugin.h +++ b/Classes/CPCodePilotPlugin.h @@ -26,4 +26,4 @@ - (void)openCodePilotWindow; - (void)checkForFirstRun; -@end \ No newline at end of file +@end diff --git a/Classes/CPCodePilotWindowDelegate.m b/Classes/CPCodePilotWindowDelegate.m index 5e26bd3..be327f7 100644 --- a/Classes/CPCodePilotWindowDelegate.m +++ b/Classes/CPCodePilotWindowDelegate.m @@ -98,4 +98,4 @@ - (void)windowDidResignMain:(NSNotification *)notification - (void)windowWillClose:(NSNotification *)notification { } -@end \ No newline at end of file +@end diff --git a/Classes/CPFileReference.h b/Classes/CPFileReference.h index 8687532..dab26b3 100644 --- a/Classes/CPFileReference.h +++ b/Classes/CPFileReference.h @@ -29,4 +29,4 @@ - (BOOL)isEqualToPbxReference:(PBXFileReference *)pbxReference; + (BOOL)pbxFileReferenceIsImportable:(PBXFileReference *)pbxFileReference; - (CPFileReference *)initWithDVTFilePath:(DVTFilePath *)_filePath; -@end \ No newline at end of file +@end diff --git a/Classes/CPFileReference.m b/Classes/CPFileReference.m index 12f5817..bb646e8 100644 --- a/Classes/CPFileReference.m +++ b/Classes/CPFileReference.m @@ -170,4 +170,4 @@ - (double)scoreOffset { return [self isImplementation] ? 16.01 : 16; } -@end \ No newline at end of file +@end diff --git a/Classes/CPFileReferenceCell.m b/Classes/CPFileReferenceCell.m index 1b93bb2..8468628 100644 --- a/Classes/CPFileReferenceCell.m +++ b/Classes/CPFileReferenceCell.m @@ -118,4 +118,4 @@ - (void)drawWithExpansionFrame:(NSRect)cellFrame inView:(NSView *)view { return; } -@end \ No newline at end of file +@end diff --git a/Classes/CPPluginInstaller.h b/Classes/CPPluginInstaller.h index f979929..900af5b 100644 --- a/Classes/CPPluginInstaller.h +++ b/Classes/CPPluginInstaller.h @@ -36,4 +36,4 @@ - (void)installStandardKeyBinding; - (IDEKeyBinding *)menuKeyBindingWithItemTitle:(NSString *)itemTitle underMenuCalled:(NSString *)menuName; - (void)updateKeyBinding:(IDEKeyBinding *)keyBinding forMenuItem:(NSMenuItem *)_menuItem defaultsKey:(NSString *)defaultsKey; -@end \ No newline at end of file +@end diff --git a/Classes/CPPreferencesToolbarDelegate.m b/Classes/CPPreferencesToolbarDelegate.m index 70fccb6..8505c78 100644 --- a/Classes/CPPreferencesToolbarDelegate.m +++ b/Classes/CPPreferencesToolbarDelegate.m @@ -198,4 +198,4 @@ - (void)toolbarWillAddItem:(NSNotification *)notification [self.originalDelegate toolbarWillAddItem:notification]; } } -@end \ No newline at end of file +@end diff --git a/Classes/CPPreferencesView.m b/Classes/CPPreferencesView.m index 7180308..e050d5c 100755 --- a/Classes/CPPreferencesView.m +++ b/Classes/CPPreferencesView.m @@ -185,4 +185,4 @@ + (CGFloat)preferredHeight return PreferredViewHeight; } -@end \ No newline at end of file +@end diff --git a/Classes/CPPreferencesViewController.m b/Classes/CPPreferencesViewController.m index 96c64d1..ddea725 100755 --- a/Classes/CPPreferencesViewController.m +++ b/Classes/CPPreferencesViewController.m @@ -34,4 +34,4 @@ - (void)applyChanges [[NSUserDefaults standardUserDefaults] setBool:externalEditorValue forKey:DEFAULTS_EXTERNAL_EDITOR_KEY]; } -@end \ No newline at end of file +@end diff --git a/Classes/CPResultCell.h b/Classes/CPResultCell.h index 9ca4ec8..6964f45 100644 --- a/Classes/CPResultCell.h +++ b/Classes/CPResultCell.h @@ -19,4 +19,4 @@ - (NSAttributedString *)queryHitAttributedStringWithString:(NSString *)subjectString; - (void)drawIconImage:(NSImage *)icon withFrame:(NSRect)cellFrame; - (void)drawWithBackgroundImageNamed:(NSString *)backgroundImageName withFrame:(NSRect)cellFrame; -@end \ No newline at end of file +@end diff --git a/Classes/CPResultCell.m b/Classes/CPResultCell.m index b722f30..baf1cc5 100644 --- a/Classes/CPResultCell.m +++ b/Classes/CPResultCell.m @@ -107,4 +107,4 @@ - (void)drawIconImage:(NSImage *)icon withFrame:(NSRect)cellFrame [icon drawInRect:dstRect fromRect:srcRect operation:NSCompositeSourceOver fraction:1.0f respectFlipped:YES hints:nil]; } } -@end \ No newline at end of file +@end diff --git a/Classes/CPSearchController.h b/Classes/CPSearchController.h index 9a5be40..5b22cd6 100644 --- a/Classes/CPSearchController.h +++ b/Classes/CPSearchController.h @@ -67,4 +67,4 @@ enum { - (NSFont *)statusLabelFont; - (NSMutableAttributedString *)normalFacedStatusLabelString:(NSString *)str; -@end \ No newline at end of file +@end diff --git a/Classes/CPSearchController.m b/Classes/CPSearchController.m index 8fff04e..6fe32fe 100755 --- a/Classes/CPSearchController.m +++ b/Classes/CPSearchController.m @@ -575,4 +575,4 @@ - (void)animateIndexingProgressIndicator:(NSTimer *)aTimer } } -@end \ No newline at end of file +@end diff --git a/Classes/CPSearchField.h b/Classes/CPSearchField.h index 62c9827..b66adc3 100644 --- a/Classes/CPSearchField.h +++ b/Classes/CPSearchField.h @@ -27,4 +27,4 @@ - (void)selectedObjectDidChange; - (BOOL)cmdBackspaceKeyDown; - (void)pasteString:(NSString *)str; -@end \ No newline at end of file +@end diff --git a/Classes/CPSearchField.m b/Classes/CPSearchField.m index f7e71c0..4a73fd0 100644 --- a/Classes/CPSearchField.m +++ b/Classes/CPSearchField.m @@ -236,4 +236,4 @@ - (void)drawRect:(NSRect)dirtyRect { [self.placeholderTextField setHidden:!IsEmpty([self stringValue])]; } -@end \ No newline at end of file +@end diff --git a/Classes/CPSearchFieldTextView.m b/Classes/CPSearchFieldTextView.m index 57e116a..87bd59e 100644 --- a/Classes/CPSearchFieldTextView.m +++ b/Classes/CPSearchFieldTextView.m @@ -114,4 +114,4 @@ - (NSMenu *)menuForEvent:(NSEvent *)theEvent { return nil; } -@end \ No newline at end of file +@end diff --git a/Classes/CPSearchWindowView.m b/Classes/CPSearchWindowView.m index 59280fb..5cf2d00 100644 --- a/Classes/CPSearchWindowView.m +++ b/Classes/CPSearchWindowView.m @@ -333,4 +333,4 @@ - (void)drawRect:(NSRect)_rect [self drawInfoLabelBar]; } -@end \ No newline at end of file +@end diff --git a/Classes/CPStatusLabel.m b/Classes/CPStatusLabel.m index 7c12e2b..7b83722 100644 --- a/Classes/CPStatusLabel.m +++ b/Classes/CPStatusLabel.m @@ -40,4 +40,4 @@ - (CGFloat)textWidth { return [[self attributedStringValue] size].width; } -@end \ No newline at end of file +@end diff --git a/Classes/CPSymbol.h b/Classes/CPSymbol.h index ba9435f..01c21e5 100644 --- a/Classes/CPSymbol.h +++ b/Classes/CPSymbol.h @@ -37,4 +37,4 @@ - (NSArray *)children; - (void)cacheRelatedSymbolOccurrence; -@end \ No newline at end of file +@end diff --git a/Classes/CPSymbol.m b/Classes/CPSymbol.m index 5fa5a53..034886c 100644 --- a/Classes/CPSymbol.m +++ b/Classes/CPSymbol.m @@ -210,4 +210,4 @@ - (double)scoreOffset { return [self isImplementation] ? 0.01 : 0; } -@end \ No newline at end of file +@end diff --git a/Classes/CPSymbolCell.h b/Classes/CPSymbolCell.h index 9eb7f02..68821a3 100644 --- a/Classes/CPSymbolCell.h +++ b/Classes/CPSymbolCell.h @@ -21,4 +21,4 @@ - (NSColor *)symbolCategoryNameForegroundColor; - (NSColor *)symbolNameForegroundColorWithoutHighlight; - (NSColor *)symbolNameForegroundColorWithHighlight; -@end \ No newline at end of file +@end diff --git a/Classes/CPSymbolCell.m b/Classes/CPSymbolCell.m index b2ea329..076846e 100644 --- a/Classes/CPSymbolCell.m +++ b/Classes/CPSymbolCell.m @@ -164,4 +164,4 @@ - (void)drawWithExpansionFrame:(NSRect)cellFrame inView:(NSView *)view { return; } -@end \ No newline at end of file +@end diff --git a/Classes/CPWindow.h b/Classes/CPWindow.h index a09014b..e31cd3a 100644 --- a/Classes/CPWindow.h +++ b/Classes/CPWindow.h @@ -21,4 +21,4 @@ - (instancetype)initWithDefaultSettings; - (void)firstRunOrderFront; - (NSScreen *)destinationScreen; -@end \ No newline at end of file +@end diff --git a/Classes/CPXcodeWrapper.h b/Classes/CPXcodeWrapper.h index 0004c77..f864531 100755 --- a/Classes/CPXcodeWrapper.h +++ b/Classes/CPXcodeWrapper.h @@ -67,4 +67,4 @@ - (BOOL)isSymbolCachingInProgress; - (NSArray *)recentlyVisitedFiles; -@end \ No newline at end of file +@end diff --git a/Classes/NSAppleEventDescriptor+ToObject.m b/Classes/NSAppleEventDescriptor+ToObject.m index 645fb8e..9bdba4a 100644 --- a/Classes/NSAppleEventDescriptor+ToObject.m +++ b/Classes/NSAppleEventDescriptor+ToObject.m @@ -105,4 +105,3 @@ - (id)_toDictionary } @end - diff --git a/Classes/NSMutableArray+MiscExtensions.h b/Classes/NSMutableArray+MiscExtensions.h index 6171648..dd73aed 100644 --- a/Classes/NSMutableArray+MiscExtensions.h +++ b/Classes/NSMutableArray+MiscExtensions.h @@ -11,4 +11,4 @@ @interface NSMutableArray (MiscExtensions) - (NSArray *)arrayFilteredAndScoredWithFuzzyQuery:(NSString *)query forKey:(NSString *)key; - (void)filterWithFuzzyQuery:(NSString *)query forKey:(NSString *)key; -@end \ No newline at end of file +@end diff --git a/Classes/NSMutableArray+MiscExtensions.m b/Classes/NSMutableArray+MiscExtensions.m index b38a133..ce7b798 100644 --- a/Classes/NSMutableArray+MiscExtensions.m +++ b/Classes/NSMutableArray+MiscExtensions.m @@ -44,4 +44,4 @@ - (void)filterWithFuzzyQuery:(NSString *)query forKey:(NSString *)key [self removeObjectsAtIndexes:indexesToRemove]; } -@end \ No newline at end of file +@end diff --git a/Classes/NSString+Abbreviation.m b/Classes/NSString+Abbreviation.m index c6913c8..313029a 100644 --- a/Classes/NSString+Abbreviation.m +++ b/Classes/NSString+Abbreviation.m @@ -106,4 +106,4 @@ - (BOOL)matchesFuzzyQuery:(NSString *)query return wordMatches; } -@end \ No newline at end of file +@end diff --git a/Classes/NSString+MiscExtensions.h b/Classes/NSString+MiscExtensions.h index 588101b..e645f3b 100644 --- a/Classes/NSString+MiscExtensions.h +++ b/Classes/NSString+MiscExtensions.h @@ -15,4 +15,4 @@ - (NSRange)completeRange; - (NSString *)hexString; + (NSString *)nounWithCount:(NSInteger)count forNoun:(NSString *)noun; -@end \ No newline at end of file +@end diff --git a/Classes/NSString+MiscExtensions.m b/Classes/NSString+MiscExtensions.m index 4272e9f..e4d1e7d 100644 --- a/Classes/NSString+MiscExtensions.m +++ b/Classes/NSString+MiscExtensions.m @@ -56,4 +56,4 @@ + (NSString *)nounWithCount:(NSInteger)count forNoun:(NSString *)noun return [NSString stringWithFormat:format, count, noun]; } -@end \ No newline at end of file +@end diff --git a/Classes/NSView+RoundedFrame.h b/Classes/NSView+RoundedFrame.h index ae4e947..ee320cf 100644 --- a/Classes/NSView+RoundedFrame.h +++ b/Classes/NSView+RoundedFrame.h @@ -10,4 +10,4 @@ @interface NSView (RoundedFrame) + (void)drawRoundedFrame:(NSRect)roundedFrame withRadius:(NSInteger)radius filledWithColor:(NSColor *)color; -@end \ No newline at end of file +@end diff --git a/Classes/NSView+RoundedFrame.m b/Classes/NSView+RoundedFrame.m index f605dd9..5e1caa9 100644 --- a/Classes/NSView+RoundedFrame.m +++ b/Classes/NSView+RoundedFrame.m @@ -36,4 +36,4 @@ + (void)drawRoundedFrame:(NSRect)roundedFrame withRadius:(NSInteger)radius fille NSRectFill(NSMakeRect(roundedFrame.origin.x + radius / 2, roundedFrame.origin.y, roundedFrame.size.width - radius, radius)); } -@end \ No newline at end of file +@end diff --git a/MCCommons/MCLog.m b/MCCommons/MCLog.m index 1df27a9..a6eabb0 100644 --- a/MCCommons/MCLog.m +++ b/MCCommons/MCLog.m @@ -110,4 +110,4 @@ + (NSString *)messageWithFile:(char *)sourceFile function:(char *)functionName l return MCNSStringWithFormat(@"? <%s>", typeCode); } -@end \ No newline at end of file +@end From 9f08cbe75838e027f58a5aedf52318834e6fa8a1 Mon Sep 17 00:00:00 2001 From: Artem Starosvetskiy Date: Sun, 14 Jul 2019 00:55:05 +0300 Subject: [PATCH 7/7] Link to BoringSSL instead of OpenSSL --- CodePilot.xcodeproj/project.pbxproj | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/CodePilot.xcodeproj/project.pbxproj b/CodePilot.xcodeproj/project.pbxproj index e1848d8..36ff649 100755 --- a/CodePilot.xcodeproj/project.pbxproj +++ b/CodePilot.xcodeproj/project.pbxproj @@ -64,9 +64,8 @@ 4BEE526C1339193600DA9881 /* MCStringScoring.c in Sources */ = {isa = PBXBuildFile; fileRef = 4B63C9261190199500C0DB12 /* MCStringScoring.c */; }; 4BEE526E1339193600DA9881 /* CPSymbol.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BBC547911D7757D00C63705 /* CPSymbol.m */; }; 4BEE52741339193600DA9881 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */; }; - 4BEE52751339193600DA9881 /* libssl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B71F65C11561A15005A8471 /* libssl.dylib */; }; - 4BEE52761339193600DA9881 /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B71F66011561A5E005A8471 /* libcrypto.dylib */; }; 4BEE52771339193600DA9881 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B25285A1165E23700374EB0 /* WebKit.framework */; }; + 7C05CBEE22DA8A7000910745 /* libboringssl.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C05CBED22DA8A7000910745 /* libboringssl.tbd */; }; C79122D6189E3449001776A1 /* NSURL+Xcode.m in Sources */ = {isa = PBXBuildFile; fileRef = C79122D5189E3449001776A1 /* NSURL+Xcode.m */; }; C79122D9189E391D001776A1 /* NSWorkspace+OpenFileOnLine.m in Sources */ = {isa = PBXBuildFile; fileRef = C79122D8189E391D001776A1 /* NSWorkspace+OpenFileOnLine.m */; }; F93F4FAD17B3FE550077B19E /* NSColor+ColorArithmetic.m in Sources */ = {isa = PBXBuildFile; fileRef = F93F4FAC17B3FE550077B19E /* NSColor+ColorArithmetic.m */; }; @@ -197,6 +196,7 @@ 4BEB7734138E466D00D52605 /* CPResultScrollView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = CPResultScrollView.m; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objc; }; 4BEE527B1339193600DA9881 /* CodePilot3.xcplugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CodePilot3.xcplugin; sourceTree = BUILT_PRODUCTS_DIR; }; 4BEE52A513391CBF00DA9881 /* CPCodePilotConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = CPCodePilotConfig.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; + 7C05CBED22DA8A7000910745 /* libboringssl.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libboringssl.tbd; path = usr/lib/libboringssl.tbd; sourceTree = SDKROOT; }; C79122D4189E3449001776A1 /* NSURL+Xcode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSURL+Xcode.h"; sourceTree = ""; }; C79122D5189E3449001776A1 /* NSURL+Xcode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSURL+Xcode.m"; sourceTree = ""; }; C79122D7189E391D001776A1 /* NSWorkspace+OpenFileOnLine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSWorkspace+OpenFileOnLine.h"; sourceTree = ""; }; @@ -217,9 +217,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 7C05CBEE22DA8A7000910745 /* libboringssl.tbd in Frameworks */, 4BEE52741339193600DA9881 /* Cocoa.framework in Frameworks */, - 4BEE52751339193600DA9881 /* libssl.dylib in Frameworks */, - 4BEE52761339193600DA9881 /* libcrypto.dylib in Frameworks */, 4BEE52771339193600DA9881 /* WebKit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -235,6 +234,7 @@ 089C167CFE841241C02AAC07 /* Resources */, 089C1671FE841209C02AAC07 /* Frameworks and Libraries */, 19C28FB8FE9D52D311CA2CBB /* Products */, + 7C05CBEC22DA8A7000910745 /* Frameworks */, ); indentWidth = 2; name = CodePilot; @@ -504,6 +504,14 @@ path = ../Classes; sourceTree = ""; }; + 7C05CBEC22DA8A7000910745 /* Frameworks */ = { + isa = PBXGroup; + children = ( + 7C05CBED22DA8A7000910745 /* libboringssl.tbd */, + ); + name = Frameworks; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */