Better autocompletion list handling

qgis · Jan 10, 2023 · a888d9c · a888d9c
1 parent 660990e
commit a888d9c
Showing 1 changed file with 16 additions and 22 deletions.
diff --git a/src/gui/codeeditors/qgscodeeditor.cpp b/src/gui/codeeditors/qgscodeeditor.cpp
@@ -170,7 +170,13 @@ void QgsCodeEditor::focusOutEvent( QFocusEvent *event )
 // but only is the auto-completion suggestion list isn't displayed
 void QgsCodeEditor::keyPressEvent( QKeyEvent *event )
 {
-  if ( event->key() == Qt::Key_Escape && !isListActive() )
+  if( isListActive() )
+  {
+    QsciScintilla::keyPressEvent( event );
+    return;
+  }
+
+  if ( event->key() == Qt::Key_Escape )
   {
     // Shortcut QScintilla and redirect the event to the QWidget handler
     QWidget::keyPressEvent( event ); // clazy:exclude=skipped-base-method
@@ -188,34 +194,22 @@ void QgsCodeEditor::keyPressEvent( QKeyEvent *event )
         return;
 
       case Qt::Key_Down:
-
-        if ( !isListActive() )
-        {
-          showPreviousCommand();
-          updatePrompt();
-          return;
-        }
-        break;
+        showPreviousCommand();
+        updatePrompt();
+        return;
 
       case Qt::Key_Up:
-
-        if ( !isListActive() )
-        {
-          showNextCommand();
-          updatePrompt();
-          return;
-        }
-        break;
+        showNextCommand();
+        updatePrompt();
+        return;
 
       default:
         break;
     }
-    QsciScintilla::keyPressEvent( event );
-  }
-  else
-  {
-    QsciScintilla::keyPressEvent( event );
   }
+
+  QsciScintilla::keyPressEvent( event );
+
 }
 
 void QgsCodeEditor::contextMenuEvent( QContextMenuEvent *event )