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

Prometheus: Disable suggestions at beginning of value (#21302)

Browse Source 
* Prometheus: Disable suggestions at beginning of value

- fixed comparison operator regex
- no longer suggest anything at beginning of label value

* Detect cursor in front of label values
This commit is contained in:
David 2020-01-03 12:16:27 +01:00 committed by GitHub
parent 41fd265c64
commit d63ad9ac93
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
public/app/plugins/datasource/prometheus/language_provider.ts
View File

@ -303,10 +303,17 @@ export default class PromQlLanguageProvider extends LanguageProvider {
const suggestions: CompletionItemGroup[] = []; const suggestions: CompletionItemGroup[] = [];
const line = value.anchorBlock.getText(); const line = value.anchorBlock.getText();
const cursorOffset = value.selection.anchor.offset; const cursorOffset = value.selection.anchor.offset;
const nextChar = line[cursorOffset]; const suffix = line.substr(cursorOffset);
const isValueContext = wrapperClasses.includes('attr-value'); const prefix = line.substr(0, cursorOffset);
if (!nextChar.match(/["}]/)) { const isValueStart = text.match(/^(=|=~|!=|!~)/);
// Don't suggest anything inside a value const isValueEnd = suffix.match(/^"?[,}]/);
// detect cursor in front of value, e.g., {key=|"}
const isPreValue = prefix.match(/(=|=~|!=|!~)$/) && suffix.match(/^"/);
// Don't suggestq anything at the beginning or inside a value
const isValueEmpty = isValueStart && isValueEnd;
const hasValuePrefix = isValueEnd && !isValueStart;
if ((!isValueEmpty && !hasValuePrefix) || isPreValue) {
return { suggestions }; return { suggestions };
} }
@ -335,7 +342,7 @@ export default class PromQlLanguageProvider extends LanguageProvider {
} }
let context: string; let context: string;
if ((text && text.match(/^!?=~?/)) || isValueContext) { if ((text && isValueStart) || wrapperClasses.includes('attr-value')) {
// Label values // Label values
if (labelKey && labelValues[labelKey]) { if (labelKey && labelValues[labelKey]) {
context = 'context-label-values'; context = 'context-label-values';