Skip to content

Commit 4971ad3

Browse files
authored
feat: update grammar and highlight (#3050)
1 parent 1b11db5 commit 4971ad3

File tree

5 files changed

+19
-18
lines changed

5 files changed

+19
-18
lines changed

package-lock.json

Lines changed: 11 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"@gravity-ui/table": "^1.10.1",
2727
"@gravity-ui/uikit": "^7.23.0",
2828
"@gravity-ui/unipika": "^5.2.1",
29-
"@gravity-ui/websql-autocomplete": "^13.7.0",
29+
"@gravity-ui/websql-autocomplete": "^13.14.0",
3030
"@hookform/resolvers": "^3.10.0",
3131
"@mjackson/multipart-parser": "^0.8.2",
3232
"@reduxjs/toolkit": "^2.8.2",
@@ -156,7 +156,7 @@
156156
"lint-staged": "^15.3.0",
157157
"mini-css-extract-plugin": "^2.9.2",
158158
"monaco-editor-webpack-plugin": "^7.1.0",
159-
"monaco-yql-languages": "^1.3.0",
159+
"monaco-yql-languages": "^1.21.1",
160160
"npm-run-all": "^4.1.5",
161161
"postcss": "^8.5.1",
162162
"prettier": "^3.5.3",
@@ -172,7 +172,7 @@
172172
"typescript": "^5.8.3"
173173
},
174174
"peerDependencies": {
175-
"monaco-yql-languages": ">=1.3.0",
175+
"monaco-yql-languages": ">=1.21.0",
176176
"prop-types": "^15.8.1",
177177
"react": "^18.3.1",
178178
"react-dom": "^18.3.1"

src/utils/monaco/constats.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
export const S_EXPRESSION_LANGUAGE_ID = 's-expression';
2-
export const YQL_LANGUAGE_ID = 'yql';
1+
export const S_EXPRESSION_LANGUAGE_ID = 's-expression_unstable';
2+
export const YQL_LANGUAGE_ID = 'yql_unstable';

src/utils/monaco/yql/constants.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -756,4 +756,5 @@ export const EntitySettings: Record<YQLEntity, string[]> = {
756756
replication: ['ENDPOINT', 'DATABASE', 'USER', 'PASSWORD'],
757757
tableIndex: [],
758758
topicConsumer: ['important', 'read_from'],
759+
streamingQuery: ['RUN'],
759760
};

src/utils/monaco/yql/yql.completionItemProvider.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import type {YQLEntity} from '@gravity-ui/websql-autocomplete/yql';
22
import type {FetchedColumn} from 'monaco-yql-languages/build/yql/autocomplete';
33
import {registerCompletionItemProvider} from 'monaco-yql-languages/build/yql/autocomplete';
4-
import {LANGUAGE_ID} from 'monaco-yql-languages/build/yql/yql.contribution';
54

65
import {isAutocompleteColumn} from '../../../types/api/autocomplete';
76
import type {TAutocompleteEntity} from '../../../types/api/autocomplete';
7+
import {YQL_LANGUAGE_ID} from '../constats';
88

99
import {
1010
checkIsDirectory,
@@ -66,7 +66,7 @@ export function registerYQLCompletionItemProvider(database: string) {
6666
return result;
6767
};
6868

69-
registerCompletionItemProvider(LANGUAGE_ID, [' ', '.', '`', '(', '/'], {
69+
registerCompletionItemProvider(YQL_LANGUAGE_ID, [' ', '.', '`', '(', '/'], {
7070
fetchEntities,
7171
fetchEntityColumns,
7272
getEntitySettings,

0 commit comments

Comments
 (0)