public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CloudWatch/Logs: Fix suggestions of fields after comma (#24520)

Browse Source
This commit is contained in:
Andrej Ocenas
2020-05-11 16:10:49 +02:00
committed by GitHub
parent 9dd68dae36
commit 2d29997bda
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/app/plugins/datasource/cloudwatch/language_provider.test.ts
+4
View File
@@ -40,6 +40,10 @@ describe('CloudWatchLanguageProvider', () => {
await runSuggestionTest('fields field1, \\', [fields, FUNCTIONS.map(v => v.label)]);
});
it('should suggest fields and functions after comma with prefix', async () => {
await runSuggestionTest('fields field1, @mess\\', [fields, FUNCTIONS.map(v => v.label)]);
});
it('should suggest fields and functions after display command', async () => {
await runSuggestionTest('display \\', [fields, FUNCTIONS.map(v => v.label)]);
});
public/app/plugins/datasource/cloudwatch/language_provider.ts
+1 -1
View File
@@ -165,7 +165,7 @@ export class CloudWatchLanguageProvider extends LanguageProvider {
const currentTokenIsComma = curToken.content === ',' && curToken.types.includes('punctuation');
const currentTokenIsCommaOrAfterComma =
currentTokenIsComma || (curToken.prev?.content === ',' && curToken.prev.types.includes('punctuation'));
currentTokenIsComma || (prevToken?.content === ',' && prevToken?.types.includes('punctuation'));
// We only show suggestions if we are after a command or after a comma which is a field separator
if (!(currentTokenIsAfterCommand || currentTokenIsCommaOrAfterComma)) {