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/Log: Fix field autocomplete suggestions inside function (#24406)

Browse Source 
* Fix autocomplete inside function

* Remove debug log

* Add comment and return type
This commit is contained in:
Andrej Ocenas 2020-05-11 12:56:32 +02:00 committed by GitHub
parent d385045d16
commit b16202acc2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 52 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -126,52 +126,15 @@ export class CloudWatchLanguageProvider extends LanguageProvider {
(token: any) => (token: any) =>
token.offsets.start <= value!.selection?.start?.offset && token.offsets.end >= value!.selection?.start?.offset token.offsets.start <= value!.selection?.start?.offset && token.offsets.end >= value!.selection?.start?.offset
)[0]; )[0];
const isFirstToken = curToken.prev === null || curToken.prev === undefined; const isFirstToken = curToken.prev === null || curToken.prev === undefined;
const prevToken = prevNonWhitespaceToken(curToken); const prevToken = prevNonWhitespaceToken(curToken);
const funcsWithFieldArgs = [
'avg',
'count',
'count_distinct',
'earliest',
'latest',
'sortsFirst',
'sortsLast',
'max',
'min',
'pct',
'stddev',
'ispresent',
'fromMillis',
'toMillis',
'isempty',
'isblank',
'isValidIp',
'isValidIpV4',
'isValidIpV6',
'isIpInSubnet',
'isIpv4InSubnet',
'isIpv6InSubnet',
].map(funcName => funcName.toLowerCase());
if (curToken.content === '(' && prevToken != null) { if (isInsideFunctionParenthesis(curToken)) {
if (funcsWithFieldArgs.includes(prevToken.content.toLowerCase()) && prevToken.types.includes('function')) { return await this.getFieldCompletionItems(context?.logGroupNames ?? []);
const suggs = await this.getFieldCompletionItems(context?.logGroupNames ?? []);
return suggs;
}
} }
// if (prevToken === null) {
// return {
// suggestions: [],
// };
// }
// if (prevToken) {
// console.log(`Previous token: '${prevToken.content}'`);
// }
const isCommandStart = isFirstToken || (!isFirstToken && prevToken?.types.includes('command-separator')); const isCommandStart = isFirstToken || (!isFirstToken && prevToken?.types.includes('command-separator'));
//console.log(`Is command start? ${isCommandStart}`);
if (isCommandStart) { if (isCommandStart) {
return this.getCommandCompletionItems(); return this.getCommandCompletionItems();
} else if (!isFirstToken) { } else if (!isFirstToken) {
@ -427,3 +390,52 @@ function prevNonWhitespaceToken(token: Token): Token | null {
return null; return null;
} }
const funcsWithFieldArgs = [
'avg',
'count',
'count_distinct',
'earliest',
'latest',
'sortsFirst',
'sortsLast',
'max',
'min',
'pct',
'stddev',
'ispresent',
'fromMillis',
'toMillis',
'isempty',
'isblank',
'isValidIp',
'isValidIpV4',
'isValidIpV6',
'isIpInSubnet',
'isIpv4InSubnet',
'isIpv6InSubnet',
].map(funcName => funcName.toLowerCase());
/**
* Returns true if cursor is currently inside a function parenthesis for example `count(|)` or `count(@mess|)` should
* return true.
*/
function isInsideFunctionParenthesis(curToken: Token): boolean {
const prevToken = prevNonWhitespaceToken(curToken);
if (!prevToken) {
return false;
}
const parenthesisToken = curToken.content === '(' ? curToken : prevToken.content === '(' ? prevToken : undefined;
if (parenthesisToken) {
const maybeFunctionToken = prevNonWhitespaceToken(parenthesisToken);
if (maybeFunctionToken) {
return (
funcsWithFieldArgs.includes(maybeFunctionToken.content.toLowerCase()) &&
maybeFunctionToken.types.includes('function')
);
}
}
return false;
}