SystemSh0cker/monaco-editor
1
0
Fork 0
mirror of https://github.com/microsoft/monaco-editor.git synced 2025-12-22 20:52:56 +01:00
Code Issues Projects Releases Packages Activity

Merge pull request #45 from finalfantasia/master

Browse source 
[clojure] Improve Clojure syntax highlighting.
This commit is contained in:
Alexandru Dima 2018-09-13 13:27:32 +02:00 • committed by GitHub
commit 0aea831f05
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 1536 additions and 249 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -1,2 +1,4 @@
/.idea/
/*.iml
/node_modules/ /node_modules/
/release/ /release/

866
src/clojure/clojure.test.ts
View file

@ -5,86 +5,814 @@
'use strict'; 'use strict';
import { testTokenization } from '../test/testRunner'; import {ITestItem, testTokenization} from '../test/testRunner';
const specialForms = [
'.',
'catch',
'def',
'do',
'if',
'monitor-enter',
'monitor-exit',
'new',
'quote',
'recur',
'set!',
'throw',
'try',
'var',
];
const coreSymbols = [
'*',
'*\'',
'*1',
'*2',
'*3',
'*agent*',
'*allow-unresolved-vars*',
'*assert*',
'*clojure-version*',
'*command-line-args*',
'*compile-files*',
'*compile-path*',
'*compiler-options*',
'*data-readers*',
'*default-data-reader-fn*',
'*e',
'*err*',
'*file*',
'*flush-on-newline*',
'*fn-loader*',
'*in*',
'*math-context*',
'*ns*',
'*out*',
'*print-dup*',
'*print-length*',
'*print-level*',
'*print-meta*',
'*print-namespace-maps*',
'*print-readably*',
'*read-eval*',
'*reader-resolver*',
'*source-path*',
'*suppress-read*',
'*unchecked-math*',
'*use-context-classloader*',
'*verbose-defrecords*',
'*warn-on-reflection*',
'+',
'+\'',
'-',
'-\'',
'->',
'->>',
'->ArrayChunk',
'->Eduction',
'->Vec',
'->VecNode',
'->VecSeq',
'-cache-protocol-fn',
'-reset-methods',
'..',
'/',
'<',
'<=',
'=',
'==',
'>',
'>=',
'EMPTY-NODE',
'Inst',
'StackTraceElement->vec',
'Throwable->map',
'accessor',
'aclone',
'add-classpath',
'add-watch',
'agent',
'agent-error',
'agent-errors',
'aget',
'alength',
'alias',
'all-ns',
'alter',
'alter-meta!',
'alter-var-root',
'amap',
'ancestors',
'and',
'any?',
'apply',
'areduce',
'array-map',
'as->',
'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',
'biginteger',
'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',
'boolean?',
'booleans',
'bound-fn',
'bound-fn*',
'bound?',
'bounded-count',
'butlast',
'byte',
'byte-array',
'bytes',
'bytes?',
'case',
'cast',
'cat',
'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',
'completing',
'concat',
'cond',
'cond->',
'cond->>',
'condp',
'conj',
'conj!',
'cons',
'constantly',
'construct-proxy',
'contains?',
'count',
'counted?',
'create-ns',
'create-struct',
'cycle',
'dec',
'dec\'',
'decimal?',
'declare',
'dedupe',
'default-data-readers',
'definline',
'definterface',
'defmacro',
'defmethod',
'defmulti',
'defn',
'defn-',
'defonce',
'defprotocol',
'defrecord',
'defstruct',
'deftype',
'delay',
'delay?',
'deliver',
'denominator',
'deref',
'derive',
'descendants',
'destructure',
'disj',
'disj!',
'dissoc',
'dissoc!',
'distinct',
'distinct?',
'doall',
'dorun',
'doseq',
'dosync',
'dotimes',
'doto',
'double',
'double-array',
'double?',
'doubles',
'drop',
'drop-last',
'drop-while',
'eduction',
'empty',
'empty?',
'ensure',
'ensure-reduced',
'enumeration-seq',
'error-handler',
'error-mode',
'eval',
'even?',
'every-pred',
'every?',
'ex-data',
'ex-info',
'extend',
'extend-protocol',
'extend-type',
'extenders',
'extends?',
'false?',
'ffirst',
'file-seq',
'filter',
'filterv',
'find',
'find-keyword',
'find-ns',
'find-protocol-impl',
'find-protocol-method',
'find-var',
'first',
'flatten',
'float',
'float-array',
'float?',
'floats',
'flush',
'fn',
'fn?',
'fnext',
'fnil',
'for',
'force',
'format',
'frequencies',
'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',
'group-by',
'halt-when',
'hash',
'hash-combine',
'hash-map',
'hash-ordered-coll',
'hash-set',
'hash-unordered-coll',
'ident?',
'identical?',
'identity',
'if-let',
'if-not',
'if-some',
'ifn?',
'import',
'in-ns',
'inc',
'inc\'',
'indexed?',
'init-proxy',
'inst-ms',
'inst-ms*',
'inst?',
'instance?',
'int',
'int-array',
'int?',
'integer?',
'interleave',
'intern',
'interpose',
'into',
'into-array',
'ints',
'io!',
'isa?',
'iterate',
'iterator-seq',
'juxt',
'keep',
'keep-indexed',
'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-entry?',
'map-indexed',
'map?',
'mapcat',
'mapv',
'max',
'max-key',
'memfn',
'memoize',
'merge',
'merge-with',
'meta',
'method-sig',
'methods',
'min',
'min-key',
'mix-collection-hash',
'mod',
'munge',
'name',
'namespace',
'namespace-munge',
'nat-int?',
'neg-int?',
'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',
'nthrest',
'num',
'number?',
'numerator',
'object-array',
'odd?',
'or',
'parents',
'partial',
'partition',
'partition-all',
'partition-by',
'pcalls',
'peek',
'persistent!',
'pmap',
'pop',
'pop!',
'pop-thread-bindings',
'pos-int?',
'pos?',
'pr',
'pr-str',
'prefer-method',
'prefers',
'primitives-classnames',
'print',
'print-ctor',
'print-dup',
'print-method',
'print-simple',
'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',
'qualified-ident?',
'qualified-keyword?',
'qualified-symbol?',
'quot',
'rand',
'rand-int',
'rand-nth',
'random-sample',
'range',
'ratio?',
'rational?',
'rationalize',
're-find',
're-groups',
're-matcher',
're-matches',
're-pattern',
're-seq',
'read',
'read-line',
'read-string',
'reader-conditional',
'reader-conditional?',
'realized?',
'record?',
'reduce',
'reduce-kv',
'reduced',
'reduced?',
'reductions',
'ref',
'ref-history-count',
'ref-max-history',
'ref-min-history',
'ref-set',
'refer',
'refer-clojure',
'reify',
'release-pending-sends',
'rem',
'remove',
'remove-all-methods',
'remove-method',
'remove-ns',
'remove-watch',
'repeat',
'repeatedly',
'replace',
'replicate',
'require',
'reset!',
'reset-meta!',
'reset-vals!',
'resolve',
'rest',
'restart-agent',
'resultset-seq',
'reverse',
'reversible?',
'rseq',
'rsubseq',
'run!',
'satisfies?',
'second',
'select-keys',
'send',
'send-off',
'send-via',
'seq',
'seq?',
'seqable?',
'seque',
'sequence',
'sequential?',
'set',
'set-agent-send-executor!',
'set-agent-send-off-executor!',
'set-error-handler!',
'set-error-mode!',
'set-validator!',
'set?',
'short',
'short-array',
'shorts',
'shuffle',
'shutdown-agents',
'simple-ident?',
'simple-keyword?',
'simple-symbol?',
'slurp',
'some',
'some->',
'some->>',
'some-fn',
'some?',
'sort',
'sort-by',
'sorted-map',
'sorted-map-by',
'sorted-set',
'sorted-set-by',
'sorted?',
'special-symbol?',
'spit',
'split-at',
'split-with',
'str',
'string?',
'struct',
'struct-map',
'subs',
'subseq',
'subvec',
'supers',
'swap!',
'swap-vals!',
'symbol',
'symbol?',
'sync',
'tagged-literal',
'tagged-literal?',
'take',
'take-last',
'take-nth',
'take-while',
'test',
'the-ns',
'thread-bound?',
'time',
'to-array',
'to-array-2d',
'trampoline',
'transduce',
'transient',
'tree-seq',
'true?',
'type',
'unchecked-add',
'unchecked-add-int',
'unchecked-byte',
'unchecked-char',
'unchecked-dec',
'unchecked-dec-int',
'unchecked-divide-int',
'unchecked-double',
'unchecked-float',
'unchecked-inc',
'unchecked-inc-int',
'unchecked-int',
'unchecked-long',
'unchecked-multiply',
'unchecked-multiply-int',
'unchecked-negate',
'unchecked-negate-int',
'unchecked-remainder-int',
'unchecked-short',
'unchecked-subtract',
'unchecked-subtract-int',
'underive',
'unquote',
'unquote-splicing',
'unreduced',
'unsigned-bit-shift-right',
'update',
'update-in',
'update-proxy',
'uri?',
'use',
'uuid?',
'val',
'vals',
'var-get',
'var-set',
'var?',
'vary-meta',
'vec',
'vector',
'vector-of',
'vector?',
'volatile!',
'volatile?',
'vreset!',
'vswap!',
'when',
'when-first',
'when-let',
'when-not',
'when-some',
'while',
'with-bindings',
'with-bindings*',
'with-in-str',
'with-loading-context',
'with-local-vars',
'with-meta',
'with-open',
'with-out-str',
'with-precision',
'with-redefs',
'with-redefs-fn',
'xml-seq',
'zero?',
'zipmap',
];
function createTestCases(specialForms: string[], type: string): ITestItem[] {
const testCases = [];
for (const specialForm of specialForms) {
testCases.push({
line: `${specialForm}`,
tokens: [
{startIndex: 0, type: `${type}.clj`},
],
});
}
return testCases;
}
testTokenization('clojure', [ testTokenization('clojure', [
// Keywords // special forms
[ createTestCases(specialForms, 'keyword'),
{
line: 'defmacro some',
tokens: [
{ startIndex: 0, type: 'keyword.clj' },
{ startIndex: 8, type: 'white.clj' },
{ startIndex: 9, type: 'variable.clj' },
],
},
{ // core symbols
line: 'comment "text comment"', createTestCases(coreSymbols, 'keyword'),
tokens: [
{ startIndex: 0, type: 'keyword.clj' },
{ startIndex: 7, type: 'white.clj' },
{ startIndex: 8, type: 'string.clj' },
],
},
{
line: 'in-ns "user',
tokens: [
{ startIndex: 0, type: 'keyword.clj' },
{ startIndex: 5, type: 'white.clj' },
{ startIndex: 6, type: 'string.clj' },
],
},
],
// comments // atoms
[ createTestCases(['false', 'nil', 'true'], 'constant'),
{
line: ';; comment',
tokens: [{ startIndex: 0, type: 'comment.clj' }],
},
],
// strings // keywords
[ createTestCases([':foo', '::bar', ':foo/bar', ':foo.bar/baz'], 'constant'),
{
line: '"\\n string "',
tokens: [
{ startIndex: 0, type: 'string.clj' },
{ startIndex: 1, type: 'string.escape.clj' },
{ startIndex: 3, type: 'string.clj' },
],
},
],
[
{
line: '" string \\',
tokens: [{ startIndex: 0, type: 'string.clj' }],
},
{
line: 'multiline',
tokens: [{ startIndex: 0, type: 'string.clj' }],
},
{
line: ' ',
tokens: [
// previous line needs to be terminated with \
{ startIndex: 0, type: 'white.clj' },
],
},
],
// numbers // numbers
createTestCases([
'42', '+42', '-421',
'42N', '+42N', '-42N',
'0.42', '+0.42', '-0.42',
'42M', '+42M', '-42M',
'42.42M', '+42.42M', '-42.42M',
'1/42', '+1/42', '-1/42',
'0x42af', '+0x42af', '-0x42af',
'0x42AF', '+0x42AF', '-0x42AF',
'1e2', '1e+2', '1e-2',
'+1e2', '+1e+2', '+1e-2',
'-1e2', '-1e+2', '-1e-2',
'-1.0e2', '-0.1e+2', '-1.01e-2',
'1E2', '1E+2', '1E-2',
'+1E2', '+1E+2', '+1E-2',
'-1E2', '-1E+2', '-1E-2',
'-1.0E2', '-0.1E+2', '-1.01E-2',
'2r101010', '+2r101010', '-2r101010',
'2r101010', '+2r101010', '-2r101010',
'8r52', '+8r52', '-8r52',
'36rhello', '+36rhello', '-36rhello',
'36rz', '+36rz', '-36rz',
'36rZ', '+36rZ', '-36rZ',
], 'number'),
// characters
createTestCases([
'\\1',
'\\a',
'\\#',
'\\\\',
'\\\"',
'\\(',
'\\A',
'\\backspace',
'\\formfeed',
'\\newline',
'\\space',
'\\return',
'\\tab',
'\\o123',
'\\u1000',
'\\uAaAa',
'\\u9F9F'
], 'string'),
// strings
createTestCases([
'\"I\'m a little teapot.\"',
'\"I\'m a \\\"little\\\" teapot.\"',
'\"I\'m', // this is
'a little', // a multi-line
'teapot.\"' // string
], 'string'),
// comments
createTestCases([
'; this is an in-line comment.',
';; this is a line comment.',
], 'comment'),
// `comment`
[ [
{ {
line: '1e2', line: '(comment)',
tokens: [{ startIndex: 0, type: 'number.float.clj' }], tokens: [
}, {startIndex: 0, type: 'comment.clj'},
], ],
[ },
{ {
line: '0xff', line: 'foo :bar 42',
tokens: [{ startIndex: 0, type: 'number.hex.clj' }], tokens: [
{startIndex: 0, type: 'identifier.clj'},
{startIndex: 3, type: 'white.clj'},
{startIndex: 4, type: 'constant.clj'},
{startIndex: 8, type: 'white.clj'},
{startIndex: 9, type: 'number.clj'},
],
},
{
line: '(comment (foo [bar :baz 1 "qux"]))',
tokens: [
{startIndex: 0, type: 'comment.clj'},
],
},
{
line: '(comment foo',
tokens: [
{startIndex: 0, type: 'comment.clj'},
],
},
{
line: 'foo',
tokens: [
{startIndex: 0, type: 'comment.clj'},
],
}, },
], ],
// reader macro characters
createTestCases([
'#',
'@',
'^',
'`',
'~',
"'",
], 'meta')
]); ]);

855
src/clojure/clojure.ts
View file

@ -13,19 +13,19 @@ export const conf: IRichLanguageConfiguration = {
lineComment: ';;', lineComment: ';;',
}, },
brackets: [['(', ')'], ['{', '}'], ['[', ']']], brackets: [['(', ')'], ['[', ']'], ['{', '}']],
autoClosingPairs: [ autoClosingPairs: [
{ open: '{', close: '}' },
{ open: '[', close: ']' },
{open: '(', close: ')'}, {open: '(', close: ')'},
{open: '[', close: ']'},
{open: '{', close: '}'},
{open: '"', close: '"'}, {open: '"', close: '"'},
], ],
surroundingPairs: [ surroundingPairs: [
{ open: '{', close: '}' },
{ open: '[', close: ']' },
{open: '(', close: ')'}, {open: '(', close: ')'},
{open: '[', close: ']'},
{open: '{', close: '}'},
{open: '"', close: '"'}, {open: '"', close: '"'},
], ],
}; };
@ -41,187 +41,744 @@ export const language = <ILanguage>{
{open: '[', close: ']', token: 'delimiter.square'}, {open: '[', close: ']', token: 'delimiter.square'},
], ],
keywords: [ specialForms: [
'ns', '.',
'ns-unmap', 'catch',
'create-ns',
'in-ns',
'fn',
'def', 'def',
'defn', 'do',
'defmacro',
'defmulti',
'defonce',
'require',
'import',
'new',
'refer',
'pos',
'pos?',
'filter',
'map',
'reduce',
'repeat',
'key',
'rest',
'concat',
'into',
'reverse',
'iterate',
'range',
'drop',
'drop-while',
'take',
'take-while',
'neg',
'neg?',
'bound-fn',
'if', 'if',
'if-not', 'monitor-enter',
'if-let', 'monitor-exit',
'case,', 'new',
'contains', 'quote',
'conj', 'recur',
'disj', 'set!',
'sort', 'throw',
'get', 'try',
'var',
],
coreSymbols: [
'*',
'*\'',
'*1',
'*2',
'*3',
'*agent*',
'*allow-unresolved-vars*',
'*assert*',
'*clojure-version*',
'*command-line-args*',
'*compile-files*',
'*compile-path*',
'*compiler-options*',
'*data-readers*',
'*default-data-reader-fn*',
'*e',
'*err*',
'*file*',
'*flush-on-newline*',
'*fn-loader*',
'*in*',
'*math-context*',
'*ns*',
'*out*',
'*print-dup*',
'*print-length*',
'*print-level*',
'*print-meta*',
'*print-namespace-maps*',
'*print-readably*',
'*read-eval*',
'*reader-resolver*',
'*source-path*',
'*suppress-read*',
'*unchecked-math*',
'*use-context-classloader*',
'*verbose-defrecords*',
'*warn-on-reflection*',
'+',
'+\'',
'-',
'-\'',
'->',
'->>',
'->ArrayChunk',
'->Eduction',
'->Vec',
'->VecNode',
'->VecSeq',
'-cache-protocol-fn',
'-reset-methods',
'..',
'/',
'<',
'<=',
'=',
'==',
'>',
'>=',
'EMPTY-NODE',
'Inst',
'StackTraceElement->vec',
'Throwable->map',
'accessor',
'aclone',
'add-classpath',
'add-watch',
'agent',
'agent-error',
'agent-errors',
'aget',
'alength',
'alias',
'all-ns',
'alter',
'alter-meta!',
'alter-var-root',
'amap',
'ancestors',
'and',
'any?',
'apply',
'areduce',
'array-map',
'as->',
'aset',
'aset-boolean',
'aset-byte',
'aset-char',
'aset-double',
'aset-float',
'aset-int',
'aset-long',
'aset-short',
'assert',
'assoc', 'assoc',
'merge', 'assoc!',
'keys', 'assoc-in',
'vals', 'associative?',
'nth', 'atom',
'first', 'await',
'last', 'await-for',
'count', 'await1',
'contains?', 'bases',
'bean',
'bigdec',
'bigint',
'biginteger',
'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',
'boolean?',
'booleans',
'bound-fn',
'bound-fn*',
'bound?',
'bounded-count',
'butlast',
'byte',
'byte-array',
'bytes',
'bytes?',
'case',
'cast',
'cat',
'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',
'completing',
'concat',
'cond', 'cond',
'condp',
'cond->', 'cond->',
'cond->>', 'cond->>',
'when', 'condp',
'while', 'conj',
'when-not', 'conj!',
'when-let', 'cons',
'when-first', 'constantly',
'do', 'construct-proxy',
'future', 'contains?',
'comment', 'count',
'doto', 'counted?',
'locking', 'create-ns',
'proxy', 'create-struct',
'println', 'cycle',
'type', 'dec',
'meta', 'dec\'',
'var', 'decimal?',
'as->', 'declare',
'reify', 'dedupe',
'deftype', 'default-data-readers',
'defrecord', 'definline',
'definterface',
'defmacro',
'defmethod',
'defmulti',
'defn',
'defn-',
'defonce',
'defprotocol', 'defprotocol',
'defrecord',
'defstruct',
'deftype',
'delay',
'delay?',
'deliver',
'denominator',
'deref',
'derive',
'descendants',
'destructure',
'disj',
'disj!',
'dissoc',
'dissoc!',
'distinct',
'distinct?',
'doall',
'dorun',
'doseq',
'dosync',
'dotimes',
'doto',
'double',
'double-array',
'double?',
'doubles',
'drop',
'drop-last',
'drop-while',
'eduction',
'empty',
'empty?',
'ensure',
'ensure-reduced',
'enumeration-seq',
'error-handler',
'error-mode',
'eval',
'even?',
'every-pred',
'every?',
'ex-data',
'ex-info',
'extend', 'extend',
'extend-protocol', 'extend-protocol',
'extend-type', 'extend-type',
'specify', 'extenders',
'specify!', 'extends?',
'try', 'false?',
'catch', 'ffirst',
'finally', 'file-seq',
'filter',
'filterv',
'find',
'find-keyword',
'find-ns',
'find-protocol-impl',
'find-protocol-method',
'find-var',
'first',
'flatten',
'float',
'float-array',
'float?',
'floats',
'flush',
'fn',
'fn?',
'fnext',
'fnil',
'for',
'force',
'format',
'frequencies',
'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',
'group-by',
'halt-when',
'hash',
'hash-combine',
'hash-map',
'hash-ordered-coll',
'hash-set',
'hash-unordered-coll',
'ident?',
'identical?',
'identity',
'if-let',
'if-not',
'if-some',
'ifn?',
'import',
'in-ns',
'inc',
'inc\'',
'indexed?',
'init-proxy',
'inst-ms',
'inst-ms*',
'inst?',
'instance?',
'int',
'int-array',
'int?',
'integer?',
'interleave',
'intern',
'interpose',
'into',
'into-array',
'ints',
'io!',
'isa?',
'iterate',
'iterator-seq',
'juxt',
'keep',
'keep-indexed',
'key',
'keys',
'keyword',
'keyword?',
'last',
'lazy-cat',
'lazy-seq',
'let', 'let',
'letfn', 'letfn',
'binding', 'line-seq',
'list',
'list*',
'list?',
'load',
'load-file',
'load-reader',
'load-string',
'loaded-libs',
'locking',
'long',
'long-array',
'longs',
'loop', 'loop',
'for', 'macroexpand',
'seq', 'macroexpand-1',
'doseq', 'make-array',
'dotimes', 'make-hierarchy',
'when-let', 'map',
'if-let', 'map-entry?',
'when-some', 'map-indexed',
'if-some', 'map?',
'this-as', 'mapcat',
'defmethod', 'mapv',
'testing', 'max',
'deftest', 'max-key',
'are', 'memfn',
'use-fixtures', 'memoize',
'use', 'merge',
'merge-with',
'meta',
'method-sig',
'methods',
'min',
'min-key',
'mix-collection-hash',
'mod',
'munge',
'name',
'namespace',
'namespace-munge',
'nat-int?',
'neg-int?',
'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',
'nthrest',
'num',
'number?',
'numerator',
'object-array',
'odd?',
'or',
'parents',
'partial',
'partition',
'partition-all',
'partition-by',
'pcalls',
'peek',
'persistent!',
'pmap',
'pop',
'pop!',
'pop-thread-bindings',
'pos-int?',
'pos?',
'pr',
'pr-str',
'prefer-method',
'prefers',
'primitives-classnames',
'print',
'print-ctor',
'print-dup',
'print-method',
'print-simple',
'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',
'qualified-ident?',
'qualified-keyword?',
'qualified-symbol?',
'quot',
'rand',
'rand-int',
'rand-nth',
'random-sample',
'range',
'ratio?',
'rational?',
'rationalize',
're-find',
're-groups',
're-matcher',
're-matches',
're-pattern',
're-seq',
'read',
'read-line',
'read-string',
'reader-conditional',
'reader-conditional?',
'realized?',
'record?',
'reduce',
'reduce-kv',
'reduced',
'reduced?',
'reductions',
'ref',
'ref-history-count',
'ref-max-history',
'ref-min-history',
'ref-set',
'refer',
'refer-clojure',
'reify',
'release-pending-sends',
'rem',
'remove', 'remove',
'run', 'remove-all-methods',
'run*', 'remove-method',
'fresh', 'remove-ns',
'alt!', 'remove-watch',
'alt!!', 'repeat',
'go', 'repeatedly',
'go-loop', 'replace',
'thread', 'replicate',
'boolean', 'require',
'reset!',
'reset-meta!',
'reset-vals!',
'resolve',
'rest',
'restart-agent',
'resultset-seq',
'reverse',
'reversible?',
'rseq',
'rsubseq',
'run!',
'satisfies?',
'second',
'select-keys',
'send',
'send-off',
'send-via',
'seq',
'seq?',
'seqable?',
'seque',
'sequence',
'sequential?',
'set',
'set-agent-send-executor!',
'set-agent-send-off-executor!',
'set-error-handler!',
'set-error-mode!',
'set-validator!',
'set?',
'short',
'short-array',
'shorts',
'shuffle',
'shutdown-agents',
'simple-ident?',
'simple-keyword?',
'simple-symbol?',
'slurp',
'some',
'some->',
'some->>',
'some-fn',
'some?',
'sort',
'sort-by',
'sorted-map',
'sorted-map-by',
'sorted-set',
'sorted-set-by',
'sorted?',
'special-symbol?',
'spit',
'split-at',
'split-with',
'str', 'str',
'string?',
'struct',
'struct-map',
'subs',
'subseq',
'subvec',
'supers',
'swap!',
'swap-vals!',
'symbol',
'symbol?',
'sync',
'tagged-literal',
'tagged-literal?',
'take',
'take-last',
'take-nth',
'take-while',
'test',
'the-ns',
'thread-bound?',
'time',
'to-array',
'to-array-2d',
'trampoline',
'transduce',
'transient',
'tree-seq',
'true?',
'type',
'unchecked-add',
'unchecked-add-int',
'unchecked-byte',
'unchecked-char',
'unchecked-dec',
'unchecked-dec-int',
'unchecked-divide-int',
'unchecked-double',
'unchecked-float',
'unchecked-inc',
'unchecked-inc-int',
'unchecked-int',
'unchecked-long',
'unchecked-multiply',
'unchecked-multiply-int',
'unchecked-negate',
'unchecked-negate-int',
'unchecked-remainder-int',
'unchecked-short',
'unchecked-subtract',
'unchecked-subtract-int',
'underive',
'unquote',
'unquote-splicing',
'unreduced',
'unsigned-bit-shift-right',
'update',
'update-in',
'update-proxy',
'uri?',
'use',
'uuid?',
'val',
'vals',
'var-get',
'var-set',
'var?',
'vary-meta',
'vec',
'vector',
'vector-of',
'vector?',
'volatile!',
'volatile?',
'vreset!',
'vswap!',
'when',
'when-first',
'when-let',
'when-not',
'when-some',
'while',
'with-bindings',
'with-bindings*',
'with-in-str',
'with-loading-context',
'with-local-vars',
'with-meta',
'with-open',
'with-out-str',
'with-precision',
'with-redefs',
'with-redefs-fn',
'xml-seq',
'zero?',
'zipmap',
], ],
constants: ['true', 'false', 'nil'], constants: ['true', 'false', 'nil'],
operators: [ symbolCharacter: /[!#'*+\-.\/:<=>?_\w\xa1-\uffff]/,
'=',
'not=', numbers: /[+\-]?\d+(?:(?:N|(?:[eE][+\-]?\d+))|(?:\.?\d*(?:M|(?:[eE][+\-]?\d+))?)|\/\d+|[xX][0-9a-fA-F]+|r[0-9a-zA-Z]+)?/,
'<',
'<=', characters: /\\(?:backspace|formfeed|newline|return|space|tab|x[0-9A-Fa-f]{4}|u[0-9A-Fa-f]{4}|o[0-7]{3}|@symbolCharacter|[\\"()\[\]{}])/,
'>',
'>=',
'and',
'or',
'not',
'inc',
'dec',
'max',
'min',
'rem',
'bit-and',
'bit-or',
'bit-xor',
'bit-not',
],
tokenizer: { tokenizer: {
root: [ root: [
[/0[xX][0-9a-fA-F]+/, 'number.hex'], // whitespaces and comments
[/[+-]?\d+(?:(?:\.\d*)?(?:[eE][+-]?\d+)?)?/, 'number.float'], {include: '@whitespace'},
[ // numbers
/(?:\b(?:(ns|def|defn|defn-|defmacro|defmulti|defonce|ns|ns-unmap|fn))(?![\w-]))(\s+)((?:\w|\-|\!|\?)*)/, [/@numbers/, 'number'],
['keyword', 'white', 'variable'],
],
[ // characters
/[a-zA-Z_#][a-zA-Z0-9_\-\?\!\*]*/, [/@characters/, 'string'],
{
// strings
{include: '@string'},
// brackets
[/[()\[\]{}]/, '@brackets'],
// regular expressions
[/\/#"(?:\.|(?:")|[^"\n])*"\/g/, 'regexp'],
// reader macro characters
[/[#'@^`~]/, 'meta'],
// keywords
[/:@symbolCharacter+/, 'constant'],
// symbols
[/@symbolCharacter+/, {
cases: { cases: {
'@keywords': 'keyword', '@specialForms': 'keyword',
'@coreSymbols': 'keyword',
'@constants': 'constant', '@constants': 'constant',
'@operators': 'operators',
'@default': 'identifier', '@default': 'identifier',
}, },
}, },
], ],
[/\/#"(?:\.|(?:\")|[^""\n])*"\/g/, 'regexp'],
{ include: '@whitespace' },
{ include: '@strings' },
], ],
whitespace: [[/[ \t\r\n]+/, 'white'], [/;;.*$/, 'comment']], whitespace: [
[/\s+/, 'white'],
[/;.*$/, 'comment'],
[/\(comment/, 'comment', '@comment'],
],
strings: [ comment: [
[/"$/, 'string', '@popall'], [/\(/, 'comment', '@push'],
[/"(?=.)/, 'string', '@multiLineString'], [/\)/, 'comment', '@pop'],
[/[^)]/, 'comment'],
],
string: [
[/"/, 'string', '@multiLineString'],
], ],
multiLineString: [ multiLineString: [
[/\\./, 'string.escape'], [/[^\\"]+/, 'string'],
[/"/, 'string', '@popall'], [/@characters/, 'string'],
[/.(?=.*")/, 'string'], [/"/, 'string', '@pop']
[/.*\\$/, 'string'],
[/.*$/, 'string', '@popall'],
], ],
}, },
}; };

40
test/setup.js
View file

@ -21,59 +21,59 @@ define('vs/nls', [], {
} }
}); });
define(['require'], function (require) { define(['require'], function () {
requirejs([ requirejs([
'vs/editor/editor.main' 'vs/editor/editor.main'
], function () { ], function () {
requirejs([ requirejs([
'release/dev/apex/apex.test',
'release/dev/azcli/azcli.test',
'release/dev/bat/bat.test', 'release/dev/bat/bat.test',
'release/dev/css/css.test', 'release/dev/clojure/clojure.test',
'release/dev/coffee/coffee.test', 'release/dev/coffee/coffee.test',
'release/dev/cpp/cpp.test', 'release/dev/cpp/cpp.test',
'release/dev/csharp/csharp.test', 'release/dev/csharp/csharp.test',
'release/dev/csp/csp.test',
'release/dev/css/css.test',
'release/dev/dockerfile/dockerfile.test', 'release/dev/dockerfile/dockerfile.test',
'release/dev/fsharp/fsharp.test', 'release/dev/fsharp/fsharp.test',
'release/dev/go/go.test', 'release/dev/go/go.test',
'release/dev/handlebars/handlebars.test', 'release/dev/handlebars/handlebars.test',
'release/dev/html/html.test', 'release/dev/html/html.test',
'release/dev/pug/pug.test',
'release/dev/java/java.test', 'release/dev/java/java.test',
'release/dev/javascript/javascript.test', 'release/dev/javascript/javascript.test',
'release/dev/less/less.test', 'release/dev/less/less.test',
'release/dev/lua/lua.test', 'release/dev/lua/lua.test',
'release/dev/markdown/markdown.test', 'release/dev/markdown/markdown.test',
'release/dev/msdax/msdax.test', 'release/dev/msdax/msdax.test',
'release/dev/mysql/mysql.test',
'release/dev/objective-c/objective-c.test', 'release/dev/objective-c/objective-c.test',
'release/dev/perl/perl.test',
'release/dev/pgsql/pgsql.test',
'release/dev/php/php.test', 'release/dev/php/php.test',
'release/dev/postiats/postiats.test', 'release/dev/postiats/postiats.test',
'release/dev/powerquery/powerquery.test', 'release/dev/powerquery/powerquery.test',
'release/dev/powershell/powershell.test', 'release/dev/powershell/powershell.test',
'release/dev/pug/pug.test',
'release/dev/python/python.test', 'release/dev/python/python.test',
'release/dev/r/r.test', 'release/dev/r/r.test',
'release/dev/razor/razor.test', 'release/dev/razor/razor.test',
'release/dev/redis/redis.test',
'release/dev/redshift/redshift.test',
'release/dev/ruby/ruby.test', 'release/dev/ruby/ruby.test',
'release/dev/rust/rust.test', 'release/dev/rust/rust.test',
'release/dev/sb/sb.test',
'release/dev/scheme/scheme.test',
'release/dev/scss/scss.test', 'release/dev/scss/scss.test',
'release/dev/swift/swift.test', 'release/dev/shell/shell.test',
'release/dev/solidity/solidity.test',
'release/dev/sql/sql.test', 'release/dev/sql/sql.test',
'release/dev/st/st.test',
'release/dev/swift/swift.test',
'release/dev/typescript/typescript.test',
'release/dev/vb/vb.test', 'release/dev/vb/vb.test',
'release/dev/xml/xml.test', 'release/dev/xml/xml.test',
'release/dev/yaml/yaml.test', 'release/dev/yaml/yaml.test'
'release/dev/solidity/solidity.test',
'release/dev/sb/sb.test',
'release/dev/mysql/mysql.test',
'release/dev/pgsql/pgsql.test',
'release/dev/redshift/redshift.test',
'release/dev/redis/redis.test',
'release/dev/csp/csp.test',
'release/dev/st/st.test',
'release/dev/scheme/scheme.test',
'release/dev/typescript/typescript.test',
'release/dev/clojure/clojure.test',
'release/dev/shell/shell.test',
'release/dev/perl/perl.test',
'release/dev/azcli/azcli.test',
'release/dev/apex/apex.test'
], function () { ], function () {
run(); // We can launch the tests! run(); // We can launch the tests!
}, function (err) { }, function (err) {