Skip to content

Commit 384a32f

Browse files
committed
Bug fix
1 parent 39933d8 commit 384a32f

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

src/autocomplete.tsx

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
import { useRef, useEffect } from 'react';
22
import { type Monaco, type monacoTypes } from '@grafana/ui';
33
import { languages } from 'monaco-editor';
4+
import { DataSourceApi } from '@grafana/data';
45

56
// Supports JSON only right now
67
class CompletionProvider implements monacoTypes.languages.CompletionItemProvider {
78
constructor(
9+
private readonly datasource: DataSourceApi,
810
private readonly monaco: Monaco,
911
private readonly editor: monacoTypes.editor.IStandaloneCodeEditor,
1012
) {}
@@ -67,7 +69,7 @@ class CompletionProvider implements monacoTypes.languages.CompletionItemProvider
6769
{
6870
label: '"$limit"',
6971
kind: languages.CompletionItemKind.Function,
70-
insertText: '"\\$match": ${1:number}',
72+
insertText: '"\\$limit": ${1:number}',
7173
range: range,
7274
detail: 'stage',
7375
insertTextRules: languages.CompletionItemInsertTextRule.InsertAsSnippet,
@@ -118,7 +120,7 @@ class CompletionProvider implements monacoTypes.languages.CompletionItemProvider
118120
}
119121
}
120122

121-
export function useAutocomplete() {
123+
export function useAutocomplete(datasource: DataSourceApi) {
122124
const autocompleteDisposeFun = useRef<(() => void) | null>(null);
123125
useEffect(() => {
124126
return () => {
@@ -127,7 +129,7 @@ export function useAutocomplete() {
127129
}, []);
128130

129131
return (editor: monacoTypes.editor.IStandaloneCodeEditor, monaco: Monaco) => {
130-
const provider = new CompletionProvider(monaco, editor);
132+
const provider = new CompletionProvider(datasource, monaco, editor);
131133
const { dispose } = monaco.languages.registerCompletionItemProvider('json', provider);
132134
autocompleteDisposeFun.current = dispose;
133135
};

src/components/QueryEditor.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ const languageOptions: Array<SelectableValue<string>> = [
4343
{ label: 'JavaScript Shadow', value: QueryLanguage.JAVASCRIPT_SHADOW, description: 'JavaScript with Evaluation' },
4444
];
4545

46-
export function QueryEditor({ query, onChange, app }: Props) {
46+
export function QueryEditor({ query, onChange, app, datasource }: Props) {
4747
const codeEditorRef = useRef<monacoTypes.editor.IStandaloneCodeEditor | null>(null);
4848
const [queryTextError, setQueryTextError] = useState<string | null>(null);
4949
const [isOpen, setIsOpen] = useState(false);
50-
const setupAutocompleteFn = useAutocomplete();
50+
const setupAutocompleteFn = useAutocomplete(datasource);
5151

5252
const [maxTimeMSText, setMaxTimeMSText] = useState<string>(
5353
query.aggregateMaxTimeMS ? query.aggregateMaxTimeMS.toString() : '',

0 commit comments

Comments
 (0)