CodeMirror
@@ -69,11 +70,57 @@
Autocomplete Demo
and
javascript-hint
addons.
-
-
+
+
+
+
+
diff --git a/demo/merge.html b/demo/merge.html
index c60e653297..20783b866c 100644
--- a/demo/merge.html
+++ b/demo/merge.html
@@ -11,7 +11,7 @@
-
+
+
+
+
+mbox mode
+
+
+
+ MIME types defined: application/mbox.
+
+
diff --git a/mode/mbox/mbox.js b/mode/mbox/mbox.js
new file mode 100644
index 0000000000..ba2416ac81
--- /dev/null
+++ b/mode/mbox/mbox.js
@@ -0,0 +1,129 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+ if (typeof exports == "object" && typeof module == "object") // CommonJS
+ mod(require("../../lib/codemirror"));
+ else if (typeof define == "function" && define.amd) // AMD
+ define(["../../lib/codemirror"], mod);
+ else // Plain browser env
+ mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+var rfc2822 = [
+ "From", "Sender", "Reply-To", "To", "Cc", "Bcc", "Message-ID",
+ "In-Reply-To", "References", "Resent-From", "Resent-Sender", "Resent-To",
+ "Resent-Cc", "Resent-Bcc", "Resent-Message-ID", "Return-Path", "Received"
+];
+var rfc2822NoEmail = [
+ "Date", "Subject", "Comments", "Keywords", "Resent-Date"
+];
+
+CodeMirror.registerHelper("hintWords", "mbox", rfc2822.concat(rfc2822NoEmail));
+
+var whitespace = /^[ \t]/;
+var separator = /^From /; // See RFC 4155
+var rfc2822Header = new RegExp("^(" + rfc2822.join("|") + "): ");
+var rfc2822HeaderNoEmail = new RegExp("^(" + rfc2822NoEmail.join("|") + "): ");
+var header = /^[^:]+:/; // Optional fields defined in RFC 2822
+var email = /^[^ ]+@[^ ]+/;
+var untilEmail = /^.*?(?=[^ ]+?@[^ ]+)/;
+var bracketedEmail = /^<.*?>/;
+var untilBracketedEmail = /^.*?(?=<.*>)/;
+
+function styleForHeader(header) {
+ if (header === "Subject") return "header";
+ return "string";
+}
+
+function readToken(stream, state) {
+ if (stream.sol()) {
+ // From last line
+ state.inSeparator = false;
+ if (state.inHeader && stream.match(whitespace)) {
+ // Header folding
+ return null;
+ } else {
+ state.inHeader = false;
+ state.header = null;
+ }
+
+ if (stream.match(separator)) {
+ state.inHeaders = true;
+ state.inSeparator = true;
+ return "atom";
+ }
+
+ var match;
+ var emailPermitted = false;
+ if ((match = stream.match(rfc2822HeaderNoEmail)) ||
+ (emailPermitted = true) && (match = stream.match(rfc2822Header))) {
+ state.inHeaders = true;
+ state.inHeader = true;
+ state.emailPermitted = emailPermitted;
+ state.header = match[1];
+ return "atom";
+ }
+
+ // Use vim's heuristics: recognize custom headers only if the line is in a
+ // block of legitimate headers.
+ if (state.inHeaders && (match = stream.match(header))) {
+ state.inHeader = true;
+ state.emailPermitted = true;
+ state.header = match[1];
+ return "atom";
+ }
+
+ state.inHeaders = false;
+ stream.skipToEnd();
+ return null;
+ }
+
+ if (state.inSeparator) {
+ if (stream.match(email)) return "link";
+ if (stream.match(untilEmail)) return "atom";
+ stream.skipToEnd();
+ return "atom";
+ }
+
+ if (state.inHeader) {
+ var style = styleForHeader(state.header);
+
+ if (state.emailPermitted) {
+ if (stream.match(bracketedEmail)) return style + " link";
+ if (stream.match(untilBracketedEmail)) return style;
+ }
+ stream.skipToEnd();
+ return style;
+ }
+
+ stream.skipToEnd();
+ return null;
+};
+
+CodeMirror.defineMode("mbox", function() {
+ return {
+ startState: function() {
+ return {
+ // Is in a mbox separator
+ inSeparator: false,
+ // Is in a mail header
+ inHeader: false,
+ // If bracketed email is permitted. Only applicable when inHeader
+ emailPermitted: false,
+ // Name of current header
+ header: null,
+ // Is in a region of mail headers
+ inHeaders: false
+ };
+ },
+ token: readToken,
+ blankLine: function(state) {
+ state.inHeaders = state.inSeparator = state.inHeader = false;
+ }
+ };
+});
+
+CodeMirror.defineMIME("application/mbox", "mbox");
+});
diff --git a/mode/meta.js b/mode/meta.js
index e90ab29448..eb25e242dd 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -21,7 +21,7 @@
{name: "C++", mime: "text/x-c++src", mode: "clike", ext: ["cpp", "c++", "cc", "cxx", "hpp", "h++", "hh", "hxx"], alias: ["cpp"]},
{name: "Cobol", mime: "text/x-cobol", mode: "cobol", ext: ["cob", "cpy"]},
{name: "C#", mime: "text/x-csharp", mode: "clike", ext: ["cs"], alias: ["csharp"]},
- {name: "Clojure", mime: "text/x-clojure", mode: "clojure", ext: ["clj"]},
+ {name: "Clojure", mime: "text/x-clojure", mode: "clojure", ext: ["clj", "cljc", "cljx"]},
{name: "ClojureScript", mime: "text/x-clojurescript", mode: "clojure", ext: ["cljs"]},
{name: "Closure Stylesheets (GSS)", mime: "text/x-gss", mode: "css", ext: ["gss"]},
{name: "CMake", mime: "text/x-cmake", mode: "cmake", ext: ["cmake", "cmake.in"], file: /^CMakeLists.txt$/},
@@ -41,6 +41,7 @@
{name: "Dylan", mime: "text/x-dylan", mode: "dylan", ext: ["dylan", "dyl", "intr"]},
{name: "EBNF", mime: "text/x-ebnf", mode: "ebnf"},
{name: "ECL", mime: "text/x-ecl", mode: "ecl", ext: ["ecl"]},
+ {name: "edn", mime: "application/edn", mode: "clojure", ext: ["edn"]},
{name: "Eiffel", mime: "text/x-eiffel", mode: "eiffel", ext: ["e"]},
{name: "Elm", mime: "text/x-elm", mode: "elm", ext: ["elm"]},
{name: "Embedded Javascript", mime: "application/x-ejs", mode: "htmlembedded", ext: ["ejs"]},
@@ -86,11 +87,12 @@
{name: "Modelica", mime: "text/x-modelica", mode: "modelica", ext: ["mo"]},
{name: "MUMPS", mime: "text/x-mumps", mode: "mumps", ext: ["mps"]},
{name: "MS SQL", mime: "text/x-mssql", mode: "sql"},
+ {name: "mbox", mime: "application/mbox", mode: "mbox", ext: ["mbox"]},
{name: "MySQL", mime: "text/x-mysql", mode: "sql"},
{name: "Nginx", mime: "text/x-nginx-conf", mode: "nginx", file: /nginx.*\.conf$/i},
{name: "NSIS", mime: "text/x-nsis", mode: "nsis", ext: ["nsh", "nsi"]},
{name: "NTriples", mime: "text/n-triples", mode: "ntriples", ext: ["nt"]},
- {name: "Objective C", mime: "text/x-objectivec", mode: "clike", ext: ["m", "mm"]},
+ {name: "Objective C", mime: "text/x-objectivec", mode: "clike", ext: ["m", "mm"], alias: ["objective-c", "objc"]},
{name: "OCaml", mime: "text/x-ocaml", mode: "mllike", ext: ["ml", "mli", "mll", "mly"]},
{name: "Octave", mime: "text/x-octave", mode: "octave", ext: ["m"]},
{name: "Oz", mime: "text/x-oz", mode: "oz", ext: ["oz"]},
@@ -101,8 +103,10 @@
{name: "Pig", mime: "text/x-pig", mode: "pig", ext: ["pig"]},
{name: "Plain Text", mime: "text/plain", mode: "null", ext: ["txt", "text", "conf", "def", "list", "log"]},
{name: "PLSQL", mime: "text/x-plsql", mode: "sql", ext: ["pls"]},
+ {name: "PowerShell", mime: "application/x-powershell", mode: "powershell", ext: ["ps1", "psd1", "psm1"]},
{name: "Properties files", mime: "text/x-properties", mode: "properties", ext: ["properties", "ini", "in"], alias: ["ini", "properties"]},
- {name: "Python", mime: "text/x-python", mode: "python", ext: ["py", "pyw"]},
+ {name: "ProtoBuf", mime: "text/x-protobuf", mode: "protobuf", ext: ["proto"]},
+ {name: "Python", mime: "text/x-python", mode: "python", ext: ["BUILD", "bzl", "py", "pyw"], file: /^(BUCK|BUILD)$/},
{name: "Puppet", mime: "text/x-puppet", mode: "puppet", ext: ["pp"]},
{name: "Q", mime: "text/x-q", mode: "q", ext: ["q"]},
{name: "R", mime: "text/x-rsrc", mode: "r", ext: ["r"], alias: ["rscript"]},
@@ -111,6 +115,7 @@
{name: "RPM Spec", mime: "text/x-rpm-spec", mode: "rpm", ext: ["spec"]},
{name: "Ruby", mime: "text/x-ruby", mode: "ruby", ext: ["rb"], alias: ["jruby", "macruby", "rake", "rb", "rbx"]},
{name: "Rust", mime: "text/x-rustsrc", mode: "rust", ext: ["rs"]},
+ {name: "SAS", mime: "text/x-sas", mode: "sas", ext: ["sas"]},
{name: "Sass", mime: "text/x-sass", mode: "sass", ext: ["sass"]},
{name: "Scala", mime: "text/x-scala", mode: "clike", ext: ["scala"]},
{name: "Scheme", mime: "text/x-scheme", mode: "scheme", ext: ["scm", "ss"]},
@@ -136,12 +141,13 @@
{name: "Tiki wiki", mime: "text/tiki", mode: "tiki"},
{name: "TOML", mime: "text/x-toml", mode: "toml", ext: ["toml"]},
{name: "Tornado", mime: "text/x-tornado", mode: "tornado"},
- {name: "troff", mime: "troff", mode: "troff", ext: ["1", "2", "3", "4", "5", "6", "7", "8", "9"]},
+ {name: "troff", mime: "text/troff", mode: "troff", ext: ["1", "2", "3", "4", "5", "6", "7", "8", "9"]},
{name: "TTCN", mime: "text/x-ttcn", mode: "ttcn", ext: ["ttcn", "ttcn3", "ttcnpp"]},
{name: "TTCN_CFG", mime: "text/x-ttcn-cfg", mode: "ttcn-cfg", ext: ["cfg"]},
{name: "Turtle", mime: "text/turtle", mode: "turtle", ext: ["ttl"]},
{name: "TypeScript", mime: "application/typescript", mode: "javascript", ext: ["ts"], alias: ["ts"]},
{name: "Twig", mime: "text/x-twig", mode: "twig"},
+ {name: "Web IDL", mime: "text/x-webidl", mode: "webidl", ext: ["webidl"]},
{name: "VB.NET", mime: "text/x-vb", mode: "vb", ext: ["vb"]},
{name: "VBScript", mime: "text/vbscript", mode: "vbscript", ext: ["vbs"]},
{name: "Velocity", mime: "text/velocity", mode: "velocity", ext: ["vtl"]},
@@ -149,6 +155,7 @@
{name: "VHDL", mime: "text/x-vhdl", mode: "vhdl", ext: ["vhd", "vhdl"]},
{name: "XML", mimes: ["application/xml", "text/xml"], mode: "xml", ext: ["xml", "xsl", "xsd"], alias: ["rss", "wsdl", "xsd"]},
{name: "XQuery", mime: "application/xquery", mode: "xquery", ext: ["xy", "xquery"]},
+ {name: "Yacas", mime: "text/x-yacas", mode: "yacas", ext: ["ys"]},
{name: "YAML", mime: "text/x-yaml", mode: "yaml", ext: ["yaml", "yml"], alias: ["yml"]},
{name: "Z80", mime: "text/x-z80", mode: "z80", ext: ["z80"]},
{name: "mscgen", mime: "text/x-mscgen", mode: "mscgen", ext: ["mscgen", "mscin", "msc"]},
diff --git a/mode/octave/index.html b/mode/octave/index.html
index 79df581199..3490ee6371 100644
--- a/mode/octave/index.html
+++ b/mode/octave/index.html
@@ -65,7 +65,7 @@
Octave mode
%one line comment
%{ multi
-line commment %}
+line comment %}
+
+
+
+
+ 