Run IWYU. (#208)

examples/component/input.cpp

@@ -1,12 +1,13 @@
 #include <memory>  // for allocator, __shared_ptr_access
-#include <string>  // for char_traits, operator+, wstring, basic_string
+#include <string>  // for char_traits, operator+, string, basic_string
 
-#include "ftxui/component/captured_mouse.hpp"     // for ftxui
+#include "ftxui/component/captured_mouse.hpp"  // for ftxui
-#include "ftxui/component/component.hpp"          // for Renderer, Vertical
+#include "ftxui/component/component.hpp"       // for Input, Renderer, Vertical
-#include "ftxui/component/component_base.hpp"     // for ComponentBase
+#include "ftxui/component/component_base.hpp"  // for ComponentBase
 #include "ftxui/component/component_options.hpp"  // for InputOption
 #include "ftxui/component/screen_interactive.hpp"  // for Component, ScreenInteractive
-#include "ftxui/dom/elements.hpp"  // for hbox, separator, Element, operator|, vbox, border
+#include "ftxui/dom/elements.hpp"  // for text, hbox, separator, Element, operator|, vbox, border
+#include "ftxui/util/ref.hpp"  // for Ref
 
 int main(int argc, const char* argv[]) {
   using namespace ftxui;

examples/component/menu_entries.cpp

@@ -1,12 +1,15 @@
-#include <functional>  // for function
 #include <iostream>  // for basic_ostream::operator<<, operator<<, endl, basic_ostream, basic_ostream<>::__ostream_type, cout, ostream
-#include <string>    // for string, basic_string, allocator
+#include <memory>    // for shared_ptr, __shared_ptr_access
-#include <vector>    // for vector
+#include <string>    // for to_string, allocator
 
-#include "ftxui/component/captured_mouse.hpp"      // for ftxui
+#include "ftxui/component/captured_mouse.hpp"  // for ftxui
-#include "ftxui/component/component.hpp"           // for Menu
+#include "ftxui/component/component.hpp"  // for MenuEntry, Renderer, Vertical
-#include "ftxui/component/component_options.hpp"   // for MenuOption
+#include "ftxui/component/component_base.hpp"      // for ComponentBase
+#include "ftxui/component/component_options.hpp"   // for MenuEntryOption
 #include "ftxui/component/screen_interactive.hpp"  // for ScreenInteractive
+#include "ftxui/dom/elements.hpp"  // for operator|, separator, Element, Decorator, color, text, hbox, size, bold, frame, inverted, vbox, HEIGHT, LESS_THAN, border
+#include "ftxui/screen/color.hpp"  // for Color, Color::Blue, Color::Cyan, Color::Green, Color::Red, Color::Yellow
+
 using namespace ftxui;
 
 // Define a special style for some menu entry.
@@ -22,23 +25,6 @@ MenuEntryOption Colored(ftxui::Color c) {
 int main(int argc, const char* argv[]) {
   auto screen = ScreenInteractive::TerminalOutput();
 
-    //Black        = 0,
-    //Red          = 1,
-    //Green        = 2,
-    //Yellow       = 3,
-    //Blue         = 4,
-    //Magenta      = 5,
-    //Cyan         = 6,
-    //GrayLight    = 7,
-    //GrayDark     = 8,
-    //RedLight     = 9,
-    //GreenLight   = 10,
-    //YellowLight  = 11,
-    //BlueLight    = 12,
-    //MagentaLight = 13,
-    //CyanLight    = 14,
-    //White        = 15,
-
   int selected = 0;
   auto menu = Container::Vertical(
       {

examples/component/nested_screen.cpp

@@ -1,12 +1,11 @@
-#include <memory>  // for shared_ptr, __shared_ptr_access
+#include <memory>  // for allocator, shared_ptr, __shared_ptr_access
-#include <string>  // for operator+, to_wstring
+#include <string>  // for operator+, string, char_traits, basic_string
 
 #include "ftxui/component/captured_mouse.hpp"  // for ftxui
-#include "ftxui/component/component.hpp"  // for Button, Horizontal, Renderer
+#include "ftxui/component/component.hpp"       // for Button, Vertical, Renderer
-#include "ftxui/component/component_base.hpp"      // for ComponentBase
+#include "ftxui/component/component_base.hpp"  // for ComponentBase
-#include "ftxui/component/component_options.hpp"   // for ButtonOption
 #include "ftxui/component/screen_interactive.hpp"  // for ScreenInteractive
-#include "ftxui/dom/elements.hpp"  // for separator, gauge, Element, operator|, vbox, border
+#include "ftxui/dom/elements.hpp"  // for separator, text, Element, operator|, vbox, border
 
 using namespace ftxui;
 
@@ -24,13 +23,14 @@ void Nested(std::string path) {
   });
   auto renderer = Renderer(layout, [&] {
     return vbox({
-        text("path: " + path),
+               text("path: " + path),
-        separator(),
+               separator(),
-        back_button->Render(),
+               back_button->Render(),
-        goto_1->Render(),
+               goto_1->Render(),
-        goto_2->Render(),
+               goto_2->Render(),
-        goto_3->Render(),
+               goto_3->Render(),
-    }) | border;
+           }) |
+           border;
   });
   screen.Loop(renderer);
 }
@@ -40,8 +40,8 @@ int main(int argc, const char* argv[]) {
   auto button_quit = Button("Quit", screen.ExitLoopClosure());
   auto button_nested = Button("Nested", [] { Nested(""); });
   screen.Loop(Container::Vertical({
-    button_quit,
+      button_quit,
-    button_nested,
+      button_nested,
   }));
   return 0;
 }

examples/dom/separator_style.cpp

@@ -1,10 +1,10 @@
-#include <ftxui/dom/elements.hpp>  // for text, operator|, vbox, border, Element, Fit, hbox
+#include <ftxui/screen/screen.hpp>  // for Screen
-#include <ftxui/screen/screen.hpp>  // for Full, Screen
+#include <iostream>                 // for endl, cout, ostream
-#include <iostream>
+#include <memory>                   // for allocator
-#include <memory>  // for allocator
 
-#include "ftxui/dom/node.hpp"    // for Render
+#include "ftxui/dom/elements.hpp"  // for text, hbox, separatorDouble, separatorHeavy, separatorLight, vbox, operator|, Element, Fit, borderDouble, borderHeavy, borderLight
-#include "ftxui/screen/box.hpp"  // for ftxui
+#include "ftxui/dom/node.hpp"      // for Render
+#include "ftxui/screen/box.hpp"    // for ftxui
 
 int main(int argc, const char* argv[]) {
   using namespace ftxui;

include/ftxui/component/component.hpp

@@ -19,6 +19,7 @@ struct InputOption;
 struct MenuOption;
 struct RadioboxOption;
 struct ToggleOption;
+struct MenuEntryOption;
 
 template <class T, class... Args>
 std::shared_ptr<T> Make(Args&&... args) {

include/ftxui/component/component_options.hpp

@@ -43,11 +43,11 @@ struct ButtonOption {
 /// @brief Option for the Checkbox component.
 /// @ingroup component
 struct CheckboxOption {
-  std::string style_checked = "▣ ";     ///< Prefix for a "checked" state.
+  std::string style_checked = "▣ ";    ///< Prefix for a "checked" state.
-  std::string style_unchecked = "☐ ";   ///< Prefix for a "unchecked" state.
+  std::string style_unchecked = "☐ ";  ///< Prefix for a "unchecked" state.
-  Decorator style_normal = nothing;     ///< style.
+  Decorator style_normal = nothing;    ///< style.
-  Decorator style_focused = inverted;   ///< Style when focused.
+  Decorator style_focused = inverted;  ///< Style when focused.
-  Decorator style_selected = bold;      ///< Style when selected.
+  Decorator style_selected = bold;     ///< Style when selected.
   Decorator style_selected_focused =
       Decorator(inverted) | bold;  ///< Style when selected and focused.
 
@@ -74,8 +74,8 @@ struct InputOption {
 /// @brief Option for the Radiobox component.
 /// @ingroup component
 struct RadioboxOption {
-  std::string style_checked = "◉ ";     ///< Prefix for a "checked" state.
+  std::string style_checked = "◉ ";    ///< Prefix for a "checked" state.
-  std::string style_unchecked = "○ ";   ///< Prefix for a "unchecked" state.
+  std::string style_unchecked = "○ ";  ///< Prefix for a "unchecked" state.
   Decorator style_normal = nothing;    ///< style.
   Decorator style_focused = inverted;  ///< Style when focused.
   Decorator style_selected = bold;     ///< Style when selected.

include/ftxui/component/screen_interactive.hpp

@@ -6,7 +6,7 @@
 #include <functional>                    // for function
 #include <memory>                        // for shared_ptr
 #include <string>                        // for string
-#include <thread>
+#include <thread>                        // for thread
 
 #include "ftxui/component/captured_mouse.hpp"  // for CapturedMouse
 #include "ftxui/component/event.hpp"           // for Event

include/ftxui/screen/color.hpp

@@ -2,7 +2,7 @@
 #define FTXUI_SCREEN_COLOR
 
 #include <stdint.h>  // for uint8_t
-#include <string>  // for wstring
+#include <string>    // for wstring
 
 #ifdef RGB
 // Workaround for wingdi.h (via Windows.h) defining macros that break things.

iwyu.imp

@@ -1,4 +1,5 @@
 [
+  { symbol: [ "char_traits", private, "<string>", public ] },
   { symbol: [ "ECHO", private, "<termios.h>", public ] },
   { symbol: [ "ICANON", private, "<termios.h>", public ] },
   { symbol: [ "TCSANOW", private, "<termios.h>", public ] },

src/ftxui/component/container.cpp

@@ -1,13 +1,15 @@
 #include <stddef.h>   // for size_t
 #include <algorithm>  // for max, min
-#include <memory>  // for __shared_ptr_access, shared_ptr, make_shared, allocator, __shared_ptr_access<>::element_type, allocator_traits<>::value_type
+#include <memory>  // for make_shared, __shared_ptr_access, allocator, shared_ptr, allocator_traits<>::value_type
 #include <utility>  // for move
 #include <vector>   // for vector, __alloc_traits<>::value_type
 
-#include "ftxui/component/component.hpp"  // for Component, Components, Horizontal, Vertical, Tab
+#include "ftxui/component/component.hpp"  // for Horizontal, Vertical, Tab
-#include "ftxui/component/component_base.hpp"  // for ComponentBase
+#include "ftxui/component/component_base.hpp"  // for Components, Component, ComponentBase
 #include "ftxui/component/event.hpp"  // for Event, Event::Tab, Event::TabReverse, Event::ArrowDown, Event::ArrowLeft, Event::ArrowRight, Event::ArrowUp
-#include "ftxui/dom/elements.hpp"     // for text, Elements, Element, hbox, vbox
+#include "ftxui/component/mouse.hpp"  // for Mouse, Mouse::WheelDown, Mouse::WheelUp
+#include "ftxui/dom/elements.hpp"  // for text, Elements, operator|, reflect, Element, hbox, vbox
+#include "ftxui/screen/box.hpp"  // for Box
 
 namespace ftxui {
 

src/ftxui/component/menu.cpp

@@ -185,10 +185,10 @@ Component MenuEntry(ConstStringRef label, Ref<MenuEntryOption> option) {
    private:
     Element Render() override {
       bool focused = Focused();
-      auto style = hovered_ ? (focused ? option_->style_selected_focused
+      auto style =
-                                        : option_->style_selected)
+          hovered_ ? (focused ? option_->style_selected_focused
-                            : (focused ? option_->style_focused
+                              : option_->style_selected)
-                                        : option_->style_normal);
+                   : (focused ? option_->style_focused : option_->style_normal);
       auto focus_management = focused ? select : nothing;
       auto label = focused ? "> " + (*label_)  //
                            : "  " + (*label_);

src/ftxui/dom/border.cpp

@@ -149,7 +149,6 @@ Element border(Element child) {
   return std::make_shared<Border>(unpack(std::move(child)), ROUNDED);
 }
 
-
 /// @brief Same as border but with a constant Pixel around the element.
 /// @ingroup dom
 /// @see border

src/ftxui/dom/box_helper.cpp

@@ -1,5 +1,7 @@
 #include "ftxui/dom/box_helper.hpp"
 
+#include <algorithm>  // for max
+
 namespace ftxui {
 namespace box_helper {
 
@@ -83,3 +85,7 @@ void Compute(std::vector<Element>* elements, int target_size) {
 
 }  // namespace box_helper
 }  // namespace ftxui
+
+// Copyright 2021 Arthur Sonzogni. All rights reserved.
+// Use of this source code is governed by the MIT license that can be found in
+// the LICENSE file.

src/ftxui/dom/box_helper.hpp

@@ -22,3 +22,7 @@ void Compute(std::vector<Element>* elements, int target_size);
 }  // namespace ftxui
 
 #endif /* end of include guard: FTXUI_DOM_BOX_HELPER_HPP */
+
+// Copyright 2021 Arthur Sonzogni. All rights reserved.
+// Use of this source code is governed by the MIT license that can be found in
+// the LICENSE file.

src/ftxui/dom/gauge.cpp

@@ -1,6 +1,6 @@
-#include <cmath>
+#include <algorithm>  // for max, min
-#include <memory>  // for allocator, make_shared
+#include <memory>     // for allocator, make_shared
-#include <string>  // for string
+#include <string>     // for string
 
 #include "ftxui/dom/elements.hpp"     // for Element, gauge
 #include "ftxui/dom/node.hpp"         // for Node

src/ftxui/dom/gridbox.cpp

@@ -1,16 +1,17 @@
-#include <iostream>
+#include <stddef.h>   // for size_t
-#include <algorithm>  // for max
+#include <algorithm>  // for max, min
-#include <memory>     // for __shared_ptr_access, shared_ptr, make_shared
+#include <memory>  // for __shared_ptr_access, shared_ptr, make_shared, allocator_traits<>::value_type
-#include <utility>    // for move
+#include <utility>  // for move
-#include <vector>     // for vector
+#include <vector>   // for vector, __alloc_traits<>::value_type
 
-#include "ftxui/dom/box_helper.hpp"   // for Requirement
+#include "ftxui/dom/box_helper.hpp"   // for Element, Compute
-#include "ftxui/dom/elements.hpp"     // for Element, Elements, hbox
+#include "ftxui/dom/elements.hpp"     // for Elements, filler, Element, gridbox
 #include "ftxui/dom/node.hpp"         // for Node
 #include "ftxui/dom/requirement.hpp"  // for Requirement
 #include "ftxui/screen/box.hpp"       // for Box
 
 namespace ftxui {
+class Screen;
 
 class GridBox : public Node {
  public:
@@ -19,9 +20,9 @@ class GridBox : public Node {
     for (const auto& line : lines_)
       x_size = std::max(x_size, (int)line.size());
     for (auto& line : lines_) {
-        while (line.size() < (size_t)y_size) {
+      while (line.size() < (size_t)y_size) {
-          line.push_back(filler());
+        line.push_back(filler());
-        }
+      }
     }
   }
 
@@ -33,8 +34,8 @@ class GridBox : public Node {
     requirement_.flex_shrink_x = 0;
     requirement_.flex_shrink_y = 0;
 
-    for(auto& line : lines_) {
+    for (auto& line : lines_) {
-      for(auto& cell : line) {
+      for (auto& cell : line) {
         cell->ComputeRequirement();
 
         // Determine focus based on the focused child.

src/ftxui/dom/gridbox_test.cpp

@@ -1,11 +1,12 @@
 #include <gtest/gtest-message.h>  // for Message
 #include <gtest/gtest-test-part.h>  // for SuiteApiResolver, TestFactoryImpl, TestPartResult
+#include <algorithm>                // for remove
 #include <string>                   // for allocator, basic_string, string
 #include <vector>                   // for vector
 
-#include "ftxui/dom/elements.hpp"  // for text, operator|, Element, flex_grow, flex_shrink, gridbox
+#include "ftxui/dom/elements.hpp"  // for text, operator|, Element, flex, flex_grow, Elements, flex_shrink, vtext, gridbox, vbox, border
-#include "ftxui/dom/node.hpp"       // for Render
+#include "ftxui/dom/node.hpp"      // for Render
-#include "ftxui/screen/box.hpp"     // for ftxui
+#include "ftxui/screen/box.hpp"    // for ftxui
 #include "ftxui/screen/screen.hpp"  // for Screen
 #include "gtest/gtest_pred_impl.h"  // for Test, EXPECT_EQ, TEST
 

src/ftxui/dom/hbox.cpp

@@ -1,11 +1,12 @@
+#include <stddef.h>   // for size_t
 #include <algorithm>  // for max
-#include <memory>     // for __shared_ptr_access, shared_ptr, make_shared
+#include <memory>  // for __shared_ptr_access, shared_ptr, make_shared, allocator_traits<>::value_type
-#include <utility>    // for move
+#include <utility>  // for move
-#include <vector>     // for vector
+#include <vector>   // for vector, __alloc_traits<>::value_type
 
-#include "ftxui/dom/box_helper.hpp"   // for Box
+#include "ftxui/dom/box_helper.hpp"   // for Element, Compute
 #include "ftxui/dom/elements.hpp"     // for Element, Elements, hbox
-#include "ftxui/dom/node.hpp"         // for Node
+#include "ftxui/dom/node.hpp"         // for Node, Elements
 #include "ftxui/dom/requirement.hpp"  // for Requirement
 #include "ftxui/screen/box.hpp"       // for Box
 

src/ftxui/dom/reflect.cpp

@@ -1,11 +1,12 @@
 #include <memory>   // for make_shared, __shared_ptr_access
 #include <utility>  // for move
-#include <vector>   // for __alloc_traits<>::value_type, vector
+#include <vector>   // for __alloc_traits<>::value_type
 
 #include "ftxui/dom/elements.hpp"     // for Element, unpack, Decorator, reflect
-#include "ftxui/dom/node.hpp"         // for Node
+#include "ftxui/dom/node.hpp"         // for Node, Elements
 #include "ftxui/dom/requirement.hpp"  // for Requirement
 #include "ftxui/screen/box.hpp"       // for Box
+#include "ftxui/screen/screen.hpp"    // for Screen
 
 namespace ftxui {
 

src/ftxui/dom/vbox.cpp

@@ -1,11 +1,12 @@
+#include <stddef.h>   // for size_t
 #include <algorithm>  // for max
-#include <memory>     // for __shared_ptr_access, shared_ptr, make_shared
+#include <memory>  // for __shared_ptr_access, shared_ptr, make_shared, allocator_traits<>::value_type
-#include <utility>    // for move
+#include <utility>  // for move
-#include <vector>     // for vector
+#include <vector>   // for vector, __alloc_traits<>::value_type
 
-#include "ftxui/dom/box_helper.hpp"  // for Box
+#include "ftxui/dom/box_helper.hpp"   // for Element, Compute
 #include "ftxui/dom/elements.hpp"     // for Element, Elements, vbox
-#include "ftxui/dom/node.hpp"         // for Node
+#include "ftxui/dom/node.hpp"         // for Node, Elements
 #include "ftxui/dom/requirement.hpp"  // for Requirement
 #include "ftxui/screen/box.hpp"       // for Box
 

src/ftxui/screen/screen.cpp

@@ -1,7 +1,9 @@
+#include <stdint.h>  // for uint16_t
 #include <iostream>  // for operator<<, stringstream, basic_ostream, flush, cout, ostream
-#include <map>
+#include <map>      // for _Rb_tree_const_iterator, map, operator!=, operator==
-#include <memory>   // for allocator
+#include <memory>   // for allocator, allocator_traits<>::value_type
 #include <sstream>  // IWYU pragma: keep
+#include <utility>  // for pair
 
 #include "ftxui/screen/screen.hpp"
 #include "ftxui/screen/string.hpp"    // for string_width