Merge commit 'be3e8236086165e5e45a5a10783823874b3f3ebd' as 'lib/vscode'

lib/vscode/extensions/objective-c/.vscodeignore

@@ -0,0 +1,2 @@
+test/**
+cgmanifest.json

lib/vscode/extensions/objective-c/build/update-grammars.js

@@ -0,0 +1,11 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+
+var updateGrammar = require('../../../build/npm/update-grammar');
+
+updateGrammar.update('jeff-hykin/cpp-textmate-grammar', '/syntaxes/objc.tmLanguage.json', './syntaxes/objective-c.tmLanguage.json', undefined, 'master', 'source/languages/cpp');
+updateGrammar.update('jeff-hykin/cpp-textmate-grammar', '/syntaxes/objcpp.tmLanguage.json', './syntaxes/objective-c++.tmLanguage.json', undefined, 'master', 'source/languages/cpp');
+

lib/vscode/extensions/objective-c/cgmanifest.json

@@ -0,0 +1,18 @@
+{
+	"registrations": [
+		{
+			"component": {
+				"type": "git",
+				"git": {
+					"name": "jeff-hykin/cpp-textmate-grammar",
+					"repositoryUrl": "https://github.com/jeff-hykin/cpp-textmate-grammar",
+					"commitHash": "bc7dedd28eebe52b374744d3fb34d77ff441569e"
+				}
+			},
+			"license": "MIT",
+			"version": "1.12.11",
+			"description": "The files syntaxes/objective-c.tmLanguage.json and syntaxes/objective-c++.tmLanguage.json were derived from the language package https://github.com/jeff-hykin/cpp-textmate-grammar."
+		}
+	],
+	"version": 1
+}

lib/vscode/extensions/objective-c/language-configuration.json

@@ -0,0 +1,25 @@
+{
+	"comments": {
+		"lineComment": "//",
+		"blockComment": [ "/*", "*/" ]
+	},
+	"brackets": [
+		["{", "}"],
+		["[", "]"],
+		["(", ")"]
+	],
+	"autoClosingPairs": [
+		["{", "}"],
+		["[", "]"],
+		["(", ")"],
+		{ "open": "\"", "close": "\"", "notIn": ["string"] },
+		{ "open": "'", "close": "'", "notIn": ["string"] }
+	],
+	"surroundingPairs": [
+		["{", "}"],
+		["[", "]"],
+		["(", ")"],
+		["\"", "\""],
+		["'", "'"]
+	]
+}

lib/vscode/extensions/objective-c/package.json

@@ -0,0 +1,50 @@
+{
+	"name": "objective-c",
+	"displayName": "%displayName%",
+	"description": "%description%",
+	"version": "1.0.0",
+	"publisher": "vscode",
+	"license": "MIT",
+	"engines": {
+		"vscode": "*"
+	},
+	"scripts": {
+		"update-grammar": "node ./build/update-grammars.js"
+	},
+	"contributes": {
+		"languages": [
+			{
+				"id": "objective-c",
+				"extensions": [
+					".m"
+				],
+				"aliases": [
+					"Objective-C"
+				],
+				"configuration": "./language-configuration.json"
+			},
+			{
+				"id": "objective-cpp",
+				"extensions": [
+					".mm"
+				],
+				"aliases": [
+					"Objective-C++"
+				],
+				"configuration": "./language-configuration.json"
+			}
+		],
+		"grammars": [
+			{
+				"language": "objective-c",
+				"scopeName": "source.objc",
+				"path": "./syntaxes/objective-c.tmLanguage.json"
+			},
+			{
+				"language": "objective-cpp",
+				"scopeName": "source.objcpp",
+				"path": "./syntaxes/objective-c++.tmLanguage.json"
+			}
+		]
+	}
+}

lib/vscode/extensions/objective-c/package.nls.json

@@ -0,0 +1,4 @@
+{
+	"displayName": "Objective-C Language Basics",
+	"description": "Provides syntax highlighting and bracket matching in Objective-C files."
+}

lib/vscode/extensions/objective-c/test/colorize-fixtures/test.m

@@ -0,0 +1,52 @@
+//
+//  Copyright (c) Microsoft Corporation. All rights reserved.
+//
+
+#import "UseQuotes.h"
+#import <Use/GTLT.h>
+
+/*
+	Multi
+	Line
+	Comments
+*/
+@implementation Test
+
+- (void) applicationWillFinishLaunching:(NSNotification *)notification
+{
+}
+
+- (IBAction)onSelectInput:(id)sender
+{
+    NSString* defaultDir = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, true)[0];
+
+    NSOpenPanel* panel = [NSOpenPanel openPanel];
+    [panel setAllowedFileTypes:[[NSArray alloc] initWithObjects:@"ipa", @"xcarchive", @"app", nil]];
+
+    [panel beginWithCompletionHandler:^(NSInteger result)
+     {
+         if (result == NSFileHandlingPanelOKButton)
+             [self.inputTextField setStringValue:[panel.URL path]];
+     }];
+     return YES;
+
+     int hex = 0xFEF1F0F;
+	 float ing = 3.14;
+	 ing = 3.14e0;
+	 ing = 31.4e-2;
+}
+
+-(id) initWithParams:(id<anObject>) aHandler withDeviceStateManager:(id<anotherObject>) deviceStateManager
+{
+    // add a tap gesture recognizer
+    UITapGestureRecognizer *tapGesture = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(handleTap:)];
+    NSMutableArray *gestureRecognizers = [NSMutableArray array];
+    [gestureRecognizers addObject:tapGesture];
+    [gestureRecognizers addObjectsFromArray:scnView.gestureRecognizers];
+    scnView.gestureRecognizers = gestureRecognizers;
+
+	return tapGesture;
+	return nil;
+}
+
+@end

lib/vscode/extensions/objective-c/test/colorize-fixtures/test.mm

@@ -0,0 +1,52 @@
+//
+//  Copyright (c) Microsoft Corporation. All rights reserved.
+//
+
+#import "UseQuotes.h"
+#import <Use/GTLT.h>
+
+/*
+	Multi
+	Line
+	Comments
+*/
+@implementation Test
+
+- (void) applicationWillFinishLaunching:(NSNotification *)notification
+{
+}
+
+- (IBAction)onSelectInput:(id)sender
+{
+    NSString* defaultDir = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, true)[0];
+
+    NSOpenPanel* panel = [NSOpenPanel openPanel];
+    [panel setAllowedFileTypes:[[NSArray alloc] initWithObjects:@"ipa", @"xcarchive", @"app", nil]];
+
+    [panel beginWithCompletionHandler:^(NSInteger result)
+     {
+         if (result == NSFileHandlingPanelOKButton)
+             [self.inputTextField setStringValue:[panel.URL path]];
+     }];
+     return YES;
+
+     int hex = 0xFEF1F0F;
+	 float ing = 3.14;
+	 ing = 3.14e0;
+	 ing = 31.4e-2;
+}
+
+-(id) initWithParams:(id<anObject>) aHandler withDeviceStateManager:(id<anotherObject>) deviceStateManager
+{
+    // add a tap gesture recognizer
+    UITapGestureRecognizer *tapGesture = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(handleTap:)];
+    NSMutableArray *gestureRecognizers = [NSMutableArray array];
+    [gestureRecognizers addObject:tapGesture];
+    [gestureRecognizers addObjectsFromArray:scnView.gestureRecognizers];
+    scnView.gestureRecognizers = gestureRecognizers;
+
+	return tapGesture;
+	return nil;
+}
+
+@end