Migrate to official antlr4 package #177211
Merged
Conversation
This file contains hidden or 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
23a5405 to
79258d0
Compare
eokoneyo
commented
Feb 19, 2024
| @@ -905,7 +905,7 @@ | |||
| "adm-zip": "^0.5.9", | |||
| "ajv": "^8.12.0", | |||
| "ansi-regex": "^6.0.1", | |||
| "antlr4ts": "^0.5.0-alpha.3", | |||
| "antlr4": "^4.13.1-patch-1", | |||
There was a problem hiding this comment.
This is the antlr4 javascript runtime and should not be confused with the cli that's a java binary used to generate the lexer and parser for defined languages.
eokoneyo
commented
Feb 19, 2024
eokoneyo
commented
Feb 19, 2024
26da451 to
16a6499
Compare
|
/ci |
|
Pinging @elastic/appex-sharedux (Team:SharedUX) |
|
@elasticmachine merge upstream |
dej611
approved these changes
Mar 5, 2024
| @@ -28,10 +27,6 @@ export const ESQLLang: CustomLangModuleType<ESQLCallbacks> = { | |||
| workerProxyService.setup(ESQL_LANG_ID); | |||
|
|
|||
| monaco.languages.setTokensProvider(ESQL_LANG_ID, new ESQLTokensProvider()); | |||
|
|
|||
| // handle syntax errors via the diagnostic adapter | |||
There was a problem hiding this comment.
This is handled now together with the rest of the validation task.
d9b5c5c to
aa65424
Compare
aa65424 to
7aababd
Compare
💚 Build Succeeded
Metrics [docs]Page load bundle
Unknown metric groupsESLint disabled line counts
Total ESLint disabled count
History
To update your PR or re-run it, just comment with: cc @eokoneyo |
vadimkibana
approved these changes
Mar 5, 2024
Comment on lines
+30
to
32
| // @ts-expect-error the addParseListener API does exist and is documented here | ||
| // https://github.com/antlr/antlr4/blob/dev/doc/listeners.md | ||
| parser.addParseListener(parseListener); |
There was a problem hiding this comment.
Maybe better to cast to any instead of @ts-expect-error.
There was a problem hiding this comment.
Using @ts-expect-error is actually a better choice for this scenario, in the event that this method becomes present in the type declaration we'd get an error to remove this, unlike with any.
1 task
drewdaemon
added a commit
that referenced
this pull request
Mar 8, 2024
## Summary Up till now, we had to define our own lexer rules for our client-side ES|QL validation. This was because we were using an unofficial ANTLR package (before the official ANTLR had typescript support). Now that we are using the official ANTLR library (as of #177211), we no longer have to encode case insensitivity into the lexer rules themselves because the [`caseInsensitive` option](antlr/antlr4#3399) is now available to us. This means we can adopt the very [same definitions](https://github.com/elastic/elasticsearch/blob/343b1ae1ba74fbf2e75c29adddb2790312dd680b/x-pack/plugin/esql/src/main/antlr/EsqlBaseLexer.g4) that Elasticsearch uses as long as we set `caseInsensitive` (Elasticsearch handles case insensitivity at runtime). ### Checklist - [x] [Unit or functional tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html) were updated or added to match the most common scenarios
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary
This PR migrates kibana away from using the antlr4ts to the official antlr package, so the grammar used in Kibana (for example with ES|QL) is on par with ES.