Execute IWYU (#299)

src/ftxui/component/collapsible.cpp

@@ -1,11 +1,10 @@
-#include <memory>  // for make_unique, __shared_ptr_access, __shared_ptr_access<>::element_type, shared_ptr
+#include <string>   // for string
 #include <utility>  // for move
 
-#include "ftxui/component/component.hpp"       // for Make, Collapsible
-#include "ftxui/component/component_base.hpp"  // for ComponentBase, Component
-#include "ftxui/component/event.hpp"           // for Event
-#include "ftxui/dom/elements.hpp"              // for Element
-#include "ftxui/dom/node.hpp"                  // for Node
+#include "ftxui/component/component.hpp"  // for Checkbox, Maybe, Make, Vertical, Collapsible
+#include "ftxui/component/component_base.hpp"  // for Component, ComponentBase
+#include "ftxui/component/component_options.hpp"  // for CheckboxOption
+#include "ftxui/util/ref.hpp"                     // for Ref, ConstStringRef
 
 namespace ftxui {
 
@@ -14,7 +13,7 @@ namespace ftxui {
 /// @params label The label of the checkbox.
 /// @params child The children to display.
 /// @params show Hold the state about whether the children is displayed or not.
-/// 
+///
 /// ### Example
 /// ```cpp
 /// auto component = Collapsible("Show details", details);
@@ -22,24 +21,22 @@ namespace ftxui {
 ///
 /// ### Output
 /// ```
-/// 
+///
 /// ▼ Show details
 /// <details component>
 /// ```
-Component Collapsible(ConstStringRef label,
-                      Component child,
-                      Ref<bool> show) {
+Component Collapsible(ConstStringRef label, Component child, Ref<bool> show) {
   class Impl : public ComponentBase {
    public:
     Impl(ConstStringRef label, Component child, Ref<bool> show)
         : label_(label), show_(std::move(show)) {
-          CheckboxOption opt;
-          opt.style_checked = "▼ ";
-          opt.style_unchecked = "▶ ";
-          Add(Container::Vertical({
-              Checkbox(label_, show_.operator->(), opt),
-              Maybe(std::move(child), show_.operator->()),
-          }));
+      CheckboxOption opt;
+      opt.style_checked = "▼ ";
+      opt.style_unchecked = "▶ ";
+      Add(Container::Vertical({
+          Checkbox(label_, show_.operator->(), opt),
+          Maybe(std::move(child), show_.operator->()),
+      }));
     }
     ConstStringRef label_;
     Ref<bool> show_;

src/ftxui/component/input.cpp

@@ -1,8 +1,10 @@
-#include <algorithm>   // for max, min
+#include <stddef.h>    // for size_t
+#include <algorithm>   // for clamp, max, min
 #include <functional>  // for function
 #include <memory>      // for shared_ptr, allocator
-#include <string>      // for wstring, basic_string
+#include <string>      // for string, wstring
 #include <utility>     // for move
+#include <vector>      // for vector
 
 #include "ftxui/component/captured_mouse.hpp"     // for CapturedMouse
 #include "ftxui/component/component.hpp"          // for Make, Input
@@ -12,11 +14,10 @@
 #include "ftxui/component/event.hpp"  // for Event, Event::ArrowLeft, Event::ArrowRight, Event::Backspace, Event::Custom, Event::Delete, Event::End, Event::Home, Event::Return
 #include "ftxui/component/mouse.hpp"  // for Mouse, Mouse::Left, Mouse::Pressed
 #include "ftxui/component/screen_interactive.hpp"  // for Component
-#include "ftxui/dom/deprecated.hpp"                // for text
-#include "ftxui/dom/elements.hpp"  // for operator|, Element, reflect, text, dim, flex, focus, inverted, hbox, size, frame, select, underlined, Decorator, EQUAL, HEIGHT
+#include "ftxui/dom/elements.hpp"  // for operator|, text, Element, reflect, inverted, Decorator, flex, focus, hbox, size, bold, dim, frame, select, EQUAL, HEIGHT
 #include "ftxui/screen/box.hpp"    // for Box
-#include "ftxui/screen/string.hpp"  // for to_wstring, to_string
-#include "ftxui/util/ref.hpp"  // for WideStringRef, Ref, ConstStringRef, StringRef
+#include "ftxui/screen/string.hpp"  // for GlyphPosition, GlyphCount, to_string, CellToGlyphIndex, to_wstring
+#include "ftxui/util/ref.hpp"  // for StringRef, Ref, WideStringRef, ConstStringRef
 
 namespace ftxui {
 

src/ftxui/component/input_test.cpp

@@ -8,11 +8,12 @@
 #include "ftxui/component/component_base.hpp"  // for ComponentBase, Component
 #include "ftxui/component/component_options.hpp"  // for InputOption
 #include "ftxui/component/event.hpp"  // for Event, Event::ArrowLeft, Event::ArrowRight, Event::Backspace, Event::Delete, Event::End, Event::Home
-#include "ftxui/dom/elements.hpp"     // for Fit
-#include "ftxui/dom/node.hpp"         // for Render
-#include "ftxui/screen/screen.hpp"    // for Screen, Pixel
-#include "ftxui/util/ref.hpp"         // for Ref
-#include "gtest/gtest_pred_impl.h"    // for Test, EXPECT_EQ, TEST
+#include "ftxui/component/mouse.hpp"  // for Mouse, Mouse::Button, Mouse::Left, Mouse::Motion, Mouse::Pressed
+#include "ftxui/dom/elements.hpp"   // for Fit
+#include "ftxui/dom/node.hpp"       // for Render
+#include "ftxui/screen/screen.hpp"  // for Fixed, Screen, Pixel
+#include "ftxui/util/ref.hpp"       // for Ref
+#include "gtest/gtest_pred_impl.h"  // for Test, EXPECT_EQ, TEST
 
 using namespace ftxui;
 

src/ftxui/dom/benchmark_test.cpp

@@ -1,9 +1,9 @@
 #include <benchmark/benchmark.h>
 
 #include "ftxui/dom/elements.hpp"  // for separator, gauge, operator|, text, Element, blink, inverted, hbox, vbox, border
-#include "ftxui/dom/flexbox_config.hpp"  // for ftxui
-#include "ftxui/dom/node.hpp"            // for Render
-#include "ftxui/screen/screen.hpp"       // for Screen
+#include "ftxui/dom/node.hpp"      // for Render
+#include "ftxui/screen/color.hpp"  // for ftxui
+#include "ftxui/screen/screen.hpp"  // for Screen
 
 using namespace ftxui;
 

src/ftxui/dom/canvas.cpp

@@ -1,9 +1,20 @@
 #include "ftxui/dom/canvas.hpp"
 
-#include <map>
+#include <stdlib.h>   // for abs
+#include <algorithm>  // for max, min
+#include <cstdint>    // for uint8_t
+#include <map>        // for allocator, map
+#include <memory>     // for make_shared
+#include <utility>    // for move, pair
+#include <vector>     // for vector
 
-#include "ftxui/dom/elements.hpp"
-#include "ftxui/screen/screen.hpp"
+#include "ftxui/dom/elements.hpp"     // for Element, canvas
+#include "ftxui/dom/node.hpp"         // for Node
+#include "ftxui/dom/requirement.hpp"  // for Requirement
+#include "ftxui/screen/box.hpp"       // for Box
+#include "ftxui/screen/screen.hpp"    // for Pixel, Screen
+#include "ftxui/screen/string.hpp"    // for Utf8ToGlyphs
+#include "ftxui/util/ref.hpp"         // for ConstRef
 
 namespace ftxui {
 
@@ -233,10 +244,7 @@ void Canvas::DrawPointCircle(int x, int y, int radius, const Color& color) {
 /// @param y the y coordinate of the center of the circle.
 /// @param radius the radius of the circle.
 /// @param style the style of the circle.
-void Canvas::DrawPointCircle(int x,
-                             int y,
-                             int radius,
-                             const Stylizer& style) {
+void Canvas::DrawPointCircle(int x, int y, int radius, const Stylizer& style) {
   DrawPointEllipse(x, y, radius, radius, style);
 }
 
@@ -573,10 +581,7 @@ void Canvas::DrawBlockCircle(int x, int y, int radius, const Color& color) {
 /// @param y the y coordinate of the center of the circle.
 /// @param radius the radius of the circle.
 /// @param style the style of the circle.
-void Canvas::DrawBlockCircle(int x,
-                             int y,
-                             int radius,
-                             const Stylizer& style) {
+void Canvas::DrawBlockCircle(int x, int y, int radius, const Stylizer& style) {
   DrawBlockEllipse(x, y, radius, radius, style);
 }
 
@@ -782,7 +787,7 @@ void Canvas::DrawText(int x,
     cell.type = CellType::kText;
     cell.content.character = it;
     style(cell.content);
-    x+=2;
+    x += 2;
   }
 }
 
@@ -868,3 +873,7 @@ Element canvas(std::function<void(Canvas&)> fn) {
 }
 
 }  // 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/flexbox_test.cpp

@@ -3,8 +3,9 @@
 #include <string>                   // for allocator
 
 #include "ftxui/dom/elements.hpp"        // for text, flexbox
-#include "ftxui/dom/flexbox_config.hpp"  // for FlexboxConfig, FlexboxConfig::Direction, FlexboxConfig::AlignContent, FlexboxConfig::JustifyContent, FlexboxConfig::Direction::Column, FlexboxConfig::AlignItems, FlexboxConfig::JustifyContent::SpaceAround, FlexboxConfig::AlignContent::Center, FlexboxConfig::AlignContent::FlexEnd, FlexboxConfig::AlignContent::SpaceAround, FlexboxConfig::AlignContent::SpaceBetween, FlexboxConfig::AlignContent::SpaceEvenly, FlexboxConfig::AlignItems::Center, FlexboxConfig::AlignItems::FlexEnd, FlexboxConfig::Direction::ColumnInversed, FlexboxConfig::Direction::Row, FlexboxConfig::Direction::RowInversed, FlexboxConfig::JustifyContent::Center, FlexboxConfig::JustifyContent::SpaceBetween, ftxui
+#include "ftxui/dom/flexbox_config.hpp"  // for FlexboxConfig, FlexboxConfig::Direction, FlexboxConfig::AlignContent, FlexboxConfig::JustifyContent, FlexboxConfig::Direction::Column, FlexboxConfig::AlignItems, FlexboxConfig::JustifyContent::SpaceAround, FlexboxConfig::AlignContent::Center, FlexboxConfig::AlignContent::FlexEnd, FlexboxConfig::AlignContent::SpaceAround, FlexboxConfig::AlignContent::SpaceBetween, FlexboxConfig::AlignContent::SpaceEvenly, FlexboxConfig::AlignItems::Center, FlexboxConfig::AlignItems::FlexEnd, FlexboxConfig::Direction::ColumnInversed, FlexboxConfig::Direction::Row, FlexboxConfig::Direction::RowInversed, FlexboxConfig::JustifyContent::Center, FlexboxConfig::JustifyContent::SpaceBetween
 #include "ftxui/dom/node.hpp"            // for Render
+#include "ftxui/screen/color.hpp"        // for ftxui
 #include "ftxui/screen/screen.hpp"       // for Screen
 #include "gtest/gtest_pred_impl.h"       // for Test, EXPECT_EQ, TEST
 

src/ftxui/dom/focus.cpp

@@ -1,22 +1,17 @@
 #include <memory>   // for make_shared
 #include <utility>  // for move
 
-#include "ftxui/dom/elements.hpp"        // for Element, bold
-#include "ftxui/dom/node.hpp"            // for Node
+#include "ftxui/dom/elements.hpp"  // for Decorator, Element, focusPosition, focusPositionRelative
 #include "ftxui/dom/node_decorator.hpp"  // for NodeDecorator
-#include "ftxui/screen/box.hpp"          // for Box
-#include "ftxui/screen/screen.hpp"       // for Pixel, Screen
+#include "ftxui/dom/requirement.hpp"  // for Requirement, Requirement::NORMAL, Requirement::Selection
+#include "ftxui/screen/box.hpp"  // for Box
 
 namespace ftxui {
 
-namespace {
-
-}  // namespace
-
 /// @brief Used inside a `frame`, this force the view to be scrolled toward a
 /// a given position. The position is expressed in proportion of the requested
 /// size.
-/// 
+///
 /// For instance:
 /// - (0, 0) means that the view is scrolled toward the upper left.
 /// - (1, 0) means that the view is scrolled toward the upper right.
@@ -59,7 +54,7 @@ Decorator focusPositionRelative(float x, float y) {
 
 /// @brief Used inside a `frame`, this force the view to be scrolled toward a
 /// a given position. The position is expressed in the numbers of cells.
-/// 
+///
 /// @ingroup dom
 ///
 /// ### Example

src/ftxui/dom/gauge_test.cpp

@@ -2,11 +2,11 @@
 #include <gtest/gtest-test-part.h>  // for SuiteApiResolver, TestFactoryImpl, TestPartResult
 #include <memory>                   // for allocator
 
-#include "ftxui/dom/elements.hpp"        // for gauge
-#include "ftxui/dom/flexbox_config.hpp"  // for ftxui
-#include "ftxui/dom/node.hpp"            // for Render
-#include "ftxui/screen/screen.hpp"       // for Screen
-#include "gtest/gtest_pred_impl.h"       // for Test, EXPECT_EQ, TEST
+#include "ftxui/dom/elements.hpp"   // for gauge
+#include "ftxui/dom/node.hpp"       // for Render
+#include "ftxui/screen/color.hpp"   // for ftxui
+#include "ftxui/screen/screen.hpp"  // for Screen
+#include "gtest/gtest_pred_impl.h"  // for Test, EXPECT_EQ, TEST
 
 using namespace ftxui;
 using namespace ftxui;

src/ftxui/dom/gridbox_test.cpp

@@ -4,11 +4,11 @@
 #include <string>                   // for allocator, basic_string, string
 #include <vector>                   // for vector
 
-#include "ftxui/dom/elements.hpp"  // for text, operator|, Element, flex, flex_grow, Elements, flex_shrink, vtext, gridbox, vbox, border
-#include "ftxui/dom/flexbox_config.hpp"  // for ftxui
-#include "ftxui/dom/node.hpp"            // for Render
-#include "ftxui/screen/screen.hpp"       // for Screen
-#include "gtest/gtest_pred_impl.h"       // for Test, TEST, EXPECT_EQ
+#include "ftxui/dom/elements.hpp"  // for text, operator|, Element, flex, Elements, flex_grow, flex_shrink, vtext, gridbox, vbox, border
+#include "ftxui/dom/node.hpp"      // for Render
+#include "ftxui/screen/color.hpp"  // for ftxui
+#include "ftxui/screen/screen.hpp"  // for Screen
+#include "gtest/gtest_pred_impl.h"  // for Test, TEST, EXPECT_EQ
 
 using namespace ftxui;
 

src/ftxui/dom/hbox_test.cpp

@@ -4,10 +4,10 @@
 #include <vector>                   // for vector
 
 #include "ftxui/dom/elements.hpp"  // for text, operator|, Element, flex_grow, flex_shrink, hbox
-#include "ftxui/dom/flexbox_config.hpp"  // for ftxui
-#include "ftxui/dom/node.hpp"            // for Render
-#include "ftxui/screen/screen.hpp"       // for Screen
-#include "gtest/gtest_pred_impl.h"       // for Test, EXPECT_EQ, TEST
+#include "ftxui/dom/node.hpp"       // for Render
+#include "ftxui/screen/color.hpp"   // for ftxui
+#include "ftxui/screen/screen.hpp"  // for Screen
+#include "gtest/gtest_pred_impl.h"  // for Test, EXPECT_EQ, TEST
 
 using namespace ftxui;
 using namespace ftxui;

src/ftxui/dom/table_test.cpp

@@ -3,9 +3,9 @@
 #include <memory>                   // for allocator
 
 #include "ftxui/dom/elements.hpp"  // for LIGHT, flex, center, EMPTY, DOUBLE
-#include "ftxui/dom/flexbox_config.hpp"  // for ftxui
-#include "ftxui/dom/node.hpp"            // for Render
+#include "ftxui/dom/node.hpp"      // for Render
 #include "ftxui/dom/table.hpp"
+#include "ftxui/screen/color.hpp"   // for ftxui
 #include "ftxui/screen/screen.hpp"  // for Screen
 #include "gtest/gtest_pred_impl.h"  // for Test, EXPECT_EQ, TEST
 

src/ftxui/dom/text_test.cpp

@@ -2,11 +2,11 @@
 #include <gtest/gtest-test-part.h>  // for SuiteApiResolver, TestFactoryImpl, TestPartResult
 #include <string>                   // for allocator, string
 
-#include "ftxui/dom/elements.hpp"        // for text, operator|, border, Element
-#include "ftxui/dom/flexbox_config.hpp"  // for ftxui
-#include "ftxui/dom/node.hpp"            // for Render
-#include "ftxui/screen/screen.hpp"       // for Screen
-#include "gtest/gtest_pred_impl.h"       // for Test, EXPECT_EQ, TEST
+#include "ftxui/dom/elements.hpp"   // for text, operator|, border, Element
+#include "ftxui/dom/node.hpp"       // for Render
+#include "ftxui/screen/color.hpp"   // for ftxui
+#include "ftxui/screen/screen.hpp"  // for Screen
+#include "gtest/gtest_pred_impl.h"  // for Test, EXPECT_EQ, TEST
 
 using namespace ftxui;
 

src/ftxui/dom/vbox_test.cpp

@@ -5,10 +5,10 @@
 #include <vector>                   // for vector
 
 #include "ftxui/dom/elements.hpp"  // for vtext, operator|, Element, flex_grow, flex_shrink, vbox
-#include "ftxui/dom/flexbox_config.hpp"  // for ftxui
-#include "ftxui/dom/node.hpp"            // for Render
-#include "ftxui/screen/screen.hpp"       // for Screen
-#include "gtest/gtest_pred_impl.h"       // for Test, EXPECT_EQ, TEST
+#include "ftxui/dom/node.hpp"       // for Render
+#include "ftxui/screen/color.hpp"   // for ftxui
+#include "ftxui/screen/screen.hpp"  // for Screen
+#include "gtest/gtest_pred_impl.h"  // for Test, EXPECT_EQ, TEST
 
 using namespace ftxui;
 

src/ftxui/screen/string.cpp

@@ -288,7 +288,9 @@ std::vector<std::string> Utf8ToGlyphs(const std::string& input) {
   return out;
 }
 
-int GlyphPosition(const std::string& input, size_t glyph_to_skip, size_t start) {
+int GlyphPosition(const std::string& input,
+                  size_t glyph_to_skip,
+                  size_t start) {
   if (glyph_to_skip <= 0)
     return 0;
   size_t end = 0;

src/ftxui/screen/string_test.cpp

@@ -59,7 +59,6 @@ TEST(StringTest, GlyphCount) {
   EXPECT_EQ(GlyphCount("a\1a"), 2);
 }
 
-
 TEST(StringTest, GlyphPosition) {
   // Basic:
   EXPECT_EQ(GlyphPosition("", -1), 0);

src/ftxui/screen/terminal.cpp

@@ -23,7 +23,7 @@ namespace ftxui {
 // https://arthursonzogni.com/FTXUI/examples
 // This will have to be improved when someone has time to implement and need
 // it.
-static Dimensions fallback_size {140, 43};
+static Dimensions fallback_size{140, 43};
 Dimensions Terminal::Size() {
   return fallback_size;
 }
@@ -33,7 +33,7 @@ Dimensions Terminal::Size() {
 // The terminal size in VT100 was 80x24. It is still used nowadays by
 // default in many terminal emulator. That's a good choice for a fallback
 // value.
-static Dimensions fallback_size {80, 24};
+static Dimensions fallback_size{80, 24};
 Dimensions Terminal::Size() {
   CONSOLE_SCREEN_BUFFER_INFO csbi;
 
@@ -49,7 +49,7 @@ Dimensions Terminal::Size() {
 // The terminal size in VT100 was 80x24. It is still used nowadays by
 // default in many terminal emulator. That's a good choice for a fallback
 // value.
-static Dimensions fallback_size {80, 24};
+static Dimensions fallback_size{80, 24};
 Dimensions Terminal::Size() {
   winsize w{};
   const int status = ioctl(STDOUT_FILENO, TIOCGWINSZ, &w);