Fix a bug where double-tap of a modifier didn't work unless a hotkey keypress...

Fix a bug where double-tap of a modifier didn't work unless a hotkey keypress was also defined. This revealed a bug in how weak references were used. isEqual: uses pointer equality by default, so it doesn't work on arrays of weak refs. I hacked around it by implementing isEqual: for the one class I care about.

iTerm2XCTests/iTermWeakReferenceTest.m

@@ -207,6 +207,20 @@ ITERM_WEAKLY_REFERENCEABLE
     dispatch_release(doneGroup);
 }
+- (void)testRespondsToSelector {
+    iTerm2FakeObject *fakeObject = [[[iTerm2FakeObject alloc] init] autorelease];
+    fakeObject.number = 1234;
+    iTerm2FakeObject *ref = [fakeObject weakSelf];
+    // Method from subclass
+    XCTAssertTrue([ref respondsToSelector:@selector(number)]);
+    // Method from iTermWeakReference
+    XCTAssertTrue([ref respondsToSelector:@selector(weaklyReferencedObject)]);
+    // Method from superclass
+    XCTAssertTrue([ref respondsToSelector:@selector(isEqual:)]);
+    // Method that doesn't exist
+    XCTAssertFalse([ref respondsToSelector:@selector(testRespondsToSelector)]);
+}
+
 // This is a regression test. There was a bug that the weak reference did not properly remove itself
 // from notification center. It was hard to see because it didn't happen in 10.11.
 - (void)testReferenceRemovedFromNotificationCenter {

sources/iTermBaseHotKey.m

@@ -12,7 +12,7 @@ static const CGEventFlags kCGEventHotKeyModifierMask = (kCGEventFlagMaskAlphaShi
                                                         kCGEventFlagMaskControl);
-@interface iTermBaseHotKey()<iTermEventTapObserver>
+@interface iTermBaseHotKey()<iTermEventTapObserver, iTermWeaklyReferenceable>
 // Override this to do a thing that needs to be done. `siblings` are other hotkeys (besides the one
 // this call was made for) that have the same keypress.
@@ -54,6 +54,17 @@ ITERM_WEAKLY_REFERENCEABLE
             NSStringFromClass([self class]), self, _shortcuts, @(self.hasModifierActivation), @(self.modifierActivation)];
 }
+// isEqual: uses pointer equality. Sigh. I really need to just use ARC.
+- (BOOL)isEqual:(id)object {
+    if ([self respondsToSelector:@selector(weaklyReferencedObject)]) {
+        return [[(iTermWeakReference *)self weaklyReferencedObject] isEqual:object];
+    }
+    if ([object respondsToSelector:@selector(weaklyReferencedObject)]) {
+        return [self isEqual:[(iTermWeakReference *)object weaklyReferencedObject]];
+    }
+    return [super isEqual:object];
+}
+
 - (NSArray<iTermHotKeyDescriptor *> *)hotKeyDescriptors {
     return [_shortcuts mapWithBlock:^id(iTermShortcut *anObject) {
         return [anObject descriptor];

sources/iTermHotKeyProfileBindingController.m

@@ -76,7 +76,14 @@
     }];
     if (!shortcuts.count) {
         DLog(@"None of the shortcuts in profile %@ are assigned", profile[KEY_NAME]);
-        return;
+
+        // Check if there's double-tap of modifier enabled.
+        if (![profile[KEY_HOTKEY_ACTIVATE_WITH_MODIFIER] boolValue]) {
+            DLog(@"Double-tap of modifier not enabled either");
+            return;
+        } else {
+            DLog(@"Double-tap of modifier IS enabled");
+        }
     }
     
     iTermProfileHotKey *hotKey =

sources/iTermWeakReference.m

@@ -22,6 +22,7 @@ static OSSpinLock lock = OS_SPINLOCK_INIT;
 }
 - (instancetype)initWithObject:(id<iTermWeaklyReferenceable>)object {
+    assert([object conformsToProtocol:@protocol(iTermWeaklyReferenceable)]);
     if (self) {
         _object = object;
         _class = [[object class] retain];
@@ -75,6 +76,14 @@ static OSSpinLock lock = OS_SPINLOCK_INIT;
 #pragma mark - NSProxy
+- (BOOL)respondsToSelector:(SEL)aSelector {
+    if ([NSStringFromSelector(aSelector) isEqualToString:NSStringFromSelector(@selector(weaklyReferencedObject))]) {
+        return YES;
+    } else {
+        return [super respondsToSelector:aSelector];
+    }
+}
+
 - (NSMethodSignature *)methodSignatureForSelector:(SEL)selector {
     OSSpinLockLock(&lock);
     id theObject = [_object retain];