typos #19207

Closed
opened 2026-01-31 06:36:54 +00:00 by claunia · 4 comments
Owner

Originally created by @musvaage on GitHub (Jan 12, 2023).

code comments

Coincidentally
hasn't
marshaller
marshal
preceding
process

$ grep -nr Coincidentially terminal
terminal/src/renderer/atlas/AtlasEngine.h:819:            // Coincidentially that's exactly what we want as the cursor texture lives at {0, 0}.
$ grep -nr hasnt terminal
terminal/src/cascadia/Remoting/WindowManager.cpp:313:            // future. The AppHost hasnt yet set up the callbacks, and the rest
$ grep -nr marshaler terminal
terminal/src/host/ft_uia/Common/ShortcutHelper.cs:91:                // The marshaler doesn't like using the existing instance that we made above because it's a value type and
$ grep -nr "marshall the" terminal
terminal/scratch/ScratchIslandApp/WindowExe/WindowExe.vcxproj:93:    marshall the Core types across the boundary.
$ grep -nr preceeding terminal
terminal/src/host/ft_host/CJK_DbcsTests.cpp:2049:// In other words, writing a trailing CHAR_INFO will also automatically write a leading CHAR_INFO in the preceeding cell.
$ grep -nr precess terminal
terminal/src/cascadia/TerminalSettingsModel/ActionAndArgs.cpp:195:    //     to precess the rest of the arguments in the json object.
$ 

markdown

every time
foresee

$ grep -n everytime terminal/doc/Niksa.md
148:So from our little team working hard to make developers happy, we virtually never make the cut for servicing. We're sorry, but we hope you can understand. It's just the reality of the situation to say "nope" when people ask for a backport. In our team's ideal world, you would all be running the latest console bits everywhere everytime we make a change. But that's just not how it is today.
$ grep -n forsee "terminal/doc/specs/drafts/#997 Non-Terminal-Panes.md"
63:I don't forsee this implementation by itself raising security concerns. This
$

.github/actions/spelling/expect/expect.txt

As pointed out in a previous PR 'everytime' doesn't belong in expect.txt.

Originally created by @musvaage on GitHub (Jan 12, 2023). **code comments** Coincidentally hasn't marshaller marshal preceding process ``` $ grep -nr Coincidentially terminal terminal/src/renderer/atlas/AtlasEngine.h:819: // Coincidentially that's exactly what we want as the cursor texture lives at {0, 0}. $ grep -nr hasnt terminal terminal/src/cascadia/Remoting/WindowManager.cpp:313: // future. The AppHost hasnt yet set up the callbacks, and the rest $ grep -nr marshaler terminal terminal/src/host/ft_uia/Common/ShortcutHelper.cs:91: // The marshaler doesn't like using the existing instance that we made above because it's a value type and $ grep -nr "marshall the" terminal terminal/scratch/ScratchIslandApp/WindowExe/WindowExe.vcxproj:93: marshall the Core types across the boundary. $ grep -nr preceeding terminal terminal/src/host/ft_host/CJK_DbcsTests.cpp:2049:// In other words, writing a trailing CHAR_INFO will also automatically write a leading CHAR_INFO in the preceeding cell. $ grep -nr precess terminal terminal/src/cascadia/TerminalSettingsModel/ActionAndArgs.cpp:195: // to precess the rest of the arguments in the json object. $ ``` **markdown** every time foresee ``` $ grep -n everytime terminal/doc/Niksa.md 148:So from our little team working hard to make developers happy, we virtually never make the cut for servicing. We're sorry, but we hope you can understand. It's just the reality of the situation to say "nope" when people ask for a backport. In our team's ideal world, you would all be running the latest console bits everywhere everytime we make a change. But that's just not how it is today. $ grep -n forsee "terminal/doc/specs/drafts/#997 Non-Terminal-Panes.md" 63:I don't forsee this implementation by itself raising security concerns. This $ ``` .github/actions/spelling/expect/expect.txt As pointed out in a previous PR 'everytime' doesn't belong in expect.txt.
Author
Owner

@musvaage commented on GitHub (Jan 13, 2023):

noticed this looking at the initial patch

the fix would be

find a deserializer

$ ed -s terminal/src/cascadia/TerminalSettingsModel/ActionAndArgs.cpp <<<'193,194p'
    //   * If json is an object, we'll attempt to retrieve the action name from
    //     its "action" property, and we'll use that name to fine a deserializer
$ 
@musvaage commented on GitHub (Jan 13, 2023): noticed this looking at the initial patch the fix would be find a deserializer ``` $ ed -s terminal/src/cascadia/TerminalSettingsModel/ActionAndArgs.cpp <<<'193,194p' // * If json is an object, we'll attempt to retrieve the action name from // its "action" property, and we'll use that name to fine a deserializer $ ```
Author
Owner

@DHowett commented on GitHub (Jan 14, 2023):

Even though you've got one signoff on your PR (we require two per repository policy), you're of course free to continue submitting revisions to it. fine=>find isn't a misspelling, but it sure is a silly typo--or perhaps, a thinko--that we should probably not have. I appreciate you finding these 😄

