CLIProxy.h

@@ -5,50 +5,21 @@
 //  Created by Ciaran Walsh on 16/02/2008.
 //
 
-#import <Cocoa/Cocoa.h>
-#import "OptionParser.h"
-
 @interface CLIProxy : NSObject
-{
-	NSDictionary* 	environment;
-	NSString* 		workingDirectory;
-
-	NSFileHandle* inputHandle;
-	NSFileHandle* outputHandle;
-	NSFileHandle* errorHandle;
-
-	option_t const*	optionTemplate;
-	size_t				optionCount;
-	NSArray* 			arguments;
-	NSDictionary*		parsedOptions;
-
-	NSDictionary*		parameters;
-}
-+ (id)proxyWithOptions:(NSDictionary*)options;
-- (id)initWithOptions:(NSDictionary*)options;
-
-- (void)writeStringToOutput:(NSString*)text;
-- (void)writeStringToError:(NSString*)text;
+@property (nonatomic, readonly) NSFileHandle* inputHandle;
+@property (nonatomic, readonly) NSFileHandle* outputHandle;
+@property (nonatomic, readonly) NSFileHandle* errorHandle;
+@property (nonatomic, readonly) NSDictionary* parameters;
+@property (nonatomic, readonly) NSDictionary* environment;
+@property (nonatomic, readonly) NSString* workingDirectory;
+
++ (instancetype)proxyWithOptions:(NSDictionary*)options;
+- (instancetype)initWithOptions:(NSDictionary*)options;
+
+- (void)writeStringToOutput:(NSString*)aString;
+- (void)writeStringToError:(NSString*)aString;
 - (id)readPropertyListFromInput;
 
-- (NSDictionary*)parameters;
-
-- (NSFileHandle*)inputHandle;
-- (NSFileHandle*)outputHandle;
-- (NSFileHandle*)errorHandle;
-
-- (NSDictionary*)environment;
-
-- (NSString*)workingDirectory;
-
-- (NSString*)argumentAtIndex:(int)index;
-- (int)numberOfArguments;
-
-- (id)valueForOption:(NSString*)option;
-- (void)setOptionTemplate:(option_t const*)options count:(size_t)count;
+- (NSString*)argumentAtIndex:(NSUInteger)index;
+- (NSUInteger)numberOfArguments;
 @end
-
-template <size_t optionCount> void SetOptionTemplate(CLIProxy* proxy, option_t const (&options)[optionCount])
-{
-	[proxy setOptionTemplate:options count:optionCount];
-}

CLIProxy.mm

@@ -8,162 +8,102 @@
 #import "CLIProxy.h"
 #import "TMDCommand.h"
 
-@interface CLIProxy (Private)
-- (NSArray*)arguments;
+@interface CLIProxy ()
+{
+	NSArray* _arguments;
+	NSDictionary* _parameters;
+}
 @end
 
 @implementation CLIProxy
-+ (id)proxyWithOptions:(NSDictionary*)options;
++ (instancetype)proxyWithOptions:(NSDictionary*)options;
 {
-	return [[(CLIProxy*)[[self class] alloc] initWithOptions:options] autorelease];
+	return [[CLIProxy alloc] initWithOptions:options];
 }
 
-- (id)initWithOptions:(NSDictionary*)options
+- (instancetype)initWithOptions:(NSDictionary*)options
 {
 	if(self = [super init])
 	{
-		inputHandle      = [[NSFileHandle fileHandleForReadingAtPath:[options objectForKey:@"stdin"]] retain];
-		outputHandle     = [[NSFileHandle fileHandleForWritingAtPath:[options objectForKey:@"stdout"]] retain];
-		errorHandle      = [[NSFileHandle fileHandleForWritingAtPath:[options objectForKey:@"stderr"]] retain];
-		arguments        = [[options objectForKey:@"arguments"] retain];
-		environment      = [[options objectForKey:@"environment"] retain];
-		workingDirectory = [[options objectForKey:@"cwd"] retain];
+		_inputHandle      = [NSFileHandle fileHandleForReadingAtPath:[options objectForKey:@"stdin"]];
+		_outputHandle     = [NSFileHandle fileHandleForWritingAtPath:[options objectForKey:@"stdout"]];
+		_errorHandle      = [NSFileHandle fileHandleForWritingAtPath:[options objectForKey:@"stderr"]];
+		_arguments        = [options objectForKey:@"arguments"];
+		_environment      = [options objectForKey:@"environment"];
+		_workingDirectory = [options objectForKey:@"cwd"];
 	}
 	return self;
 }
 
