Merge pull request #794 from ukyo/master

Added JSX edit mode

demo/kitchen-sink/demo.js

@@ -104,6 +104,7 @@ var modesByName = {
     java:       ["Java"         , "java"],
     javascript: ["JavaScript"   , "js"],
     json:       ["JSON"         , "json"],
+    jsx:        ["JSX"          , "jsx"],
     latex:      ["LaTeX"        , "latex|tex|ltx|bib"],
     less:       ["LESS"         , "less"],
     liquid:     ["Liquid"       , "liquid"],
@@ -201,7 +202,8 @@ var docs = {
     "docs/latex.tex": {name: "LaTeX", wrapped: true},
     "docs/sql.sql": {name: "SQL", wrapped: true},
     "docs/pgsql.pgsql": {name: "pgSQL", wrapped: true},
-    "docs/golang.go": "Go"
+    "docs/golang.go": "Go",
+    "docs/jsx.jsx": "JSX"
 }
 
 var ownSource = {

demo/kitchen-sink/docs/jsx.jsx

@@ -0,0 +1,9 @@
+/*EXPECTED
+hello world!
+*/
+class Test {
+    static function run() : void {
+        // console.log("hello world!");
+        log "hello world!";
+    }
+}

lib/ace/mode/jsx.js

@@ -0,0 +1,53 @@
+define(function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextMode = require("./text").Mode;
+var Tokenizer = require("../tokenizer").Tokenizer;
+var JsxHighlightRules = require("./jsx_highlight_rules").JsxHighlightRules;
+var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
+var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour;
+var CStyleFoldMode = require("./folding/cstyle").FoldMode;
+
+function Mode() {
+    this.$tokenizer = new Tokenizer(new JsxHighlightRules().getRules());
+    this.$outdent = new MatchingBraceOutdent();
+    this.$behaviour = new CstyleBehaviour();
+    this.foldingRules = new CStyleFoldMode();
+}
+oop.inherits(Mode, TextMode);
+
+(function() {
+
+      this.getNextLineIndent = function(state, line, tab) {
+          var indent = this.$getIndent(line);
+
+          var tokenizedLine = this.$tokenizer.getLineTokens(line, state);
+          var tokens = tokenizedLine.tokens;
+
+          if (tokens.length && tokens[tokens.length-1].type == "comment") {
+              return indent;
+          }
+
+          if (state == "start") {
+              var match = line.match(/^.*[\{\(\[]\s*$/);
+              if (match) {
+                  indent += tab;
+              }
+          }
+
+          return indent;
+      };
+
+      this.checkOutdent = function(state, line, input) {
+          return this.$outdent.checkOutdent(line, input);
+      };
+
+      this.autoOutdent = function(state, doc, row) {
+          this.$outdent.autoOutdent(doc, row);
+      };
+
+}).call(Mode.prototype);
+
+exports.Mode = Mode;
+});

lib/ace/mode/jsx_highlight_rules.js

@@ -0,0 +1,122 @@
+define(function(require, exports, module) {
+    var oop = require("../lib/oop");
+    var lang = require("../lib/lang");
+    var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules;
+    var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+    
+    var JsxHighlightRules = function() {
+        var keywords = lang.arrayToMap(
+            ("break|do|instanceof|typeof|case|else|new|var|catch|finally|return|void|continue|for|switch|default|while|function|this|" +
+             "if|throw|" +
+             "delete|in|try|" +
+             "class|extends|super|import|from|into|implements|interface|static|mixin|override|abstract|final|" +
+             "number|int|string|boolean|variant|" +
+             "log|assert").split("|")
+        );
+        
+        var buildinConstants = lang.arrayToMap(
+            ("null|true|false|NaN|Infinity|__FILE__|__LINE__|undefined").split("|")
+        );
+        
+        var reserved = lang.arrayToMap(
+            ("debugger|with|" +
+             "const|export|" +
+             "let|private|public|yield|protected|" +
+             "extern|native|as|operator|__fake__|__readonly__").split("|")
+        );
+        
+        var identifierRe = "[a-zA-Z_][a-zA-Z0-9_]*\\b";
+        
+        this.$rules = {
+            "start" : [
+                {
+                    token : "comment",
+                    regex : "\\/\\/.*$"
+                },
+                DocCommentHighlightRules.getStartRule("doc-start"),
+                {
+                    token : "comment", // multi line comment
+                    regex : "\\/\\*",
+                    merge : true,
+                    next : "comment"
+                }, {
+                    token : "string.regexp",
+                    regex : "[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*\\s*(?=[).,;]|$)"
+                }, {
+                    token : "string", // single line
+                    regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
+                }, {
+                    token : "string", // single line
+                    regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
+                }, {
+                    token : "constant.numeric", // hex
+                    regex : "0[xX][0-9a-fA-F]+\\b"
+                }, {
+                    token : "constant.numeric", // float
+                    regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
+                }, {
+                    token : "constant.language.boolean",
+                    regex : "(?:true|false)\\b"
+                }, {
+                    token : [
+                        "storage.type",
+                        "text",
+                        "entity.name.function"
+                    ],
+                    regex : "(function)(\\s+)(" + identifierRe + ")"
+                }, {
+                    token : function(value) {
+                        if (value == "this")
+                            return "variable.language";
+                        else if (value == "function")
+                            return "storage.type";
+                        else if (keywords.hasOwnProperty(value) || reserved.hasOwnProperty(value))
+                            return "keyword";
+                        else if (buildinConstants.hasOwnProperty(value))
+                            return "constant.language";
+                        else if (/^_?[A-Z][a-zA-Z0-9_]*$/.test(value))
+                            return "language.support.class";
+                        else
+                            return "identifier";
+                    },
+                    // TODO: Unicode escape sequences
+                    // TODO: Unicode identifiers
+                    regex : identifierRe
+                }, {
+                    token : "keyword.operator",
+                    regex : "!|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|==|=|!=|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)"
+                }, {
+                    token : "punctuation.operator",
+                    regex : "\\?|\\:|\\,|\\;|\\."
+                }, {
+                    token : "paren.lparen",
+                    regex : "[[({<]"
+                }, {
+                    token : "paren.rparen",
+                    regex : "[\\])}>]"
+                }, {
+                    token : "text",
+                    regex : "\\s+"
+                }
+            ],
+            "comment" : [
+                {
+                    token : "comment", // closing comment
+                    regex : ".*?\\*\\/",
+                    next : "start"
+                }, {
+                    token : "comment", // comment spanning whole line
+                    merge : true,
+                    regex : ".+"
+                }
+            ]
+        };
+        
+        this.embedRules(DocCommentHighlightRules, "doc-",
+            [ DocCommentHighlightRules.getEndRule("start") ]);
+    };
+    
+    oop.inherits(JsxHighlightRules, TextHighlightRules);
+
+    exports.JsxHighlightRules = JsxHighlightRules;
+});