-
Notifications
You must be signed in to change notification settings - Fork 8.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Implement error reporting in monaco for painless language #84695
Merged
alisonelizabeth
merged 8 commits into
elastic:master
from
alisonelizabeth:monaco/painless_error_reporting
Dec 8, 2020
Merged
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
9321231
implement painless error reporting in monaco
alisonelizabeth a0966bf
rename antlr files to snakecase
alisonelizabeth 56bcff9
Merge branch 'master' of github.com:elastic/kibana into monaco/painle…
alisonelizabeth 16ccd30
fix snakecase for listener file
alisonelizabeth 2530240
Merge branch 'master' of github.com:elastic/kibana into monaco/painle…
alisonelizabeth c9f4fc6
cleanup
alisonelizabeth 6726412
Merge branch 'master' of github.com:elastic/kibana into monaco/painle…
alisonelizabeth 32e03ae
add code comments
alisonelizabeth File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,66 @@ | ||
/* | ||
* Licensed to Elasticsearch B.V. under one or more contributor | ||
* license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright | ||
* ownership. Elasticsearch B.V. licenses this file to you under | ||
* the Apache License, Version 2.0 (the "License"); you may | ||
* not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, | ||
* software distributed under the License is distributed on an | ||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
* KIND, either express or implied. See the License for the | ||
* specific language governing permissions and limitations | ||
* under the License. | ||
*/ | ||
|
||
const { join } = require('path'); | ||
const { readdirSync, readFileSync, writeFileSync, renameSync } = require('fs'); | ||
const ora = require('ora'); | ||
|
||
const generatedAntlrFolder = join(__dirname, '..', 'src', 'painless', 'antlr'); | ||
|
||
const generatedAntlrFolderContents = readdirSync(generatedAntlrFolder); | ||
|
||
const log = ora('Updating generated antlr grammar').start(); | ||
|
||
// The generated TS produces some TS linting errors | ||
// This script adds a //@ts-nocheck comment at the top of each generated file | ||
// so that the errors can be ignored for now | ||
generatedAntlrFolderContents | ||
.filter((file) => { | ||
const fileExtension = file.split('.')[1]; | ||
return fileExtension.includes('ts'); | ||
}) | ||
.forEach((file) => { | ||
try { | ||
const fileContentRows = readFileSync(join(generatedAntlrFolder, file), 'utf8') | ||
.toString() | ||
.split('\n'); | ||
|
||
fileContentRows.unshift('// @ts-nocheck'); | ||
|
||
const filePath = join(generatedAntlrFolder, file); | ||
const fileContent = fileContentRows.join('\n'); | ||
|
||
writeFileSync(filePath, fileContent, { encoding: 'utf8' }); | ||
} catch (err) { | ||
return log.fail(err.message); | ||
} | ||
}); | ||
|
||
// Rename generated parserListener file to snakecase to satisfy file casing check | ||
// There doesn't appear to be a way to fix this OOTB with antlr4ts-cli | ||
try { | ||
renameSync( | ||
join(generatedAntlrFolder, 'painless_parserListener.ts'), | ||
join(generatedAntlrFolder, 'painless_parser_listener.ts') | ||
); | ||
} catch (err) { | ||
log.warn(`Unable to rename parserListener file to snakecase: ${err.message}`); | ||
} | ||
|
||
log.succeed('Updated generated antlr grammar successfully'); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
122 changes: 122 additions & 0 deletions
122
packages/kbn-monaco/src/painless/antlr/painless_lexer.g4
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,122 @@ | ||
/* | ||
* Licensed to Elasticsearch B.V. under one or more contributor | ||
* license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright | ||
* ownership. Elasticsearch B.V. licenses this file to you under | ||
* the Apache License, Version 2.0 (the "License"); you may | ||
* not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, | ||
* software distributed under the License is distributed on an | ||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
* KIND, either express or implied. See the License for the | ||
* specific language governing permissions and limitations | ||
* under the License. | ||
*/ | ||
|
||
lexer grammar painless_lexer; | ||
|
||
WS: [ \t\n\r]+ -> skip; | ||
COMMENT: ( '//' .*? [\n\r] | '/*' .*? '*/' ) -> skip; | ||
|
||
LBRACK: '{'; | ||
RBRACK: '}'; | ||
LBRACE: '['; | ||
RBRACE: ']'; | ||
LP: '('; | ||
RP: ')'; | ||
// We switch modes after a dot to ensure there are not conflicts | ||
// between shortcuts and decimal values. Without the mode switch | ||
// shortcuts such as id.0.0 will fail because 0.0 will be interpreted | ||
// as a decimal value instead of two individual list-style shortcuts. | ||
DOT: '.' -> mode(AFTER_DOT); | ||
NSDOT: '?.' -> mode(AFTER_DOT); | ||
COMMA: ','; | ||
SEMICOLON: ';'; | ||
IF: 'if'; | ||
IN: 'in'; | ||
ELSE: 'else'; | ||
WHILE: 'while'; | ||
DO: 'do'; | ||
FOR: 'for'; | ||
CONTINUE: 'continue'; | ||
BREAK: 'break'; | ||
RETURN: 'return'; | ||
NEW: 'new'; | ||
TRY: 'try'; | ||
CATCH: 'catch'; | ||
THROW: 'throw'; | ||
THIS: 'this'; | ||
INSTANCEOF: 'instanceof'; | ||
|
||
BOOLNOT: '!'; | ||
BWNOT: '~'; | ||
MUL: '*'; | ||
DIV: '/' { this.isSlashRegex() == false }?; | ||
REM: '%'; | ||
ADD: '+'; | ||
SUB: '-'; | ||
LSH: '<<'; | ||
RSH: '>>'; | ||
USH: '>>>'; | ||
LT: '<'; | ||
LTE: '<='; | ||
GT: '>'; | ||
GTE: '>='; | ||
EQ: '=='; | ||
EQR: '==='; | ||
NE: '!='; | ||
NER: '!=='; | ||
BWAND: '&'; | ||
XOR: '^'; | ||
BWOR: '|'; | ||
BOOLAND: '&&'; | ||
BOOLOR: '||'; | ||
COND: '?'; | ||
COLON: ':'; | ||
ELVIS: '?:'; | ||
REF: '::'; | ||
ARROW: '->'; | ||
FIND: '=~'; | ||
MATCH: '==~'; | ||
INCR: '++'; | ||
DECR: '--'; | ||
|
||
ASSIGN: '='; | ||
AADD: '+='; | ||
ASUB: '-='; | ||
AMUL: '*='; | ||
ADIV: '/='; | ||
AREM: '%='; | ||
AAND: '&='; | ||
AXOR: '^='; | ||
AOR: '|='; | ||
ALSH: '<<='; | ||
ARSH: '>>='; | ||
AUSH: '>>>='; | ||
|
||
OCTAL: '0' [0-7]+ [lL]?; | ||
HEX: '0' [xX] [0-9a-fA-F]+ [lL]?; | ||
INTEGER: ( '0' | [1-9] [0-9]* ) [lLfFdD]?; | ||
DECIMAL: ( '0' | [1-9] [0-9]* ) (DOT [0-9]+)? ( [eE] [+\-]? [0-9]+ )? [fFdD]?; | ||
|
||
STRING: ( '"' ( '\\"' | '\\\\' | ~[\\"] )*? '"' ) | ( '\'' ( '\\\'' | '\\\\' | ~[\\'] )*? '\'' ); | ||
REGEX: '/' ( '\\' ~'\n' | ~('/' | '\n') )+? '/' [cilmsUux]* { this.isSlashRegex() }?; | ||
|
||
TRUE: 'true'; | ||
FALSE: 'false'; | ||
|
||
NULL: 'null'; | ||
|
||
PRIMITIVE: 'boolean' | 'byte' | 'short' | 'char' | 'int' | 'long' | 'float' | 'double'; | ||
DEF: 'def'; | ||
|
||
ID: [_a-zA-Z] [_a-zA-Z0-9]*; | ||
|
||
mode AFTER_DOT; | ||
|
||
DOTINTEGER: ( '0' | [1-9] [0-9]* ) -> mode(DEFAULT_MODE); | ||
DOTID: [_a-zA-Z] [_a-zA-Z0-9]* -> mode(DEFAULT_MODE); |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice! Glad to see we can disable TS checks at a file-level!