-- (void)dealloc
-{
-	[inputHandle release];
-	[outputHandle release];
-	[errorHandle release];
-	[arguments release];
-	[environment release];
-	[workingDirectory release];
-	[parameters release];
-	[super dealloc];
-}
-
 - (NSDictionary*)parameters
 {
-	if(!parameters)
+	if(!_parameters)
 	{
 		NSMutableDictionary* res = [NSMutableDictionary dictionary];
-		if(id plist = [TMDCommand readPropertyList:[self inputHandle] error:NULL])
+		if(id plist = [TMDCommand readPropertyList:self.inputHandle error:NULL])
 		{
 			if([plist isKindOfClass:[NSDictionary class]])
 				res = plist;
 		}
 
-		NSString* lastKey = nil;
-		for(size_t i = 2; i < [arguments count]; ++i)
+		for(NSUInteger i = 2; i < [_arguments count]; )
 		{
-			NSString* arg = [arguments objectAtIndex:i];
-			BOOL isOption = [arg hasPrefix:@"--"];
-			if(lastKey)
-				[res setObject:(isOption ? [NSNull null] : arg) forKey:lastKey];
-			lastKey = isOption ? [arg substringFromIndex:2] : nil;
+			NSString* key = _arguments[i++];
+			if(![key hasPrefix:@"--"])
+				continue; // TODO Report unexpected argument to user
+
+			key = [key substringFromIndex:2];
+			NSString* value = i < _arguments.count ? _arguments[i] : @"";
+
+			if([value hasPrefix:@"--"] && ![value isEqualToString:@"--"])
+			{
+				value = @""; // We use NSString instead of NSNull because we may send mutableCopy to parameters
+			}
+			else
+			{
+				++i;
+				if([value isEqualToString:@"--"])
+					value = i < _arguments.count ? _arguments[i++] : @"";
+			}
+			res[key] = value;
 		}
 
-		if(lastKey)
-			[res setObject:[NSNull null] forKey:lastKey];
-
-		parameters = [res retain];
+		_parameters = res;
 	}
-	return parameters;
-}
-
-- (NSString*)workingDirectory
-{
-	return workingDirectory;
+	return _parameters;
 }
 
-- (NSDictionary*)environment
+- (NSUInteger)numberOfArguments;
 {
-	return environment;
+	return [_arguments count];
 }
 
-- (NSArray*)arguments
+- (NSString*)argumentAtIndex:(NSUInteger)index;
 {
-	if(!parsedOptions)
-		return arguments;
-	return [parsedOptions objectForKey:@"literals"];
-}
-
-- (int)numberOfArguments;
-{
-	return [[self arguments] count];
-}
-
-- (NSString*)argumentAtIndex:(int)index;
-{
-	id argument = nil;
-	if([[self arguments] count] > index)
-		argument = [[self arguments] objectAtIndex:index];
-	return argument;
-}
-
-- (id)valueForOption:(NSString*)option;
-{
-	if(!parsedOptions)
-	{
-		NSLog(@"Error: -valueForOption: called without first setting an option template");
-		return nil;
-	}
-	return [[parsedOptions objectForKey:@"options"] objectForKey:option];
-}
-
-- (void)parseOptions
-{
-	parsedOptions = ParseOptions([self arguments], optionTemplate, optionCount);
-}
-
-- (void)setOptionTemplate:(option_t const*)options count:(size_t)count;
-{
-	optionTemplate = options;
-	optionCount = count;
-	[self parseOptions];
+	return index < [_arguments count] ? _arguments[index] : nil;
 }
 
 // ===================
 // = Reading/Writing =
 // ===================
-- (void)writeStringToOutput:(NSString*)text;
+- (void)writeStringToOutput:(NSString*)aString;
 {
-	[[self outputHandle] writeString:text];
+	[self.outputHandle writeData:[aString dataUsingEncoding:NSUTF8StringEncoding]];
 }
 
-- (void)writeStringToError:(NSString*)text;
+- (void)writeStringToError:(NSString*)aString;
 {
-	[[self errorHandle] writeString:text];
+	[self.errorHandle writeData:[aString dataUsingEncoding:NSUTF8StringEncoding]];
 }
 
 - (id)readPropertyListFromInput;
 {
-	NSString* error = nil;
-	id plist        = [TMDCommand readPropertyList:[self inputHandle] error:&error];
+	NSError* error = nil;
+	id plist       = [TMDCommand readPropertyList:self.inputHandle error:&error];
 
-	if(error || !plist)
-		[self writeStringToError:error ?: @"unknown error parsing property list\n"];
+	if(!plist)
+		[self writeStringToError:[error localizedDescription] ?: @"unknown error parsing property list\n"];
 
 	return plist;
 }
