Don't show keyword, etc. completions when in annotation.

Belonging to [master]: - #115
OpenModelica · Apr 8, 2019 · fdc07bf · fdc07bf
1 parent 0116bcc
commit fdc07bf
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/OMEdit/OMEdit/OMEditGUI/Editors/ModelicaEditor.cpp b/OMEdit/OMEdit/OMEditGUI/Editors/ModelicaEditor.cpp
@@ -73,7 +73,10 @@ void ModelicaEditor::popUpCompleter()
   QString word = wordUnderCursor();
   mpPlainTextEdit->clearCompleter();
 
-  if (!word.contains('.')) {
+  QList<CompleterItem> annotations;
+  getCompletionAnnotations(stringAfterWord("annotation"), annotations);
+
+  if (!word.contains('.') && annotations.empty()) {
     QStringList keywords = ModelicaHighlighter::getKeywords();
     mpPlainTextEdit->insertCompleterKeywords(keywords);
     QStringList types = ModelicaHighlighter::getTypes();
@@ -93,8 +96,6 @@ void ModelicaEditor::popUpCompleter()
   mpPlainTextEdit->insertCompleterSymbols(classes, ":/Resources/icons/completerClass.svg");
   mpPlainTextEdit->insertCompleterSymbols(components, ":/Resources/icons/completerComponent.svg");
 
-  QList<CompleterItem> annotations;
-  getCompletionAnnotations(stringAfterWord("annotation"), annotations);
   mpPlainTextEdit->insertCompleterSymbols(annotations, ":/Resources/icons/completerAnnotation.svg");
 
   QCompleter *completer = mpPlainTextEdit->completer();