diff --git a/.gitignore b/.gitignore index 2cbd30467..5771a9e36 100644 --- a/.gitignore +++ b/.gitignore @@ -162,7 +162,7 @@ PublishScripts/ !**/packages/build/ # Uncomment if necessary however generally it will be regenerated when needed #!**/packages/repositories.config -# NuGet v3's project.json files produces more ignoreable files +# NuGet v3's project.json files produces more ignorable files *.nuget.props *.nuget.targets diff --git a/doc/Niksa.md b/doc/Niksa.md index bd8fe0e28..4ad72148c 100644 --- a/doc/Niksa.md +++ b/doc/Niksa.md @@ -33,7 +33,7 @@ Also, I'm happy to discuss this with you until you're utterly sick of reading it If I had to take an educated guess as to what is making us faster than pretty much any other application on Windows at putting your text on the screen... I would say it is because that is literally our only job! Also probably because we are using darn near the oldest and lowest level APIs that Windows has to accomplish this work. -Pretty much everything else you've listed has some sort of layer or framework involved, or many, many layers and frameworks, when you start talking about Electron and Javascript. We don't. +Pretty much everything else you've listed has some sort of layer or framework involved, or many, many layers and frameworks, when you start talking about Electron and JavaScript. We don't. We have one bare, super un-special window with no additional controls attached to it. We get our keys fed into us from just barely above the kernel given that we're processing them from window messages and not from some sort of eventing framework common to pretty much any other more complicated UI framework than ours (WPF, WinForms, UWP, Electron). And we dump our text straight onto the window surface using GDI's [PolyTextOut](https://docs.microsoft.com/en-us/windows/desktop/api/wingdi/nf-wingdi-polytextoutw) with no frills. diff --git a/doc/ORGANIZATION.md b/doc/ORGANIZATION.md index b81559100..d220c9034 100644 --- a/doc/ORGANIZATION.md +++ b/doc/ORGANIZATION.md @@ -28,10 +28,10 @@ * `/src/cascadia/TerminalConnection` - This DLL is responsible for the various different ways a terminal instance can communicate with different terminal backends. Examples include the `ConptyConnection` (for communicating with Windows Console processes), or the `AzureCloudShellConnection` for communicating with Azure. * `/src/cascadia/TerminalSettings` - This is the DLL responsible for abstracting the settings for both the TerminalCore and the TerminalControl. This provides consumers of the TerminalControl a common interface for supplying settings to the Terminal. * `/src/cascadia/TerminalCore` - This LIB is responsible for the core implementation of a terminal instance. This defines one important class `Terminal` which is a complete terminal instance, with buffer, colors table, VT parsing, input handling, etc. It does _not_ prescribe any sort of UI implementation - it should be connected to code that can handle rendering its contents, and provide input to it. - * `/src/cascadia/TerminalControl` - This DLL provides the UWP-XAML implementation of a `TermControl`, which can be embedded within an application to provide a terminal instance within the application. It contains a DX renderer for drawing text to the screen, and translates input to send to the core Terminal. It also recieves settings to apply to both itself and the core Terminal. + * `/src/cascadia/TerminalControl` - This DLL provides the UWP-XAML implementation of a `TermControl`, which can be embedded within an application to provide a terminal instance within the application. It contains a DX renderer for drawing text to the screen, and translates input to send to the core Terminal. It also receives settings to apply to both itself and the core Terminal. * `/src/cascadia/TerminalApp` - This DLL represents the implementation of the Windows Terminal application. This includes parsing settings, hosting tabs & panes with Terminals in them, and displaying other UI elements. This DLL is almost entirely UWP-like code, and shouldn't be doing any Win32-like UI work. * `/src/cascadia/WindowsTerminal` - This EXE provides Win32 hosting for the TerminalApp. It will set up XAML islands, and is responsible for drawing the window, either as a standard window or with content in the titlebar (non-client area). - * `/src/cascadia/CasadiaPackage` - This is a project for packaging the Windows Terminal and its dependencies into an .appx/.msix for deploying to the machine. + * `/src/cascadia/CascadiaPackage` - This is a project for packaging the Windows Terminal and its dependencies into an .appx/.msix for deploying to the machine. * `/src/cascadia/PublicTerminalCore` - This is a DLL wrapper for the TerminalCore and Renderer, similar to `TermControl`, which exposes some exported functions that so the Terminal can be used from C#. * `/src/cascadia/WpfTerminalControl` - A DLL implementing a WPF version of the Terminal Control. * `/src/host` – The meat of the windows console host. This includes buffer, input, output, windowing, server management, clipboard, and most interactions with the console host window that aren’t stated anywhere else. We’re trying to pull things out that are reusable into other libraries, but it’s a work in progress diff --git a/doc/cascadia/SettingsSchema.md b/doc/cascadia/SettingsSchema.md index db6a6df8b..c223e5bc6 100644 --- a/doc/cascadia/SettingsSchema.md +++ b/doc/cascadia/SettingsSchema.md @@ -27,7 +27,7 @@ Properties listed below are specific to each unique profile. | Property | Necessity | Type | Default | Description | | -------- | --------- | ---- | ------- | ----------- | | `guid` | _Required_ | String | | Unique identifier of the profile. Written in registry format: `"{00000000-0000-0000-0000-000000000000}"`. | -| `name` | _Required_ | String | | Name of the profile. Displays in the dropdown menu.
Additionally, this value will be used as the "title" to pass to the shell on startup. Some shells (like `bash`) may choose to ignore this initial value, while others (`cmd`, `powershell`) may use this value over the lifetime of the application. This "title" behavior can be overriden by using `tabTitle`. | +| `name` | _Required_ | String | | Name of the profile. Displays in the dropdown menu.
Additionally, this value will be used as the "title" to pass to the shell on startup. Some shells (like `bash`) may choose to ignore this initial value, while others (`cmd`, `powershell`) may use this value over the lifetime of the application. This "title" behavior can be overridden by using `tabTitle`. | | `acrylicOpacity` | Optional | Number | `0.5` | When `useAcrylic` is set to `true`, it sets the transparency of the window for the profile. Accepts floating point values from 0-1. | | `background` | Optional | String | | Sets the background color of the profile. Overrides `background` set in color scheme if `colorscheme` is set. Uses hex color format: `"#rrggbb"`. | | `backgroundImage` | Optional | String | | Sets the file location of the Image to draw over the window background. | @@ -44,7 +44,7 @@ Properties listed below are specific to each unique profile. | `fontFace` | Optional | String | `Consolas` | Name of the font face used in the profile. We will try to fallback to Consolas if this can't be found or is invalid. | | `fontSize` | Optional | Integer | `12` | Sets the font size. | | `foreground` | Optional | String | | Sets the foreground color of the profile. Overrides `foreground` set in color scheme if `colorscheme` is set. Uses hex color format: `#rgb` or `"#rrggbb"`. | -| `hidden` | Optional | Boolean | `false` | If set to true, the profile will not appear in the list of profiles. This can be used to hide default profiles and dynamicially generated profiles, while leaving them in your settings file. | +| `hidden` | Optional | Boolean | `false` | If set to true, the profile will not appear in the list of profiles. This can be used to hide default profiles and dynamically generated profiles, while leaving them in your settings file. | | `historySize` | Optional | Integer | `9001` | The number of lines above the ones displayed in the window you can scroll back to. | | `icon` | Optional | String | | Image file location of the icon used in the profile. Displays within the tab and the dropdown menu. | | `padding` | Optional | String | `8, 8, 8, 8` | Sets the padding around the text within the window. Can have three different formats: `"#"` sets the same padding for all sides, `"#, #"` sets the same padding for left-right and top-bottom, and `"#, #, #, #"` sets the padding individually for left, top, right, and bottom. | diff --git a/doc/cascadia/Unittesting-CppWinRT-Xaml.md b/doc/cascadia/Unittesting-CppWinRT-Xaml.md index 48dfd3a4e..3cfb228d5 100644 --- a/doc/cascadia/Unittesting-CppWinRT-Xaml.md +++ b/doc/cascadia/Unittesting-CppWinRT-Xaml.md @@ -68,7 +68,7 @@ original files. You could alternatively put all the source in one directory, and have separate `dll/` and `lib/` subdirectories from the source that are solely responsible for building their binary. -At this point, you might face some difficulty including the right wimnd +At this point, you might face some difficulty including the right winmd references, especially from other C++/WinRT dependencies for this project that exist in your solution. I don't know why, but I had a fair amount of difficulty using a `ProjectReference` from a C++/WinRT StaticLibrary to another C++/WinRT diff --git a/doc/cascadia/profiles.schema.json b/doc/cascadia/profiles.schema.json index 8fe9c3e11..2eab1987e 100644 --- a/doc/cascadia/profiles.schema.json +++ b/doc/cascadia/profiles.schema.json @@ -582,7 +582,7 @@ }, "hidden": { "default": false, - "description": "If set to true, the profile will not appear in the list of profiles. This can be used to hide default profiles and dynamicially generated profiles, while leaving them in your settings file.", + "description": "If set to true, the profile will not appear in the list of profiles. This can be used to hide default profiles and dynamically generated profiles, while leaving them in your settings file.", "type": "boolean" }, "historySize": { diff --git a/doc/specs/#1043 - Set the initial position of the Terminal/spec.md b/doc/specs/#1043 - Set the initial position of the Terminal/spec.md index a3d668a05..afafa7c59 100644 --- a/doc/specs/#1043 - Set the initial position of the Terminal/spec.md +++ b/doc/specs/#1043 - Set the initial position of the Terminal/spec.md @@ -80,11 +80,11 @@ More data reading and calculation will be included in Terminal Launch process, w ## Potential Issues -We need to consider multi-monitor scenario. If the user has multiple monitors, we must guarantee that the Terminal could be iniitalized as expected. We can keep an eye on the feedbacks of this feature from the community. +We need to consider multi-monitor scenario. If the user has multiple monitors, we must guarantee that the Terminal could be initialized as expected. We can keep an eye on the feedbacks of this feature from the community. ## Future considerations -For now, this feature only allows the user to set initial positon and choose whether to maximize the window when launch. In the future, we may consider follow-up features like: +For now, this feature only allows the user to set initial position and choose whether to maximize the window when launch. In the future, we may consider follow-up features like: 1. Save the position of the Terminal on exit, and restore the position on the next launch. This could be a true/false feature that users could choose to set. diff --git a/doc/specs/#1142 - Keybinding Arguments.md b/doc/specs/#1142 - Keybinding Arguments.md index 1d187caef..8073b9fa7 100644 --- a/doc/specs/#1142 - Keybinding Arguments.md +++ b/doc/specs/#1142 - Keybinding Arguments.md @@ -340,7 +340,7 @@ N/A For example, by default, Alt+<N> to focuses the Nth tab. Currently, those are 8 separate entries in the keybindings. Should we enable some way for them be combined into a single binding entry, where the - binding automatically recieves the number pressed as an arg? I couldn't find + binding automatically receives the number pressed as an arg? I couldn't find any prior art of this, so it doesn't seem worth it to try and invent currently. This might be something that we want to loop back on, but for the time being, it remains out of scope of this PR. diff --git a/doc/specs/#1235 - Azure cloud shell connector/spec.md b/doc/specs/#1235 - Azure cloud shell connector/spec.md index 2f124bbc9..2b840d0a1 100644 --- a/doc/specs/#1235 - Azure cloud shell connector/spec.md +++ b/doc/specs/#1235 - Azure cloud shell connector/spec.md @@ -53,7 +53,7 @@ This feature will not impact reliability of Windows Terminal. ### Compatibility -With the implementation being mostly decoupled from the Windows Terminal app itself, no existing code/behaviours should break due to this feature. +With the implementation being mostly decoupled from the Windows Terminal app itself, no existing code/behaviors should break due to this feature. ### Performance, Power, and Efficiency diff --git a/doc/specs/#2325 - Default Profile Settings.md b/doc/specs/#2325 - Default Profile Settings.md index 54251c03d..5513a0631 100644 --- a/doc/specs/#2325 - Default Profile Settings.md +++ b/doc/specs/#2325 - Default Profile Settings.md @@ -281,8 +281,8 @@ of the file. `inheritFrom` is very unique relative to other keys we already have. ##### Powerful -This lets the user have potentially many layers of settings grouping. hese -layers would let the user seperate out common settings however they like, +This lets the user have potentially many layers of settings grouping. These +layers would let the user separate out common settings however they like, without forcing them to a single "default" profile. They could potentially have many "default" profiles, e.g. * one that's used for all their WSL profiles, with `startingDirectory` set to diff --git a/doc/specs/#2563 - closeOnExit and TerminalConnection evolution.md b/doc/specs/#2563 - closeOnExit and TerminalConnection evolution.md index 14c410e96..3f682859f 100644 --- a/doc/specs/#2563 - closeOnExit and TerminalConnection evolution.md +++ b/doc/specs/#2563 - closeOnExit and TerminalConnection evolution.md @@ -28,7 +28,7 @@ Other terminal emulators like ConEmu have a similar feature. * This enum attempts to encompass all potential connection states, even those which do not make sense for a local terminal. * The wide variety of values will be useful to indicate state changes in a user interface. * `NotConnected`: All new connections will start out in this state - * `Connecting`: The connection has been initated, but has not yet completed connecting. + * `Connecting`: The connection has been initiated, but has not yet completed connecting. * `Connected`: The connection is active. * `Closing`: The connection is being closed (usually by request). * `Closed`: The connection has been closed, either by request or from the remote end terminating successfully. @@ -48,7 +48,7 @@ Other terminal emulators like ConEmu have a similar feature. ### Application and Settings -1. The existing `closeOnExit` profile key will be replaced with an enumerated string key supporting the following values (behaviours): +1. The existing `closeOnExit` profile key will be replaced with an enumerated string key supporting the following values (behaviors): * `always` - a tab or pane hosting this profile will always be closed when the launched connection reaches a terminal state. * `graceful` - a tab or pane hosting this profile will be closed if and only if the launched connection reaches the `Closed` terminal state. * `never` - a tab or pane hosting this profile will not automatically close. diff --git a/doc/specs/#532 - Panes and Split Windows.md b/doc/specs/#532 - Panes and Split Windows.md index fbba63f8a..c7ece7b35 100644 --- a/doc/specs/#532 - Panes and Split Windows.md +++ b/doc/specs/#532 - Panes and Split Windows.md @@ -53,7 +53,7 @@ When a pane is a parent, its two children are either split vertically or horizontally. Parent nodes don't have a terminal of their own, they merely display the terminals of their children. - * If a Pane is split vertically, the two panes are seperated by a vertical + * If a Pane is split vertically, the two panes are separated by a vertical split, as to appear side-by-side. Think `[|]` * If a Pane is split horizontally, the two panes are split by a horizontal separator, and appear above/below one another. Think `[-]`. @@ -228,7 +228,7 @@ pane. This could be solved a number of ways. There could be keyboard shortcuts for swapping the positions of tabs, or a shortcut for both "zooming" a tab (temporarily making it the full size) or even popping a pane out to it's own tab. Additionally, a right-click menu option could be added to do the -aformentioned actions. Discoverability of these two actions is not as high as +aforementioned actions. Discoverability of these two actions is not as high as just dragging a tab from one pane to another; however, it's believed that panes are more of a power-user scenario, and power users will not necessarily be turned off by the feature's discoverability. diff --git a/doc/specs/#605 - Search/spec.md b/doc/specs/#605 - Search/spec.md index a874c17ee..3d96f2fac 100644 --- a/doc/specs/#605 - Search/spec.md +++ b/doc/specs/#605 - Search/spec.md @@ -50,7 +50,7 @@ We will create a `SearchBoxControl` Xaml `UserControl` element. When a search pr Above is the `SearchBoxControl` in dark theme and light theme. - The two buttons with up/down arrows controls the search direction, Each button will be styled to indicate which search direction is currently selected. - - The button with a "Aa" icon, if pressed, means that we are searching case-sensitivily. + - The button with a "Aa" icon, if pressed, means that we are searching case-sensitivity. - The current style puts all elements - the `X` button, the text box and the search pattern control buttons on one single line. This ensures that the `SearchBoxControl` won't be too high and block terminal text. This is similar with VSCode. Another possible layout style is to put elements in multiple layers. This will occupy more lines, but the search dialog will narrower. Considering that there is not many elements, we do not need multiple layers. ![SearchBox mockup, arrow button clicked](images/SearchBoxUpSelected.png) @@ -92,7 +92,7 @@ This feature should not introduce any new security issues. ### Reliability 1. The key input of Terminal command line and the search box should be separated. Search box should not block interaction with the command line when it is open. -2. The search box should not block too much text. The search box only occupies one line, so it won't have big impact on the readibility of the terminal output. +2. The search box should not block too much text. The search box only occupies one line, so it won't have big impact on the readability of the terminal output. ### Compatibility @@ -106,7 +106,7 @@ This feature only launches in need. It does not impact the performance of Termin 1. If the terminal window is not wide enough for the search box to be visible, the buttons on the right of the `TextBox` will become invisible, but the `TextBox` is still visible and the window could not be narrower than the `TextBox`. This is similar to the behavior of other editors. Please see the image below: ![SearchBox width not enough](images/SearchBoxControlNoEnoughWidth.png) -2. If the terminal window is not high enough for the search box to be visible, the whole terminal screen, inlcuding the `SearchBoxControl` can disappear. This is similar to the behavior of other editors. +2. If the terminal window is not high enough for the search box to be visible, the whole terminal screen, including the `SearchBoxControl` can disappear. This is similar to the behavior of other editors. ## Future considerations diff --git a/doc/specs/#607 - Commandline Arguments for the Windows Terminal.md b/doc/specs/#607 - Commandline Arguments for the Windows Terminal.md index 0a51a6577..67fa26b87 100644 --- a/doc/specs/#607 - Commandline Arguments for the Windows Terminal.md +++ b/doc/specs/#607 - Commandline Arguments for the Windows Terminal.md @@ -440,7 +440,7 @@ developed, to make the initialization of many commands as seamless as possible. As this is a very complex feature, there will need to be a number of steps taken in the codebase to enable this functionality in a way that users are expecting. The following is a suggestion of the individual changelists that could be made -to iteratively work towards fulling implementing this funcionality. +to iteratively work towards fulling implementing this functionality. * [x] Refactor `ShortcutAction` dispatching into its own class - Right now, the `AppKeyBindings` is responsible for triggering all @@ -507,7 +507,7 @@ runtimeclass TerminalParameters { * [ ] Add a `ShortcutAction` for `FocusPane`, which accepts a single parameter `index`. - We'll need to track each `Pane`'s ID as `Pane`s are created, so that we can - quicky switch to the i'th `Pane`. + quickly switch to the i'th `Pane`. - This is in order to support the `-t,--target` parameter of `split-pane`. ## Capabilities @@ -537,7 +537,7 @@ This change should not regress any existing behaviors. ### Performance, Power, and Efficiency -This change should not particularily impact startup time or any of these other categories. +This change should not particularly impact startup time or any of these other categories. ## Potential Issues @@ -549,7 +549,7 @@ itself, we'll use `\;` as an escaped `;` within the commandline. This is an area we've been caught in before, so extensive testing will be necessary to make sure this works as expected. -Painfully, powershell uses `;` as a seperator between commands as well. So, if +Painfully, powershell uses `;` as a separator between commands as well. So, if someone wanted to call a `wt` commandline in powershell with multiple commands, the user would need to also escape those semicolons for powershell first. That means a command like ```wt new-tab ; split-pane``` would need to be ```wt new-tab diff --git a/doc/specs/#754 - Cascading Default Settings.md b/doc/specs/#754 - Cascading Default Settings.md index 710c2f5c4..1c98ee398 100644 --- a/doc/specs/#754 - Cascading Default Settings.md +++ b/doc/specs/#754 - Cascading Default Settings.md @@ -520,7 +520,7 @@ would `openDefaultSettings`, and we could bind that to ### How does this work with the settings UI? If we only have one version of the settings models (Globals, Profiles, -ColorShemes, Keybindings) at runtime, and the user changes one of the settings +ColorSchemes, Keybindings) at runtime, and the user changes one of the settings with the settings UI, how can we tell that settings changed? Fortunately, this should be handled cleanly by the algorithm proposed above, in @@ -678,7 +678,7 @@ generators _must_ be enabled to use the dynamic profiles. a WinRT interface that extensions could implement, and be triggered just like other dynamic profile generators. * **Multiple settings files** - This could enable us to place color schemes into - a seperate file (like `colorschemes.json`) and put keybindings into their own + a separate file (like `colorschemes.json`) and put keybindings into their own file as well, and reduce the number of settings in the user's `profiles.json`. It's unclear if this is something that we need quite yet, but the same layering functionality that enables this scenario could also enable more than diff --git a/doc/specs/#976 - VT52 escape sequences.md b/doc/specs/#976 - VT52 escape sequences.md index 040a0d91e..2a1cae017 100644 --- a/doc/specs/#976 - VT52 escape sequences.md +++ b/doc/specs/#976 - VT52 escape sequences.md @@ -229,7 +229,7 @@ This should not introduce any new reliability issues. ### Compatibility -This could be a breaking change for code that relies on the few existing VT52 commands being available without a mode change. However, that functionality is non-standard, and has not been around for that long. There is almost certainly more benefit in being able to implement the missing VT100 functionality than there is in retaining that non-standard behaviour. +This could be a breaking change for code that relies on the few existing VT52 commands being available without a mode change. However, that functionality is non-standard, and has not been around for that long. There is almost certainly more benefit in being able to implement the missing VT100 functionality than there is in retaining that non-standard behavior. ### Performance, Power, and Efficiency diff --git a/doc/specs/spec-template.md b/doc/specs/spec-template.md index 36444c5b9..0446a7ae0 100644 --- a/doc/specs/spec-template.md +++ b/doc/specs/spec-template.md @@ -37,7 +37,7 @@ issue id: ### Reliability -[comment]: # Will the proposed change improve reliabilty? If not, why make the change? +[comment]: # Will the proposed change improve reliability? If not, why make the change? ### Compatibility diff --git a/doc/user-docs/UsingJsonSettings.md b/doc/user-docs/UsingJsonSettings.md index 36a364e1f..9f2b7242d 100644 --- a/doc/user-docs/UsingJsonSettings.md +++ b/doc/user-docs/UsingJsonSettings.md @@ -104,7 +104,7 @@ profile is identified by a GUID and contains a number of other fields. * Which color scheme to use (see Schemes below) * Font face and size * Various settings to control appearance. E.g. Opacity, icon, cursor appearance, display name etc. -* Other behavioural settings. E.g. Close on exit, snap on input, ..... +* Other behavioral settings. E.g. Close on exit, snap on input, ..... Example settings include diff --git a/doc/virtual-dtors.md b/doc/virtual-dtors.md index 331ddd0fc..e760a6f81 100644 --- a/doc/virtual-dtors.md +++ b/doc/virtual-dtors.md @@ -25,7 +25,7 @@ You may ask yourself, why is the destructor deleted, then later defined to the this, then sometimes on object destruction, the interface's dtor will be called instead of the destructor for the base class. There is other strangeness that can occur as well, the details of which escape my memory from - when @austdi and I first investigaved this early 2018. + when @austdi and I first investigated this early 2018. The end result of not defining your interfaces exactly like this will be that occasionally, when destructing objects, you'll get a segfault. diff --git a/src/buffer/out/AttrRow.cpp b/src/buffer/out/AttrRow.cpp index b1b646c4a..b67789576 100644 --- a/src/buffer/out/AttrRow.cpp +++ b/src/buffer/out/AttrRow.cpp @@ -283,7 +283,7 @@ void ATTR_ROW::ReplaceAttrs(const TextAttribute& toBeReplacedAttr, const TextAtt else if (iStart > 0 && iStart == iEnd) { // First we try to find the run where the insertion happens, using lowerBound and upperBound to track - // where we are curretly at. + // where we are currently at. size_t lowerBound = 0; size_t upperBound = 0; for (size_t i = 0; i < _list.size(); i++) @@ -503,7 +503,7 @@ void ATTR_ROW::ReplaceAttrs(const TextAttribute& toBeReplacedAttr, const TextAtt else { // If the color didn't match, then we just need to copy the piece we skipped and adjust - // its length for the discrepency in columns not yet covered by the final/new run. + // its length for the discrepancy in columns not yet covered by the final/new run. // Move forward to a blank spot in the new run pNewRunPos++; @@ -565,7 +565,7 @@ void ATTR_ROW::ReplaceAttrs(const TextAttribute& toBeReplacedAttr, const TextAtt } // Routine Description: -// - packs a vector of TextAttribute into a vector of TextAttrbuteRun +// - packs a vector of TextAttribute into a vector of TextAttributeRun // Arguments: // - attrs - text attributes to pack // Return Value: diff --git a/src/buffer/out/CharRowCell.cpp b/src/buffer/out/CharRowCell.cpp index d8cdeff42..0fae3f9c4 100644 --- a/src/buffer/out/CharRowCell.cpp +++ b/src/buffer/out/CharRowCell.cpp @@ -5,7 +5,7 @@ #include "CharRowCell.hpp" #include "unicode.hpp" -// default glyph value, used for reseting the character data portion of a cell +// default glyph value, used for resetting the character data portion of a cell static constexpr wchar_t DefaultValue = UNICODE_SPACE; CharRowCell::CharRowCell() noexcept : diff --git a/src/buffer/out/OutputCellRect.cpp b/src/buffer/out/OutputCellRect.cpp index 903850944..e9cdc275b 100644 --- a/src/buffer/out/OutputCellRect.cpp +++ b/src/buffer/out/OutputCellRect.cpp @@ -6,7 +6,7 @@ #include "OutputCellRect.hpp" // Routine Description: -// - Constucts an empty in-memory region for holding output buffer cell data. +// - Constructs an empty in-memory region for holding output buffer cell data. OutputCellRect::OutputCellRect() noexcept : _rows(0), _cols(0) diff --git a/src/buffer/out/TextAttribute.hpp b/src/buffer/out/TextAttribute.hpp index ff0bce807..36fcc6c1d 100644 --- a/src/buffer/out/TextAttribute.hpp +++ b/src/buffer/out/TextAttribute.hpp @@ -75,7 +75,7 @@ public: // Arguments: // - defaultFgIndex: the BYTE to use as the index for the foreground, should // the foreground not be a legacy style attribute. - // - defaultBgIndex: the BYTE to use as the index for the backgound, should + // - defaultBgIndex: the BYTE to use as the index for the background, should // the background not be a legacy style attribute. // Return Value: // - a WORD with legacy-style attributes for this textattribute. diff --git a/src/buffer/out/TextColor.cpp b/src/buffer/out/TextColor.cpp index 606afdac1..05fcded14 100644 --- a/src/buffer/out/TextColor.cpp +++ b/src/buffer/out/TextColor.cpp @@ -49,8 +49,8 @@ void TextColor::SetDefault() noexcept // * If we're an indexed color table value, we'll use that index to look up // our value in the provided color table. // - If brighten is true, and the index is in the "dark" portion of the -// color table (indicies [0,7]), then we'll look up the bright version of -// this color (from indicies [8,15]). This should be true for +// color table (indices [0,7]), then we'll look up the bright version of +// this color (from indices [8,15]). This should be true for // TextAttributes that are "Bold" and we're treating bold as bright // (which is the default behavior of most terminals.) // * If we're a default color, we'll return the default color provided. diff --git a/src/buffer/out/TextColor.h b/src/buffer/out/TextColor.h index f551f4e86..21896ca04 100644 --- a/src/buffer/out/TextColor.h +++ b/src/buffer/out/TextColor.h @@ -28,7 +28,7 @@ Revision History: - From components of output.h/.c by Therese Stowell (ThereseS) 1990-1991 - Pulled into its own file from textBuffer.hpp/cpp (AustDi, 2017) -- Moved the colors into their own seperate abstraction. (migrie Nov 2018) +- Moved the colors into their own separate abstraction. (migrie Nov 2018) --*/ #pragma once diff --git a/src/buffer/out/cursor.cpp b/src/buffer/out/cursor.cpp index 0b2f461be..46f0208f8 100644 --- a/src/buffer/out/cursor.cpp +++ b/src/buffer/out/cursor.cpp @@ -282,7 +282,7 @@ void Cursor::CopyProperties(const Cursor& OtherCursor) noexcept _fDeferCursorRedraw = OtherCursor._fDeferCursorRedraw; _fHaveDeferredCursorRedraw = OtherCursor._fHaveDeferredCursorRedraw; - // Size will be handled seperately in the resize operation. + // Size will be handled separately in the resize operation. //_ulSize = OtherCursor._ulSize; _cursorType = OtherCursor._cursorType; _color = OtherCursor._color; diff --git a/src/buffer/out/cursor.h b/src/buffer/out/cursor.h index fba8b30d3..1c77cbbd1 100644 --- a/src/buffer/out/cursor.h +++ b/src/buffer/out/cursor.h @@ -89,7 +89,7 @@ public: private: TextBuffer& _parentBuffer; - //TODO: seperate the rendering and text placement + //TODO: separate the rendering and text placement // NOTE: If you are adding a property here, go add it to CopyProperties. diff --git a/src/buffer/out/search.cpp b/src/buffer/out/search.cpp index 2b662fef7..5897bde11 100644 --- a/src/buffer/out/search.cpp +++ b/src/buffer/out/search.cpp @@ -15,7 +15,7 @@ using namespace Microsoft::Console::Types; // Routine Description: // - Constructs a Search object. // - Make a Search object then call .FindNext() to locate items. -// - Once you've found something, you can perfom actions like .Select() or .Color() +// - Once you've found something, you can perform actions like .Select() or .Color() // Arguments: // - textBuffer - The screen text buffer to search through (the "haystack") // - uiaData - The IUiaData type reference, it is for providing selection methods @@ -38,7 +38,7 @@ Search::Search(IUiaData& uiaData, // Routine Description: // - Constructs a Search object. // - Make a Search object then call .FindNext() to locate items. -// - Once you've found something, you can perfom actions like .Select() or .Color() +// - Once you've found something, you can perform actions like .Select() or .Color() // Arguments: // - textBuffer - The screen text buffer to search through (the "haystack") // - uiaData - The IUiaData type reference, it is for providing selection methods diff --git a/src/buffer/out/textBuffer.cpp b/src/buffer/out/textBuffer.cpp index 4fb59de5d..68ff8d0b5 100644 --- a/src/buffer/out/textBuffer.cpp +++ b/src/buffer/out/textBuffer.cpp @@ -1633,10 +1633,10 @@ std::string TextBuffer::GenRTF(const TextAndColor& rows, const int fontHeightPoi rtfBuilder << "{"; // Standard RTF header. - // This is similar to the header gnerated by WordPad. + // This is similar to the header generated by WordPad. // \ansi - specifies that the ANSI char set is used in the current doc // \ansicpg1252 - represents the ANSI code page which is used to perform the Unicode to ANSI conversion when writing RTF text - // \deff0 - specifes that the default font for the document is the one at index 0 in the font table + // \deff0 - specifies that the default font for the document is the one at index 0 in the font table // \nouicompat - ? rtfBuilder << "\\rtf1\\ansi\\ansicpg1252\\deff0\\nouicompat"; @@ -1663,7 +1663,7 @@ std::string TextBuffer::GenRTF(const TextAndColor& rows, const int fontHeightPoi contentBuilder << "\\viewkind4\\uc4"; // paragraph styles - // \fs specificies font size in half-points i.e. \fs20 results in a font size + // \fs specifies font size in half-points i.e. \fs20 results in a font size // of 10 pts. That's why, font size is multiplied by 2 here. contentBuilder << "\\pard\\slmult1\\f0\\fs" << std::to_string(2 * fontHeightPoints) << "\\highlight1" @@ -1763,7 +1763,7 @@ std::string TextBuffer::GenRTF(const TextAndColor& rows, const int fontHeightPoi fgColorIndex = nextColorIndex++; } - contentBuilder << "\\highglight" << bkColorIndex + contentBuilder << "\\highlight" << bkColorIndex << "\\cf" << fgColorIndex << " "; } diff --git a/src/buffer/out/textBufferCellIterator.cpp b/src/buffer/out/textBufferCellIterator.cpp index 285a4ec20..9cc6deaec 100644 --- a/src/buffer/out/textBufferCellIterator.cpp +++ b/src/buffer/out/textBufferCellIterator.cpp @@ -17,7 +17,7 @@ using namespace Microsoft::Console::Types; // Routine Description: // - Creates a new read-only iterator to seek through cell data stored within a screen buffer // Arguments: -// - buffer - Text buffer to seek throught +// - buffer - Text buffer to seek through // - pos - Starting position to retrieve text data from (within screen buffer bounds) TextBufferCellIterator::TextBufferCellIterator(const TextBuffer& buffer, COORD pos) : TextBufferCellIterator(buffer, pos, buffer.GetSize()) diff --git a/src/buffer/out/ut_textbuffer/TextAttributeTests.cpp b/src/buffer/out/ut_textbuffer/TextAttributeTests.cpp index da6d89ab6..b82568606 100644 --- a/src/buffer/out/ut_textbuffer/TextAttributeTests.cpp +++ b/src/buffer/out/ut_textbuffer/TextAttributeTests.cpp @@ -146,7 +146,7 @@ void TextAttributeTests::TestTextAttributeColorGetters() VERIFY_ARE_EQUAL(green, attr._GetRgbBackground(view, _defaultBg)); VERIFY_ARE_EQUAL(green, attr.CalculateRgbBackground(view, _defaultFg, _defaultBg)); - // with reverse video set, calucated foreground/background values should be + // with reverse video set, calculated foreground/background values should be // switched while getters stay the same attr.SetMetaAttributes(COMMON_LVB_REVERSE_VIDEO); @@ -174,7 +174,7 @@ void TextAttributeTests::TestReverseDefaultColors() VERIFY_ARE_EQUAL(_defaultBg, attr._GetRgbBackground(view, _defaultBg)); VERIFY_ARE_EQUAL(_defaultBg, attr.CalculateRgbBackground(view, _defaultFg, _defaultBg)); - // with reverse video set, calucated foreground/background values should be + // with reverse video set, calculated foreground/background values should be // switched while getters stay the same attr.SetMetaAttributes(COMMON_LVB_REVERSE_VIDEO); VERIFY_IS_TRUE(attr._IsReverseVideo()); diff --git a/src/cascadia/LocalTests_TerminalApp/CppWinrtTailored.h b/src/cascadia/LocalTests_TerminalApp/CppWinrtTailored.h index 229093b37..874653ed2 100644 --- a/src/cascadia/LocalTests_TerminalApp/CppWinrtTailored.h +++ b/src/cascadia/LocalTests_TerminalApp/CppWinrtTailored.h @@ -57,7 +57,7 @@ namespace details // Function Description: // - This is a helper function for running a bit of test code on the UI thread. -// It will synchonously dispatch the provided function to the UI thread, and +// It will synchronously dispatch the provided function to the UI thread, and // wait for that function to complete, before returning to the caller. Callers // should make sure to VERIFY_SUCCEEDED the result of this function, to ensure // the code executed successfully. diff --git a/src/cascadia/LocalTests_TerminalApp/TerminalApp.LocalTests.AppxManifest.prototype.xml b/src/cascadia/LocalTests_TerminalApp/TerminalApp.LocalTests.AppxManifest.prototype.xml index bd04ed078..100e0340a 100644 --- a/src/cascadia/LocalTests_TerminalApp/TerminalApp.LocalTests.AppxManifest.prototype.xml +++ b/src/cascadia/LocalTests_TerminalApp/TerminalApp.LocalTests.AppxManifest.prototype.xml @@ -3,7 +3,7 @@ diff --git a/src/cascadia/TerminalApp/GlobalAppSettings.cpp b/src/cascadia/TerminalApp/GlobalAppSettings.cpp index 9284da908..2007655c5 100644 --- a/src/cascadia/TerminalApp/GlobalAppSettings.cpp +++ b/src/cascadia/TerminalApp/GlobalAppSettings.cpp @@ -383,7 +383,7 @@ std::wstring_view GlobalAppSettings::_SerializeTheme(const ElementTheme theme) n // Method Description: // - Helper function for converting the initial position string into // 2 coordinate values. We allow users to only provide one coordinate, -// thus, we use comma as the separater: +// thus, we use comma as the separator: // (100, 100): standard input string // (, 100), (100, ): if a value is missing, we set this value as a default // (,): both x and y are set to default diff --git a/src/cascadia/TerminalApp/JsonUtils.h b/src/cascadia/TerminalApp/JsonUtils.h index e4a086590..1186b48fc 100644 --- a/src/cascadia/TerminalApp/JsonUtils.h +++ b/src/cascadia/TerminalApp/JsonUtils.h @@ -43,7 +43,7 @@ namespace TerminalApp::JsonUtils // Arguments: // - json: The json object to search for the given key // - key: The key to look for in the json object - // - target: the optional object to recieve the value from json + // - target: the optional object to receive the value from json // - conversion: a std::function which can be used to // convert the Json::Value to the appropriate type. // Return Value: diff --git a/src/cascadia/TerminalApp/KeyChordSerialization.cpp b/src/cascadia/TerminalApp/KeyChordSerialization.cpp index d5dd796c5..b825c2510 100644 --- a/src/cascadia/TerminalApp/KeyChordSerialization.cpp +++ b/src/cascadia/TerminalApp/KeyChordSerialization.cpp @@ -205,7 +205,7 @@ winrt::Microsoft::Terminal::Settings::KeyChord KeyChordSerialization::FromString } // Function Description: -// - Serialize this keychord into a string represenation. +// - Serialize this keychord into a string representation. // - The string will fit the format "[ctrl+][alt+][shift+]", // where each modifier is optional, and keyName is either one of the // names listed in the vkeyNamePairs vector above, or is one of 0-9a-z. diff --git a/src/cascadia/TerminalApp/Pane.cpp b/src/cascadia/TerminalApp/Pane.cpp index 0d54c0b9f..f7c7942fd 100644 --- a/src/cascadia/TerminalApp/Pane.cpp +++ b/src/cascadia/TerminalApp/Pane.cpp @@ -786,7 +786,7 @@ void Pane::_SetupChildCloseHandlers() // - Sets up row/column definitions for this pane. There are three total // row/cols. The middle one is for the separator. The first and third are for // each of the child panes, and are given a size in pixels, based off the -// availiable space, and the percent of the space they respectively consume, +// available space, and the percent of the space they respectively consume, // which is stored in _desiredSplitPosition // - Does nothing if our split state is currently set to SplitState::None // Arguments: diff --git a/src/cascadia/TerminalApp/Pane.h b/src/cascadia/TerminalApp/Pane.h index d702634e2..84bf041fe 100644 --- a/src/cascadia/TerminalApp/Pane.h +++ b/src/cascadia/TerminalApp/Pane.h @@ -5,7 +5,7 @@ // - Pane.h // // Abstract: -// - Panes are an abstraction by which the terminal can dislay multiple terminal +// - Panes are an abstraction by which the terminal can display multiple terminal // instances simultaneously in a single terminal window. While tabs allow for // a single terminal window to have many terminal sessions running // simultaneously within a single window, only one tab can be visible at a @@ -191,7 +191,7 @@ private: std::unique_ptr secondChild; // These two fields hold next possible snapped values of firstChild and - // secondChild. Although that could be calculated from these fields themself, + // secondChild. Although that could be calculated from these fields themselves, // it would be wasteful as we have to know these values more often than for // simple increment. Hence we cache that here. std::unique_ptr nextFirstChild; diff --git a/src/cascadia/TerminalApp/Profile.cpp b/src/cascadia/TerminalApp/Profile.cpp index 16c96db45..adcc9f766 100644 --- a/src/cascadia/TerminalApp/Profile.cpp +++ b/src/cascadia/TerminalApp/Profile.cpp @@ -936,7 +936,7 @@ CloseOnExitMode Profile::GetCloseOnExitMode() const noexcept // Arguments: // - // Return Value: -// - true iff the profile chould be hidden from the list of profiles. +// - true iff the profile should be hidden from the list of profiles. bool Profile::IsHidden() const noexcept { return _hidden; @@ -1309,7 +1309,7 @@ bool Profile::IsDynamicProfileObject(const Json::Value& json) GUID Profile::_GenerateGuidForProfile(const std::wstring& name, const std::optional& source) noexcept { // If we have a _source, then we can from a dynamic profile generator. Use - // our source to build the naespace guid, instead of using the default GUID. + // our source to build the namespace guid, instead of using the default GUID. const GUID namespaceGuid = source.has_value() ? Utils::CreateV5Uuid(RUNTIME_GENERATED_PROFILE_NAMESPACE_GUID, gsl::as_bytes(gsl::make_span(source.value()))) : diff --git a/src/cascadia/TerminalApp/Tab.cpp b/src/cascadia/TerminalApp/Tab.cpp index 061ee5f59..a4b496b12 100644 --- a/src/cascadia/TerminalApp/Tab.cpp +++ b/src/cascadia/TerminalApp/Tab.cpp @@ -295,7 +295,7 @@ namespace winrt::TerminalApp::implementation // - void Tab::ResizeContent(const winrt::Windows::Foundation::Size& newSize) { - // NOTE: This _must_ be called on the root pane, so that it can propogate + // NOTE: This _must_ be called on the root pane, so that it can propagate // throughout the entire tree. _rootPane->ResizeContent(newSize); } @@ -309,7 +309,7 @@ namespace winrt::TerminalApp::implementation // - void Tab::ResizePane(const winrt::TerminalApp::Direction& direction) { - // NOTE: This _must_ be called on the root pane, so that it can propogate + // NOTE: This _must_ be called on the root pane, so that it can propagate // throughout the entire tree. _rootPane->ResizePane(direction); } @@ -323,7 +323,7 @@ namespace winrt::TerminalApp::implementation // - void Tab::NavigateFocus(const winrt::TerminalApp::Direction& direction) { - // NOTE: This _must_ be called on the root pane, so that it can propogate + // NOTE: This _must_ be called on the root pane, so that it can propagate // throughout the entire tree. _rootPane->NavigateFocus(direction); } diff --git a/src/cascadia/TerminalApp/TerminalPage.cpp b/src/cascadia/TerminalApp/TerminalPage.cpp index e1f4d1f3b..3cd02c93d 100644 --- a/src/cascadia/TerminalApp/TerminalPage.cpp +++ b/src/cascadia/TerminalApp/TerminalPage.cpp @@ -289,7 +289,7 @@ namespace winrt::TerminalApp::implementation // Method Description: // - Displays a dialog for warnings found while closing the terminal app using // key binding with multiple tabs opened. Display messages to warn user - // that more than 1 tab is opend, and once the user clicks the OK button, remove + // that more than 1 tab is opened, and once the user clicks the OK button, remove // all the tabs and shut down and app. If cancel is clicked, the dialog will close // - Only one dialog can be visible at a time. If another dialog is visible // when this is called, nothing happens. See _ShowDialog for details @@ -480,7 +480,7 @@ namespace winrt::TerminalApp::implementation g_hTerminalAppProvider, // handle to TerminalApp tracelogging provider "TabInformation", TraceLoggingDescription("Event emitted upon new tab creation in TerminalApp"), - TraceLoggingUInt32(tabCount, "TabCount", "Count of tabs curently opened in TerminalApp"), + TraceLoggingUInt32(tabCount, "TabCount", "Count of tabs currently opened in TerminalApp"), TraceLoggingBool(usedManualProfile, "ProfileSpecified", "Whether the new tab specified a profile explicitly"), TraceLoggingGuid(profileGuid, "ProfileGuid", "The GUID of the profile spawned in the new tab"), TraceLoggingKeyword(MICROSOFT_KEYWORD_MEASURES), @@ -521,7 +521,7 @@ namespace winrt::TerminalApp::implementation auto weakTab = make_weak(newTabImpl); // When the tab's active pane changes, we'll want to lookup a new icon - // for it, and possibly propogate the title up to the window. + // for it, and possibly propagate the title up to the window. newTabImpl->ActivePaneChanged([weakTab, weakThis{ get_weak() }]() { auto page{ weakThis.get() }; auto tab{ weakTab.get() }; @@ -1236,7 +1236,7 @@ namespace winrt::TerminalApp::implementation } // Method Description: - // - Calculates the appropriate size to snap to in the gived direction, for + // - Calculates the appropriate size to snap to in the given direction, for // the given dimension. If the global setting `snapToGridOnResize` is set // to `false`, this will just immediately return the provided dimension, // effectively disabling snapping. diff --git a/src/cascadia/TerminalApp/Utils.cpp b/src/cascadia/TerminalApp/Utils.cpp index 6bf6bdc87..01fa28dfd 100644 --- a/src/cascadia/TerminalApp/Utils.cpp +++ b/src/cascadia/TerminalApp/Utils.cpp @@ -5,7 +5,7 @@ #include "Utils.h" // Method Description: -// - Contstructs a wstring from a given Json::Value object. Reads the object as +// - Constructs a wstring from a given Json::Value object. Reads the object as // a std::string using asString, then builds an hstring from that std::string, // then converts that hstring into a std::wstring. // Arguments: diff --git a/src/cascadia/TerminalApp/lib/TerminalAppLib.vcxproj b/src/cascadia/TerminalApp/lib/TerminalAppLib.vcxproj index 4adb40293..84180307d 100644 --- a/src/cascadia/TerminalApp/lib/TerminalAppLib.vcxproj +++ b/src/cascadia/TerminalApp/lib/TerminalAppLib.vcxproj @@ -246,7 +246,7 @@ $(_BinRoot)TerminalSettings\Microsoft.Terminal.Settings.winmd @@ -285,7 +285,7 @@ to reference its winmd, but very specifically with the CopyLocalSatelliteAssemblies and Private properties set to false, as to not have projects including us double-including MUX's .winmd. The following blob - is taken straight from the MUX build targets, with the afformentioned + is taken straight from the MUX build targets, with the aforementioned changes.--> x86 diff --git a/src/cascadia/TerminalConnection/ConptyConnection.cpp b/src/cascadia/TerminalConnection/ConptyConnection.cpp index ce5d06c7d..4f352a634 100644 --- a/src/cascadia/TerminalConnection/ConptyConnection.cpp +++ b/src/cascadia/TerminalConnection/ConptyConnection.cpp @@ -385,20 +385,20 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation return 0; } - if (!_recievedFirstByte) + if (!_receivedFirstByte) { const auto now = std::chrono::high_resolution_clock::now(); const std::chrono::duration delta = now - _startTime; #pragma warning(suppress : 26477 26485 26494 26482 26446) // We don't control TraceLoggingWrite TraceLoggingWrite(g_hTerminalConnectionProvider, - "RecievedFirstByte", - TraceLoggingDescription("An event emitted when the connection recieves the first byte"), + "ReceivedFirstByte", + TraceLoggingDescription("An event emitted when the connection receives the first byte"), TraceLoggingGuid(_guid, "SessionGuid", "The WT_SESSION's GUID"), TraceLoggingFloat64(delta.count(), "Duration"), TraceLoggingKeyword(MICROSOFT_KEYWORD_MEASURES), TelemetryPrivacyDataTag(PDT_ProductAndServicePerformance)); - _recievedFirstByte = true; + _receivedFirstByte = true; } // Pass the output to our registered event handlers diff --git a/src/cascadia/TerminalConnection/ConptyConnection.h b/src/cascadia/TerminalConnection/ConptyConnection.h index 53b62194e..c9888ab44 100644 --- a/src/cascadia/TerminalConnection/ConptyConnection.h +++ b/src/cascadia/TerminalConnection/ConptyConnection.h @@ -42,7 +42,7 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation hstring _startingTitle; guid _guid{}; // A unique session identifier for connected client - bool _recievedFirstByte{ false }; + bool _receivedFirstByte{ false }; std::chrono::high_resolution_clock::time_point _startTime{}; wil::unique_hfile _inPipe; // The pipe for writing input to diff --git a/src/cascadia/TerminalControl/SearchBoxControl.idl b/src/cascadia/TerminalControl/SearchBoxControl.idl index 30ed43155..ed6c4e4cc 100644 --- a/src/cascadia/TerminalControl/SearchBoxControl.idl +++ b/src/cascadia/TerminalControl/SearchBoxControl.idl @@ -3,7 +3,7 @@ namespace Microsoft.Terminal.TerminalControl { - delegate void SearchHandler(String query, Boolean goFarward, Boolean isCaseSensitive); + delegate void SearchHandler(String query, Boolean goForward, Boolean isCaseSensitive); [default_interface] runtimeclass SearchBoxControl : Windows.UI.Xaml.Controls.UserControl { diff --git a/src/cascadia/TerminalControl/TSFInputControl.cpp b/src/cascadia/TerminalControl/TSFInputControl.cpp index 78e15ba90..5fe2485c4 100644 --- a/src/cascadia/TerminalControl/TSFInputControl.cpp +++ b/src/cascadia/TerminalControl/TSFInputControl.cpp @@ -193,7 +193,7 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation // Method Description: // - Handler for CompositionStarted event by CoreEditContext responsible - // for making internal TSFInputControl controls visisble. + // for making internal TSFInputControl controls visible. // Arguments: // - sender: CoreTextEditContext sending the request. Not used in method. // - args: CoreTextCompositionStartedEventArgs. Not used in method. @@ -207,7 +207,7 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation // Method Description: // - Handler for CompositionCompleted event by CoreEditContext responsible - // for making internal TSFInputControl controls visisble. + // for making internal TSFInputControl controls visible. // Arguments: // - sender: CoreTextEditContext sending the request. Not used in method. // - args: CoreTextCompositionCompletedEventArgs. Not used in method. @@ -238,7 +238,7 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation // Method Description: // - Handler for FocusRemoved event by CoreEditContext responsible // for removing focus for the TSFInputControl control accordingly - // when focus was forecibly removed from text input control. (TODO GitHub #3644) + // when focus was forcibly removed from text input control. (TODO GitHub #3644) // NOTE: Documentation says application should handle this event // Arguments: // - sender: CoreTextEditContext sending the request. Not used in method. diff --git a/src/cascadia/TerminalControl/TermControl.cpp b/src/cascadia/TerminalControl/TermControl.cpp index d4bb8dc8c..6b3417a17 100644 --- a/src/cascadia/TerminalControl/TermControl.cpp +++ b/src/cascadia/TerminalControl/TermControl.cpp @@ -647,17 +647,17 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation dxEngine->SetCallback(std::bind(&TermControl::SwapChainChanged, this)); // TODO:GH#3927 - Make it possible to hot-reload this setting. Right - // here, the setting will only be used when the Temrinal is initialized. + // here, the setting will only be used when the Terminal is initialized. dxEngine->SetRetroTerminalEffects(_settings.RetroTerminalEffect()); THROW_IF_FAILED(dxEngine->Enable()); _renderEngine = std::move(dxEngine); // This event is explicitly revoked in the destructor: does not need weak_ref - auto onRecieveOutputFn = [this](const hstring str) { + auto onReceiveOutputFn = [this](const hstring str) { _terminal->Write(str); }; - _connectionOutputEventToken = _connection.TerminalOutput(onRecieveOutputFn); + _connectionOutputEventToken = _connection.TerminalOutput(onReceiveOutputFn); auto inputFn = std::bind(&TermControl::_SendInputToConnection, this, std::placeholders::_1); _terminal->SetWriteInputCallback(inputFn); @@ -711,13 +711,13 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation localPointerToThread->EnablePainting(); // No matter what order these guys are in, The KeyDown's will fire - // before the CharacterRecieved, so we can't easily get characters + // before the CharacterReceived, so we can't easily get characters // first, then fallback to getting keys from vkeys. // TODO: This apparently handles keys and characters correctly, though // I'd keep an eye on it, and test more. // I presume that the characters that aren't translated by terminalInput // just end up getting ignored, and the rest of the input comes - // through CharacterRecieved. + // through CharacterReceived. // I don't believe there's a difference between KeyDown and // PreviewKeyDown for our purposes // These two handlers _must_ be on this, not _root. @@ -873,7 +873,7 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation // If the terminal translated the key, mark the event as handled. // This will prevent the system from trying to get the character out - // of it and sending us a CharacterRecieved event. + // of it and sending us a CharacterReceived event. const auto handled = vkey ? _terminal->SendKeyEvent(vkey, scanCode, modifiers) : true; if (_cursorTimer.has_value()) @@ -1231,7 +1231,7 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation } else { - // This is a scroll event that wasn't initiated by the termnial + // This is a scroll event that wasn't initiated by the terminal // itself - it was initiated by the mouse wheel, or the scrollbar. this->ScrollViewport(static_cast(newValue)); } @@ -1438,7 +1438,7 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation // performance guarantees aren't exactly stellar) // - The STL doesn't have a simple string search/replace method. // This fact is lamentable. - // - This line-ending converstion is intentionally fairly + // - This line-ending conversion is intentionally fairly // conservative, to avoid stripping out lone \n characters // where they could conceivably be intentional. @@ -1620,7 +1620,7 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation } // Method Description: - // - Update the postion and size of the scrollbar to match the given + // - Update the position and size of the scrollbar to match the given // viewport top, viewport height, and buffer size. // The change will be actually handled in _ScrollbarChangeHandler. // This should be done on the UI thread. Make sure the caller is calling @@ -1644,7 +1644,7 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation } // Method Description: - // - Update the postion and size of the scrollbar to match the given + // - Update the position and size of the scrollbar to match the given // viewport top, viewport height, and buffer size. // Additionally fires a ScrollPositionChanged event for anyone who's // registered an event handler for us. @@ -1992,13 +1992,13 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation // or we hit max number of allowable values (= 4) for the bounding rectangle // Non-numeral values detected will default to 0 // std::getline will not throw exception unless flags are set on the wstringstream - // std::stod will throw invalid_argument expection if the input is an invalid double value - // std::stod will throw out_of_range expection if the input value is more than DBL_MAX + // std::stod will throw invalid_argument exception if the input is an invalid double value + // std::stod will throw out_of_range exception if the input value is more than DBL_MAX try { for (; std::getline(tokenStream, token, singleCharDelim) && (paddingPropIndex < thicknessArr.size()); paddingPropIndex++) { - // std::stod internall calls wcstod which handles whitespace prefix (which is ignored) + // std::stod internally calls wcstod which handles whitespace prefix (which is ignored) // & stops the scan when first char outside the range of radix is encountered // We'll be permissive till the extent that stod function allows us to be by default // Ex. a value like 100.3#535w2 will be read as 100.3, but ;df25 will fail @@ -2256,7 +2256,7 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation void TermControl::_DragOverHandler(Windows::Foundation::IInspectable const& /*sender*/, DragEventArgs const& e) { - // Make sure to set the AcceptedOperation, so that we can later recieve the path in the Drop event + // Make sure to set the AcceptedOperation, so that we can later receive the path in the Drop event e.AcceptedOperation(winrt::Windows::ApplicationModel::DataTransfer::DataPackageOperation::Copy); // Sets custom UI text diff --git a/src/cascadia/TerminalCore/Terminal.cpp b/src/cascadia/TerminalCore/Terminal.cpp index c8dabc885..4179e19cc 100644 --- a/src/cascadia/TerminalCore/Terminal.cpp +++ b/src/cascadia/TerminalCore/Terminal.cpp @@ -245,7 +245,7 @@ bool Terminal::SendKeyEvent(const WORD vkey, const WORD scanCode, const ControlK // pressed, manually get the character that's being typed, and put it in the // KeyEvent. // DON'T manually handle Alt+Space - the system will use this to bring up - // the system menu for restore, min/maximimize, size, move, close + // the system menu for restore, min/maximize, size, move, close wchar_t ch = UNICODE_NULL; if (states.IsAltPressed() && vkey != VK_SPACE) { @@ -345,7 +345,7 @@ catch (...) } // Method Description: -// - Aquire a read lock on the terminal. +// - Acquire a read lock on the terminal. // Return Value: // - a shared_lock which can be used to unlock the terminal. The shared_lock // will release this lock when it's destructed. @@ -355,7 +355,7 @@ catch (...) } // Method Description: -// - Aquire a write lock on the terminal. +// - Acquire a write lock on the terminal. // Return Value: // - a unique_lock which can be used to unlock the terminal. The unique_lock // will release this lock when it's destructed. diff --git a/src/cascadia/TerminalCore/Terminal.hpp b/src/cascadia/TerminalCore/Terminal.hpp index f07467ddd..2df547e13 100644 --- a/src/cascadia/TerminalCore/Terminal.hpp +++ b/src/cascadia/TerminalCore/Terminal.hpp @@ -225,7 +225,7 @@ private: // _visibleTop as well. // Additionally, maybe some people want to scroll into the history, then have that scroll out from // underneath them, while others would prefer to anchor it in place. - // Either way, we sohould make this behavior controlled by a setting. + // Either way, we should make this behavior controlled by a setting. static WORD _ScanCodeFromVirtualKey(const WORD vkey) noexcept; static wchar_t _CharacterFromKeyEvent(const WORD vkey, const WORD scanCode, const ControlKeyStates states) noexcept; diff --git a/src/cascadia/UnitTests_TerminalCore/ConptyRoundtripTests.cpp b/src/cascadia/UnitTests_TerminalCore/ConptyRoundtripTests.cpp index a66f21a1a..e6b4be530 100644 --- a/src/cascadia/UnitTests_TerminalCore/ConptyRoundtripTests.cpp +++ b/src/cascadia/UnitTests_TerminalCore/ConptyRoundtripTests.cpp @@ -2,7 +2,7 @@ // Licensed under the MIT license. // // 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 resopnse on the +// 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 // `renderer.PaintFrame()` is called, the tests will validate the expected diff --git a/src/cascadia/UnitTests_TerminalCore/InputTest.cpp b/src/cascadia/UnitTests_TerminalCore/InputTest.cpp index 2492c2208..6d66301e1 100644 --- a/src/cascadia/UnitTests_TerminalCore/InputTest.cpp +++ b/src/cascadia/UnitTests_TerminalCore/InputTest.cpp @@ -59,7 +59,7 @@ namespace TerminalCoreUnitTests void InputTest::AltSpace() { // Make sure we don't handle Alt+Space. The system will use this to - // bring up the system menu for restore, min/maximimize, size, move, + // bring up the system menu for restore, min/maximize, size, move, // close VERIFY_IS_FALSE(term.SendKeyEvent(L' ', 0, ControlKeyStates::LeftAltPressed)); } diff --git a/src/cascadia/WindowsTerminal/AppHost.cpp b/src/cascadia/WindowsTerminal/AppHost.cpp index c4f8f2b7a..eae4aba95 100644 --- a/src/cascadia/WindowsTerminal/AppHost.cpp +++ b/src/cascadia/WindowsTerminal/AppHost.cpp @@ -129,7 +129,7 @@ void AppHost::Initialize() if (_useNonClientArea) { - // Register our callbar for when the app's non-client content changes. + // Register our callback for when the app's non-client content changes. // This has to be done _before_ App::Create, as the app might set the // content in Create. _logic.SetTitleBarContent({ this, &AppHost::_UpdateTitleBarContent }); @@ -202,7 +202,7 @@ void AppHost::_HandleCreateWindow(const HWND hwnd, RECT proposedRect, winrt::Ter { launchMode = _logic.GetLaunchMode(); - // Acquire the actual intial position + // Acquire the actual initial position winrt::Windows::Foundation::Point initialPosition = _logic.GetLaunchInitialPositions(proposedRect.left, proposedRect.top); proposedRect.left = gsl::narrow_cast(initialPosition.X); proposedRect.top = gsl::narrow_cast(initialPosition.Y); @@ -211,7 +211,7 @@ void AppHost::_HandleCreateWindow(const HWND hwnd, RECT proposedRect, winrt::Ter long adjustedWidth = 0; if (launchMode == winrt::TerminalApp::LaunchMode::DefaultMode) { - // Find nearest montitor. + // Find nearest monitor. HMONITOR hmon = MonitorFromRect(&proposedRect, MONITOR_DEFAULTTONEAREST); // Get nearest monitor information @@ -279,7 +279,7 @@ void AppHost::_HandleCreateWindow(const HWND hwnd, RECT proposedRect, winrt::Ter newPos.Height(), SWP_NOACTIVATE | SWP_NOZORDER); - // Refresh the dpi of HWND becuase the dpi where the window will launch may be different + // Refresh the dpi of HWND because the dpi where the window will launch may be different // at this time _window->RefreshCurrentDPI(); diff --git a/src/cascadia/WindowsTerminal/BaseWindow.h b/src/cascadia/WindowsTerminal/BaseWindow.h index 899bc56b3..ac0064229 100644 --- a/src/cascadia/WindowsTerminal/BaseWindow.h +++ b/src/cascadia/WindowsTerminal/BaseWindow.h @@ -191,7 +191,7 @@ public: //// Gets the logical (in DIPs) size of a physical size specified by the parameter physicalSize //// Remarks: - //// XAML coordinate system is always in Display Indepenent Pixels (a.k.a DIPs or Logical). However Win32 GDI (because of legacy reasons) + //// XAML coordinate system is always in Display Independent Pixels (a.k.a DIPs or Logical). However Win32 GDI (because of legacy reasons) //// in DPI mode "Per-Monitor and Per-Monitor (V2) DPI Awareness" is always in physical pixels. //// The formula to transform is: //// logical = (physical / dpi) + 0.5 // 0.5 is to ensure that we pixel snap correctly at the edges, this is necessary with odd DPIs like 1.25, 1.5, 1, .75 @@ -203,8 +203,8 @@ public: const auto scale = GetCurrentDpiScale(); // 0.5 is to ensure that we pixel snap correctly at the edges, this is necessary with odd DPIs like 1.25, 1.5, 1, .75 const auto logicalWidth = (physicalSize.cx / scale) + 0.5f; - const auto logicalHeigth = (physicalSize.cy / scale) + 0.5f; - return winrt::Windows::Foundation::Size(logicalWidth, logicalHeigth); + const auto logicalHeight = (physicalSize.cy / scale) + 0.5f; + return winrt::Windows::Foundation::Size(logicalWidth, logicalHeight); } winrt::Windows::Foundation::Size GetLogicalSize() const noexcept diff --git a/src/cascadia/WindowsTerminal/IslandWindow.cpp b/src/cascadia/WindowsTerminal/IslandWindow.cpp index d0fc574ab..3b5e72442 100644 --- a/src/cascadia/WindowsTerminal/IslandWindow.cpp +++ b/src/cascadia/WindowsTerminal/IslandWindow.cpp @@ -79,7 +79,7 @@ void IslandWindow::Close() // Method Description: // - Set a callback to be called when we process a WM_CREATE message. This gives -// the AppHost a chance to resize the window to the propoer size. +// the AppHost a chance to resize the window to the proper size. // Arguments: // - pfn: a function to be called during the handling of WM_CREATE. It takes two // parameters: diff --git a/src/cascadia/WindowsTerminal/IslandWindow.h b/src/cascadia/WindowsTerminal/IslandWindow.h index 77f8a0736..432b78c31 100644 --- a/src/cascadia/WindowsTerminal/IslandWindow.h +++ b/src/cascadia/WindowsTerminal/IslandWindow.h @@ -49,7 +49,7 @@ public: TerminalApp to have TerminalApp handle the ChangeViewport call. (See IslandWindow::SetCreateCallback as an example of a similar pattern we're using today.) That way, if someone else were trying - to resuse this, they could have their own AppHost (or TerminalApp + to reuse this, they could have their own AppHost (or TerminalApp equivalent) handle the ChangeViewport call their own way. */ return; diff --git a/src/cascadia/WindowsTerminal/main.cpp b/src/cascadia/WindowsTerminal/main.cpp index d7be7d15b..f8fcb2c7c 100644 --- a/src/cascadia/WindowsTerminal/main.cpp +++ b/src/cascadia/WindowsTerminal/main.cpp @@ -108,7 +108,7 @@ int __stdcall wWinMain(HINSTANCE, HINSTANCE, LPWSTR, int) AppHost host; // Initialize the xaml content. This must be called AFTER the - // WindowsXamlManager is initalized. + // WindowsXamlManager is initialized. host.Initialize(); MSG message; diff --git a/src/cascadia/ut_app/DynamicProfileTests.cpp b/src/cascadia/ut_app/DynamicProfileTests.cpp index 1fe979314..312bc0f1d 100644 --- a/src/cascadia/ut_app/DynamicProfileTests.cpp +++ b/src/cascadia/ut_app/DynamicProfileTests.cpp @@ -549,7 +549,7 @@ namespace TerminalAppUnitTests VERIFY_ARE_EQUAL(L"Windows.Terminal.Wsl", settings._profiles.at(1)._source.value()); VERIFY_ARE_EQUAL(L"Windows.Terminal.Wsl", settings._profiles.at(2)._source.value()); VERIFY_ARE_EQUAL(L"Windows.Terminal.Azure", settings._profiles.at(3)._source.value()); - // settings._profiles.at(4) does not have a soruce + // settings._profiles.at(4) does not have a source VERIFY_ARE_EQUAL(L"profile0FromUserSettings", settings._profiles.at(0)._name); VERIFY_ARE_EQUAL(L"profile1FromUserSettings", settings._profiles.at(1)._name); VERIFY_ARE_EQUAL(L"profile2FromUserSettings", settings._profiles.at(2)._name); diff --git a/src/cascadia/ut_app/TerminalApp.Unit.Tests.AppxManifest.xml b/src/cascadia/ut_app/TerminalApp.Unit.Tests.AppxManifest.xml index 4ab002d40..d65ac6968 100644 --- a/src/cascadia/ut_app/TerminalApp.Unit.Tests.AppxManifest.xml +++ b/src/cascadia/ut_app/TerminalApp.Unit.Tests.AppxManifest.xml @@ -3,7 +3,7 @@ {{FG: {_foreground}, BG: {_background}, Legacy: {_wAttrLegacy}, {_extendedAttrs}} diff --git a/tools/GenerateAppxFromManifest.ps1 b/tools/GenerateAppxFromManifest.ps1 index b23db70a7..3bf0bba82 100644 --- a/tools/GenerateAppxFromManifest.ps1 +++ b/tools/GenerateAppxFromManifest.ps1 @@ -38,7 +38,7 @@ $files | ForEach-Object { $InProcessServer = $appxPrototypeData.CreateNode("element", "InProcessServer", $rootNS) $Path = $appxPrototypeData.CreateNode("element", "Path", $rootNS) - # You need to stash the result here, otherwise a blank line will be echod to + # You need to stash the result here, otherwise a blank line will be echoed to # the console. $placeholder = $Path.InnerText = $_.name diff --git a/tools/bcz.cmd b/tools/bcz.cmd index fb509f8d3..7e2c8c4f6 100644 --- a/tools/bcz.cmd +++ b/tools/bcz.cmd @@ -116,7 +116,7 @@ if "%_MSBUILD_TARGET%" == "Build" ( ) else if "%_MSBUILD_TARGET%" == "Clean,Build" ( set __MSBUILD_TARGET=%__PROJECT_NAME%:Rebuild ) -rem This statement will propogate our internal variables up to the calling +rem This statement will propagate our internal variables up to the calling rem scope. Because they're all on one line, the value of our local variables rem will be evaluated before we endlocal endlocal & set "PROJECT_NAME=%__PROJECT_NAME%" & set "_MSBUILD_TARGET=%__MSBUILD_TARGET%" diff --git a/tools/testcon.cmd b/tools/testcon.cmd index db5c0bb75..49ed9eb45 100644 --- a/tools/testcon.cmd +++ b/tools/testcon.cmd @@ -5,7 +5,7 @@ rem Run the console tests. rem I couldn't come up with a good way to combine the ft and ut lists rem automatically, so this is manually updated for now :( -rem NOTE: UIA tests are still seperate because they takeover your mouse/keyboard. +rem NOTE: UIA tests are still separate because they takeover your mouse/keyboard. rem Run them on your own. call %TAEF% ^