Fix C highlighting, update ObjC, fix themes, add UUID

tool/Theme.tmpl.css

@@ -1,4 +1,4 @@
-/* THIS THEME WAS AUTOGENERATED BY Theme.tmpl.css */
+/* THIS THEME WAS AUTOGENERATED BY Theme.tmpl.css (UUID: %uuid%) */
 
 .%cssClass% .ace_editor {
   border: 2px solid rgb(159, 159, 159);
@@ -81,12 +81,12 @@
   %constant%
 }
 
-.%cssClass% .ace_constant.ace_character,  {
+.%cssClass% .ace_constant.ace_character  {
   %constant.character%
 }
 
-.%cssClass% .ace_constant.ace_character.ace_escape,  {
-  %constant%
+.%cssClass% .ace_constant.ace_character.ace_escape  {
+  %constant.character.escape%
 }
 
 .%cssClass% .ace_constant.ace_language {
@@ -134,6 +134,18 @@
   %support.function%
 }
 
+.%cssClass% .ace_support.ace_type {
+  %support.type%
+}
+
+.%cssClass% .ace_support.ace_class {
+  %support.class%
+}
+
+.%cssClass% .ace_support.ace_other {
+  %support.other%
+}
+
 .%cssClass% .ace_storage {
   %storage%
 }

tool/mode_highlight_rules.tmpl.js

@@ -34,14 +34,18 @@
  * ***** END LICENSE BLOCK ***** */
 
 /*
-  THIS FILE WAS AUTOGENERATED BY mode_highlight_rules.tmpl.js
+  THIS FILE WAS AUTOGENERATED BY mode_highlight_rules.tmpl.js (UUID: %uuid%) */
 
-  IT MIGHT NOT BE PERFECT, PARTICULARLY:
+/*******
+
+  THIS FILE MIGHT NOT BE PERFECT, PARTICULARLY:
 
   IN DECIDING STATES TO TRANSITION TO,
 
   IGNORING WHITESPACE, 
 
+  IGNORING GROUPS WITH ?:, 
+
   EXTENDING EXISTING MODES,
 
   GATHERING KEYWORDS, OR
@@ -49,7 +53,8 @@
   RULE PREFERENCE ORDER.
 
   ...But it's a good start from an existing *.tmlanguage file.
-*/
+
+*******/
 
 define(function(require, exports, module) {
 "use strict";

tool/theme.tmpl.js

@@ -28,8 +28,6 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-// THIS FILE WAS AUTOGENERATED BY theme.tmpl.js
-
 define(function(require, exports, module) {
 
 exports.isDark = %isDark%;

tool/tmlanguage.js

@@ -164,7 +164,6 @@ function extractPatterns(patterns) {
       
       tokenObj.regex = checkForLookBehind(pattern.begin);
       tokenObj.next = strState;
-      startState.start.push(tokenObj);
     }
     else if( ( pattern.begin || pattern.end ) && !( pattern.begin && pattern.end ) ) {
       logDebug("Somehow, there's pattern.begin or pattern.end--but not both?", pattern);
@@ -174,27 +173,30 @@ function extractPatterns(patterns) {
       tokenObj.token.push([]);
       tokenObj.token.push(pattern.captures);
       tokenObj.regex = checkForLookBehind(pattern.match);
-
-      startState.start.push(tokenObj);
     }
 
     else if (pattern.match) {
       tokenObj.token.push(pattern.name);
       tokenObj.regex = checkForLookBehind(pattern.match);
-
-      startState.start.push(tokenObj);
     }
 
     else if (pattern.include) {
       tokenObj.token.push(pattern.include);
       tokenObj.regex = "";
-
-      startState.start.push(tokenObj);
     }
 
     else {
+      tokenObj.token.push("");
+      tokenObj.regex = "";
       logDebug("I've gone through every choice, and have no clue what this is:", pattern);
     }
+
+    // sometimes captures have names--not sure when or why
+    if (pattern.name) {
+      tokenObj.token.push(pattern.name);
+    }
+
+    startState.start.push(tokenObj);
   });
 
   var resultingObj = startState;
@@ -229,16 +231,19 @@ function convertLanguage(name) {
         if (devMode)
           console.log(util.inspect(language.patterns, false, 4));
 
-        var patterns = extractPatterns(language.patterns);
-        var languageHighlightRules = fillTemplate(modeHighlightTemplate, {
-              language: languageNameSanitized,
-              languageTokens: patterns
-        });
-
         var languageMode = fillTemplate(modeTemplate, {
               language: languageNameSanitized,
               languageHighlightFilename: languageHighlightFilename
         });
+        
+        var patterns = extractPatterns(language.patterns);
+        var languageHighlightRules = fillTemplate(modeHighlightTemplate, {
+              language: languageNameSanitized,
+              languageTokens: patterns,
+              uuid: language.uuid
+        });
+
+
 
         if (devMode) {
           console.log("Not writing, 'cause we're in dev mode, baby.");

tool/tmtheme.js

@@ -27,6 +27,9 @@ var supportedScopes = {
    "support.function.firebug": "support.firebug",
    "support.function.constant": "support.function.constant",
    "support.constant": "support.constant",
+   "support.class": "support.class",
+   "support.type": "support.type",
+   "support.other": "support.other",
 
    "function": "function",
    "function.buildin": "function.buildin",
@@ -206,6 +209,7 @@ function convertTheme(name) {
 		var styles = extractStyles(theme);
 
 		styles.cssClass = "ace-" + hyphenate(name);
+    styles.uuid = theme.uuid;
 		var css = fillTemplate(cssTemplate, styles);
 		css = css.replace(/[^\{\}]+{\s*}/g, "");