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: Code editor autocomplete returns bad results when text is highlighted (#70856)

Browse Source 
* adjust cursor when text is selected to give better autocomplete results in prometheus code editor
This commit is contained in:
Galen Kistler 2023-07-05 07:22:23 -05:00 committed by GitHub
parent 7252c6dd91
commit 927393633c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
public/app/plugins/datasource/prometheus/components/monaco-query-field/monaco-completion-provider/index.ts
View File

@ -43,6 +43,7 @@ function getMonacoCompletionItemKind(type: CompletionType, monaco: Monaco): mona
throw new NeverCaseError(type); throw new NeverCaseError(type);
} }
} }
export function getCompletionProvider( export function getCompletionProvider(
monaco: Monaco, monaco: Monaco,
dataProvider: DataProvider dataProvider: DataProvider
@ -63,10 +64,21 @@ export function getCompletionProvider(
: monaco.Range.fromPositions(position); : monaco.Range.fromPositions(position);
// documentation says `position` will be "adjusted" in `getOffsetAt` // documentation says `position` will be "adjusted" in `getOffsetAt`
// i don't know what that means, to be sure i clone it // i don't know what that means, to be sure i clone it
const positionClone = { const positionClone = {
column: position.column, column: position.column,
lineNumber: position.lineNumber, lineNumber: position.lineNumber,
}; };
// Check to see if the browser supports window.getSelection()
if (window.getSelection) {
const selectedText = window.getSelection()?.toString();
// If the user has selected text, adjust the cursor position to be at the start of the selection, instead of the end
if (selectedText && selectedText.length > 0) {
positionClone.column = positionClone.column - selectedText.length;
}
}
const offset = model.getOffsetAt(positionClone); const offset = model.getOffsetAt(positionClone);
const situation = getSituation(model.getValue(), offset); const situation = getSituation(model.getValue(), offset);
const completionsPromise = situation != null ? getCompletions(situation, dataProvider) : Promise.resolve([]); const completionsPromise = situation != null ? getCompletions(situation, dataProvider) : Promise.resolve([]);