Skip to content

feat: update grammar and highlight #3050

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.

Sign up for GitHub

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

Merged
Raubzeug merged 1 commit into from
Nov 7, 2025
Merged

feat: update grammar and highlight #3050

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"@gravity-ui/table": "^1.10.1",
"@gravity-ui/uikit": "^7.23.0",
"@gravity-ui/unipika": "^5.2.1",
"@gravity-ui/websql-autocomplete": "^13.7.0",
"@gravity-ui/websql-autocomplete": "^13.14.0",
"@hookform/resolvers": "^3.10.0",
"@mjackson/multipart-parser": "^0.8.2",
"@reduxjs/toolkit": "^2.8.2",
Expand Down Expand Up @@ -156,7 +156,7 @@
"lint-staged": "^15.3.0",
"mini-css-extract-plugin": "^2.9.2",
"monaco-editor-webpack-plugin": "^7.1.0",
"monaco-yql-languages": "^1.3.0",
"monaco-yql-languages": "^1.21.1",
"npm-run-all": "^4.1.5",
"postcss": "^8.5.1",
"prettier": "^3.5.3",
Expand All @@ -172,7 +172,7 @@
"typescript": "^5.8.3"
},
"peerDependencies": {
"monaco-yql-languages": ">=1.3.0",
"monaco-yql-languages": ">=1.21.0",
"prop-types": "^15.8.1",
"react": "^18.3.1",
"react-dom": "^18.3.1"
Expand Down
4 changes: 2 additions & 2 deletions src/utils/monaco/constats.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
export const S_EXPRESSION_LANGUAGE_ID = 's-expression';
export const YQL_LANGUAGE_ID = 'yql';
export const S_EXPRESSION_LANGUAGE_ID = 's-expression_unstable';
export const YQL_LANGUAGE_ID = 'yql_unstable';
Comment on lines +1 to +2
Copy link
Member

@artemmufazalov artemmufazalov Nov 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you please comment, why we use _unstable versions?

Copy link
Contributor Author

@Raubzeug Raubzeug Nov 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you please comment, why we use _unstable versions?

It's an experiment - we're going to use monarch highlight, that is generated by YQL backend team. For now it's stable enough to try it in YDB (it's been using in YQL for 1 month), to not stable enough to call it stable :)

1 change: 1 addition & 0 deletions src/utils/monaco/yql/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -756,4 +756,5 @@ export const EntitySettings: Record<YQLEntity, string[]> = {
replication: ['ENDPOINT', 'DATABASE', 'USER', 'PASSWORD'],
tableIndex: [],
topicConsumer: ['important', 'read_from'],
streamingQuery: ['RUN'],
};
4 changes: 2 additions & 2 deletions src/utils/monaco/yql/yql.completionItemProvider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import type {YQLEntity} from '@gravity-ui/websql-autocomplete/yql';
import type {FetchedColumn} from 'monaco-yql-languages/build/yql/autocomplete';
import {registerCompletionItemProvider} from 'monaco-yql-languages/build/yql/autocomplete';
import {LANGUAGE_ID} from 'monaco-yql-languages/build/yql/yql.contribution';

import {isAutocompleteColumn} from '../../../types/api/autocomplete';
import type {TAutocompleteEntity} from '../../../types/api/autocomplete';
import {YQL_LANGUAGE_ID} from '../constats';

import {
checkIsDirectory,
Expand Down Expand Up @@ -66,7 +66,7 @@ export function registerYQLCompletionItemProvider(database: string) {
return result;
};

registerCompletionItemProvider(LANGUAGE_ID, [' ', '.', '`', '(', '/'], {
registerCompletionItemProvider(YQL_LANGUAGE_ID, [' ', '.', '`', '(', '/'], {
fetchEntities,
fetchEntityColumns,
getEntitySettings,
Expand Down
Loading