Merge pull request #1092 from ajaxorg/mode/objc

Add obj-c support

lib/ace/mode/c_cpp_highlight_rules.js

@@ -47,7 +47,7 @@ var c_cppHighlightRules = function() {
     
     var storageType = (
         "asm|__asm__|auto|bool|_Bool|char|_Complex|double|enum|float|" +
-        "_Imaginary|int|long|short|signed|struct|typedef|union|unsigned|void" +
+        "_Imaginary|int|long|short|signed|struct|typedef|union|unsigned|void|" +
         "class|wchar_t|template"
     );
 
@@ -65,7 +65,7 @@ var c_cppHighlightRules = function() {
         "NULL|true|false|TRUE|FALSE"
     );
 
-    var keywordMapper = this.createKeywordMapper({
+    var keywordMapper = exports.keywordMapper = this.createKeywordMapper({
         "keyword.control" : keywordControls,
         "storage.type" : storageType,
         "storage.modifier" : storageModifiers,
@@ -118,16 +118,10 @@ var c_cppHighlightRules = function() {
               regex : "<[a-zA-Z0-9.]+>"
             }, {
               token : "keyword", // pre-compiler directivs
-              regex : "(?:#include|#pragma|#line|#define|#undef|#ifdef|#else|#elif|#endif|#ifndef)"
+              regex : "(?:#include|#import|#pragma|#line|#define|#undef|#ifdef|#else|#elif|#endif|#ifndef)"
             }, {
                 token : "support.function.C99.c",
                 regex : cFunctions
-            }, {
-                // function myFunc(arg) { }
-                token : [
-                    "text", "entity.name.function", "text", "paren.lparen"
-                ],
-                regex : "(\\s+)(" + identifierRe + ")(\\s*)(\\()"
             }, {
                 token : keywordMapper,
                 regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"

lib/ace/mode/objectivec.js

@@ -0,0 +1,60 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Distributed under the BSD license:
+ *
+ * Copyright (c) 2012, Ajax.org B.V.
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of Ajax.org B.V. nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * Contributor(s):
+ * 
+ *
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+/*
+  THIS FILE WAS AUTOGENERATED BY mode.tmpl.js
+*/
+
+define(function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextMode = require("./text").Mode;
+var Tokenizer = require("../tokenizer").Tokenizer;
+var ObjectiveCHighlightRules = require("./objectivec_highlight_rules").ObjectiveCHighlightRules;
+
+var Mode = function() {
+    var highlighter = new ObjectiveCHighlightRules();
+    
+    this.$tokenizer = new Tokenizer(highlighter.getRules());
+};
+oop.inherits(Mode, TextMode);
+
+(function() {
+    // Extra logic goes here. (see below)
+}).call(Mode.prototype);
+
+exports.Mode = Mode;
+});

lib/ace/theme/monokai.css

@@ -101,7 +101,7 @@
 }
 
 .ace-monokai .ace_entity.ace_name.ace_function,
-.ace-monokai .ace_entity.ace_other.ace_attribute-name,
+.ace-monokai .ace_entity.ace_other,
 .ace-monokai .ace_variable {
   color: #A6E22E
 }