opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-08-01 04:21:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Chore: Update lezer package of prometheus frontend (#91252)

Browse Source 
* update lezer package

* Use UnquotedLabelMatcher instead of LabelMatcher

* Use UnquotedLabelMatcher instead of LabelMatcher in parsing.ts
This commit is contained in:
ismail simsek
2024-08-11 23:48:04 +02:00
committed by GitHub
parent 75f0b3a228
commit b8ebc5d463
6 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
packages/grafana-prometheus/src/components/monaco-query-field/monaco-completion-provider/situation.ts
View File

@ -9,7 +9,6 @@ import {
FunctionCallBody,
GroupingLabels,
Identifier,
LabelMatcher,
LabelMatchers,
LabelName,
MatchOp,
@ -19,6 +18,7 @@ import {
parser,
PromQL,
StringLiteral,
UnquotedLabelMatcher,
VectorSelector,
} from '@prometheus-io/lezer-promql';
@ -33,7 +33,7 @@ type NodeTypeId =
| typeof FunctionCallBody
| typeof GroupingLabels
| typeof Identifier
| typeof LabelMatcher
| typeof UnquotedLabelMatcher
| typeof LabelMatchers
| typeof LabelName
| typeof PromQL
@ -178,7 +178,7 @@ const RESOLVERS: Resolver[] = [
fun: resolveInFunction,
},
{
path: [StringLiteral, LabelMatcher],
path: [StringLiteral, UnquotedLabelMatcher],
fun: resolveLabelMatcher,
},
{
@ -186,7 +186,7 @@ const RESOLVERS: Resolver[] = [
fun: resolveTopLevel,
},
{
path: [ERROR_NODE_NAME, LabelMatcher],
path: [ERROR_NODE_NAME, UnquotedLabelMatcher],
fun: resolveLabelMatcher,
},
{
@ -216,7 +216,7 @@ function getLabelOp(opNode: SyntaxNode): LabelOperator | null {
}
function getLabel(labelMatcherNode: SyntaxNode, text: string): Label | null {
if (labelMatcherNode.type.id !== LabelMatcher) {
if (labelMatcherNode.type.id !== UnquotedLabelMatcher) {
return null;
}
@ -253,7 +253,7 @@ function getLabels(labelMatchersNode: SyntaxNode, text: string): Label[] {
return [];
}
const labelNodes = labelMatchersNode.getChildren(LabelMatcher);
const labelNodes = labelMatchersNode.getChildren(UnquotedLabelMatcher);
return labelNodes.map((ln) => getLabel(ln, text)).filter(notEmpty);
}
@ -317,7 +317,7 @@ function resolveLabelMatcher(node: SyntaxNode, text: string, pos: number): Situa
// - or an error node (like in `{job=^}`)
const inStringNode = !node.type.isError;
const parent = walk(node, [['parent', LabelMatcher]]);
const parent = walk(node, [['parent', UnquotedLabelMatcher]]);
if (parent === null) {
return null;
}
@ -387,7 +387,7 @@ function resolveDurations(node: SyntaxNode, text: string, pos: number): Situatio
function resolveLabelKeysWithEquals(node: SyntaxNode, text: string, pos: number): Situation | null {
// next false positive:
// `something{a="1"^}`
const child = walk(node, [['firstChild', LabelMatcher]]);
const child = walk(node, [['firstChild', UnquotedLabelMatcher]]);
if (child !== null) {
// means the label-matching part contains at least one label already.
//