@DHowett commented on GitHub (Jan 14, 2023): Even though you've got one signoff on your PR (we require two per repository policy), you're of course free to continue submitting revisions to it. `fine`=>`find` isn't a misspelling, but it sure is a silly typo--or perhaps, a thinko--that we should probably not have. I appreciate you finding these :smile:
Author
Owner

@musvaage commented on GitHub (Jan 14, 2023):

After a commit reverting the changes to the bundled oss subdirectory files I did a soft reset.

git reset --soft HEAD~2

I used the same commit message as for the initial commit.

git commit -m "typos"

And then I force-pushed the changes.

git push -f origin main


@DHowett

06bca55c22

I presume from your previous comment that the above commit was correct.


I'll leave this for Members' consideration in another PR.

@zadjii-msft

https://github.com/microsoft/terminal/pull/12475 left everytime in the allow list

.github/actions/spelling/expect/expect.txt

--- expect.txt.orig     2023-01-14 11:12:27.296971808 -0600
+++ expect.txt  2023-01-14 11:37:56.432957871 -0600
@@ -590,7 +590,6 @@
 EUDC
 EVENTID
 eventing
-everytime
 evflags
 evt
 execd
@@ -1550,7 +1549,6 @@
 READCONSOLEOUTPUTSTRING
 READMODE
 reallocs
-reamapping
 rects
 redef
 redefinable
@@ -2196,7 +2194,6 @@
 WNegative
 WNull
 wnwb
-workarea
 workaround
 WOutside
 WOWARM

terminal/src/terminal/input/terminalInput.cpp

the fix would be

Vim without remapping

$ ed -s terminal/src/terminal/input/terminalInput.cpp <<<'128,130p'
    // PuTTY uses a set of mappings that don't work in ViM without reamapping them back to the numpad
    // (see http://vim.wikia.com/wiki/PuTTY_numeric_keypad_mappings#Comments)
    // I think the best solution is to just not do any for the time being.
$ 

terminal/src/interactivity/win32/window.cpp

the fixes would be

monitor's work area
monitor work area's

it doesn't appear that WORKAREA is a variable; so should be rewritten in lowercase and as two words

$ ed -s terminal/src/interactivity/win32/window.cpp <<<'284,295p'
                    //get origin of monitor's workarea
                    mi.cbSize = sizeof(MONITORINFO);
                    GetMonitorInfo(hMon, &mi);

                    //Adjust right and bottom to new positions, relative to monitor workarea's origin
                    //Need to do this before adjusting left/top so RECT_* calculations are correct
                    rectProposed.right = mi.rcWork.left + rectProposed.width();
                    rectProposed.bottom = mi.rcWork.top + rectProposed.height();

                    // Move origin to top left of nearest
                    // monitor's WORKAREA (accounting for taskbar
                    // and any app toolbars)
$ 
@musvaage commented on GitHub (Jan 14, 2023): After a commit reverting the changes to the bundled `oss` subdirectory files I did a soft reset. `git reset --soft HEAD~2` I used the same commit message as for the initial commit. `git commit -m "typos"` And then I force-pushed the changes. `git push -f origin main` <hr> @DHowett https://github.com/microsoft/terminal/pull/14671/commits/06bca55c228e939eeb79679598dd66d8f8cf000f I presume from your previous comment that the above commit was correct. <hr> I'll leave this for Members' consideration in another PR. @zadjii-msft https://github.com/microsoft/terminal/pull/12475 left everytime in the allow list .github/actions/spelling/expect/expect.txt ```patch --- expect.txt.orig 2023-01-14 11:12:27.296971808 -0600 +++ expect.txt 2023-01-14 11:37:56.432957871 -0600 @@ -590,7 +590,6 @@ EUDC EVENTID eventing -everytime evflags evt execd @@ -1550,7 +1549,6 @@ READCONSOLEOUTPUTSTRING READMODE reallocs -reamapping rects redef redefinable @@ -2196,7 +2194,6 @@ WNegative WNull wnwb -workarea workaround WOutside WOWARM ``` terminal/src/terminal/input/terminalInput.cpp the fix would be Vim without remapping ``` $ ed -s terminal/src/terminal/input/terminalInput.cpp <<<'128,130p' // PuTTY uses a set of mappings that don't work in ViM without reamapping them back to the numpad // (see http://vim.wikia.com/wiki/PuTTY_numeric_keypad_mappings#Comments) // I think the best solution is to just not do any for the time being. $ ``` terminal/src/interactivity/win32/window.cpp the fixes would be monitor's work area monitor work area's it doesn't appear that WORKAREA is a variable; so should be rewritten in lowercase and as two words ``` $ ed -s terminal/src/interactivity/win32/window.cpp <<<'284,295p' //get origin of monitor's workarea mi.cbSize = sizeof(MONITORINFO); GetMonitorInfo(hMon, &mi); //Adjust right and bottom to new positions, relative to monitor workarea's origin //Need to do this before adjusting left/top so RECT_* calculations are correct rectProposed.right = mi.rcWork.left + rectProposed.width(); rectProposed.bottom = mi.rcWork.top + rectProposed.height(); // Move origin to top left of nearest // monitor's WORKAREA (accounting for taskbar // and any app toolbars) $ ```
Author
Owner