-
-// ================
-// = File handles =
-// ================
-- (NSFileHandle*)inputHandle;
-{
-	return inputHandle;
-}
-
-- (NSFileHandle*)outputHandle;
-{
-	return outputHandle;
-}
-
-- (NSFileHandle*)errorHandle;
-{
-	return errorHandle;
-}
 @end

Commands/Utilities/TextMate.mm

@@ -1,17 +1,109 @@
 #import "TextMate.h"
 
+static CGFloat insertionDelayForNewDoc = 0.1;
+
+// Declarations to avoid compiler warnings
 @interface NSObject (OakTextViewPrivate)
-- (id)insertSnippetWithOptions:(NSDictionary*)options;
+- (void)insertSnippetWithOptions:(NSDictionary*)options;
+- (void)makeTextViewFirstResponder:(id)sender;
+- (void)newDocument:(id)sender;
 @end
 
+/**
+ Returns the front most text view and by reference:
+ - “isNew” – “YES” if no text view was found it was created a new document
+ - “winForTextView” – the NSWindow which contains the the front most text view
+ It returns “nil” if no text view could be found or created.
+*/
+id frontMostTextViewForSelector (SEL selector, BOOL* isNew, NSWindow** winForTextView)
+{
+
+	// Return value if a new doc was created
+	if(isNew)
+		*isNew = NO;
+
+	// unique method for identifying a OakTextView
+	SEL checkSelector = @selector(insertSnippetWithOptions:);
+
+	// Find the front most OakTextView
+	for(NSWindow* win in [NSApp orderedWindows])
+	{
+		NSMutableArray* views = [NSMutableArray array];
+		if(id firstResponder = [win firstResponder])
+			[views addObject:firstResponder];
+		[views addObject:[win contentView]];
+
+		for(NSUInteger i = 0; i < [views count]; ++i)
+		{
+			id view = [views objectAtIndex:i];
+			if([view respondsToSelector:checkSelector] && [view respondsToSelector:selector])
+			{
+				if(winForTextView)
+					*winForTextView = win;
+				return view;
+			}
+
+			if([view respondsToSelector:@selector(subviews)])
+				[views addObjectsFromArray:[view performSelector:@selector(subviews)]];
+		}
+	}
+
+	// If no textView was found create a new document
+	if(id tmApp = [NSApp targetForAction:@selector(newDocument:)])
+	{
+
+		[tmApp newDocument:nil];
+
+		if([[NSApp orderedWindows] count]
+			&& [[[[NSApp orderedWindows] objectAtIndex:0] windowController] tryToPerform:
+															@selector(makeTextViewFirstResponder:) with:nil])
+		{
+			id textView = [NSApp targetForAction:checkSelector];
+			if(textView && [textView respondsToSelector:selector])
+			{
+				if(isNew)
+					*isNew = YES;
+				if(winForTextView)
+					*winForTextView = [[NSApp orderedWindows] objectAtIndex:0];
+				return textView;
+			}
+		}
+	}
+
+	return nil;
+
+}
+
+/**
+ Tries to insert “someText” as text into the front most text view.
+*/
 void insert_text (NSString* someText)
 {
-	if(id textView = [NSApp targetForAction:@selector(insertText:)])
-		[textView insertText:someText];
+	BOOL isNewDocument = NO;
+	if(id textView = frontMostTextViewForSelector(@selector(insertText:), &isNewDocument, NULL))
+	{
+		if(isNewDocument) // delay the insertion to let TM finish the initialization of the new doc
+				[textView performSelector:@selector(insertText:) withObject:someText afterDelay:insertionDelayForNewDoc];
+		else	[textView insertText:someText];
+	}
 }
 
+/**
+ Tries to insert “aSnippet” as snippet into the front most text view
+ and set the key focus to the current document.
+*/
 void insert_snippet (NSString* aSnippet)
 {
-	if(id textView = [NSApp targetForAction:@selector(insertSnippetWithOptions:)])
-		[textView insertSnippetWithOptions:[NSDictionary dictionaryWithObject:aSnippet forKey:@"content"]];
+	BOOL isNewDocument = NO;
+	NSWindow* win = nil;
+	if(id textView = frontMostTextViewForSelector(@selector(insertSnippetWithOptions:), &isNewDocument, &win))
+	{
+		if(isNewDocument) // delay the insertion to let TM finish the initialization of the new doc
+				[textView performSelector:@selector(insertSnippetWithOptions:) withObject:[NSDictionary dictionaryWithObject:aSnippet forKey:@"content"] afterDelay:insertionDelayForNewDoc];
+		else	[textView insertSnippetWithOptions: [NSDictionary dictionaryWithObject:aSnippet forKey:@"content"]];
+
+		// Since after inserting a snippet the user should interact with the snippet
+		// set key focus to current textView
+		[win makeKeyWindow];
+	}
 }