IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Tempo: Add } when { is inserted automatically (#80113)

Browse Source
This commit is contained in:
Hariom Maurya
2024-01-11 20:22:19 +05:30
committed by GitHub
parent c9dd12851f
commit 5c8e88d6ab
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
public/app/plugins/datasource/tempo/traceql/autocomplete.test.ts
View File

@@ -137,8 +137,8 @@ describe('CompletionProvider', () => {
const { provider, model } = setup('', 0, v1Tags);
const result = await provider.provideCompletionItems(model, emptyPosition);
expect((result! as monacoTypes.languages.CompletionList).suggestions).toEqual([
...scopes.map((s) => expect.objectContaining({ label: s, insertText: `{ ${s}` })),
...intrinsics.map((s) => expect.objectContaining({ label: s, insertText: `{ ${s}` })),
...scopes.map((s) => expect.objectContaining({ label: s, insertText: `{ ${s}$0 }` })),
...intrinsics.map((s) => expect.objectContaining({ label: s, insertText: `{ ${s}$0 }` })),
expect.objectContaining({ label: 'bar', insertText: '{ .bar' }),
expect.objectContaining({ label: 'foo', insertText: '{ .foo' }),
expect.objectContaining({ label: 'status', insertText: '{ .status' }),
@@ -149,8 +149,8 @@ describe('CompletionProvider', () => {
const { provider, model } = setup('', 0, undefined, v2Tags);
const result = await provider.provideCompletionItems(model, emptyPosition);
expect((result! as monacoTypes.languages.CompletionList).suggestions).toEqual([
...scopes.map((s) => expect.objectContaining({ label: s, insertText: `{ ${s}` })),
...intrinsics.map((s) => expect.objectContaining({ label: s, insertText: `{ ${s}` })),
...scopes.map((s) => expect.objectContaining({ label: s, insertText: `{ ${s}$0 }` })),
...intrinsics.map((s) => expect.objectContaining({ label: s, insertText: `{ ${s}$0 }` })),
expect.objectContaining({ label: 'cluster', insertText: '{ .cluster' }),
expect.objectContaining({ label: 'container', insertText: '{ .container' }),
expect.objectContaining({ label: 'db', insertText: '{ .db' }),

4
public/app/plugins/datasource/tempo/traceql/autocomplete.ts
View File

@@ -305,8 +305,8 @@ export class CompletionProvider implements monacoTypes.languages.CompletionItemP
return [];
}
case 'EMPTY': {
return this.getScopesCompletions('{ ')
.concat(this.getIntrinsicsCompletions('{ '))
return this.getScopesCompletions('{ ', '$0 }')
.concat(this.getIntrinsicsCompletions('{ ', '$0 }'))
.concat(this.getTagsCompletions('{ .'));
}
case 'SPANSET_EMPTY':