Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Polish the editor

pull/10616/head
Andrew Watkins 2017-07-13 16:28:36 -07:00
parent fa0a832bb7
commit 9fb878e7e8
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ui/src/external/codemirror.js vendored
View File

@ -144,7 +144,8 @@ function tokenFunction(states, config) {
tok = state.local.mode.token(stream, state.localState) tok = state.local.mode.token(stream, state.localState)
if ( if (
state.local.endScan && (m = state.local.endScan.exec(stream.current())) state.local.endScan &&
(m = state.local.endScan.exec(stream.current()))
) { ) {
stream.pos = stream.start + m.index stream.pos = stream.start + m.index
} }
@ -304,9 +305,8 @@ CodeMirror.defineSimpleMode('tickscript', {
// The start state contains the rules that are intially used // The start state contains the rules that are intially used
start: [ start: [
// The regex matches the token, the token property contains the type // The regex matches the token, the token property contains the type
{regex: /"(?:[^\\]|\\.)*?(?:"|$)/, token: 'string'}, {regex: /"(?:[^\\]|\\.)*?(?:"|$)/, token: 'string.double'},
// You can match multiple tokens at once. Note that the captured {regex: /'(?:[^\\]|\\.)*?(?:'|$)/, token: 'string.single'},
// groups must span the whole string in this case
{ {
regex: /(function)(\s+)([a-z$][\w$]*)/, regex: /(function)(\s+)([a-z$][\w$]*)/,
token: ['keyword', null, 'variable-2'], token: ['keyword', null, 'variable-2'],
@ -314,10 +314,10 @@ CodeMirror.defineSimpleMode('tickscript', {
// Rules are matched in the order in which they appear, so there is // Rules are matched in the order in which they appear, so there is
// no ambiguity between this one and the one above // no ambiguity between this one and the one above
{ {
regex: /(?:function|var|return|if|for|while|else|do|this)\b/, regex: /(?:function|var|return|if|for|while|else|do|this|stream|batch|influxql)\b/,
token: 'keyword', token: 'keyword',
}, },
{regex: /true|false|null|undefined/, token: 'atom'}, {regex: /true|false|null|undefined|TRUE|FALSE/, token: 'atom'},
{ {
regex: /0x[a-f\d]+|[-+]?(?:\.\d+|\d+\.?\d*)(?:e[-+]?\d+)?/i, regex: /0x[a-f\d]+|[-+]?(?:\.\d+|\d+\.?\d*)(?:e[-+]?\d+)?/i,
token: 'number', token: 'number',
@ -331,10 +331,6 @@ CodeMirror.defineSimpleMode('tickscript', {
{regex: /[\{\[\(]/, indent: true}, {regex: /[\{\[\(]/, indent: true},
{regex: /[\}\]\)]/, dedent: true}, {regex: /[\}\]\)]/, dedent: true},
{regex: /[a-z$][\w$]*/, token: 'variable'}, {regex: /[a-z$][\w$]*/, token: 'variable'},
// You can embed other modes with the mode property. This rule
// causes all code between << and >> to be highlighted with the XML
// mode.
{regex: /<</, token: 'meta', mode: {spec: 'xml', end: />>/}},
], ],
// The multi-line comment state. // The multi-line comment state.
comment: [ comment: [

2
ui/src/style/external/codemirror.scss vendored
View File

@ -3,7 +3,7 @@
.CodeMirror { .CodeMirror {
/* Set height, width, borders, and global font properties here */ /* Set height, width, borders, and global font properties here */
font-family: monospace; font-family: monospace;
height: calc(100% - 76px); height: calc(100vh - 140px);
color: black; color: black;
} }