upstream/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2026-07-16 12:33:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

ui/codemirror-promql: tidy duration autocomplete dedupe and tests

Browse source 
Remove two orphaned option-set constants from hybrid.test.ts that were
never asserted against. Reflow the grandParent type-id condition to
satisfy prettier. Include the string apply value in the dedupeCompletions
key so completions differing only by inserted text are not merged.

Signed-off-by: Julien Pivotto <291750+roidelapluie@users.noreply.github.com>
This commit is contained in:
Julien Pivotto 2026-06-12 17:25:49 +02:00
parent 7d59ef8c11
commit ee2614fc68
2 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
web/ui/module/codemirror-promql/src/complete/hybrid.test.ts
View file

@ -33,9 +33,6 @@ import { syntaxTree } from '@codemirror/language';
import { newCompleteStrategy } from './index';
import nock from 'nock';
const durationExprOperandOptions = ([] as Completion[]).concat(durationTerms, durationExprTerms, durationExprOperatorTerms);
const durationExprContinuationOptions = ([] as Completion[]).concat(durationExprTerms, durationExprOperatorTerms);
describe('analyzeCompletion test', () => {
const testCases = [
{

12
web/ui/module/codemirror-promql/src/complete/hybrid.ts
View file

@ -194,7 +194,11 @@ function dedupeCompletions(data: Completion[]): Completion[] {
const deduped: Completion[] = [];
for (const completion of data) {
const infoKey = typeof completion.info === 'string' ? completion.info : '';
const key = `${completion.label}|${completion.type ?? ''}|${infoKey}`;
// Include `apply` in the key when it is a string (e.g. snippet insert text) so that two
// completions sharing the same label/type/info but inserting different text are not merged.
// Function `apply` values cannot be compared meaningfully, so they fall back to an empty key.
const applyKey = typeof completion.apply === 'string' ? completion.apply : '';
const key = `${completion.label}|${completion.type ?? ''}|${infoKey}|${applyKey}`;
if (seen.has(key)) {
continue;
}
@ -519,11 +523,7 @@ export function analyzeCompletion(state: EditorState, node: SyntaxNode, pos: num
result.push({ kind: ContextKind.LabelName, metricName: getMetricNameInVectorSelector(node, state) });
} else if (node.parent?.type.id === 0) {
const grandParent = node.parent.parent;
if (
grandParent?.type.id === MatrixSelector ||
grandParent?.type.id === OffsetExpr ||
grandParent?.type.id === SubqueryExpr
) {
if (grandParent?.type.id === MatrixSelector || grandParent?.type.id === OffsetExpr || grandParent?.type.id === SubqueryExpr) {
// LabelName typed after a complete duration in a duration slot (e.g. `foo[5mss]`).
// Offer duration-expression functions so the user can complete `step()`, `range()`, etc.
result.push({ kind: ContextKind.DurationExpr });