From 71c75561e5df3db53cfe6f9da1173a46441b99ed Mon Sep 17 00:00:00 2001 From: Dimitri Papadopoulos Orfanos <3234522+DimitriPapadopoulos@users.noreply.github.com> Date: Thu, 17 Feb 2022 18:58:31 +0100 Subject: [PATCH] Fix typos found by codespell (#12475) ## Summary of the Pull Request Fix typos found by codespell. Some of it in documentation and user-visible text, mostly in code comments. While I understand you might not be interested in fixing code comments, one of the reasons being extra noise in git history, kindly note that most spell checking tools do not discriminate between documentation and code comments. So it's easier to fix everything for long maintenance. ## References ## PR Checklist * [ ] Closes #xxx * [X] CLA signed. If not, go over [here](https://cla.opensource.microsoft.com/microsoft/Terminal) and sign the CLA * [x] Tests added/passed * [X] Documentation updated. If checked, please file a pull request on [our docs repo](https://github.com/MicrosoftDocs/terminal) and link it here: [#501](https://github.com/MicrosoftDocs/terminal/pull/501) * [ ] Schema updated. * [ ] I've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx ## Detailed Description of the Pull Request / Additional comments ## Validation Steps Performed I have checked and re-checked all changes. --- .github/actions/spelling/expect/expect.txt | 4 ---- doc/Niksa.md | 2 +- doc/cascadia/Unittesting-CppWinRT-Xaml.md | 2 +- doc/specs/#1790 - Font features and axes-spec.md | 2 +- .../#2871 - Pane Navigation/#2871 - Pane Navigation.md | 2 +- .../#1032 - Elevation Quality of Life Improvements.md | 2 +- .../#5000 - Process Model 2.0/#5000 - Process Model 2.0.md | 2 +- doc/specs/#6899 - Action IDs/#6899 - Action IDs.md | 2 +- .../#885 - Terminal Settings Model.md | 2 +- doc/specs/TerminalSettings-spec.md | 2 +- doc/specs/drafts/#1256 - Tab tearoff.md | 2 +- doc/specs/drafts/#997 Non-Terminal-Panes.md | 2 +- samples/ConPTY/MiniTerm/MiniTerm/PseudoConsole.cs | 2 +- samples/ReadConsoleInputStream/ReadConsoleInputStream.cs | 4 ++-- src/buffer/out/textBuffer.cpp | 2 +- src/cascadia/TerminalApp/TerminalPage.cpp | 4 ++-- src/cascadia/TerminalApp/TerminalTab.cpp | 2 +- src/cascadia/TerminalControl/TermControl.cpp | 2 +- .../TerminalSettingsSerializationHelpers.h | 2 +- .../UnitTests_TerminalCore/ConptyRoundtripTests.cpp | 6 +++--- src/cascadia/WindowsTerminal/AppHost.cpp | 2 +- src/cascadia/WindowsTerminal/IslandWindow.cpp | 6 +++--- src/host/popup.cpp | 2 +- src/host/screenInfo.cpp | 2 +- src/host/selectionInput.cpp | 2 +- src/host/ut_host/ScreenBufferTests.cpp | 2 +- src/inc/consoletaeftemplates.hpp | 6 +++--- src/interactivity/win32/Clipboard.cpp | 2 +- .../win32/ut_interactivity_win32/UiaTextRangeTests.cpp | 2 +- src/renderer/dx/CustomTextLayout.cpp | 2 +- src/renderer/dx/DxRenderer.cpp | 2 +- src/renderer/dx/DxRenderer.hpp | 2 +- src/renderer/inc/IRenderData.hpp | 2 +- src/terminal/adapter/adaptDispatch.cpp | 4 ++-- src/terminal/adapter/ut_adapter/adapterTest.cpp | 2 +- src/terminal/adapter/ut_adapter/inputTest.cpp | 2 +- src/terminal/parser/ut_parser/StateMachineTest.cpp | 4 ++-- src/tools/MonarchPeasantSample/AppState.cpp | 2 +- src/tools/ansi-color/ansi-color.cmd | 6 +++--- src/tools/ansi-color/crisman.def | 4 ++-- src/types/viewport.cpp | 2 +- tools/bcz.cmd | 4 ++-- 42 files changed, 55 insertions(+), 59 deletions(-) diff --git a/.github/actions/spelling/expect/expect.txt b/.github/actions/spelling/expect/expect.txt index 3afa4c4765..6706e4ef04 100644 --- a/.github/actions/spelling/expect/expect.txt +++ b/.github/actions/spelling/expect/expect.txt @@ -678,7 +678,6 @@ dxp dxsm dxttbmp Dyreen -eachother eaf EASTEUROPE ECH @@ -829,7 +828,6 @@ FORCEOFFFEEDBACK FORCEONFEEDBACK FORCEV foreach -forground fprintf framebuffer FRAMECHANGED @@ -1698,7 +1696,6 @@ outfile Outof OUTOFCONTEXT OUTOFMEMORY -outout Outptr outstr OVERLAPPEDWINDOW @@ -1850,7 +1847,6 @@ pragma prc prealigned prebuilt -precendence precomp prect prefast diff --git a/doc/Niksa.md b/doc/Niksa.md index c4c7e47988..c3f8a1fa1a 100644 --- a/doc/Niksa.md +++ b/doc/Niksa.md @@ -163,7 +163,7 @@ Given that we're using Xaml islands to host a modern UI and stitching a DirectX Now, the obvious followup question is _"why can't you have one elevated connection in a tab next to a non-elevated connection?"_ This is where @sba923 should pick up reading (:smile:). I'm probably going to cover some things that you (@robomac) know already. -[2] When you have two windows on the same desktop in the same window station, they can communicate with eachother. I can use `SendKeys` easily through `WScript.Shell` to send keyboard input to any window that the shell can see. +[2] When you have two windows on the same desktop in the same window station, they can communicate with each other. I can use `SendKeys` easily through `WScript.Shell` to send keyboard input to any window that the shell can see. Running a process elevated _severs_ that connection. The shell can't see the elevated window. No other program at the same integrity level as the shell can see the elevated window. Even if it has its window handle, it can't really interact with it. This is also why you can't drag/drop from explorer into notepad if notepad is running elevated. Only another elevated process can interact with another elevated window. diff --git a/doc/cascadia/Unittesting-CppWinRT-Xaml.md b/doc/cascadia/Unittesting-CppWinRT-Xaml.md index 4160e035e2..9ddcae046a 100644 --- a/doc/cascadia/Unittesting-CppWinRT-Xaml.md +++ b/doc/cascadia/Unittesting-CppWinRT-Xaml.md @@ -268,7 +268,7 @@ this: ``` -Again, verify the correct paths to your dependant C++/WinRT dlls, as they may be +Again, verify the correct paths to your dependent C++/WinRT dlls, as they may be different than the above #### Activating the manifest from TAEF diff --git a/doc/specs/#1790 - Font features and axes-spec.md b/doc/specs/#1790 - Font features and axes-spec.md index 63b5623036..fd0f59bb7e 100644 --- a/doc/specs/#1790 - Font features and axes-spec.md +++ b/doc/specs/#1790 - Font features and axes-spec.md @@ -74,7 +74,7 @@ Should not affect security. ### Reliability -Aside from additional parsing required for the settings file (which inherently offers more locations for parsing to fail), we need to be careful about badly formed/non-existant feature tags or axes specified in the user-defined dictionaries. We must make sure to ignore such declarations (perhaps alongside emitting a warning to the user) and only apply those that are correctly formed and exist. +Aside from additional parsing required for the settings file (which inherently offers more locations for parsing to fail), we need to be careful about badly formed/non-existent feature tags or axes specified in the user-defined dictionaries. We must make sure to ignore such declarations (perhaps alongside emitting a warning to the user) and only apply those that are correctly formed and exist. ### Compatibility diff --git a/doc/specs/#2871 - Pane Navigation/#2871 - Pane Navigation.md b/doc/specs/#2871 - Pane Navigation/#2871 - Pane Navigation.md index 64fcf5d782..e4b5ec6a4f 100644 --- a/doc/specs/#2871 - Pane Navigation/#2871 - Pane Navigation.md +++ b/doc/specs/#2871 - Pane Navigation/#2871 - Pane Navigation.md @@ -241,7 +241,7 @@ So `focusPane(target=1, direction=up)` will attempt to focus the pane above pane > 👉 **NOTE**: At this point, the author considered "Do we even want a separate > action to engage the tab switcher with panes expanded?" Perhaps panes being -> visible in the tab switcher is just part fo the tab switcher's behavior. Maybe +> visible in the tab switcher is just part of the tab switcher's behavior. Maybe > there shouldn't be a separate "open the tab switcher with the panes expanded > to the pane I'm currently on, and the panes listed in MRU order" action. diff --git a/doc/specs/#5000 - Process Model 2.0/#1032 - Elevation Quality of Life Improvements.md b/doc/specs/#5000 - Process Model 2.0/#1032 - Elevation Quality of Life Improvements.md index 1757352e9c..a1137a77ac 100644 --- a/doc/specs/#5000 - Process Model 2.0/#1032 - Elevation Quality of Life Improvements.md +++ b/doc/specs/#5000 - Process Model 2.0/#1032 - Elevation Quality of Life Improvements.md @@ -552,7 +552,7 @@ following behaviors: * `false`: If the current window is elevated, try to create a new unelevated window to host this connection. -We could always re-introduce this setting, to supercede `elevate`. +We could always re-introduce this setting, to supersede `elevate`. ### Change profile appearance for elevated windows diff --git a/doc/specs/#5000 - Process Model 2.0/#5000 - Process Model 2.0.md b/doc/specs/#5000 - Process Model 2.0/#5000 - Process Model 2.0.md index c1a3dee38d..e32af6b72e 100644 --- a/doc/specs/#5000 - Process Model 2.0/#5000 - Process Model 2.0.md +++ b/doc/specs/#5000 - Process Model 2.0/#5000 - Process Model 2.0.md @@ -1123,7 +1123,7 @@ elevated windows, when they trust the extension. We could have an additional set of settings the user could use to enable certain extensions in elevated windows. However, this setting cannot live in the normal `settings.json` or even `state.json` (see [#7972], since those files are writable by any medium-IL -process. Instead, this setting would ned to live in a separate file that's +process. Instead, this setting would need to live in a separate file that's protected to only be writable by elevated processes. This would ensure that an attacker could not just add their extension to the list of white-listed extensions. When the settings UI wants to modify that setting, it'll need to diff --git a/doc/specs/#6899 - Action IDs/#6899 - Action IDs.md b/doc/specs/#6899 - Action IDs/#6899 - Action IDs.md index c3d2871cb3..50faf9d1ef 100644 --- a/doc/specs/#6899 - Action IDs/#6899 - Action IDs.md +++ b/doc/specs/#6899 - Action IDs/#6899 - Action IDs.md @@ -26,7 +26,7 @@ This spec was largely inspired by the following diagram from @DHowett: ![figure 1](data-mockup.png) The goal is to introduce an `id` parameter by which actions could be uniquely -refered to. If we'd ever like to use an action outside the list of `actions`, we +referred to. If we'd ever like to use an action outside the list of `actions`, we can simply refer to the action's ID, allowing the user to only define the action _once_. diff --git a/doc/specs/#885 - Terminal Settings Model/#885 - Terminal Settings Model.md b/doc/specs/#885 - Terminal Settings Model/#885 - Terminal Settings Model.md index c7dbefeab0..ad36121840 100644 --- a/doc/specs/#885 - Terminal Settings Model/#885 - Terminal Settings Model.md +++ b/doc/specs/#885 - Terminal Settings Model/#885 - Terminal Settings Model.md @@ -230,7 +230,7 @@ def cloneGraph(oldSource, newSource, visited): for old in oldSource.adj: # Below check is for backtracking, so new - # nodes don't get initialized everytime + # nodes don't get initialized every time if clone is None or(clone is not None and clone.key != old.key): clone = Node(old.key, []) newSource.adj.append(clone) diff --git a/doc/specs/TerminalSettings-spec.md b/doc/specs/TerminalSettings-spec.md index 1bf098274a..16d3cfbd93 100644 --- a/doc/specs/TerminalSettings-spec.md +++ b/doc/specs/TerminalSettings-spec.md @@ -58,7 +58,7 @@ VS needs to be able to persist settings just as a simple set of global settings. When the application needs to retrieve these settings, they need to use them as a tripartite structure: frontend-component-terminal settings. Each frontend will have its own set of settings. -Each component implementation will also ned to have some settings that control it. +Each component implementation will also need to have some settings that control it. The terminal also will have some settings specific to the terminal. ### Globals and Profiles diff --git a/doc/specs/drafts/#1256 - Tab tearoff.md b/doc/specs/drafts/#1256 - Tab tearoff.md index d57a695067..fa1b2e9a0d 100644 --- a/doc/specs/drafts/#1256 - Tab tearoff.md +++ b/doc/specs/drafts/#1256 - Tab tearoff.md @@ -124,7 +124,7 @@ There's a few areas to study here. #### Communicating the launch For the parameters passing, I see a few options: -1. `conhost.exe` can look up the package registration for `wt.exe` and call an entrypoint with arguments. This could be adapted to instead look up which package is registered as the default one instead of `wt.exe` for third party hosts. We would have to build provisions into the OS to select this, or use some sort of publically documented registry key mechanism. Somewhat gross. +1. `conhost.exe` can look up the package registration for `wt.exe` and call an entrypoint with arguments. This could be adapted to instead look up which package is registered as the default one instead of `wt.exe` for third party hosts. We would have to build provisions into the OS to select this, or use some sort of publicly documented registry key mechanism. Somewhat gross. 1. `conhost.exe` can call the execution alias with parameters. WSL distro launchers use this. 1. We can define a protocol handler for these sorts of connections and let `wt.exe` register for it. Protocol handlers are already well supported and understood both by classic applications and by packaged/modern applications on Windows. They must have provisions to communicate at least some semblance of argument data as well. This is the route I'd probably prefer. `ms-term://incoming/` or something like that. The receiving `wt.exe` can contact the manager process (or set one up if it is the first) and negotiate receiving the session that was specified into a new tab. diff --git a/doc/specs/drafts/#997 Non-Terminal-Panes.md b/doc/specs/drafts/#997 Non-Terminal-Panes.md index 512165580b..6fb539cf33 100644 --- a/doc/specs/drafts/#997 Non-Terminal-Panes.md +++ b/doc/specs/drafts/#997 Non-Terminal-Panes.md @@ -77,7 +77,7 @@ is a bigger discussion than the feature at hand, however. ### Performance, Power, and Efficiency decide to host a WebView in a pane, then it surely could impact these measures. -I don't believe this will have a noticable impact _on its own_. Should the user +I don't believe this will have a noticeable impact _on its own_. Should the user However, I leave that discussion to the implementation of the actual alternative pane content itself. diff --git a/samples/ConPTY/MiniTerm/MiniTerm/PseudoConsole.cs b/samples/ConPTY/MiniTerm/MiniTerm/PseudoConsole.cs index 84d3d3d44b..50cb6064b6 100644 --- a/samples/ConPTY/MiniTerm/MiniTerm/PseudoConsole.cs +++ b/samples/ConPTY/MiniTerm/MiniTerm/PseudoConsole.cs @@ -26,7 +26,7 @@ namespace MiniTerm 0, out IntPtr hPC); if(createResult != 0) { - throw new InvalidOperationException("Could not create psuedo console. Error Code " + createResult); + throw new InvalidOperationException("Could not create pseudo console. Error Code " + createResult); } return new PseudoConsole(hPC); } diff --git a/samples/ReadConsoleInputStream/ReadConsoleInputStream.cs b/samples/ReadConsoleInputStream/ReadConsoleInputStream.cs index 2b0c8088a2..cc3c9158a1 100644 --- a/samples/ReadConsoleInputStream/ReadConsoleInputStream.cs +++ b/samples/ReadConsoleInputStream/ReadConsoleInputStream.cs @@ -136,7 +136,7 @@ namespace Samples.Terminal if (record.EventType != Kernel32.EVENT_TYPE.FOCUS_EVENT) { // I assume success adding records - this is not so critical - // if it is critical to you, loop on this with a miniscule delay + // if it is critical to you, loop on this with a minuscule delay _nonKeyEvents.TryAdd(record); } } @@ -195,4 +195,4 @@ namespace Samples.Terminal if (!CanRead) throw new NotSupportedException("Get read not supported."); } } -} \ No newline at end of file +} diff --git a/src/buffer/out/textBuffer.cpp b/src/buffer/out/textBuffer.cpp index 36266710a8..777dc83c1d 100644 --- a/src/buffer/out/textBuffer.cpp +++ b/src/buffer/out/textBuffer.cpp @@ -1751,7 +1751,7 @@ const TextBuffer::TextAndColor TextBuffer::GetText(const bool includeCRLF, if (copyTextColor) { - // cant see CR/LF so just use black FG & BK + // can't see CR/LF so just use black FG & BK COLORREF const Blackness = RGB(0x00, 0x00, 0x00); selectionFgAttr.push_back(Blackness); selectionFgAttr.push_back(Blackness); diff --git a/src/cascadia/TerminalApp/TerminalPage.cpp b/src/cascadia/TerminalApp/TerminalPage.cpp index 62444e2bf5..19ccaa195e 100644 --- a/src/cascadia/TerminalApp/TerminalPage.cpp +++ b/src/cascadia/TerminalApp/TerminalPage.cpp @@ -316,7 +316,7 @@ namespace winrt::TerminalApp::implementation // elevated window. if (!_startupActions || IsElevated() || _shouldStartInboundListener) { - // there arent startup actions, or we're elevated. In that case, go for it. + // there aren't startup actions, or we're elevated. In that case, go for it. return false; } @@ -1219,7 +1219,7 @@ namespace winrt::TerminalApp::implementation // message without vkey or scanCode if a user drags a tab. // The KeyChord constructor has a debug assertion ensuring that all KeyChord // either have a valid vkey/scanCode. This is important, because this prevents - // accidential insertion of invalid KeyChords into classes like ActionMap. + // accidental insertion of invalid KeyChords into classes like ActionMap. if (!vkey && !scanCode) { return; diff --git a/src/cascadia/TerminalApp/TerminalTab.cpp b/src/cascadia/TerminalApp/TerminalTab.cpp index 0c0617066a..bacba947c5 100644 --- a/src/cascadia/TerminalApp/TerminalTab.cpp +++ b/src/cascadia/TerminalApp/TerminalTab.cpp @@ -1415,7 +1415,7 @@ namespace winrt::TerminalApp::implementation selectedTabBrush.Color(color); // currently if a tab has a custom color, a deselected state is - // signified by using the same color with a bit ot transparency + // signified by using the same color with a bit of transparency auto deselectedTabColor = color; deselectedTabColor.A = 64; deselectedTabBrush.Color(deselectedTabColor); diff --git a/src/cascadia/TerminalControl/TermControl.cpp b/src/cascadia/TerminalControl/TermControl.cpp index cf415b000c..b6bb9e6b98 100644 --- a/src/cascadia/TerminalControl/TermControl.cpp +++ b/src/cascadia/TerminalControl/TermControl.cpp @@ -936,7 +936,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation // message without vkey or scanCode if a user drags a tab. // The KeyChord constructor has a debug assertion ensuring that all KeyChord // either have a valid vkey/scanCode. This is important, because this prevents - // accidential insertion of invalid KeyChords into classes like ActionMap. + // accidental insertion of invalid KeyChords into classes like ActionMap. if (!vkey && !scanCode) { e.Handled(true); diff --git a/src/cascadia/TerminalSettingsModel/TerminalSettingsSerializationHelpers.h b/src/cascadia/TerminalSettingsModel/TerminalSettingsSerializationHelpers.h index 26a83e0e42..940843fcbc 100644 --- a/src/cascadia/TerminalSettingsModel/TerminalSettingsSerializationHelpers.h +++ b/src/cascadia/TerminalSettingsModel/TerminalSettingsSerializationHelpers.h @@ -133,7 +133,7 @@ JSON_ENUM_MAPPER(::winrt::Microsoft::Terminal::Settings::Model::CloseOnExitMode) }; // This specialization isn't using JSON_ENUM_MAPPER because we need to have a different -// value type (unsinged int) and return type (FontWeight struct). JSON_ENUM_MAPPER +// value type (unsigned int) and return type (FontWeight struct). JSON_ENUM_MAPPER // expects that the value type _is_ the return type. template<> struct ::Microsoft::Terminal::Settings::Model::JsonUtils::ConversionTrait<::winrt::Windows::UI::Text::FontWeight> : diff --git a/src/cascadia/UnitTests_TerminalCore/ConptyRoundtripTests.cpp b/src/cascadia/UnitTests_TerminalCore/ConptyRoundtripTests.cpp index 8a812d75a2..0d7f72f1c6 100644 --- a/src/cascadia/UnitTests_TerminalCore/ConptyRoundtripTests.cpp +++ b/src/cascadia/UnitTests_TerminalCore/ConptyRoundtripTests.cpp @@ -4,7 +4,7 @@ // This test class creates an in-proc conpty host as well as a Terminal, to // validate that strings written to the conpty create the same response on the // terminal end. Tests can be written that validate both the contents of the -// host buffer as well as the terminal buffer. Everytime that +// host buffer as well as the terminal buffer. Every time that // `renderer.PaintFrame()` is called, the tests will validate the expected // output, and then flush the output of the VtEngine straight to the Terminal. @@ -392,7 +392,7 @@ void ConptyRoundtripTests::WriteTwoLinesUsesNewline() void ConptyRoundtripTests::WriteAFewSimpleLines() { Log::Comment(NoThrowString().Format( - L"Write more lines of outout. We should use \r\n to move the cursor")); + L"Write more lines of output. We should use \r\n to move the cursor")); auto& g = ServiceLocator::LocateGlobals(); auto& renderer = *g.pRender; @@ -3047,7 +3047,7 @@ void ConptyRoundtripTests::NewLinesAtBottomWithBackground() // Line 2 chars: ____#_________#___ (break) // Line 2 attrs: BBBBBBBBBBBBBBDDDD (First spacesToPrint+5 are blue BG, then default attrs) // [<----->] - // This number of spaces controled by spacesToPrint + // This number of spaces controlled by spacesToPrint if (i > 0) { sm.ProcessString(L"\r\n"); diff --git a/src/cascadia/WindowsTerminal/AppHost.cpp b/src/cascadia/WindowsTerminal/AppHost.cpp index f1380679c3..ec539fcfa5 100644 --- a/src/cascadia/WindowsTerminal/AppHost.cpp +++ b/src/cascadia/WindowsTerminal/AppHost.cpp @@ -392,7 +392,7 @@ void AppHost::Initialize() } // Method Description: -// - Called everytime when the active tab's title changes. We'll also fire off +// - Called every time when the active tab's title changes. We'll also fire off // a window message so we can update the window's title on the main thread, // though we'll only do so if the settings are configured for that. // Arguments: diff --git a/src/cascadia/WindowsTerminal/IslandWindow.cpp b/src/cascadia/WindowsTerminal/IslandWindow.cpp index cbd2509385..bacf5c35b5 100644 --- a/src/cascadia/WindowsTerminal/IslandWindow.cpp +++ b/src/cascadia/WindowsTerminal/IslandWindow.cpp @@ -389,7 +389,7 @@ void IslandWindow::_OnGetMinMaxInfo(const WPARAM /*wParam*/, const LPARAM lParam } // Method Description: -// - Helper function that calculates a singe dimension value, given initialWindow and nonClientSizes +// - Helper function that calculates a single dimension value, given initialWindow and nonClientSizes // Arguments: // - isWidth: parameter to pass to SnapDimensionCallback. // True if the method is invoked for width computation, false if for height. @@ -1332,7 +1332,7 @@ void IslandWindow::_dropdownWindow(const uint32_t dropdownDuration, { // First, get the window that's currently in the foreground. We'll need // _this_ window to be able to appear on top of. If we just use - // GetForegroundWindow afer the SetWindowPlacement call, _we_ will be the + // GetForegroundWindow after the SetWindowPlacement call, _we_ will be the // foreground window. const auto oldForegroundWindow = GetForegroundWindow(); @@ -1389,7 +1389,7 @@ void IslandWindow::_globalActivateWindow(const uint32_t dropdownDuration, { // First, get the window that's currently in the foreground. We'll need // _this_ window to be able to appear on top of. If we just use - // GetForegroundWindow afer the SetWindowPlacement/ShowWindow call, _we_ + // GetForegroundWindow after the SetWindowPlacement/ShowWindow call, _we_ // will be the foreground window. const auto oldForegroundWindow = GetForegroundWindow(); diff --git a/src/host/popup.cpp b/src/host/popup.cpp index 5fd28534c9..3468301114 100644 --- a/src/host/popup.cpp +++ b/src/host/popup.cpp @@ -26,7 +26,7 @@ using Microsoft::Console::Interactivity::ServiceLocator; // - Creates an object representing an interactive popup overlay during cooked mode command line editing. // - NOTE: Modifies global popup count (and adjusts cursor visibility as appropriate.) // Arguments: -// - screenInfo - Reference to screen on which the popup should be drawn/overlayed. +// - screenInfo - Reference to screen on which the popup should be drawn/overlaid. // - proposedSize - Suggested size of the popup. May be adjusted based on screen size. Popup::Popup(SCREEN_INFORMATION& screenInfo, const COORD proposedSize) : _screenInfo(screenInfo), diff --git a/src/host/screenInfo.cpp b/src/host/screenInfo.cpp index f0f3e03710..6c786b4aa4 100644 --- a/src/host/screenInfo.cpp +++ b/src/host/screenInfo.cpp @@ -2711,7 +2711,7 @@ const FontInfo& SCREEN_INFORMATION::GetCurrentFont() const noexcept // - Gets the desired font of the screen buffer. If we try loading this font and // have to fallback to another, then GetCurrentFont()!=GetDesiredFont(). // We store this separately, so that if we need to reload the font, we can -// try again with our prefered font info (in the desired font info) instead +// try again with our preferred font info (in the desired font info) instead // of re-using the looked up value from before. // Arguments: // - diff --git a/src/host/selectionInput.cpp b/src/host/selectionInput.cpp index cab5aa88b6..64d27d9a47 100644 --- a/src/host/selectionInput.cpp +++ b/src/host/selectionInput.cpp @@ -628,7 +628,7 @@ bool Selection::_HandleColorSelection(const INPUT_KEY_INFO* const pInputKeyInfo) const WORD wVirtualKeyCode = pInputKeyInfo->GetVirtualKey(); // It's a numeric key, a text mode buffer and the color selection regkey is set, - // then check to see if the user want's to color the selection or search and + // then check to see if the user wants to color the selection or search and // highlight the selection. bool fAltPressed = pInputKeyInfo->IsAltPressed(); bool fShiftPressed = pInputKeyInfo->IsShiftPressed(); diff --git a/src/host/ut_host/ScreenBufferTests.cpp b/src/host/ut_host/ScreenBufferTests.cpp index a722c8bef8..2a963911fc 100644 --- a/src/host/ut_host/ScreenBufferTests.cpp +++ b/src/host/ut_host/ScreenBufferTests.cpp @@ -4536,7 +4536,7 @@ void ScreenBufferTests::ScrollLines256Colors() int scrollType; int colorStyle; - VERIFY_SUCCEEDED(TestData::TryGetValue(L"scrollType", scrollType), L"controls whether to use InsertLines, DeleteLines ot ReverseLineFeed"); + VERIFY_SUCCEEDED(TestData::TryGetValue(L"scrollType", scrollType), L"controls whether to use InsertLines, DeleteLines or ReverseLineFeed"); VERIFY_SUCCEEDED(TestData::TryGetValue(L"colorStyle", colorStyle), L"controls whether to use the 16 color table, 256 table, or RGB colors"); // This test is largely taken from repro code from diff --git a/src/inc/consoletaeftemplates.hpp b/src/inc/consoletaeftemplates.hpp index 04986dc63f..c5242de71f 100644 --- a/src/inc/consoletaeftemplates.hpp +++ b/src/inc/consoletaeftemplates.hpp @@ -20,9 +20,9 @@ Revision History: #include // Helper for declaring a variable to store a TEST_METHOD_PROPERTY and get it's value from the test metadata -#define INIT_TEST_PROPERTY(type, identifer, description) \ - type identifer; \ - VERIFY_SUCCEEDED(TestData::TryGetValue(L## #identifer, identifer), description); +#define INIT_TEST_PROPERTY(type, identifier, description) \ + type identifier; \ + VERIFY_SUCCEEDED(TestData::TryGetValue(L## #identifier, identifier), description); // Thinking of adding a new VerifyOutputTraits for a new type? MAKE SURE that // you include this header (or at least the relevant definition) before _every_ diff --git a/src/interactivity/win32/Clipboard.cpp b/src/interactivity/win32/Clipboard.cpp index e2d285795d..2e60c4afb9 100644 --- a/src/interactivity/win32/Clipboard.cpp +++ b/src/interactivity/win32/Clipboard.cpp @@ -340,7 +340,7 @@ bool Clipboard::FilterCharacterOnPaste(_Inout_ WCHAR* const pwch) { switch (*pwch) { - // swallow tabs to prevent inadvertant tab expansion + // swallow tabs to prevent inadvertent tab expansion case UNICODE_TAB: { fAllowChar = false; diff --git a/src/interactivity/win32/ut_interactivity_win32/UiaTextRangeTests.cpp b/src/interactivity/win32/ut_interactivity_win32/UiaTextRangeTests.cpp index 9f9a79a07b..ac93141e1d 100644 --- a/src/interactivity/win32/ut_interactivity_win32/UiaTextRangeTests.cpp +++ b/src/interactivity/win32/ut_interactivity_win32/UiaTextRangeTests.cpp @@ -1667,7 +1667,7 @@ class UiaTextRangeTests VERIFY_SUCCEEDED(utr->GetAttributeValue(UIA_UnderlineStyleAttributeId, &result)); VERIFY_ARE_EQUAL(TextDecorationLineStyle_Single, result.lVal); - // Double underline (double supercedes single) + // Double underline (double supersedes single) attr.SetDoublyUnderlined(true); updateBuffer(attr); VERIFY_SUCCEEDED(utr->GetAttributeValue(UIA_UnderlineStyleAttributeId, &result)); diff --git a/src/renderer/dx/CustomTextLayout.cpp b/src/renderer/dx/CustomTextLayout.cpp index 0f75c46b1f..b958b914e8 100644 --- a/src/renderer/dx/CustomTextLayout.cpp +++ b/src/renderer/dx/CustomTextLayout.cpp @@ -1578,7 +1578,7 @@ CATCH_RETURN(); // Arguments: // - // Return Value: -// - Mutable reference ot the current run. +// - Mutable reference of the current run. [[nodiscard]] CustomTextLayout::LinkedRun& CustomTextLayout::_GetCurrentRun() { return _runs.at(_runIndex); diff --git a/src/renderer/dx/DxRenderer.cpp b/src/renderer/dx/DxRenderer.cpp index 42055233ce..68ba9ff684 100644 --- a/src/renderer/dx/DxRenderer.cpp +++ b/src/renderer/dx/DxRenderer.cpp @@ -591,7 +591,7 @@ try RETURN_IF_FAILED(_d3dDevice.As(&_dxgiDevice)); RETURN_IF_FAILED(_d2dFactory->CreateDevice(_dxgiDevice.Get(), _d2dDevice.ReleaseAndGetAddressOf())); - // Create a device context out of it (supercedes render targets) + // Create a device context out of it (supersedes render targets) RETURN_IF_FAILED(_d2dDevice->CreateDeviceContext(D2D1_DEVICE_CONTEXT_OPTIONS_NONE, &_d2dDeviceContext)); if (createSwapChain) diff --git a/src/renderer/dx/DxRenderer.hpp b/src/renderer/dx/DxRenderer.hpp index e93c3f1c7c..7cfe9834ab 100644 --- a/src/renderer/dx/DxRenderer.hpp +++ b/src/renderer/dx/DxRenderer.hpp @@ -231,7 +231,7 @@ namespace Microsoft::Console::Render // Experimental and deprecated retro terminal effect // Preserved for backwards compatibility // Implemented in terms of the more generic pixel shader effect - // Has precendence over pixel shader effect + // Has precedence over pixel shader effect bool _retroTerminalEffect; // Experimental and pixel shader effect diff --git a/src/renderer/inc/IRenderData.hpp b/src/renderer/inc/IRenderData.hpp index 6e4f1b9183..722c31528f 100644 --- a/src/renderer/inc/IRenderData.hpp +++ b/src/renderer/inc/IRenderData.hpp @@ -27,7 +27,7 @@ namespace Microsoft::Console::Render // This is where the data is stored const TextBuffer& buffer; - // This is where the top left of the stored buffer should be overlayed on the screen + // This is where the top left of the stored buffer should be overlaid on the screen // (relative to the current visible viewport) const COORD origin; diff --git a/src/terminal/adapter/adaptDispatch.cpp b/src/terminal/adapter/adaptDispatch.cpp index 48d89483f0..773087fa53 100644 --- a/src/terminal/adapter/adaptDispatch.cpp +++ b/src/terminal/adapter/adaptDispatch.cpp @@ -877,7 +877,7 @@ void AdaptDispatch::_WriteResponse(const std::wstring_view reply) const // TODO GH#4954 During the input refactor we may want to add a "priority" input list // to make sure that "response" input is spooled directly into the application. // We switched this to an append (vs. a prepend) to fix GH#1637, a bug where two CPR - // could collide with eachother. + // could collide with each other. _pConApi->WriteInput(inEvents, eventsWritten); } @@ -1578,7 +1578,7 @@ void AdaptDispatch::_ResetTabStops() noexcept // current screen width, initializing tab stops every 8 columns in the // newly allocated space, iff the _initDefaultTabStops flag is set. // Arguments: -// - width - the width of the screen buffer that we need to accomodate +// - width - the width of the screen buffer that we need to accommodate // Return value: // - void AdaptDispatch::_InitTabStopsForWidth(const size_t width) diff --git a/src/terminal/adapter/ut_adapter/adapterTest.cpp b/src/terminal/adapter/ut_adapter/adapterTest.cpp index f102b168e8..c75be3a58b 100644 --- a/src/terminal/adapter/ut_adapter/adapterTest.cpp +++ b/src/terminal/adapter/ut_adapter/adapterTest.cpp @@ -1684,7 +1684,7 @@ public: Log::Comment(L"Test 2: Verify multiple CPRs with a cursor move between them"); _testGetSet->PrepData(CursorX::XCENTER, CursorY::YCENTER); - // enable retention so that the two DSR responses don't delete eachother + // enable retention so that the two DSR responses don't delete each other auto retentionScope{ _testGetSet->EnableInputRetentionInScope() }; // start with the cursor position in the buffer. diff --git a/src/terminal/adapter/ut_adapter/inputTest.cpp b/src/terminal/adapter/ut_adapter/inputTest.cpp index fe19266a47..368c792e4c 100644 --- a/src/terminal/adapter/ut_adapter/inputTest.cpp +++ b/src/terminal/adapter/ut_adapter/inputTest.cpp @@ -464,7 +464,7 @@ void InputTest::TerminalInputModifierKeyTests() case VK_TAB: if (AltPressed(uiKeystate)) { - // Alt+Tab isn't possible - thats reserved by the system. + // Alt+Tab isn't possible - that's reserved by the system. continue; } else if (ShiftPressed(uiKeystate)) diff --git a/src/terminal/parser/ut_parser/StateMachineTest.cpp b/src/terminal/parser/ut_parser/StateMachineTest.cpp index 67137beee6..125036c16f 100644 --- a/src/terminal/parser/ut_parser/StateMachineTest.cpp +++ b/src/terminal/parser/ut_parser/StateMachineTest.cpp @@ -149,7 +149,7 @@ class Microsoft::Console::VirtualTerminal::StateMachineTest return true; } - TEST_METHOD(TwoStateMachinesDoNotInterfereWithEachother); + TEST_METHOD(TwoStateMachinesDoNotInterfereWithEachOther); TEST_METHOD(PassThroughUnhandled); TEST_METHOD(RunStorageBeforeEscape); @@ -159,7 +159,7 @@ class Microsoft::Console::VirtualTerminal::StateMachineTest TEST_METHOD(DcsDataStringsReceivedByHandler); }; -void StateMachineTest::TwoStateMachinesDoNotInterfereWithEachother() +void StateMachineTest::TwoStateMachinesDoNotInterfereWithEachOther() { auto firstEnginePtr{ std::make_unique() }; // this dance is required because StateMachine presumes to take ownership of its engine. diff --git a/src/tools/MonarchPeasantSample/AppState.cpp b/src/tools/MonarchPeasantSample/AppState.cpp index 8eb2c164b5..0a4ebfed51 100644 --- a/src/tools/MonarchPeasantSample/AppState.cpp +++ b/src/tools/MonarchPeasantSample/AppState.cpp @@ -56,7 +56,7 @@ void AppState::remindKingWhoTheyAre(const winrt::MonarchPeasantSample::IPeasant& } else { - printf("Shoot, we wanted to be able to get the monarchImpl here but couldnt\n"); + printf("Shoot, we wanted to be able to get the monarchImpl here but couldn't\n"); } } diff --git a/src/tools/ansi-color/ansi-color.cmd b/src/tools/ansi-color/ansi-color.cmd index 3f215f960b..a0169cf3b6 100644 --- a/src/tools/ansi-color/ansi-color.cmd +++ b/src/tools/ansi-color/ansi-color.cmd @@ -94,7 +94,7 @@ REM SET "SEPARATOR.CELL=╎" & :: UTF-8 IF DEFINED SHOW.UTF8 (SET "SEPARATOR.STUBHEAD_BOXHEAD=│") ELSE (SET "SEPARATOR.STUBHEAD_BOXHEAD=:") IF DEFINED SHOW.UTF8 (SET "SEPARATOR.STUBHEAD_STUB=─") ELSE (SET "SEPARATOR.STUBHEAD_STUB=-") IF DEFINED SHOW.UTF8 (SET "SEPARATOR.INTERSECT=┘") ELSE (SET "SEPARATOR.INTERSECT=+") -:: You can also define control for formating +:: You can also define control for formatting SET "SECTION=!CSI!1;4m" __TABLE:END__ @@ -1402,7 +1402,7 @@ SET @counter=FOR %%. IN (1 2) DO IF [%%.] EQU [2] (%\n% :: @exit [ErrorLevel] :: :: Used to exit and optionally sets an error code if provided. -:: This is prefered for exiting a script over GOTO :EOF for consistency +:: This is preferred for exiting a script over GOTO :EOF for consistency :: and to pass Error Levels if necessary. This tidy's up a call :: to EXIT /B [ErrorLevel] so the use feels the same as other macros. :: @@ -1535,7 +1535,7 @@ ECHO. :: # :: # This file echoes a bunch of color codes to the :: # terminal to demonstrate what's available. Each -:: # line is the color code of one forground color, +:: # line is the color code of one foreground color, :: # out of 17 (default + 16 escapes), followed by a :: # test use of that color on all nine background :: # colors (default + 8 escapes). diff --git a/src/tools/ansi-color/crisman.def b/src/tools/ansi-color/crisman.def index bacfe408fc..1705ef7022 100644 --- a/src/tools/ansi-color/crisman.def +++ b/src/tools/ansi-color/crisman.def @@ -2,7 +2,7 @@ :: # :: # This file echoes a bunch of color codes to the :: # terminal to demonstrate what's available. Each -:: # line is the color code of one forground color, +:: # line is the color code of one foreground color, :: # out of 17 (default + 16 escapes), followed by a :: # test use of that color on all nine background :: # colors (default + 8 escapes). @@ -77,4 +77,4 @@ m 37m 1;37m __ROWS:END__ -__DATA:END__ \ No newline at end of file +__DATA:END__ diff --git a/src/types/viewport.cpp b/src/types/viewport.cpp index ac3ac498f4..9038a60cca 100644 --- a/src/types/viewport.cpp +++ b/src/types/viewport.cpp @@ -910,7 +910,7 @@ Viewport Viewport::ToOrigin() const noexcept } // Function Description: -// - Creates a viewport from the intersection fo both the parameter viewports. +// - Creates a viewport from the intersection of both the parameter viewports. // The result will be the smallest area that fits within both rectangles. // Arguments: // - lhs: one of the viewports to intersect diff --git a/tools/bcz.cmd b/tools/bcz.cmd index d70e61ddbd..c95fbe21ff 100644 --- a/tools/bcz.cmd +++ b/tools/bcz.cmd @@ -122,8 +122,8 @@ rem ############################################################################ rem The code to figure out what project we're building needs to be in its own rem function. Otherwise, when cmd evaluates the if statement above `if rem "%_EXCLUSIVE%" == "1"`, it'll evaluate the entire block with the value of -rem the the variables at the time the if was executed. So instead, make a -rem function here with `enabledelayedexpansion` set. +rem the variables at the time the if was executed. So instead, make a function +rem here with `enabledelayedexpansion` set. :get_project setlocal enabledelayedexpansion