[Lldb-commits] [PATCH] D106459: [LLDB][GUI] Check fields validity in actions

Greg Clayton via Phabricator via lldb-commits lldb-commits at lists.llvm.org
Fri Jul 23 18:03:12 PDT 2021


This revision was landed with ongoing or failed builds.
This revision was automatically updated to reflect the committed changes.
Closed by commit rG80ac12b70b16: [LLDB][GUI] Check fields validity in actions (authored by OmarEmaraDev, committed by clayborg).

Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D106459/new/

https://reviews.llvm.org/D106459

Files:
  lldb/source/Core/IOHandlerCursesGUI.cpp


Index: lldb/source/Core/IOHandlerCursesGUI.cpp
===================================================================
--- lldb/source/Core/IOHandlerCursesGUI.cpp
+++ lldb/source/Core/IOHandlerCursesGUI.cpp
@@ -1061,6 +1061,9 @@
   // Select the last element in the field if multiple elements exists.
   virtual void FieldDelegateSelectLastElement() { return; }
 
+  // Returns true if the field has an error, false otherwise.
+  virtual bool FieldDelegateHasError() { return false; }
+
   bool FieldDelegateIsVisible() { return m_is_visible; }
 
   void FieldDelegateHide() { m_is_visible = false; }
@@ -1098,7 +1101,7 @@
   // field and an optional line for an error if it exists.
   int FieldDelegateGetHeight() override {
     int height = GetFieldHeight();
-    if (HasError())
+    if (FieldDelegateHasError())
       height++;
     return height;
   }
@@ -1138,7 +1141,7 @@
   }
 
   void DrawError(SubPad &surface) {
-    if (!HasError())
+    if (!FieldDelegateHasError())
       return;
     surface.MoveCursor(0, 0);
     surface.AttributeOn(COLOR_PAIR(RedOnBlack));
@@ -1239,6 +1242,8 @@
     return eKeyNotHandled;
   }
 
+  bool FieldDelegateHasError() override { return !m_error.empty(); }
+
   void FieldDelegateExitCallback() override {
     if (!IsSpecified() && m_required)
       SetError("This field is required!");
@@ -1246,8 +1251,6 @@
 
   bool IsSpecified() { return !m_content.empty(); }
 
-  bool HasError() { return !m_error.empty(); }
-
   void ClearError() { m_error.clear(); }
 
   const std::string &GetError() { return m_error; }
@@ -1920,6 +1923,19 @@
 
   void SetError(const char *error) { m_error = error; }
 
+  // If all fields are valid, true is returned. Otherwise, an error message is
+  // set and false is returned. This method is usually called at the start of an
+  // action that requires valid fields.
+  bool CheckFieldsValidity() {
+    for (int i = 0; i < GetNumberOfFields(); i++) {
+      if (GetField(i)->FieldDelegateHasError()) {
+        SetError("Some fields are invalid!");
+        return false;
+      }
+    }
+    return true;
+  }
+
   // Factory methods to create and add fields of specific types.
 
   TextFieldDelegate *AddTextField(const char *label, const char *content,
@@ -2535,6 +2551,10 @@
   void Attach(Window &window) {
     ClearError();
 
+    bool all_fields_are_valid = CheckFieldsValidity();
+    if (!all_fields_are_valid)
+      return;
+
     bool process_is_running = StopRunningProcess();
     if (process_is_running)
       return;


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D106459.361395.patch
Type: text/x-patch
Size: 2515 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/lldb-commits/attachments/20210724/d2b1e0e9/attachment.bin>


More information about the lldb-commits mailing list