Merge pull request #33 from FuzzyAutocomplete/develop

Fuzzy Autocomplete 2.0

Author: slazyk

CHANGELOG.md

@@ -0,0 +1,59 @@
+## Changelog
+
+#### 2.0.0 - 2014/04/16
+**A major update introducing many fixes and improvements, including:**
+
+* Visual feedback in Completion List and Inline Preview
+* Settings Window, settings now don't require Xcode restart
+* Option to sort items by match score
+* Option to hide items based on threshold
+* Option to hide Inline Preview, which now works correctly
+* Option to show a List Header with query and number of matches
+* Option to show item scores in the List
+* Improved score formula, added option to tweak parameters
+* Previously hidden items can now re-appear if their score rises
+* `Tab` now inserts an useful prefix based on whole fuzzy match
+* The results should no longer depend on the speed of typing
+* Got rid of order dependent "shortest match" selection mechanism
+* Performance++
+* UX++
+* ...
+
+#### 1.7 - 2014/03/23
+
+* Adds inserting useful prefix with `Tab` as an option.
+
+#### 1.6 - 2014/03/22
+
+* No longer prioritises shortest match by default. Can be re-enabled with `defaults write com.apple.dt.Xcode FuzzyAutocompletePrioritizeShortestMatch -bool yes` and restarting Xcode.
+
+#### 1.5 - 2013/11/05
+
+* Shortest match will always be selected
+
+#### 1.4 - 2013/10/26
+
+* Remove requirement to start fuzzy match with first letter of desired match
+* Improve performance by parallelising work
+
+#### 1.3.1 - 2013/10/24
+
+* Decrease the weighting of Xcode's priority factor from `1.0` to `0.2`
+* Prepare for [KSImageNamed](https://github.com/ksuther/KSImageNamed-Xcode) compatibility when [KSImageNamed#31](https://github.com/ksuther/KSImageNamed-Xcode/pull/31) gets merged.
+
+#### 1.3 - 2013/10/23
+
+* Now factors in Xcode's learning priority system - [#2](https://github.com/chendo/FuzzyAutocompletePlugin/issues/2)
+* `Tab` now accepts selected completion as it doesn't make sense to insert prefix with fuzzy matching
+
+#### 1.2 - 2013/10/22
+
+* Fixes missing file entries when autocompleting paths - [#1](https://github.com/chendo/FuzzyAutocompletePlugin/issues/1)
+
+#### 1.1 - 2013/10/21
+
+* Implement partial completion support via `Tab`
+
+#### 1.0 - 2013/10/20
+
+* Initial release

FuzzyAutocomplete.xcodeproj/project.pbxproj

@@ -0,0 +1,16 @@
+//
+//  DVTTextCompletionInlinePreviewController+FuzzyAutocomplete.h
+//  FuzzyAutocomplete
+//
+//  Created by Leszek Slazynski on 03/02/2014.
+//  Copyright (c) 2014 United Lines of Code. All rights reserved.
+//
+
+#import "DVTTextCompletionInlinePreviewController.h"
+
+@interface DVTTextCompletionInlinePreviewController (FuzzyAutocomplete)
+
+/// Matched ranges mapped to preview space.
+@property (nonatomic, retain) NSArray * fa_matchedRanges;
+
+@end

FuzzyAutocomplete.xcodeproj/xcuserdata/chendo.xcuserdatad/xcschemes/FuzzyAutocomplete.xcscheme

@@ -0,0 +1,107 @@
+//
+//  DVTTextCompletionInlinePreviewController+FuzzyAutocomplete.m
+//  FuzzyAutocomplete
+//
+//  Created by Leszek Slazynski on 03/02/2014.
+//  Copyright (c) 2014 United Lines of Code. All rights reserved.
+//
+
+#import "DVTTextCompletionInlinePreviewController+FuzzyAutocomplete.h"
+#import "DVTTextCompletionSession.h"
+#import "DVTTextCompletionSession+FuzzyAutocomplete.h"
+#import "DVTFontAndColorTheme.h"
+#import "JRSwizzle.h"
+#import <objc/runtime.h>
+
+@implementation DVTTextCompletionInlinePreviewController (FuzzyAutocomplete)
+
++ (void) load {
+    [self jr_swizzleMethod: @selector(ghostComplementRange)
+                withMethod: @selector(_fa_ghostComplementRange)
+                     error: NULL];
+
+    [self jr_swizzleMethod: @selector(_showPreviewForItem:)
+                withMethod: @selector(_fa_showPreviewForItem:)
+                     error: NULL];
+}
+
+#pragma mark - overrides
+
+// We added calculation of matchedRanges and ghostRange here.
+- (void) _fa_showPreviewForItem: (id<DVTTextCompletionItem>) item {
+    [self _fa_showPreviewForItem: item];
+
+    DVTTextCompletionSession * session = [self valueForKey: @"_session"];
+
+    NSArray * ranges = [session fa_matchedRangesForItem: item];
+
+    if (!ranges.count) {
+        self.fa_matchedRanges = nil;
+        self.fa_overridedGhostRange = nil;
+        return;
+    }
+
+    NSUInteger previewLength = self.previewRange.length;
+    NSString *previewText;
+
+    if (previewLength == item.completionText.length) {
+        previewText = item.completionText;
+    } else if (previewLength == item.name.length) {
+        previewText = item.name;
+    } else if (previewLength == item.displayText.length) {
+        previewText = item.displayText;
+    } else {
+        NSTextView * textView = (NSTextView *) session.textView;
+        previewText = [[textView.textStorage attributedSubstringFromRange: self.previewRange] string];
+    }
+
+    ranges = [session fa_convertRanges: ranges
+                            fromString: item.name
+                              toString: previewText
+                             addOffset: self.previewRange.location];
+
+    if (!ranges.count) {
+        self.fa_overridedGhostRange = nil;
+    } else {
+        NSRange lastRange = [[ranges lastObject] rangeValue];
+        NSUInteger start = NSMaxRange(lastRange);
+        NSUInteger end = NSMaxRange(self.previewRange);
+        NSRange override = NSMakeRange(start, end - start);
+        self.fa_overridedGhostRange = [NSValue valueWithRange: override];
+    }
+
+    self.fa_matchedRanges = ranges;
+}
+
+- (NSRange) _fa_ghostComplementRange {
+    NSValue * override = self.fa_overridedGhostRange;
+    if (override) {
+        return [override rangeValue];
+    }
+    return [self _fa_ghostComplementRange];
+}
+
+#pragma mark - additional properties
+
+static char overrideGhostKey;
+static char matchedRangesKey;
+
+- (NSArray *)fa_matchedRanges {
+    return objc_getAssociatedObject(self, &matchedRangesKey);
+}
+
+- (void)setFa_matchedRanges:(NSArray *)array {
+    objc_setAssociatedObject(self, &matchedRangesKey, array, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+}
+
+// We override the gost range to span only after last matched letter.
+// This way we do not need to apply arguments to matched ranges.
+- (NSValue *)fa_overridedGhostRange {
+    return objc_getAssociatedObject(self, &overrideGhostKey);
+}
+
+- (void)setFa_overridedGhostRange:(NSValue *)value {
+    objc_setAssociatedObject(self, &overrideGhostKey, value, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+}
+
+@end

FuzzyAutocomplete.xcodeproj/xcuserdata/chendo.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -0,0 +1,13 @@
+//
+//  DVTTextCompletionListWindowController+FuzzyAutocomplete.h
+//  FuzzyAutocomplete
+//
+//  Created by Leszek Slazynski on 01/02/2014.
+//  Copyright (c) 2014 United Lines of Code. All rights reserved.
+//
+
+#import "DVTTextCompletionListWindowController.h"
+
+@interface DVTTextCompletionListWindowController (FuzzyAutocomplete)
+
+@end