@musvaage commented on GitHub (Jan 15, 2023):

If Members want to add the additional changes from the previous comment they are welcome to do so.

.github/actions/spelling/expect/expect.txt
(patch appears in previous comment)

terminal/src/terminal/input/terminalInput.cpp

--- terminalInput.cpp.orig      2023-01-15 10:05:05.979936352 -0600
+++ terminalInput.cpp   2023-01-15 10:05:52.739935827 -0600
@@ -125,7 +125,7 @@
     // The numpad has a variety of mappings, none of which seem standard or really configurable by the OS.
     // See http://invisible-island.net/xterm/ctlseqs/ctlseqs.html#h2-PC-Style-Function-Keys
     //   to see just how convoluted this all is.
-    // PuTTY uses a set of mappings that don't work in ViM without reamapping them back to the numpad
+    // PuTTY uses a set of mappings that don't work in Vim without remapping them back to the numpad
     // (see http://vim.wikia.com/wiki/PuTTY_numeric_keypad_mappings#Comments)
     // I think the best solution is to just not do any for the time being.
     // Putty also provides configuration for choosing which of the 5 mappings it has through the settings, which is more work than we can manage now.

terminal/src/interactivity/win32/window.cpp
(presuming WORKAREA isn't a variable)

--- window.cpp.orig     2023-01-15 10:09:36.609933311 -0600
+++ window.cpp  2023-01-15 10:10:48.072932507 -0600
@@ -281,17 +281,17 @@
                     auto hMon = MonitorFromRect(rectProposed.as_win32_rect(), MONITOR_DEFAULTTONEAREST);
                     MONITORINFO mi = { 0 };
 
-                    //get origin of monitor's workarea
+                    //get origin of monitor's work area
                     mi.cbSize = sizeof(MONITORINFO);
                     GetMonitorInfo(hMon, &mi);
 
-                    //Adjust right and bottom to new positions, relative to monitor workarea's origin
+                    //Adjust right and bottom to new positions, relative to monitor work area's origin
                     //Need to do this before adjusting left/top so RECT_* calculations are correct
                     rectProposed.right = mi.rcWork.left + rectProposed.width();
                     rectProposed.bottom = mi.rcWork.top + rectProposed.height();
 
                     // Move origin to top left of nearest
-                    // monitor's WORKAREA (accounting for taskbar
+                    // monitor's work area (accounting for taskbar
                     // and any app toolbars)
                     rectProposed.left = mi.rcWork.left;
                     rectProposed.top = mi.rcWork.top;
@musvaage commented on GitHub (Jan 15, 2023): If Members want to add the additional changes from the previous comment they are welcome to do so. .github/actions/spelling/expect/expect.txt (patch appears in previous comment) terminal/src/terminal/input/terminalInput.cpp ```patch --- terminalInput.cpp.orig 2023-01-15 10:05:05.979936352 -0600 +++ terminalInput.cpp 2023-01-15 10:05:52.739935827 -0600 @@ -125,7 +125,7 @@ // The numpad has a variety of mappings, none of which seem standard or really configurable by the OS. // See http://invisible-island.net/xterm/ctlseqs/ctlseqs.html#h2-PC-Style-Function-Keys // to see just how convoluted this all is. - // PuTTY uses a set of mappings that don't work in ViM without reamapping them back to the numpad + // PuTTY uses a set of mappings that don't work in Vim without remapping them back to the numpad // (see http://vim.wikia.com/wiki/PuTTY_numeric_keypad_mappings#Comments) // I think the best solution is to just not do any for the time being. // Putty also provides configuration for choosing which of the 5 mappings it has through the settings, which is more work than we can manage now. ``` terminal/src/interactivity/win32/window.cpp (presuming WORKAREA isn't a variable) ```patch --- window.cpp.orig 2023-01-15 10:09:36.609933311 -0600 +++ window.cpp 2023-01-15 10:10:48.072932507 -0600 @@ -281,17 +281,17 @@ auto hMon = MonitorFromRect(rectProposed.as_win32_rect(), MONITOR_DEFAULTTONEAREST); MONITORINFO mi = { 0 }; - //get origin of monitor's workarea + //get origin of monitor's work area mi.cbSize = sizeof(MONITORINFO); GetMonitorInfo(hMon, &mi); - //Adjust right and bottom to new positions, relative to monitor workarea's origin + //Adjust right and bottom to new positions, relative to monitor work area's origin //Need to do this before adjusting left/top so RECT_* calculations are correct rectProposed.right = mi.rcWork.left + rectProposed.width(); rectProposed.bottom = mi.rcWork.top + rectProposed.height(); // Move origin to top left of nearest - // monitor's WORKAREA (accounting for taskbar + // monitor's work area (accounting for taskbar // and any app toolbars) rectProposed.left = mi.rcWork.left; rectProposed.top = mi.rcWork.top; ```
Sign in to join this conversation.
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: starred/terminal#19207