aboutsummaryrefslogtreecommitdiff
path: root/imports/codemirror/mode
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-05-03 17:09:07 -0700
committerNivesh Rajbhandari2012-05-03 17:09:07 -0700
commit8be6e94b57f4bd6e28754a6113b4d6a401365e13 (patch)
tree19f48f969ab872b9ef46cc4e7d6c2b9d2544cd4d /imports/codemirror/mode
parentc14b8d9fd1acde98ffc427b0bbdba7d1442c39a4 (diff)
parentfec9ccee11ea21ffc95edce6e89d0d302b63e3d8 (diff)
downloadninja-8be6e94b57f4bd6e28754a6113b4d6a401365e13.tar.gz
Merge branch 'refs/heads/ninja-internal' into WebGLFixes
Diffstat (limited to 'imports/codemirror/mode')
-rw-r--r--imports/codemirror/mode/clike/index.html2
-rw-r--r--imports/codemirror/mode/clojure/clojure.js26
-rw-r--r--imports/codemirror/mode/css/css.js2
-rw-r--r--imports/codemirror/mode/htmlmixed/htmlmixed.js2
-rw-r--r--imports/codemirror/mode/javascript/javascript.js6
-rw-r--r--imports/codemirror/mode/less/index.html39
-rw-r--r--imports/codemirror/mode/less/less.js143
-rw-r--r--imports/codemirror/mode/markdown/index.html1
-rw-r--r--imports/codemirror/mode/markdown/markdown.js89
-rwxr-xr-ximports/codemirror/mode/properties/index.html4
-rwxr-xr-ximports/codemirror/mode/properties/properties.css3
-rwxr-xr-ximports/codemirror/mode/properties/properties.js28
-rw-r--r--imports/codemirror/mode/scheme/scheme.js402
-rw-r--r--imports/codemirror/mode/smarty/index.html82
-rw-r--r--imports/codemirror/mode/smarty/smarty.js148
-rw-r--r--imports/codemirror/mode/stex/stex.js17
-rw-r--r--imports/codemirror/mode/stex/test.html251
-rw-r--r--imports/codemirror/mode/tiddlywiki/index.html69
-rw-r--r--imports/codemirror/mode/tiddlywiki/tiddlywiki.css2
-rw-r--r--imports/codemirror/mode/tiddlywiki/tiddlywiki.js72
-rw-r--r--imports/codemirror/mode/vbscript/index.html42
-rw-r--r--imports/codemirror/mode/vbscript/vbscript.js26
-rw-r--r--imports/codemirror/mode/xml/xml.js3
-rw-r--r--imports/codemirror/mode/xmlpure/index.html1
-rw-r--r--imports/codemirror/mode/xquery/LICENSE20
-rw-r--r--imports/codemirror/mode/xquery/index.html222
-rw-r--r--imports/codemirror/mode/xquery/test/index.html27
-rw-r--r--imports/codemirror/mode/xquery/test/testBase.js42
-rw-r--r--imports/codemirror/mode/xquery/test/testEmptySequenceKeyword.js16
-rw-r--r--imports/codemirror/mode/xquery/test/testMultiAttr.js16
-rw-r--r--imports/codemirror/mode/xquery/test/testNamespaces.js91
-rw-r--r--imports/codemirror/mode/xquery/test/testProcessingInstructions.js16
-rw-r--r--imports/codemirror/mode/xquery/test/testQuotes.js19
-rw-r--r--imports/codemirror/mode/xquery/xquery.js448
34 files changed, 1919 insertions, 458 deletions
diff --git a/imports/codemirror/mode/clike/index.html b/imports/codemirror/mode/clike/index.html
index 5c327451..64d02f11 100644
--- a/imports/codemirror/mode/clike/index.html
+++ b/imports/codemirror/mode/clike/index.html
@@ -96,6 +96,6 @@ void* zmq_thread_init(void* zmq_context, int signal_fd) {
96 <p><strong>MIME types defined:</strong> <code>text/x-csrc</code> 96 <p><strong>MIME types defined:</strong> <code>text/x-csrc</code>
97 (C code), <code>text/x-c++src</code> (C++ 97 (C code), <code>text/x-c++src</code> (C++
98 code), <code>text/x-java</code> (Java 98 code), <code>text/x-java</code> (Java
99 code).</p> 99 code), <code>text/x-csharp</code> (C#).</p>
100 </body> 100 </body>
101</html> 101</html>
diff --git a/imports/codemirror/mode/clojure/clojure.js b/imports/codemirror/mode/clojure/clojure.js
index cce7ce37..c6836415 100644
--- a/imports/codemirror/mode/clojure/clojure.js
+++ b/imports/codemirror/mode/clojure/clojure.js
@@ -4,7 +4,7 @@
4 */ 4 */
5CodeMirror.defineMode("clojure", function (config, mode) { 5CodeMirror.defineMode("clojure", function (config, mode) {
6 var BUILTIN = "builtin", COMMENT = "comment", STRING = "string", TAG = "tag", 6 var BUILTIN = "builtin", COMMENT = "comment", STRING = "string", TAG = "tag",
7 ATOM = "atom", NUMBER = "number", BRACKET = "bracket", KEYWORD="keyword"; 7 ATOM = "atom", NUMBER = "number", BRACKET = "bracket", KEYWORD = "keyword";
8 var INDENT_WORD_SKIP = 2, KEYWORDS_SKIP = 1; 8 var INDENT_WORD_SKIP = 2, KEYWORDS_SKIP = 1;
9 9
10 function makeKeywords(str) { 10 function makeKeywords(str) {
@@ -14,26 +14,25 @@ CodeMirror.defineMode("clojure", function (config, mode) {
14 } 14 }
15 15
16 var atoms = makeKeywords("true false nil"); 16 var atoms = makeKeywords("true false nil");
17 17
18 var keywords = makeKeywords( 18 var keywords = makeKeywords(
19 // Control structures 19 "defn defn- def def- defonce defmulti defmethod defmacro defstruct deftype defprotocol defrecord defproject deftest slice defalias defhinted defmacro- defn-memo defnk defnk defonce- defunbound defunbound- defvar defvar- let letfn do case cond condp for loop recur when when-not when-let when-first if if-let if-not . .. -> ->> doto and or dosync doseq dotimes dorun doall load import unimport ns in-ns refer try catch finally throw with-open with-local-vars binding gen-class gen-and-load-class gen-and-save-class handler-case handle");
20 "defn defn- def def- defonce defmulti defmethod defmacro defstruct deftype defprotocol defrecord deftest slice defalias defhinted defmacro- defn-memo defnk defnk defonce- defunbound defunbound- defvar defvar- let letfn do case cond condp for loop recur when when-not when-let when-first if if-let if-not . .. -> ->> doto and or dosync doseq dotimes dorun doall load import unimport ns in-ns refer try catch finally throw with-open with-local-vars binding gen-class gen-and-load-class gen-and-save-class handler-case handle" +
21 20
22 // Built-ins 21 var builtins = makeKeywords(
23 "* *1 *2 *3 *agent* *allow-unresolved-vars* *assert *clojure-version* *command-line-args* *compile-files* *compile-path* *e *err* *file* *flush-on-newline* *in* *macro-meta* *math-context* *ns* *out* *print-dup* *print-length* *print-level* *print-meta* *print-readably* *read-eval* *source-path* *use-context-classloader* *warn-on-reflection* + - / < <= = == > >= accessor aclone agent agent-errors aget alength alias all-ns alter alter-meta! alter-var-root amap ancestors and apply areduce array-map aset aset-boolean aset-byte aset-char aset-double aset-float aset-int aset-long aset-short assert assoc assoc! assoc-in associative? atom await await-for await1 bases bean bigdec bigint binding bit-and bit-and-not bit-clear bit-flip bit-not bit-or bit-set bit-shift-left bit-shift-right bit-test bit-xor boolean boolean-array booleans bound-fn bound-fn* butlast byte byte-array bytes case cast char char-array char-escape-string char-name-string char? chars chunk chunk-append chunk-buffer chunk-cons chunk-first chunk-next chunk-rest chunked-seq? class class? clear-agent-errors clojure-version coll? comment commute comp comparator compare compare-and-set! compile complement concat cond condp conj conj! cons constantly construct-proxy contains? count counted? create-ns create-struct cycle dec decimal? declare definline defmacro defmethod defmulti defn defn- defonce defstruct delay delay? deliver deref derive descendants destructure disj disj! dissoc dissoc! distinct distinct? doall doc dorun doseq dosync dotimes doto double double-array doubles drop drop-last drop-while empty empty? ensure enumeration-seq eval even? every? extend extend-protocol extend-type extends? extenders false? ffirst file-seq filter find find-doc find-ns find-var first float float-array float? floats flush fn fn? fnext for force format future future-call future-cancel future-cancelled? future-done? future? gen-class gen-interface gensym get get-in get-method get-proxy-class get-thread-bindings get-validator hash hash-map hash-set identical? identity if-let if-not ifn? import in-ns inc init-proxy instance? int int-array integer? interleave intern interpose into into-array ints io! isa? iterate iterator-seq juxt key keys keyword keyword? last lazy-cat lazy-seq let letfn line-seq list list* list? load load-file load-reader load-string loaded-libs locking long long-array longs loop macroexpand macroexpand-1 make-array make-hierarchy map map? mapcat max max-key memfn memoize merge merge-with meta method-sig methods min min-key mod name namespace neg? newline next nfirst nil? nnext not not-any? not-empty not-every? not= ns ns-aliases ns-imports ns-interns ns-map ns-name ns-publics ns-refers ns-resolve ns-unalias ns-unmap nth nthnext num number? odd? or parents partial partition pcalls peek persistent! pmap pop pop! pop-thread-bindings pos? pr pr-str prefer-method prefers primitives-classnames print print-ctor print-doc print-dup print-method print-namespace-doc print-simple print-special-doc print-str printf println println-str prn prn-str promise proxy proxy-call-with-super proxy-mappings proxy-name proxy-super push-thread-bindings pvalues quot rand rand-int range ratio? rational? rationalize re-find re-groups re-matcher re-matches re-pattern re-seq read read-line read-string reify reduce ref ref-history-count ref-max-history ref-min-history ref-set refer refer-clojure release-pending-sends rem remove remove-method remove-ns repeat repeatedly replace replicate require reset! reset-meta! resolve rest resultset-seq reverse reversible? rseq rsubseq satisfies? second select-keys send send-off seq seq? seque sequence sequential? set set-validator! set? short short-array shorts shutdown-agents slurp some sort sort-by sorted-map sorted-map-by sorted-set sorted-set-by sorted? special-form-anchor special-symbol? split-at split-with str stream? string? struct struct-map subs subseq subvec supers swap! symbol symbol? sync syntax-symbol-anchor take take-last take-nth take-while test the-ns time to-array to-array-2d trampoline transient tree-seq true? type unchecked-add unchecked-dec unchecked-divide unchecked-inc unchecked-multiply unchecked-negate unchecked-remainder unchecked-subtract underive unquote unquote-splicing update-in update-proxy use val vals var-get var-set var? vary-meta vec vector vector? when when-first when-let when-not while with-bindings with-bindings* with-in-str with-loading-context with-local-vars with-meta with-open with-out-str with-precision xml-seq"); 22 "* *1 *2 *3 *agent* *allow-unresolved-vars* *assert *clojure-version* *command-line-args* *compile-files* *compile-path* *e *err* *file* *flush-on-newline* *in* *macro-meta* *math-context* *ns* *out* *print-dup* *print-length* *print-level* *print-meta* *print-readably* *read-eval* *source-path* *use-context-classloader* *warn-on-reflection* + - / < <= = == > >= accessor aclone agent agent-errors aget alength alias all-ns alter alter-meta! alter-var-root amap ancestors and apply areduce array-map aset aset-boolean aset-byte aset-char aset-double aset-float aset-int aset-long aset-short assert assoc assoc! assoc-in associative? atom await await-for await1 bases bean bigdec bigint binding bit-and bit-and-not bit-clear bit-flip bit-not bit-or bit-set bit-shift-left bit-shift-right bit-test bit-xor boolean boolean-array booleans bound-fn bound-fn* butlast byte byte-array bytes case cast char char-array char-escape-string char-name-string char? chars chunk chunk-append chunk-buffer chunk-cons chunk-first chunk-next chunk-rest chunked-seq? class class? clear-agent-errors clojure-version coll? comment commute comp comparator compare compare-and-set! compile complement concat cond condp conj conj! cons constantly construct-proxy contains? count counted? create-ns create-struct cycle dec decimal? declare definline defmacro defmethod defmulti defn defn- defonce defstruct delay delay? deliver deref derive descendants destructure disj disj! dissoc dissoc! distinct distinct? doall doc dorun doseq dosync dotimes doto double double-array doubles drop drop-last drop-while empty empty? ensure enumeration-seq eval even? every? extend extend-protocol extend-type extends? extenders false? ffirst file-seq filter find find-doc find-ns find-var first float float-array float? floats flush fn fn? fnext for force format future future-call future-cancel future-cancelled? future-done? future? gen-class gen-interface gensym get get-in get-method get-proxy-class get-thread-bindings get-validator hash hash-map hash-set identical? identity if-let if-not ifn? import in-ns inc init-proxy instance? int int-array integer? interleave intern interpose into into-array ints io! isa? iterate iterator-seq juxt key keys keyword keyword? last lazy-cat lazy-seq let letfn line-seq list list* list? load load-file load-reader load-string loaded-libs locking long long-array longs loop macroexpand macroexpand-1 make-array make-hierarchy map map? mapcat max max-key memfn memoize merge merge-with meta method-sig methods min min-key mod name namespace neg? newline next nfirst nil? nnext not not-any? not-empty not-every? not= ns ns-aliases ns-imports ns-interns ns-map ns-name ns-publics ns-refers ns-resolve ns-unalias ns-unmap nth nthnext num number? odd? or parents partial partition pcalls peek persistent! pmap pop pop! pop-thread-bindings pos? pr pr-str prefer-method prefers primitives-classnames print print-ctor print-doc print-dup print-method print-namespace-doc print-simple print-special-doc print-str printf println println-str prn prn-str promise proxy proxy-call-with-super proxy-mappings proxy-name proxy-super push-thread-bindings pvalues quot rand rand-int range ratio? rational? rationalize re-find re-groups re-matcher re-matches re-pattern re-seq read read-line read-string reify reduce ref ref-history-count ref-max-history ref-min-history ref-set refer refer-clojure release-pending-sends rem remove remove-method remove-ns repeat repeatedly replace replicate require reset! reset-meta! resolve rest resultset-seq reverse reversible? rseq rsubseq satisfies? second select-keys send send-off seq seq? seque sequence sequential? set set-validator! set? short short-array shorts shutdown-agents slurp some sort sort-by sorted-map sorted-map-by sorted-set sorted-set-by sorted? special-form-anchor special-symbol? split-at split-with str stream? string? struct struct-map subs subseq subvec supers swap! symbol symbol? sync syntax-symbol-anchor take take-last take-nth take-while test the-ns time to-array to-array-2d trampoline transient tree-seq true? type unchecked-add unchecked-dec unchecked-divide unchecked-inc unchecked-multiply unchecked-negate unchecked-remainder unchecked-subtract underive unquote unquote-splicing update-in update-proxy use val vals var-get var-set var? vary-meta vec vector vector? when when-first when-let when-not while with-bindings with-bindings* with-in-str with-loading-context with-local-vars with-meta with-open with-out-str with-precision xml-seq");
24 23
25 var indentKeys = makeKeywords( 24 var indentKeys = makeKeywords(
26 // Built-ins 25 // Built-ins
27 "ns fn def defn defmethod bound-fn if if-not case condp when while when-not when-first do future comment doto locking proxy with-open with-precision reify deftype defrecord defprotocol extend extend-protocol extend-type try catch" + 26 "ns fn def defn defmethod bound-fn if if-not case condp when while when-not when-first do future comment doto locking proxy with-open with-precision reify deftype defrecord defprotocol extend extend-protocol extend-type try catch " +
28 27
29 // Binding forms 28 // Binding forms
30 "let letfn binding loop for doseq dotimes when-let if-let" + 29 "let letfn binding loop for doseq dotimes when-let if-let " +
31 30
32 // Data structures 31 // Data structures
33 "defstruct struct-map assoc" + 32 "defstruct struct-map assoc " +
34 33
35 // clojure.test 34 // clojure.test
36 "testing deftest" + 35 "testing deftest " +
37 36
38 // contrib 37 // contrib
39 "handler-case handle dotrace deftrace"); 38 "handler-case handle dotrace deftrace");
@@ -154,12 +153,11 @@ CodeMirror.defineMode("clojure", function (config, mode) {
154 (;something else, bracket, etc. 153 (;something else, bracket, etc.
155 */ 154 */
156 155
157 while ((letter = stream.eat(tests.keyword_char)) != null) { 156 if (ch == "(") while ((letter = stream.eat(tests.keyword_char)) != null) {
158 keyWord += letter; 157 keyWord += letter;
159 } 158 }
160 159
161 if (keyWord.length > 0 && indentKeys.propertyIsEnumerable(keyWord)) { // indent-word 160 if (keyWord.length > 0 && indentKeys.propertyIsEnumerable(keyWord)) { // indent-word
162
163 pushStack(state, indentTemp + INDENT_WORD_SKIP, ch); 161 pushStack(state, indentTemp + INDENT_WORD_SKIP, ch);
164 } else { // non-indent word 162 } else { // non-indent word
165 // we continue eating the spaces 163 // we continue eating the spaces
@@ -182,13 +180,15 @@ CodeMirror.defineMode("clojure", function (config, mode) {
182 } 180 }
183 } else if ( ch == ":" ) { 181 } else if ( ch == ":" ) {
184 stream.eatWhile(tests.lang_keyword); 182 stream.eatWhile(tests.lang_keyword);
185 return TAG; 183 return ATOM;
186 } else { 184 } else {
187 stream.eatWhile(tests.basic); 185 stream.eatWhile(tests.basic);
188 186
189 if (keywords && keywords.propertyIsEnumerable(stream.current())) { 187 if (keywords && keywords.propertyIsEnumerable(stream.current())) {
188 returnType = KEYWORD;
189 } else if (builtins && builtins.propertyIsEnumerable(stream.current())) {
190 returnType = BUILTIN; 190 returnType = BUILTIN;
191 } else if ( atoms && atoms.propertyIsEnumerable(stream.current()) ) { 191 } else if (atoms && atoms.propertyIsEnumerable(stream.current())) {
192 returnType = ATOM; 192 returnType = ATOM;
193 } else returnType = null; 193 } else returnType = null;
194 } 194 }
diff --git a/imports/codemirror/mode/css/css.js b/imports/codemirror/mode/css/css.js
index 45170a3d..050e1124 100644
--- a/imports/codemirror/mode/css/css.js
+++ b/imports/codemirror/mode/css/css.js
@@ -92,7 +92,7 @@ CodeMirror.defineMode("css", function(config) {
92 var style = state.tokenize(stream, state); 92 var style = state.tokenize(stream, state);
93 93
94 var context = state.stack[state.stack.length-1]; 94 var context = state.stack[state.stack.length-1];
95 if (type == "hash" && context == "rule") style = "atom"; 95 if (type == "hash" && context != "rule") style = "string-2";
96 else if (style == "variable") { 96 else if (style == "variable") {
97 if (context == "rule") style = "number"; 97 if (context == "rule") style = "number";
98 else if (!context || context == "@media{") style = "tag";