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

CloudWatch/Logs: Fix autocomplete after by keyword (#24644)

Browse Source
This commit is contained in:
Andrej Ocenas 2020-05-14 15:52:47 +02:00 committed by GitHub
parent 0c8ee5b2c9
commit 2b9cc8ba30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 65 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
public/app/plugins/datasource/cloudwatch/language_provider.test.ts
View File

@ -85,6 +85,17 @@ describe('CloudWatchLanguageProvider', () => {
it('should suggest fields and bool functions after filter', async () => {
await runSuggestionTest('filter \\', [fields, BOOLEAN_FUNCTIONS.map(v => v.label)]);
});
it('should suggest fields and functions after filter bin() function', async () => {
await runSuggestionTest('stats count(@message) by bin(30m), \\', [
fields,
STRING_FUNCTIONS.concat(DATETIME_FUNCTIONS, IP_FUNCTIONS).map(v => v.label),
]);
});
it('should not suggest anything if not after comma in by expression', async () => {
await runSuggestionTest('stats count(@message) by bin(30m) \\', []);
});
});
async function runSuggestionTest(query: string, expectedItems: string[][]) {

64
public/app/plugins/datasource/cloudwatch/language_provider.ts
View File

@ -194,14 +194,12 @@ export class CloudWatchLanguageProvider extends LanguageProvider {
}
}
const currentTokenIsAfterCommandAndEmpty =
commandToken.next?.types.includes('whitespace') && !commandToken.next.next;
const currentTokenIsAfterCommandAndEmpty = isTokenType(commandToken.next, 'whitespace') && !commandToken.next.next;
const currentTokenIsAfterCommand =
currentTokenIsAfterCommandAndEmpty || nextNonWhitespaceToken(commandToken) === curToken;
const currentTokenIsComma = curToken.content === ',' && curToken.types.includes('punctuation');
const currentTokenIsCommaOrAfterComma =
currentTokenIsComma || (prevToken?.content === ',' && prevToken?.types.includes('punctuation'));
const currentTokenIsComma = isTokenType(curToken, 'punctuation', ',');
const currentTokenIsCommaOrAfterComma = currentTokenIsComma || isTokenType(prevToken, 'punctuation', ',');
// We only show suggestions if we are after a command or after a comma which is a field separator
if (!(currentTokenIsAfterCommand || currentTokenIsCommaOrAfterComma)) {
@ -241,7 +239,7 @@ export class CloudWatchLanguageProvider extends LanguageProvider {
): Promise<TypeaheadOutput> {
if (isFirstArgument) {
return await this.getFieldCompletionItems(context.logGroupNames ?? []);
} else if (prevNonWhitespaceToken(curToken)?.types.includes('field-name')) {
} else if (isTokenType(prevNonWhitespaceToken(curToken), 'field-name')) {
// suggest sort options
return {
suggestions: [
@ -341,7 +339,7 @@ function prevNonWhitespaceToken(token: Token): Token | null {
let curToken = token;
while (curToken.prev) {
if (curToken.prev.types.includes('whitespace')) {
if (isTokenType(curToken.prev, 'whitespace')) {
curToken = curToken.prev;
} else {
return curToken.prev;
@ -357,7 +355,7 @@ function previousCommandToken(startToken: Token): Token | null {
thisToken = thisToken.prev;
if (
thisToken.types.includes('query-command') &&
(!thisToken.prev || prevNonWhitespaceToken(thisToken)?.types.includes('command-separator'))
(!thisToken.prev || isTokenType(prevNonWhitespaceToken(thisToken), 'command-separator'))
) {
return thisToken;
}
@ -415,6 +413,52 @@ function isInsideFunctionParenthesis(curToken: Token): boolean {
}
function isAfterKeyword(keyword: string, token: Token): boolean {
const prevToken = prevNonWhitespaceToken(token);
return !!(prevToken?.types.includes('keyword') && prevToken?.content.toLowerCase() === 'by');
const maybeKeyword = getPreviousTokenExcluding(token, [
'whitespace',
'function',
'punctuation',
'field-name',
'number',
]);
if (isTokenType(maybeKeyword, 'keyword', 'by')) {
const prev = getPreviousTokenExcluding(token, ['whitespace']);
if (prev === maybeKeyword || isTokenType(prev, 'punctuation', ',')) {
return true;
}
}
return false;
}
function isTokenType(token: Token | undefined | null, type: string, content?: string): boolean {
if (!token?.types.includes(type)) {
return false;
}
if (content) {
if (token?.content.toLowerCase() !== content) {
return false;
}
}
return true;
}
type TokenDef = string | { type: string; value: string };
function getPreviousTokenExcluding(token: Token, exclude: TokenDef[]): Token | undefined | null {
let curToken = token.prev;
main: while (curToken) {
for (const item of exclude) {
if (typeof item === 'string') {
if (curToken.types.includes(item)) {
curToken = curToken.prev;
continue main;
}
} else {
if (curToken.types.includes(item.type) && curToken.content.toLowerCase() === item.value) {
curToken = curToken.prev;
continue main;
}
}
}
break;
}
return curToken;
}