Skip to content

Commit

Permalink
pr nits
Browse files Browse the repository at this point in the history
  • Loading branch information
zadjii-msft committed Dec 18, 2020
1 parent d08e65c commit e101efd
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 11 deletions.
1 change: 1 addition & 0 deletions src/cascadia/Remoting/CommandlineArgs.cpp
Expand Up @@ -8,6 +8,7 @@ using namespace winrt::Windows::Foundation;

namespace winrt::Microsoft::Terminal::Remoting::implementation
{
// LOAD BEARING CODE
// If you try to move this into the header, you will experience P A I N
// It must be defined after CommandlineArgs.g.cpp, otherwise the compiler
// will give you just the most impossible template errors to try and
Expand Down
3 changes: 0 additions & 3 deletions src/cascadia/Remoting/Microsoft.Terminal.RemotingLib.vcxproj
Expand Up @@ -82,9 +82,6 @@
<ItemDefinitionGroup>
<ClCompile>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<AdditionalIncludeDirectories>..;$(OpenConsoleDir)\dep\jsoncpp\json;%(AdditionalIncludeDirectories);</AdditionalIncludeDirectories>
<!-- Manually disable unreachable code warning, because jconcpp has a ton of that. -->
<DisableSpecificWarnings>4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
<AdditionalDependencies>WindowsApp.lib;user32.lib;shell32.lib;%(AdditionalDependencies)</AdditionalDependencies>
Expand Down
4 changes: 2 additions & 2 deletions src/cascadia/Remoting/Monarch.cpp
Expand Up @@ -115,7 +115,7 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
// Method Description:
// - Try to handle a commandline from a new WT invocation. We might need to
// hand the commandline to an existing window, or we might need to tell
// the caller that they need to become a new window to handle it themself.
// the caller that they need to become a new window to handle it themselves.
// Arguments:
// - <none>
// Return Value:
Expand All @@ -127,7 +127,7 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
// version of this function, with a naive implementation. For now, we
// always want to create a new window, so we'll just return true. This
// will tell the caller that we didn't handle the commandline, and they
// should open a new window to deal with it themself.
// should open a new window to deal with it themselves.
return true;
}

Expand Down
4 changes: 2 additions & 2 deletions src/cascadia/Remoting/WindowManager.cpp
Expand Up @@ -49,7 +49,7 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation

_peasant.ExecuteCommandline(args);
}
// Othersize, we'll do _nothing_.
// Otherwise, we'll do _nothing_.
}

bool WindowManager::ShouldCreateWindow()
Expand All @@ -74,7 +74,7 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
// definitions for our types automatically. This only works in the following
// cases:
//
// * If we're running unpackaged: the .winmd but be a sibling of the .exe
// * If we're running unpackaged: the .winmd must be a sibling of the .exe
// * If we're running packaged: the .winmd must be in the package root
_monarch = create_instance<Remoting::Monarch>(Monarch_clsid,
CLSCTX_LOCAL_SERVER);
Expand Down
2 changes: 1 addition & 1 deletion src/cascadia/Remoting/WindowManager.h
Expand Up @@ -7,7 +7,7 @@

namespace winrt::Microsoft::Terminal::Remoting::implementation
{
struct WindowManager : public WindowManagerT<WindowManager>
struct WindowManager final : public WindowManagerT<WindowManager>
{
WindowManager();
~WindowManager();
Expand Down
3 changes: 1 addition & 2 deletions src/cascadia/WindowsTerminal/AppHost.cpp
Expand Up @@ -3,7 +3,6 @@

#include "pch.h"
#include "AppHost.h"
// #include "MonarchFactory.h"
#include "../types/inc/Viewport.hpp"
#include "../types/inc/utils.hpp"
#include "../types/inc/User32Utils.hpp"
Expand Down Expand Up @@ -129,7 +128,7 @@ void _buildArgsFromCommandline(std::vector<winrt::hstring>& args)
// Method Description:
// - Retrieve any commandline args passed on the commandline, and pass them to
// the WindowManager, to ask if we should become a window process.
// - If we should create a window, then pass the arguements to the app logic for
// - If we should create a window, then pass the arguments to the app logic for
// processing.
// - If we shouldn't become a window, set _shouldCreateWindow to false and exit
// immediately.
Expand Down
2 changes: 1 addition & 1 deletion tools/tests.xml
Expand Up @@ -6,7 +6,7 @@
<test name="terminalApp" type="unit" binary="UnitTests_TerminalApp\Terminal.App.Unit.Tests.dll" />
<test name="localTerminalApp" type="unit" runInHostApp="true" binary="TerminalApp.LocalTests.dll" />
<test name="localSettingsModel" type="unit" runInHostApp="true" binary="SettingsModel.LocalTests.dll" />
<test name="unitRemoting" type="unit" runInHostApp="true" binary="Remoting.UnitTests.dll" />
<test name="unitRemoting" type="unit" binary="Remoting.UnitTests.dll" />
<test name="interactivityWin32" type="unit" binary="Conhost.Interactivity.Win32.Unit.Tests.dll" />
<test name="terminal" type="unit" binary="ConParser.Unit.Tests.dll" />
<test name="adapter" type="unit" binary="ConAdapter.Unit.Tests.dll" />
Expand Down

1 comment on commit e101efd

@github-actions

This comment was marked as outdated.

Please sign in to comment.