runformat

microsoft · Mar 26, 2020 · 47f8591 · 47f8591 · github-actions · Mar 26, 2020
1 parent b5a6de3
commit 47f8591
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 28 deletions.
diff --git a/src/cascadia/TerminalApp/TerminalPage.cpp b/src/cascadia/TerminalApp/TerminalPage.cpp
@@ -665,7 +665,7 @@ namespace winrt::TerminalApp::implementation
                                                                     settings.InitialRows(),
                                                                     settings.InitialCols(),
                                                                     winrt::guid());
-            sessionGuid = (GUID)conhostConn.Guid();
+            sessionGuid = conhostConn.Guid();
             connection = conhostConn;
         }
 

diff --git a/src/cascadia/TerminalControl/TermControl.cpp b/src/cascadia/TerminalControl/TermControl.cpp
@@ -1189,7 +1189,6 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
                                     const int32_t delta,
                                     const bool isLeftButtonPressed)
     {
-
         if (_CanSendVTMouseInput())
         {
             // TODO this used to be
@@ -1206,7 +1205,7 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
         const auto ctrlPressed = WI_IsFlagSet(static_cast<uint32_t>(modifiers),
                                               static_cast<uint32_t>(VirtualKeyModifiers::Control));
         const auto shiftPressed = WI_IsFlagSet(static_cast<uint32_t>(modifiers),
-                                              static_cast<uint32_t>(VirtualKeyModifiers::Shift));
+                                               static_cast<uint32_t>(VirtualKeyModifiers::Shift));
 
         if (ctrlPressed && shiftPressed)
         {
@@ -1223,7 +1222,6 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
         return false;
     }
 
-
     // Method Description:
     // - This is part of the solution to GH#979
     // - Manually handle a scrolling event. This is used to help support

diff --git a/src/cascadia/TerminalControl/TermControl.h b/src/cascadia/TerminalControl/TermControl.h
@@ -227,7 +227,6 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
         void _Search(const winrt::hstring& text, const bool goForward, const bool caseSensitive);
         void _CloseSearchBoxControl(const winrt::Windows::Foundation::IInspectable& sender, Windows::UI::Xaml::RoutedEventArgs const& args);
 
-
         // TSFInputControl Handlers
         void _CompositionCompleted(winrt::hstring text);
         void _CurrentCursorPositionHandler(const IInspectable& sender, const CursorPositionEventArgs& eventArgs);

diff --git a/src/cascadia/WindowsTerminal/AppHost.cpp b/src/cascadia/WindowsTerminal/AppHost.cpp
@@ -17,7 +17,6 @@ using namespace winrt::Windows::Foundation::Numerics;
 using namespace ::Microsoft::Console;
 using namespace ::Microsoft::Console::Types;
 
-
 AppHost::AppHost() noexcept :
     _app{},
     _logic{ nullptr }, // don't make one, we're going to take a ref on app's
@@ -52,7 +51,7 @@ AppHost::AppHost() noexcept :
                                                 _logic,
                                                 std::placeholders::_1,
                                                 std::placeholders::_2));
-    _window->MouseScrolled({ this, &AppHost::_WindowMouseWheeled});
+    _window->MouseScrolled({ this, &AppHost::_WindowMouseWheeled });
     _window->MakeWindow();
 }
 

diff --git a/src/cascadia/WindowsTerminal/IslandWindow.cpp b/src/cascadia/WindowsTerminal/IslandWindow.cpp
@@ -264,21 +264,6 @@ void IslandWindow::OnSize(const UINT width, const UINT height)
     }
 }
 
-struct MyMsg {
-    UINT message;
-    WPARAM wparam;
-    LPARAM lparam;
-};
-
-BOOL CALLBACK okay(HWND child, LPARAM lp)
-{
-    MyMsg m = *((MyMsg*)lp);
-    PostMessage(child, m.message, m.wparam, m.lparam);
-
-    return true;
-
-}
-
 [[nodiscard]] LRESULT IslandWindow::MessageHandler(UINT const message, WPARAM const wparam, LPARAM const lparam) noexcept
 {
     switch (message)
@@ -359,7 +344,7 @@ BOOL CALLBACK okay(HWND child, LPARAM lp)
         // incorrect results on systems with multiple monitors. Systems with
         // multiple monitors can have negative x- and y- coordinates, and LOWORD
         // and HIWORD treat the coordinates as unsigned quantities.
-        const til::point eventPoint{GET_X_LPARAM(lparam), GET_Y_LPARAM(lparam)};
+        const til::point eventPoint{ GET_X_LPARAM(lparam), GET_Y_LPARAM(lparam) };
         // This mouse event is relative to the display origin, not the window. Convert here.
         const til::rectangle windowRect{ GetWindowRect() };
         const auto origin = windowRect.origin();
@@ -375,8 +360,6 @@ BOOL CALLBACK okay(HWND child, LPARAM lp)
     }
     }
 
-
-
     // TODO: handle messages here...
     return base_type::MessageHandler(message, wparam, lparam);
 }

diff --git a/src/til/ut_til/PointTests.cpp b/src/til/ut_til/PointTests.cpp
@@ -444,13 +444,12 @@ class PointTests
         // All ptrdiff_ts fit into a float, so there's no exception tests.
     }
 
-
     TEST_METHOD(Scaling)
     {
         Log::Comment(L"0.) Multiplication of two things that should be in bounds.");
         {
             const til::point pt{ 5, 10 };
-            const int scale = 23 ;
+            const int scale = 23;
 
             const til::point expected{ pt.x() * scale, pt.y() * scale };
 
@@ -486,7 +485,7 @@ class PointTests
         Log::Comment(L"3.) Division of two things that should be in bounds.");
         {
             const til::point pt{ 555, 510 };
-            const int scale = 23 ;
+            const int scale = 23;
 
             const til::point expected{ pt.x() / scale, pt.y() / scale };