Updated codemirror to v4.12.
Did a lot of cleanup to limit the size of the plugin. I kept the emmet plugin.
This commit is contained in:
@@ -12,12 +12,12 @@
|
||||
.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
|
||||
</style>
|
||||
<div id=nav>
|
||||
<a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
|
||||
<a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
|
||||
|
||||
<ul>
|
||||
<li><a href="../../index.html">Home</a>
|
||||
<li><a href="../../doc/manual.html">Manual</a>
|
||||
<li><a href="https://github.com/marijnh/codemirror">Code</a>
|
||||
<li><a href="https://github.com/codemirror/codemirror">Code</a>
|
||||
</ul>
|
||||
<ul>
|
||||
<li><a href="../index.html">Language modes</a>
|
||||
|
||||
+24
-3
@@ -1,3 +1,16 @@
|
||||
// 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";
|
||||
|
||||
CodeMirror.defineMode('shell', function() {
|
||||
|
||||
var words = {};
|
||||
@@ -23,10 +36,15 @@ CodeMirror.defineMode('shell', function() {
|
||||
'touch vi vim wall wc wget who write yes zsh');
|
||||
|
||||
function tokenBase(stream, state) {
|
||||
if (stream.eatSpace()) return null;
|
||||
|
||||
var sol = stream.sol();
|
||||
var ch = stream.next();
|
||||
|
||||
if (ch === '\\') {
|
||||
stream.next();
|
||||
return null;
|
||||
}
|
||||
if (ch === '\'' || ch === '"' || ch === '`') {
|
||||
state.tokens.unshift(tokenString(ch));
|
||||
return tokenize(stream, state);
|
||||
@@ -53,7 +71,7 @@ CodeMirror.defineMode('shell', function() {
|
||||
}
|
||||
if (/\d/.test(ch)) {
|
||||
stream.eatWhile(/\d/);
|
||||
if(!/\w/.test(stream.peek())) {
|
||||
if(stream.eol() || !/\w/.test(stream.peek())) {
|
||||
return 'number';
|
||||
}
|
||||
}
|
||||
@@ -109,10 +127,13 @@ CodeMirror.defineMode('shell', function() {
|
||||
return {
|
||||
startState: function() {return {tokens:[]};},
|
||||
token: function(stream, state) {
|
||||
if (stream.eatSpace()) return null;
|
||||
return tokenize(stream, state);
|
||||
}
|
||||
},
|
||||
lineComment: '#',
|
||||
fold: "brace"
|
||||
};
|
||||
});
|
||||
|
||||
CodeMirror.defineMIME('text/x-sh', 'shell');
|
||||
|
||||
});
|
||||
|
||||
@@ -0,0 +1,58 @@
|
||||
// CodeMirror, copyright (c) by Marijn Haverbeke and others
|
||||
// Distributed under an MIT license: http://codemirror.net/LICENSE
|
||||
|
||||
(function() {
|
||||
var mode = CodeMirror.getMode({}, "shell");
|
||||
function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
|
||||
|
||||
MT("var",
|
||||
"text [def $var] text");
|
||||
MT("varBraces",
|
||||
"text[def ${var}]text");
|
||||
MT("varVar",
|
||||
"text [def $a$b] text");
|
||||
MT("varBracesVarBraces",
|
||||
"text[def ${a}${b}]text");
|
||||
|
||||
MT("singleQuotedVar",
|
||||
"[string 'text $var text']");
|
||||
MT("singleQuotedVarBraces",
|
||||
"[string 'text ${var} text']");
|
||||
|
||||
MT("doubleQuotedVar",
|
||||
'[string "text ][def $var][string text"]');
|
||||
MT("doubleQuotedVarBraces",
|
||||
'[string "text][def ${var}][string text"]');
|
||||
MT("doubleQuotedVarPunct",
|
||||
'[string "text ][def $@][string text"]');
|
||||
MT("doubleQuotedVarVar",
|
||||
'[string "][def $a$b][string "]');
|
||||
MT("doubleQuotedVarBracesVarBraces",
|
||||
'[string "][def ${a}${b}][string "]');
|
||||
|
||||
MT("notAString",
|
||||
"text\\'text");
|
||||
MT("escapes",
|
||||
"outside\\'\\\"\\`\\\\[string \"inside\\`\\'\\\"\\\\`\\$notAVar\"]outside\\$\\(notASubShell\\)");
|
||||
|
||||
MT("subshell",
|
||||
"[builtin echo] [quote $(whoami)] s log, stardate [quote `date`].");
|
||||
MT("doubleQuotedSubshell",
|
||||
"[builtin echo] [string \"][quote $(whoami)][string 's log, stardate `date`.\"]");
|
||||
|
||||
MT("hashbang",
|
||||
"[meta #!/bin/bash]");
|
||||
MT("comment",
|
||||
"text [comment # Blurb]");
|
||||
|
||||
MT("numbers",
|
||||
"[number 0] [number 1] [number 2]");
|
||||
MT("keywords",
|
||||
"[keyword while] [atom true]; [keyword do]",
|
||||
" [builtin sleep] [number 3]",
|
||||
"[keyword done]");
|
||||
MT("options",
|
||||
"[builtin ls] [attribute -l] [attribute --human-readable]");
|
||||
MT("operator",
|
||||
"[def var][operator =]value");
|
||||
})();
|
||||
Reference in New Issue
Block a user