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

CodeEditor: Trigger the lastest getSuggestions() passed to CodeEditor (#40544)

Browse Source
This commit is contained in:
Duke Manh 2021-10-18 06:36:13 -04:00 committed by GitHub
parent 1f44023ebe
commit 9eccb8e416
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/grafana-ui/src/components/Monaco/CodeEditor.tsx
View File

@ -31,7 +31,10 @@ class UnthemedCodeEditor extends React.PureComponent<Props> {
componentDidUpdate(oldProps: Props) { componentDidUpdate(oldProps: Props) {
const { getSuggestions, language } = this.props; const { getSuggestions, language } = this.props;
if (language !== oldProps.language) { const newLanguage = oldProps.language !== language;
const newGetSuggestions = oldProps.getSuggestions !== getSuggestions;
if (newGetSuggestions || newLanguage) {
if (this.completionCancel) { if (this.completionCancel) {
this.completionCancel.dispose(); this.completionCancel.dispose();
} }
@ -44,7 +47,9 @@ class UnthemedCodeEditor extends React.PureComponent<Props> {
if (getSuggestions) { if (getSuggestions) {
this.completionCancel = registerSuggestions(this.monaco, language, getSuggestions); this.completionCancel = registerSuggestions(this.monaco, language, getSuggestions);
} }
}
if (newLanguage) {
this.loadCustomLanguage(); this.loadCustomLanguage();
} }
} }