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

Rework code to avoid strange crash

Browse Source 
I’m seeing a crash in ‘-[OakDocumentView dealloc]’ stating that “selectionString” is not being observed. This would indicate that a OakDocumentView instance is created that doesn’t go through the designated initializer, how that can happen is beyond me, but with the reshuffled code, if it happens, it should no longer cause a crash in dealloc.
This commit is contained in:
Allan Odgaard
2013-08-12 19:56:43 +02:00
parent a68d206468
commit 772143088a
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Frameworks/OakTextView/src/OakDocumentView.mm
View File

@@ -62,11 +62,10 @@ static NSString* const kFoldingsColumnIdentifier = @"foldings";
@property (nonatomic) NSDictionary* gutterPressedImages;
@property (nonatomic) OakFilterWindowController* filterWindowController;
@property (nonatomic) SymbolChooser* symbolChooser;
@property (nonatomic) NSArray* observedKeys;
- (void)updateStyle;
@end
static NSString* const ObservedTextViewKeyPaths[] = { @"selectionString", @"tabSize", @"softTabs", @"isMacroRecording"};
struct document_view_callback_t : document::document_t::callback_t
{
WATCH_LEAKS(document_view_callback_t);
@@ -150,8 +149,9 @@ private:
doc->set_custom_name("null document"); // without a name it grabs an ‘untitled’ token
[self setDocument:doc];
iterate(keyPath, ObservedTextViewKeyPaths)
[textView addObserver:self forKeyPath:*keyPath options:NSKeyValueObservingOptionInitial context:NULL];
self.observedKeys = @[ @"selectionString", @"tabSize", @"softTabs", @"isMacroRecording"];
for(NSString* keyPath in self.observedKeys)
[textView addObserver:self forKeyPath:keyPath options:NSKeyValueObservingOptionInitial context:NULL];
}
return self;
}
@@ -251,7 +251,7 @@ private:
- (void)observeValueForKeyPath:(NSString*)aKeyPath ofObject:(id)observableController change:(NSDictionary*)changeDictionary context:(void*)userData
{
if(observableController != textView || ![[NSArray arrayWithObjects:&ObservedTextViewKeyPaths[0] count:sizeofA(ObservedTextViewKeyPaths)] containsObject:aKeyPath])
if(observableController != textView || ![self.observedKeys containsObject:aKeyPath])
return;
if([aKeyPath isEqualToString:@"selectionString"])
@@ -286,8 +286,8 @@ private:
gutterView.delegate = nil;
statusBar.delegate = nil;
iterate(keyPath, ObservedTextViewKeyPaths)
[textView removeObserver:self forKeyPath:*keyPath];
for(NSString* keyPath in self.observedKeys)
[textView removeObserver:self forKeyPath:keyPath];
[[NSNotificationCenter defaultCenter] removeObserver:self];
[self setDocument:document::document_ptr()];