[PICK] Cherry-pick loc key from 83d35c119

(cherry picked from commit 95f63a9100)

.github/actions/spell-check/expect/5757ec679b03a4240130c3c53766c91bbc5cd6a7.txt

@@ -1 +0,0 @@
-renamer

.github/actions/spell-check/expect/655f007265b351e140d20b3976792523ad689241.txt

@@ -1,7 +0,0 @@
-autogenerated
-CPPCORECHECK
-Debian
-filepath
-inplace
-KEYBDINPUT
-WINVER

.github/actions/spelling/advice.txt

@@ -9,17 +9,19 @@ By default the command suggestion will generate a file named based on your commi
 
 If the listed items are:
 * ... **misspelled**, then please *correct* them instead of using the command.
-* ... *names*, please add them to `.github/actions/spell-check/dictionary/names.txt`.
-* ... APIs, you can add them to a file in `.github/actions/spell-check/dictionary/`.
-* ... just things you're using, please add them to an appropriate file in `.github/actions/spell-check/expect/`.
-* ... tokens you only need in one place and shouldn't *generally be used*, you can add an item in an appropriate file in `.github/actions/spell-check/patterns/`.
+* ... *names*, please add them to `.github/actions/spelling/dictionary/names.txt`.
+* ... APIs, you can add them to a file in `.github/actions/spelling/dictionary/`.
+* ... just things you're using, please add them to an appropriate file in `.github/actions/spelling/expect/`.
+* ... tokens you only need in one place and shouldn't *generally be used*, you can add an item in an appropriate file in `.github/actions/spelling/patterns/`.
 
 See the `README.md` in each directory for more information.
 
-:microscope: You can test your commits **without** *appending* to a PR by creating a new branch with that extra change and pushing it to your fork. The [:check-spelling](https://github.com/marketplace/actions/check-spelling) action will run in response to your **push** -- it doesn't require an open pull request. By using such a branch, you can limit the number of typos your peers see you make. :wink:
+:microscope: You can test your commits **without** *appending* to a PR by creating a new branch with that extra change and pushing it to your fork. The [check-spelling](https://github.com/marketplace/actions/check-spelling) action will run in response to your **push** -- it doesn't require an open pull request. By using such a branch, you can limit the number of typos your peers see you make. :wink:
 
+:clamp: If you see a bunch of garbage and it relates to a binary-ish string, please add a file path to the `.github/actions/spelling/excludes.txt` file instead of just accepting the garbage.
+
+File paths are Perl 5 Regular Expressions - you can [test](
+https://www.regexplanet.com/advanced/perl/) yours before committing to verify it will match your files.
+
+`^` refers to the file's path from the root of the repository, so `^README\.md$` would exclude [README.md](https://github.com/microsoft/terminal/blob/main/README.md) (on whichever branch you're using).
 </details>
-
-#### :warning: Reviewers
-At present, the action that triggered this message will not show its :x: in this PR unless the branch is within this repository.
-Thus, you **should** make sure that this comment has been addressed before encouraging the merge bot to merge this PR.

.github/actions/spelling/dictionary/README.md

@@ -1,6 +1,6 @@
 # Dictionaries are lists of words to accept unconditionally
 
-While check spelling will complain about a whitelisted word
+While check spelling will complain about an expected word
 which is no longer present, you can include things here even if
 they are not otherwise present in the repository.
 

.github/actions/spelling/dictionary/apis.txt

@@ -9,6 +9,7 @@ COLORPROPERTY
 CXICON
 CYICON
 D2DERR_SHADER_COMPILE_FAILED
+dataobject
 DERR
 environstrings
 EXPCMDFLAGS
@@ -22,10 +23,13 @@ Hashtable
 HIGHCONTRASTON
 HIGHCONTRASTW
 href
+IApp
+IAppearance
 IAsync
 IBind
 IBox
 IClass
+IConnection
 IComparable
 ICustom
 IDialog
@@ -34,19 +38,27 @@ IExplorer
 IInheritable
 IMap
 IObject
+IPackage
+IPeasant
 IStorage
+IStringable
 ITab
 ITaskbar
+IVirtual
 LCID
 llabs
+llu
 localtime
 lround
 LSHIFT
+MULTIPLEUSE
 msappx
+MULTIPLEUSE
 NCHITTEST
 NCLBUTTONDBLCLK
 NCRBUTTONDBLCLK
 NOAGGREGATION
+NOASYNC
 NOPROGRESS
 NOREDIRECTIONBITMAP
 ntprivapi
@@ -56,7 +68,10 @@ otms
 OUTLINETEXTMETRICW
 overridable
 PAGESCROLL
+pmr
+REGCLS
 RETURNCMD
+REGCLS
 rfind
 roundf
 RSHIFT
@@ -68,6 +83,7 @@ shobjidl
 SIZENS
 smoothstep
 GETDESKWALLPAPER
+SHELLEXECUTEINFOW
 snprintf
 spsc
 sregex
@@ -81,6 +97,8 @@ TBPF
 THEMECHANGED
 tmp
 tolower
+TTask
+TVal
 tx
 UPDATEINIFILE
 userenv

.github/actions/spelling/dictionary/dictionary.txt

@@ -116574,6 +116574,8 @@ Dowmetal
 Down
 down
 Downall
+downside
+downsides
 down-and-out
 down-and-outer
 down-at-heel
@@ -183441,6 +183443,8 @@ hostlership
 hostlerwife
 hostless
 hostly
+hostname
+hostnames
 hostry
 hosts
 hostship
@@ -236348,6 +236352,7 @@ Maxama
 Maxantia
 Maxatawny
 Maxbass
+maxed
 Maxentia
 Maxey
 Maxfield
@@ -327070,6 +327075,7 @@ ptychopterygial
 ptychopterygium
 Ptychosperma
 p-type
+ptys
 ptysmagogue
 ptyxis
 PU
@@ -341770,6 +341776,7 @@ reimplanted
 reimplanting
 reimplants
 reimplement
+reimplementation
 reimplemented
 reimplied
 reimply
@@ -354226,6 +354233,7 @@ run-through
 runtier
 runtiest
 runtime
+runtimes
 runtiness
 runtish
 runtishly
@@ -420369,6 +420377,7 @@ tokening
 tokenism
 tokenisms
 tokenize
+tokenizes
 tokenless
 token-money
 tokens
@@ -432744,6 +432753,7 @@ uintjie
 UIP
 Uird
 Uirina
+UIs
 Uis
 UIT
 uit
@@ -459682,6 +459692,7 @@ versines
 versing
 version
 versional
+versioned
 versioner
 versionist
 versionize

.github/actions/spelling/dictionary/fonts.txt

@@ -1,5 +1,6 @@
 Consolas
 emoji
+emojis
 Extralight
 Gabriola
 Iosevka

.github/actions/spelling/dictionary/microsoft.txt

@@ -1,11 +1,19 @@
 ACLs
+ADMINS
 altform
+altforms
 appendwttlogging
 backplating
+bitmaps
+BOMs
+CPLs
 CPRs
 DACL
 DACLs
+diffs
+disposables
 dotnetfeed
+DTDs
 DWINRT
 enablewttlogging
 LKG
@@ -31,6 +39,7 @@ systemroot
 taskkill
 tasklist
 tdbuildteamid
+VCRT
 vcruntime
 visualstudio
 VSTHRD
@@ -39,3 +48,4 @@ wslpath
 wtl
 wtt
 wttlog
+Xamarin

.github/actions/spelling/dictionary/names.txt

@@ -50,6 +50,7 @@ oising
 oldnewthing
 opengl
 osgwiki
+pabhojwa
 paulcam
 pauldotknopf
 PGP
@@ -62,6 +63,7 @@ Somuah
 sonph
 sonpham
 stakx
+thereses
 Walisch
 Wirt
 Wojciech

.github/actions/spelling/excludes.txt

@@ -35,7 +35,7 @@ SUMS$
 \.pbxproj$
 \.pdf$
 \.pem$
-\.png$
+(?:(?i)\.png$)
 \.psd$
 \.runsettings$
 \.sig$
@@ -59,7 +59,8 @@ SUMS$
 ^src/interactivity/onecore/BgfxEngine\.
 ^src/renderer/wddmcon/WddmConRenderer\.
 ^src/terminal/parser/ft_fuzzer/VTCommandFuzzer\.cpp$
+^src/types/ut_types/UtilsTests.cpp$
 ^src/tools/U8U16Test/(?:fr|ru|zh)\.txt$
-^\.github/actions/spell-check/
+^\.github/actions/spelling/
 ^\.gitignore$
 ^doc/reference/master-sequence-list.csv$

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

@@ -1,8 +1,10 @@
 AAAAAABBBBBBCCC
 AAAAABBBBBBBCCC
+AAAAABBBBBBCCC
 AAAAABCCCCCCCCC
 AAAAADCCCCCCCCC
 ABANDONFONT
+abcd
 ABCDEFGHIJKLMNO
 ABCG
 abf
@@ -20,6 +22,7 @@ activatable
 ACTIVEBORDER
 ACTIVECAPTION
 ADDALIAS
+ADDB
 ADDREF
 addressof
 ADDSTRING
@@ -107,6 +110,7 @@ aumid
 Authenticode
 AUTOBUDDY
 AUTOCHECKBOX
+autogenerated
 autohide
 AUTOHSCROLL
 automagically
@@ -129,6 +133,7 @@ backstory
 Batang
 baz
 Bazz
+BBBBBCCC
 BBBBCCCCC
 BBDM
 bbwe
@@ -168,7 +173,6 @@ BOLDFONT
 BOOLIFY
 bools
 boostorg
-Bopomofo
 Borland
 BOTTOMLEFT
 BOTTOMRIGHT
@@ -248,7 +252,7 @@ charset
 CHARSETINFO
 chcp
 checkbox
-Checkboxes
+checkboxes
 chh
 Childitem
 chk
@@ -292,6 +296,7 @@ CNTRL
 codebase
 Codeflow
 codepage
+codepath
 codepoint
 codeproject
 COINIT
@@ -350,7 +355,6 @@ conprops
 conpropsp
 conpty
 conptylib
-consecteturadipiscingelit
 conserv
 consoleapi
 CONSOLECONTROL
@@ -384,13 +388,13 @@ CORESYSTEM
 cotaskmem
 countof
 cout
-CParams
 CPG
 cpinfo
 CPINFOEX
 cplinfo
 cplusplus
 cpp
+CPPCORECHECK
 cppcorecheckrules
 cpprest
 cpprestsdk
@@ -413,7 +417,7 @@ csbi
 csbiex
 csharp
 CSHORT
-cso
+CSIDL
 csproj
 Csr
 csrmsg
@@ -426,7 +430,7 @@ cstdlib
 cstr
 cstring
 cstyle
-CSV
+csv
 CSwitch
 CText
 ctime
@@ -502,11 +506,13 @@ DCOLORVALUE
 dcommon
 DCompile
 dcompiler
+DComposition
 dde
 DDESHARE
 DDevice
 DEADCHAR
 dealloc
+Debian
 debolden
 debounce
 DECALN
@@ -515,7 +521,10 @@ DECAUPSS
 DECAWM
 DECCKM
 DECCOLM
+DECDHL
+DECDWL
 DECEKBD
+DECID
 DECKPAM
 DECKPM
 DECKPNM
@@ -550,6 +559,7 @@ DECSR
 decstandar
 DECSTBM
 DECSTR
+DECSWL
 DECTCEM
 Dedupe
 deduplicated
@@ -620,7 +630,6 @@ DLLVERSIONINFO
 DLOAD
 DLOOK
 dmp
-dnceng
 DOCTYPE
 docx
 DONTCARE
@@ -628,7 +637,6 @@ doskey
 dotnet
 doubleclick
 downlevel
-DOWNSCALE
 dpg
 dpi
 DPIAPI
@@ -674,6 +682,7 @@ ECH
 echokey
 ecount
 ECpp
+Edgium
 EDITKEYS
 EDITTEXT
 EDITUPDATE
@@ -684,7 +693,7 @@ EHsc
 EJO
 EK
 ELEMENTNOTAVAILABLE
-Elems
+elems
 elif
 elseif
 emacs
@@ -761,9 +770,11 @@ FFrom
 FGCOLOR
 fgetc
 fgetwc
+FGHIJ
 fgidx
 FILEDESCRIPTION
 fileno
+filepath
 FILESUBTYPE
 FILESYSPATH
 filesystem
@@ -841,7 +852,6 @@ gcy
 gdi
 gdip
 gdirenderer
-GENERATEPROJECTPRIFILE
 geopol
 GETALIAS
 GETALIASES
@@ -879,6 +889,7 @@ GETLBTEXT
 getline
 GETMINMAXINFO
 GETMOUSEINFO
+GETMOUSEVANISH
 GETNUMBEROFFONTS
 GETNUMBEROFINPUTEVENTS
 GETOBJECT
@@ -899,6 +910,9 @@ GFEh
 Gfun
 gfx
 gh
+GHIJK
+GHIJKL
+GHIJKLM
 gitfilters
 github
 gitlab
@@ -957,7 +971,6 @@ hfont
 hglobal
 hh
 hhh
-hhhh
 hhook
 hhx
 HIBYTE
@@ -984,7 +997,7 @@ hmod
 hmodule
 hmon
 HMONITOR
-Horiz
+horiz
 HORZ
 hostable
 hostlib
@@ -1045,6 +1058,7 @@ IDesktop
 IDevice
 IDictionary
 IDISHWND
+IDispatch
 IDisposable
 idl
 idllib
@@ -1097,10 +1111,10 @@ INITMENU
 inkscape
 inl
 INLINEPREFIX
-Inlines
+inlines
 INotify
 inout
-INPATHROOT
+inplace
 inproc
 Inputkeyinfo
 INPUTPROCESSORPROFILE
@@ -1113,7 +1127,6 @@ INTERCEPTCOPYPASTE
 INTERNALNAME
 interop
 interoperability
-intersectors
 inthread
 intptr
 intsafe
@@ -1164,6 +1177,7 @@ IValue
 IVector
 IWait
 iwch
+IWeb
 IWin
 IWindow
 IXaml
@@ -1192,6 +1206,7 @@ kcuu
 Kd
 kernelbase
 kernelbasestaging
+KEYBDINPUT
 keybinding
 keychord
 keydown
@@ -1210,9 +1225,9 @@ KILLFOCUS
 kinda
 KJ
 KLF
+KLMNO
 KLMNOPQRST
 KLMNOPQRSTQQQQQ
-Kode
 KU
 KVM
 KX
@@ -1257,6 +1272,7 @@ lld
 llvm
 llx
 LMENU
+LMNOP
 lnk
 lnkd
 lnkfile
@@ -1271,7 +1287,6 @@ Loewen
 LOGFONT
 LOGFONTW
 logissue
-Loremipsumdolorsitamet
 lowercased
 loword
 lparam
@@ -1299,6 +1314,7 @@ LPFNADDPROPSHEETPAGE
 LPINT
 lpl
 LPMEASUREITEMSTRUCT
+LPMINMAXINFO
 lpmsg
 LPNEWCPLINFO
 LPNEWCPLINFOA
@@ -1330,6 +1346,7 @@ lsproj
 lss
 lstatus
 lstrcmp
+lstrcmpi
 LTEXT
 LTLTLTLTL
 ltype
@@ -1344,7 +1361,6 @@ mailto
 majorly
 makeappx
 MAKEINTRESOURCE
-MAKEINTRESOURCEA
 MAKEINTRESOURCEW
 MAKELANGID
 MAKELONG
@@ -1397,6 +1413,8 @@ mindbogglingly
 mingw
 minimizeall
 minkernel
+MINMAXINFO
+mintty
 minwin
 minwindef
 Mip
@@ -1406,6 +1424,8 @@ mmcc
 MMCPL
 mmsystem
 MNC
+MNOPQ
+MNOPQR
 MODALFRAME
 modelproj
 MODERNCORE
@@ -1417,7 +1437,6 @@ monostate
 MOUSEACTIVATE
 MOUSEFIRST
 MOUSEHWHEEL
-mousemode
 MOUSEMOVE
 mousewheel
 MOVESTART
@@ -1434,12 +1453,12 @@ MSGF
 MSGFILTER
 MSGFLG
 MSGMARKMODE
+MSGS
 MSGSCROLLMODE
 MSGSELECTMODE
 msiexec
 MSIL
 msix
-msixbundle
 msrc
 msvcrt
 MSVS
@@ -1449,6 +1468,7 @@ mui
 Mul
 multiline
 munged
+munges
 mutex
 mutexes
 muxes
@@ -1463,7 +1483,6 @@ nameof
 namespace
 namespaced
 namestream
-Namquiseratal
 nano
 natvis
 nbsp
@@ -1503,9 +1522,9 @@ Nls
 NLSMODE
 NOACTIVATE
 NOAPPLYNOW
-NOCOMM
 NOCLIP
 NOCOLOR
+NOCOMM
 NOCONTEXTHELP
 NOCOPYBITS
 nodiscard
@@ -1529,6 +1548,7 @@ NONPREROTATED
 nonspace
 NOOWNERZORDER
 NOPAINT
+NOPQRST
 noprofile
 NOREDRAW
 NOREMOVE
@@ -1580,15 +1600,16 @@ NTVDM
 ntverp
 NTWIN
 nuget
-Nullametrutrummetus
 nullness
 nullonfailure
 nullopt
 nullptr
+NULs
 numlock
 numpad
 NUMSCROLL
 nupkg
+NVDA
 NVIDIA
 NVR
 Nx
@@ -1619,6 +1640,7 @@ ONECOREWINDOWS
 onehalf
 ONLCR
 Oo
+openconsoleproxy
 openbash
 opencode
 opencon
@@ -1818,6 +1840,8 @@ prioritization
 processenv
 processhost
 PROCESSINFOCLASS
+procs
+Progman
 proj
 PROPERTYID
 PROPERTYKEY
@@ -1842,7 +1866,6 @@ pshn
 PSHNOTIFY
 PSHORT
 pshpack
-psin
 PSINGLE
 psl
 psldl
@@ -1883,6 +1906,8 @@ pythonw
 qi
 QJ
 qo
+QOL
+QRSTU
 qsort
 queryable
 QUESTIONMARK
@@ -1952,7 +1977,8 @@ REGSTR
 reingest
 Relayout
 RELBINPATH
-Remoting
+remoting
+renamer
 renderengine
 rendersize
 reparent
@@ -1962,16 +1988,14 @@ Replymessage
 repositorypath
 rescap
 Resequence
-Reserialize
+reserialize
 RESETCONTENT
 resheader
 resizable
 resmimetype
-reso
 restrictedcapabilities
 resw
 resx
-RETROII
 retval
 rfa
 rfc
@@ -1981,7 +2005,6 @@ rgba
 rgbi
 rgch
 rgci
-rgdx
 rgfae
 rgfte
 rgi
@@ -1991,7 +2014,6 @@ rgpwsz
 rgrc
 rgs
 rgui
-rgus
 rgw
 rgwch
 rhs
@@ -2032,6 +2054,7 @@ runuia
 runut
 rvalue
 RVERTICAL
+rxvt
 RWIN
 safearray
 SAFECAST
@@ -2042,14 +2065,11 @@ SBCSDBCS
 sbi
 sbiex
 sbold
-sbri
-scanbri
 scancode
 scanline
 schemename
 SCL
 scm
-scol
 scprintf
 SCRBUF
 SCRBUFSIZE
@@ -2128,7 +2148,7 @@ sfi
 SFINAE
 SFUI
 sgr
-SGRXY
+SHANDLE
 SHCo
 shcore
 shellapi
@@ -2136,6 +2156,7 @@ shellex
 shellscalingapi
 SHFILEINFO
 SHGFI
+SHGFP
 SHIFTJIS
 Shl
 shlguid
@@ -2183,9 +2204,6 @@ SOURCESDIRECTORY
 SPACEBAR
 spammy
 spand
-spe
-sph
-spherefunctions
 splashscreen
 sprintf
 sqlproj
@@ -2241,6 +2259,7 @@ strrev
 strsafe
 strtok
 structs
+STUVWX
 STX
 stylecop
 SUA
@@ -2303,7 +2322,6 @@ TCI
 tcome
 tcommandline
 tcommands
-tcon
 TDelegated
 TDP
 TEAMPROJECT
@@ -2344,7 +2362,7 @@ texel
 TExpected
 textattribute
 TEXTATTRIBUTEID
-Textbox
+textbox
 textboxes
 textbuffer
 TEXTINCLUDE
@@ -2439,6 +2457,7 @@ typename
 typeof
 typeparam
 TYUI
+UAC
 uap
 uapadmin
 UAX
@@ -2449,8 +2468,7 @@ ucdxml
 uch
 UCHAR
 ucs
-UDK
-UDKs
+udk
 UDM
 uer
 uget
@@ -2538,10 +2556,12 @@ utr
 uuid
 uuidof
 uuidv
+UVWX
+UVWXY
 UWA
 uwp
 uxtheme
-Vals
+vals
 Vanara
 vararg
 vbproj
@@ -2564,7 +2584,6 @@ vga
 vgaoem
 viewkind
 viewports
-Viginetting
 Virt
 VIRTTERM
 Virtualizing
@@ -2606,6 +2625,7 @@ VTRGBTo
 vtseq
 vtterm
 vttest
+VWX
 waaay
 waitable
 waivable
@@ -2619,6 +2639,7 @@ wch
 wchar
 WCIA
 WCIW
+WClass
 wcout
 wcschr
 wcscmp
@@ -2713,6 +2734,7 @@ wintelnet
 winternl
 winuser
 winuserp
+WINVER
 wistd
 wixproj
 wline
@@ -2772,6 +2794,7 @@ WTEXT
 WTo
 wtof
 wtoi
+WTs
 wtw
 wtypes
 Wubi
@@ -2781,7 +2804,6 @@ wwaproj
 WWith
 wx
 wxh
-wz
 xa
 xact
 xamarin
@@ -2800,14 +2822,13 @@ XColors
 xcopy
 XCount
 xdy
-xe
 XEncoding
 xes
 Xes
 XES
 xff
 XFile
-xlang
+XFORM
 XManifest
 XMath
 XMFLOAT
@@ -2826,14 +2847,14 @@ XSubstantial
 xtended
 xterm
 XTest
+XTPUSHSGR
+XTPOPSGR
 xunit
 xutr
 xvalue
 XVIRTUALSCREEN
 XWalk
-XWV
 xy
-xyw
 Xzn
 yact
 YAML
@@ -2850,7 +2871,7 @@ YVIRTUALSCREEN
 Yw
 YWalk
 yx
-yzx
+YZ
 Zc
 ZCmd
 ZCtrl
@@ -2861,10 +2882,3 @@ zsh
 zu
 zxcvbnm
 zy
-AAAAABBBBBBCCC
-AAAAA
-BBBBBCCC
-abcd
-LPMINMAXINFO
-MINMAXINFO
-lstrcmpi

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

@@ -13,3 +13,6 @@ fixterms
 uk
 winui
 appshellintegration
+cppreference
+gfycat
+what3words

.github/actions/spelling/patterns/patterns.txt

@@ -4,7 +4,8 @@ https://www\.itscj\.ipsj\.or\.jp/iso-ir/[-0-9]+\.pdf
 https://www\.vt100\.net/docs/[-a-zA-Z0-9#_\/.]*
 https://www.w3.org/[-a-zA-Z0-9?&=\/_#]*
 https://(?:(?:www\.|)youtube\.com|youtu.be)/[-a-zA-Z0-9?&=]*
-https://[a-z-]+\.githubusercontent\.com/[-a-zA-Z0-9?&=_\/.]*
+https://(?:[a-z-]+\.|)github(?:usercontent|)\.com/[-a-zA-Z0-9?%&=_\/.]*
+https://www.xfree86.org/[-a-zA-Z0-9?&=\/_#]*
 [Pp]ublicKeyToken="?[0-9a-fA-F]{16}"?
 (?:[{"]|UniqueIdentifier>)[0-9a-fA-F]{8}-(?:[0-9a-fA-F]{4}-){3}[0-9a-fA-F]{12}(?:[}"]|</UniqueIdentifier)
 (?:0[Xx]|\\x|U\+|#)[a-f0-9A-FGgRr]{2,}[Uu]?[Ll]{0,2}\b
@@ -15,7 +16,7 @@ Scro\&ll
  :\\windows\\syste\b
 TestUtils::VerifyExpectedString\(tb, L"[^"]+"
 (?:hostSm|mach)\.ProcessString\(L"[^"]+"
-\b([A-Za-z])\1{3,}\b
+\b([A-Za-z])\g{-1}{3,}\b
 0x[0-9A-Za-z]+
 Base64::s_(?:En|De)code\(L"[^"]+"
 VERIFY_ARE_EQUAL\(L"[^"]+"

.github/workflows/spelling.yml

@@ -1,9 +1,7 @@
 name: Spell checking
 on:
+  pull_request_target:
   push:
-  schedule:
-    # * is a special character in YAML so you have to quote this string
-    - cron: '15 * * * *'
 
 jobs:
   build:
@@ -12,9 +10,6 @@ jobs:
     steps:
     - uses: actions/checkout@v2.0.0
       with:
+        ref: ${{ github.event.pull_request.head.sha }}
         fetch-depth: 5
-    - uses: check-spelling/check-spelling@0.0.16-alpha
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        bucket: .github/actions
-        project: spell-check
+    - uses: check-spelling/check-spelling@0.0.17-alpha

NuGet.Config

@@ -1,24 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <packageSources>
-        <add key="NuGet.org" value="https://api.nuget.org/v3/index.json" />
-        <!-- Add repositories here to the list of available repositories -->
-        
-        <!-- Dependencies that we must carry because they're not on public nuget feeds right now. -->
+        <clear />
+        <!-- Dependencies that we can turn on to force override for testing purposes before uploading. -->
         <!--<add key="Static Package Dependencies" value="dep\packages" />-->
-        
-        <!-- Use our own NuGet Feed -->
         <add key="TerminalDependencies" value="https://pkgs.dev.azure.com/ms/terminal/_packaging/TerminalDependencies/nuget/v3/index.json" />
-		
-		<!-- Temporarily? use the feeds from our friends in MUX for Helix test stuff -->
-		<add key="dotnetfeed" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
-        <add key="dnceng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
-        <add key="MUX-Dependencies" value="https://pkgs.dev.azure.com/ms/microsoft-ui-xaml/_packaging/MUX-Dependencies/nuget/v3/index.json" />
-        
-        <!-- Internal NuGet feeds that may not be accessible outside Microsoft corporate network -->
-        <!--<add key="TAEF - internal" value="https://microsoft.pkgs.visualstudio.com/DefaultCollection/_packaging/Taef/nuget/v3/index.json" />
-        <add key="OpenConsole - Internal" value="https://microsoft.pkgs.visualstudio.com/_packaging/OpenConsole/nuget/v3/index.json" />-->
     </packageSources>
+    <disabledPackageSources>
+        <clear />
+    </disabledPackageSources>
     <config>
         <add key="repositorypath" value=".\packages" />
     </config>

build/Helix/runtests.cmd

@@ -18,7 +18,7 @@ FOR %%A IN (TestHostApp.exe,te.exe,te.processhost.exe,conhost.exe,OpenConsole.ex
 
 echo %TIME%
 
-:: kill dhandler, which is a tool designed to handle unexpected windows appearing. But since our tests are 
+:: kill dhandler, which is a tool designed to handle unexpected windows appearing. But since our tests are
 :: expected to show UI we don't want it running.
 taskkill -f -im dhandler.exe
 
@@ -28,7 +28,7 @@ echo %TIME%
 powershell -ExecutionPolicy Bypass .\InstallTestAppDependencies.ps1
 echo %TIME%
 
-set testBinaryCandidates=TerminalApp.LocalTests.dll Conhost.UIA.Tests.dll
+set testBinaryCandidates=TerminalApp.LocalTests.dll SettingsModel.LocalTests.dll Conhost.UIA.Tests.dll
 set testBinaries=
 for %%B in (%testBinaryCandidates%) do (
     if exist %%B (
@@ -103,4 +103,4 @@ copy /y *_subresults.json %HELIX_WORKITEM_UPLOAD_ROOT%
 
 type testResults.xml
 
-echo %TIME%
+echo %TIME%

build/pipelines/templates/helix-runtests-job.yml

@@ -5,14 +5,14 @@ parameters:
   testSuite: ''
   # If a Pipeline runs this template more than once, this parameter should be unique per build flavor to differentiate the
   # the different test runs:
-  helixType: 'test/devtest' 
+  helixType: 'test/devtest'
   artifactName: 'drop'
   maxParallel: 4
   rerunPassesRequiredToAvoidFailure: 5
   taefQuery: ''
   # if 'useBuildOutputFromBuildId' is set, we will default to using a build from this pipeline:
   useBuildOutputFromPipeline: $(System.DefinitionId)
-  matrix: 
+  matrix:
     # Release_x86:
     #   buildPlatform: 'x86'
     #   buildConfiguration: 'release'
@@ -39,13 +39,13 @@ jobs:
     taefPath: $(Build.SourcesDirectory)\build\Helix\packages\taef.redist.wlk.10.57.200731005-develop\build\Binaries\$(buildPlatform)
     helixCommonArgs: '/binaryLogger:$(Build.SourcesDirectory)/${{parameters.name}}.$(buildPlatform).$(buildConfiguration).binlog /p:HelixBuild=$(Build.BuildId).$(buildPlatform).$(buildConfiguration) /p:Platform=$(buildPlatform) /p:Configuration=$(buildConfiguration) /p:HelixType=${{parameters.helixType}} /p:TestSuite=${{parameters.testSuite}} /p:ProjFilesPath=$(Build.ArtifactStagingDirectory) /p:rerunPassesRequiredToAvoidFailure=${{parameters.rerunPassesRequiredToAvoidFailure}}'
 
-      
+
   steps:
   - task: CmdLine@1
     displayName: 'Display build machine environment variables'
     inputs:
       filename: 'set'
-      
+
   - task: NuGetToolInstaller@0
     displayName: 'Use NuGet 5.2.0'
     inputs:
@@ -59,23 +59,23 @@ jobs:
       nugetConfigPath: nuget.config
       restoreDirectory: packages
 
-  - task: DownloadBuildArtifacts@0 
+  - task: DownloadBuildArtifacts@0
     condition:
       and(succeeded(),eq(variables['useBuildOutputFromBuildId'],''))
-    inputs: 
-      artifactName: ${{ parameters.artifactName }} 
+    inputs:
+      artifactName: ${{ parameters.artifactName }}
       downloadPath: '$(artifactsDir)'
 
-  - task: DownloadBuildArtifacts@0 
+  - task: DownloadBuildArtifacts@0
     condition:
       and(succeeded(),ne(variables['useBuildOutputFromBuildId'],''))
-    inputs: 
+    inputs:
       buildType: specific
       buildVersionToDownload: specific
       project: $(System.TeamProjectId)
       pipeline: ${{ parameters.useBuildOutputFromPipeline }}
       buildId: $(useBuildOutputFromBuildId)
-      artifactName: ${{ parameters.artifactName }} 
+      artifactName: ${{ parameters.artifactName }}
       downloadPath: '$(artifactsDir)'
 
   - task: CmdLine@1
@@ -90,7 +90,7 @@ jobs:
       targetType: filePath
       filePath: build\Helix\PrepareHelixPayload.ps1
       arguments: -Platform '$(buildPlatform)' -Configuration '$(buildConfiguration)' -ArtifactName '${{ parameters.artifactName }}'
-      
+
   - task: CmdLine@1
     displayName: 'Display Helix payload contents'
     inputs:
@@ -104,7 +104,16 @@ jobs:
       outputProjFileName: 'RunTestsInHelix-TerminalAppLocalTests.proj'
       testSuite: '${{ parameters.testSuite }}'
       taefQuery: ${{ parameters.taefQuery }}
-      
+
+  - template: helix-createprojfile-steps.yml
+    parameters:
+      condition: and(succeeded(),ne('${{ parameters.testSuite }}','NugetTestSuite'))
+      testFilePath: '$(artifactsDir)\${{ parameters.artifactName }}\$(buildConfiguration)\$(buildPlatform)\Test\SettingsModel.LocalTests.dll'
+      outputProjFileName: 'RunTestsInHelix-SettingsModelLocalTests.proj'
+      testSuite: '${{ parameters.testSuite }}'
+      taefQuery: ${{ parameters.taefQuery }}
+
+
   - template: helix-createprojfile-steps.yml
     parameters:
       condition: and(succeeded(),ne('${{ parameters.testSuite }}','NugetTestSuite'))
@@ -118,7 +127,7 @@ jobs:
     inputs:
       PathtoPublish: $(Build.ArtifactStagingDirectory)
       artifactName: ${{ parameters.artifactName }}
-      
+
   - task: DotNetCoreCLI@2
     displayName: 'Run tests in Helix (open queues)'
     env:

consolegit2gitfilters.json

@@ -21,7 +21,8 @@
     "/res/terminal/",
     "/doc/specs/",
     "/doc/cascadia/",
-    "/doc/user-docs/"
+    "/doc/user-docs/",
+    "/src/tools/MonarchPeasantSample/",
   ],
   "SuffixFilters": [
     ".dbb",
@@ -38,5 +39,5 @@
     ".rec",
     ".err",
     ".xlsx"
-  ]    
+  ]
 }

custom.props

@@ -3,9 +3,9 @@
   <!-- This file is read by XES, which we use in our Release builds. -->
   <PropertyGroup Label="Version">
     <XesUseOneStoreVersioning>true</XesUseOneStoreVersioning>
-    <XesBaseYearForStoreVersion>2020</XesBaseYearForStoreVersion>
+    <XesBaseYearForStoreVersion>2021</XesBaseYearForStoreVersion>
     <VersionMajor>1</VersionMajor>
-    <VersionMinor>6</VersionMinor>
+    <VersionMinor>7</VersionMinor>
     <VersionInfoProductName>Windows Terminal</VersionInfoProductName>
   </PropertyGroup>
 </Project>

doc/AddASetting.md

@@ -11,7 +11,7 @@
         - Yes, the large majority of the `DEFINE_PROPERTYKEY` defs are the same, it's only the last byte of the guid that changes
 
 2. Add matching fields to Settings.hpp
-    - add getters, setters, the whole drill.
+    - Add getters, setters, the whole drill.
 
 3. Add to the propsheet
     - We need to add it to *reading and writing* the registry from the propsheet, and *reading* the link from the propsheet. Yes, that's weird, but the propsheet is smart enough to re-use ShortcutSerialization::s_SetLinkValues, but not smart enough to do the same with RegistrySerialization.

doc/TAEF.md

@@ -48,3 +48,17 @@ Invoke-OpenConsoleTests
 ```
 
 `Invoke-OpenConsoleTests` supports a number of options, which you can enumerate by running `Invoke-OpenConsoleTests -?`.
+
+
+### Debugging Tests
+
+If you want to debug a test, you can do so by using the TAEF /waitForDebugger flag, such as:
+
+	runut *Tests.dll /name:TextBufferTests::TestInsertCharacter /waitForDebugger
+
+Replace the test name with the one you want to debug.  Then, TAEF will begin executing the test and output something like this:
+
+	TAEF: Waiting for debugger - PID <some PID> @ IP <some IP address>
+
+You can then attach to that PID in your debugger of choice.  In Visual Studio, you can use Debug -> Attach To Process, or you could use WinDbg or whatever you want.
+Once the debugger attaches, the test will execute and your breakpoints will be hit.

doc/cascadia/AddASetting.md

@@ -0,0 +1,397 @@
+# Adding Settings to Windows Terminal
+
+Adding a setting to Windows Terminal is fairly straightforward. This guide serves as a reference on how to add a setting.
+
+## 1. Terminal Settings Model
+
+The Terminal Settings Model (`Microsoft.Terminal.Settings.Model`) is responsible for (de)serializing and exposing settings.
+
+### `GETSET_SETTING` macro
+
+The `GETSET_SETTING` macro can be used to implement inheritance for your new setting and store the setting in the settings model. It takes three parameters:
+- `type`: the type that the setting will be stored as
+- `name`: the name of the variable for storage
+- `defaultValue`: the value to use if the user does not define the setting anywhere
+
+### Adding a Profile setting
+
+This tutorial will add `CloseOnExitMode CloseOnExit` as a profile setting.
+
+1. In `Profile.h`, declare/define the setting:
+
+```c++
+GETSET_SETTING(CloseOnExitMode, CloseOnExit, CloseOnExitMode::Graceful)
+```
+
+2. In `Profile.idl`, expose the setting via WinRT:
+
+```c++
+Boolean HasCloseOnExit();
+void ClearCloseOnExit();
+CloseOnExitMode CloseOnExit;
+```
+
+3. In `Profile.cpp`, add (de)serialization and copy logic:
+
+```c++
+// Top of file:
+// - Add the serialization key
+static constexpr std::string_view CloseOnExitKey{ "closeOnExit" };
+
+// CopySettings() or Copy():
+// - The setting is exposed in the Settings UI
+profile->_CloseOnExit = source->_CloseOnExit;
+
+// LayerJson():
+// - get the value from the JSON
+JsonUtils::GetValueForKey(json, CloseOnExitKey, _CloseOnExit);
+
+// ToJson():
+// - write the value to the JSON
+JsonUtils::SetValueForKey(json, CloseOnExitKey, _CloseOnExit);
+```
+
+  - If the setting is not a primitive type, in `TerminalSettingsSerializationHelpers.h` add (de)serialization logic for the accepted values:
+
+```c++
+// For enum values...
+JSON_ENUM_MAPPER(::winrt::Microsoft::Terminal::Settings::Model::CloseOnExitMode)
+{
+    JSON_MAPPINGS(3) = {
+        pair_type{ "always", ValueType::Always },
+        pair_type{ "graceful", ValueType::Graceful },
+        pair_type{ "never", ValueType::Never },
+    };
+};
+
+// For enum flag values...
+JSON_FLAG_MAPPER(::winrt::Microsoft::Terminal::TerminalControl::CopyFormat)
+{
+    JSON_MAPPINGS(5) = {
+        pair_type{ "none", AllClear },
+        pair_type{ "html", ValueType::HTML },
+        pair_type{ "rtf", ValueType::RTF },
+        pair_type{ "all", AllSet },
+    };
+};
+
+// NOTE: This is also where you can add functionality for...
+// - overloaded type support (i.e. accept a bool and an enum)
+// - custom (de)serialization logic (i.e. coordinates)
+```
+
+### Adding a Global setting
+
+Follow the "adding a Profile setting" instructions above, but do it on the `GlobalAppSettings` files.
+
+### Adding an Action
+
+This tutorial will add the `openSettings` action.
+
+1. In `KeyMapping.idl`, declare the action:
+
+```c++
+// Add the action to ShortcutAction
+enum ShortcutAction
+{
+    OpenSettings
+}
+```
+
+2. In `ActionAndArgs.cpp`, add serialization logic:
+
+```c++
+// Top of file:
+// - Add the serialization key
+static constexpr std::string_view OpenSettingsKey{ "openSettings" };
+
+// ActionKeyNamesMap:
+// - map the new enum to the json key
+{ OpenSettingsKey, ShortcutAction::OpenSettings },
+```
+
+3. If the action should automatically generate a name when it appears in the Command Palette...
+```c++
+// In ActionAndArgs.cpp GenerateName() --> GeneratedActionNames
+{ ShortcutAction::OpenSettings, RS_(L"OpenSettingsCommandKey") },
+
+// In Resources.resw for Microsoft.Terminal.Settings.Model.Lib,
+// add the generated name
+// NOTE: Visual Studio presents the resw file as a table.
+//       If you choose to edit the file with a text editor,
+//       the code should look something like this...
+<data name="OpenSettingsCommandKey" xml:space="preserve">
+    <value>Open settings file</value>
+</data>
+```
+
+4. If the action supports arguments...
+  - In `ActionArgs.idl`, declare the arguments
+```c++
+[default_interface] runtimeclass OpenSettingsArgs : IActionArgs
+{
+    // this declares the "target" arg
+    SettingsTarget Target { get; };
+};
+```
+  - In `ActionArgs.h`, define the new runtime class
+```c++
+struct OpenSettingsArgs : public OpenSettingsArgsT<OpenSettingsArgs>
+{
+    OpenSettingsArgs() = default;
+
+    // adds a getter/setter for your argument, and defines the json key
+    GETSET_PROPERTY(SettingsTarget, Target, SettingsTarget::SettingsFile);
+    static constexpr std::string_view TargetKey{ "target" };
+
+    public:
+        hstring GenerateName() const;
+
+        bool Equals(const IActionArgs& other)
+        {
+            auto otherAsUs = other.try_as<OpenSettingsArgs>();
+            if (otherAsUs)
+            {
+                return otherAsUs->_Target == _Target;
+            }
+            return false;
+        };
+
+        static FromJsonResult FromJson(const Json::Value& json)
+        {
+            // LOAD BEARING: Not using make_self here _will_ break you in the future!
+            auto args = winrt::make_self<OpenSettingsArgs>();
+            JsonUtils::GetValueForKey(json, TargetKey, args->_Target);
+            return { *args, {} };
+        }
+
+        IActionArgs Copy() const
+        {
+            auto copy{ winrt::make_self<OpenSettingsArgs>() };
+            copy->_Target = _Target;
+            return *copy;
+        }
+};
+```
+  - In `ActionArgs.cpp`, define `GenerateName()`. This is used to automatically generate a name when it appears in the Command Palette.
+  - In `ActionAndArgs.cpp`, add serialization logic:
+
+```c++
+// ActionKeyNamesMap --> argParsers
+{ ShortcutAction::OpenSettings, OpenSettingsArgs::FromJson },
+```
+
+### Adding an Action Argument
+
+Follow step 3 from the "adding an Action" instructions above, but modify the relevant `ActionArgs` files.
+
+## 2. Setting Functionality
+
+Now that the Terminal Settings Model is updated, Windows Terminal can read and write to the settings file. This section covers how to add functionality to your newly created setting.
+
+### App-level settings
+
+App-level settings are settings that affect the frame of Windows Terminal. Generally, these tend to be global settings. The `TerminalApp` project is responsible for presenting the frame of Windows Terminal. A few files of interest include:
+- `TerminalPage`: XAML control responsible for the look and feel of Windows Terminal
+- `AppLogic`: WinRT class responsible for window-related issues (i.e. the titlebar, focus mode, etc...)
+
+Both have access to a `CascadiaSettings` object, for you to read the loaded setting and update Windows Terminal appropriately.
+
+### Terminal-level settings
+
+Terminal-level settings are settings that affect a shell session. Generally, these tend to be profile settings. The `TerminalApp` project is responsible for packaging this settings from the Terminal Settings Model to the terminal instance. There are two kinds of settings here:
+- `IControlSettings`:
+  - These are settings that affect the `TerminalControl` (a XAML control that hosts a shell session).
+  - Examples include background image customization, interactivity behavior (i.e. selection), acrylic and font customization.
+  - The `TerminalControl` project has access to these settings via a saved `IControlSettings` member.
+- `ICoreSettings`:
+  - These are settings that affect the `TerminalCore` (a lower level object that interacts with the text buffer).
+  - Examples include initial size, history size, and cursor customization.
+  - The `TerminalCore` project has access to these settings via a saved `ICoreSettings` member.
+
+`TerminalApp` packages these settings into a `TerminalSettings : IControlSettings, ICoreSettings` object upon creating a new terminal instance. To do so, you must submit the following changes:
+- Declare the setting in `IControlSettings.idl` or `ICoreSettings.idl` (whichever is relevant to your setting). If your setting is an enum setting, declare the enum here instead of in the `TerminalSettingsModel` project.
+- In `TerminalSettings.h`, declare/define the setting...
+```c++
+// The GETSET_PROPERTY macro declares/defines a getter setter for the setting.
+// Like GETSET_SETTING, it takes in a type, name, and defaultValue.
+GETSET_PROPERTY(bool, UseAcrylic, false);
+```
+- In `TerminalSettings.cpp`...
+  - update `_ApplyProfileSettings` for profile settings
+  - update `_ApplyGlobalSettings` for global settings
+  - If additional processing is necessary, that would happen here. For example, `backgroundImageAlignment` is stored as a `ConvergedAlignment` in the Terminal Settings Model, but converted into XAML's separate horizontal and vertical alignment enums for packaging.
+
+### Actions
+
+Actions are packaged as an `ActionAndArgs` object, then handled in `TerminalApp`. To add functionality for actions...
+- In the `ShortcutActionDispatch` files, dispatch an event when the action occurs...
+```c++
+// ShortcutActionDispatch.idl
+event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, Microsoft.Terminal.Settings.Model.ActionEventArgs> OpenSettings;
+
+// ShortcutActionDispatch.h
+TYPED_EVENT(OpenSettings, TerminalApp::ShortcutActionDispatch, Microsoft::Terminal::Settings::Model::ActionEventArgs);
+
+// ShortcutActionDispatch.cpp --> DoAction()
+// - dispatch the appropriate event
+case ShortcutAction::OpenSettings:
+{
+    _OpenSettingsHandlers(*this, eventArgs);
+    break;
+}
+```
+- In `TerminalPage` files, handle the event...
+```c++
+// TerminalPage.h
+// - declare the handler
+void _HandleOpenSettings(const IInspectable& sender, const Microsoft::Terminal::Settings::Model::ActionEventArgs& args);
+
+// TerminalPage.cpp --> _RegisterActionCallbacks()
+// - register the handler
+_actionDispatch->OpenSettings({ this, &TerminalPage::_HandleOpenSettings });
+
+// AppActionHandlers.cpp
+// - direct the function to the right place and call a helper function
+void TerminalPage::_HandleOpenSettings(const IInspectable& /*sender*/,
+                                       const ActionEventArgs& args)
+{
+    // NOTE: this if-statement can be omitted if the action does not support arguments
+    if (const auto& realArgs = args.ActionArgs().try_as<OpenSettingsArgs>())
+    {
+        _LaunchSettings(realArgs.Target());
+        args.Handled(true);
+    }
+}
+```
+
+`AppActionHandlers` vary based on the action you want to perform. A few useful helper functions include:
+- `_GetFocusedTab()`: retrieves the focused tab
+- `_GetActiveControl()`: retrieves the active terminal control
+- `_GetTerminalTabImpl()`: tries to cast the given tab as a `TerminalTab` (a tab that hosts a terminal instance)
+
+
+## 3. Settings UI
+
+### Exposing Enum Settings
+If the new setting supports enums, you need to expose a map of the enum and the respective value in the Terminal Settings Model's `EnumMappings`:
+
+```c++
+// EnumMappings.idl
+static Windows.Foundation.Collections.IMap<String, Microsoft.Terminal.Settings.Model.CloseOnExitMode> CloseOnExitMode { get; };
+
+// EnumMappings.h
+static winrt::Windows::Foundation::Collections::IMap<winrt::hstring, CloseOnExitMode> CloseOnExitMode();
+
+// EnumMappings.cpp
+// - this macro leverages the json enum mapper in TerminalSettingsSerializationHelper to expose
+//   the mapped values across project boundaries
+DEFINE_ENUM_MAP(Model::CloseOnExitMode, CloseOnExitMode);
+```
+
+### Binding and Localizing the Enum Setting
+
+Find the page in the Settings UI that the new setting fits best in. In this example, we are adding `LaunchMode`.
+1. In `Launch.idl`, expose the bindable setting...
+```c++
+// Expose the current value for the setting
+IInspectable CurrentLaunchMode;
+
+// Expose the list of possible values
+Windows.Foundation.Collections.IObservableVector<Microsoft.Terminal.Settings.Editor.EnumEntry> LaunchModeList { get; };
+```
+
+2. In `Launch.h`, declare the bindable enum setting...
+```c++
+// the GETSET_BINDABLE_ENUM_SETTING macro accepts...
+// - name: the name of the setting
+// - enumType: the type of the setting
+// - settingsModelName: how to retrieve the setting (use State() to get access to the settings model)
+// - settingNameInModel: the name of the setting in the terminal settings model
+GETSET_BINDABLE_ENUM_SETTING(LaunchMode, Model::LaunchMode, State().Settings().GlobalSettings, LaunchMode);
+```
+
+3. In `Launch.cpp`, populate these functions...
+```c++
+// Constructor (after InitializeComponent())
+// the INITIALIZE_BINDABLE_ENUM_SETTING macro accepts...
+// - name: the name of the setting
+// - enumMappingsName: the name from the TerminalSettingsModel's EnumMappings
+// - enumType: the type for the enum
+// - resourceSectionAndType: prefix for the localization
+// - resourceProperty: postfix for the localization
+INITIALIZE_BINDABLE_ENUM_SETTING(LaunchMode, LaunchMode, LaunchMode, L"Globals_LaunchMode", L"Content");
+```
+
+4. In `Resources.resw` for Microsoft.Terminal.Settings.Editor, add the localized text to expose each enum value. Use the following format: `<SettingGroup>_<SettingName><EnumValue>.Content`
+  - `SettingGroup`:
+    - `Globals` for global settings
+    - `Profile` for profile settings
+  - `SettingName`:
+    - the Pascal-case format for the setting type (i.e. `LaunchMode` for `"launchMode"`)
+  - `EnumValue`:
+    - the json key for the setting value, but with the first letter capitalized (i.e. `Focus` for `"focus"`)
+  - The resulting resw key should look something like this `Globals_LaunchModeFocus.Content`
+  - This is the text that will be used in your control
+
+### Updating the UI
+
+When adding a setting to the UI, make sure you follow the [UWP design guidance](https://docs.microsoft.com/windows/uwp/design/).
+
+#### Enum Settings
+
+Now, create a XAML control in the relevant XAML file. Use the following tips and tricks to style everything appropriately:
+- Wrap the control in a `ContentPresenter` adhering to the `SettingContainerStyle` style
+- Bind `SelectedItem` to the relevant `Current<Setting>` (i.e. `CurrentLaunchMode`). Ensure it's a TwoWay binding
+- Bind `ItemsSource` to `<Setting>List` (i.e. `LaunchModeList`)
+- Set the ItemTemplate to the `Enum<ControlType>Template` (i.e. `EnumRadioButtonTemplate` for radio buttons)
+- Set the style to the appropriate one in `CommonResources.xaml`
+
+```xml
+<!--Launch Mode-->
+<ContentPresenter Style="{StaticResource SettingContainerStyle}">
+    <muxc:RadioButtons x:Uid="Globals_LaunchMode"
+                       SelectedItem="{x:Bind CurrentLaunchMode, Mode="TwoWay"}"
+                       ItemsSource="{x:Bind LaunchModeList}"
+                       ItemTemplate="{StaticResource EnumRadioButtonTemplate}"
+                       Style="{StaticResource RadioButtonsSettingStyle}"/>
+</ContentPresenter>
+```
+
+To add any localized text, add a `x:Uid`, and access the relevant property via the Resources.resw file. For example, `Globals_LaunchMode.Header` sets the header for this control. You can also set the tooltip text like this:
+`Globals_DefaultProfile.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip`.
+
+#### Non-Enum Settings
+
+Continue to reference `CommonResources.xaml` for appropriate styling and wrap the control with a similar `ContentPresenter`. However, instead of binding to the `Current<Setting>` and `<Setting>List`, bind directly to the setting via the state. Binding a setting like `altGrAliasing` should look something like this:
+```xml
+<!--AltGr Aliasing-->
+<ContentPresenter Style="{StaticResource SettingContainerStyle}">
+    <CheckBox x:Uid="Profile_AltGrAliasing"
+              IsChecked="{x:Bind State.Profile.AltGrAliasing, Mode=TwoWay}"
+              Style="{StaticResource CheckBoxSettingStyle}"/>
+</ContentPresenter>
+```
+
+#### Profile Settings
+
+If you are specifically adding a Profile setting, in addition to the steps above, you need to make the setting observable by modifying the `Profiles` files...
+```c++
+// Profiles.idl --> ProfileViewModel
+// - this declares the setting as observable using the type and the name of the setting
+OBSERVABLE_PROJECTED_SETTING(Microsoft.Terminal.Settings.Model.CloseOnExitMode, CloseOnExit);
+
+// Profiles.h --> ProfileViewModel
+// - this defines the setting as observable off of the _profile object
+OBSERVABLE_PROJECTED_SETTING(_profile, CloseOnExit);
+
+// Profiles.h --> ProfileViewModel
+// - if the setting cannot be inherited by another profile (aka missing the Clear() function), use the following macro instead:
+PERMANENT_OBSERVABLE_PROJECTED_SETTING(_profile, Guid);
+```
+
+The `ProfilePageNavigationState` holds a `ProfileViewModel`, which wraps the `Profile` object from the Terminal Settings Model. The `ProfileViewModel` makes all of the profile settings observable.
+
+### Actions
+
+Actions are not yet supported in the Settings UI.

doc/cascadia/profiles.schema.json

@@ -76,9 +76,11 @@
         "copy",
         "duplicateTab",
         "find",
+        "findMatch",
         "moveFocus",
         "moveTab",
         "newTab",
+        "newWindow",
         "nextTab",
         "openNewTabDropdown",
         "openSettings",
@@ -93,6 +95,8 @@
         "scrollDownPage",
         "scrollUp",
         "scrollUpPage",
+        "scrollToBottom",
+        "scrollToTop",
         "sendInput",
         "setColorScheme",
         "setTabColor",
@@ -103,6 +107,7 @@
         "toggleFocusMode",
         "toggleFullscreen",
         "togglePaneZoom",
+        "toggleReadOnlyMode",
         "toggleShaderEffects",
         "wt",
         "unbound"
@@ -135,6 +140,13 @@
       ],
       "type": "string"
     },
+    "FindMatchDirection": {
+      "enum": [
+        "next",
+        "prev"
+      ],
+      "type": "string"
+    },
     "SplitState": {
       "enum": [
         "vertical",
@@ -369,6 +381,13 @@
             "splitMode": {
               "default": "duplicate",
               "description": "Control how the pane splits. Only accepts \"duplicate\" which will duplicate the focused pane's profile into a new pane."
+            },
+            "size": {
+              "default": 0.5,
+              "description": "Specify how large the new pane should be, as a fraction of the current pane's size. 1.0 would be 'all of the current pane', and 0.0 is 'None of the parent'. Accepts floating point values from 0-1 (default 0.5).",
+              "maximum": 1,
+              "minimum": 0,
+              "type": "number"
             }
           }
         }
@@ -549,6 +568,35 @@
         }
       ]
     },
+    "FindMatchAction": {
+      "description": "Arguments corresponding to a Find Match Action",
+      "allOf": [
+        { "$ref": "#/definitions/ShortcutAction" },
+        {
+          "properties": {
+            "action": { "type": "string", "pattern": "findMatch" },
+            "direction": {
+              "$ref": "#/definitions/FindMatchDirection",
+              "default": "prev",
+              "description": "The direction to search in. \"prev\" will search upwards in the buffer, and \"next\" will search downwards."
+            }
+          }
+        }
+      ],
+      "required": [ "direction" ]
+    },
+    "NewWindowAction": {
+      "description": "Arguments corresponding to a New Window Action",
+      "allOf": [
+        { "$ref": "#/definitions/ShortcutAction" },
+        { "$ref": "#/definitions/NewTerminalArgs" },
+        {
+          "properties": {
+            "action": { "type":"string", "pattern": "newWindow" }
+          }
+        }
+      ]
+    },
     "Keybinding": {
       "additionalProperties": false,
       "properties": {
@@ -573,6 +621,8 @@
               { "$ref": "#/definitions/ScrollUpAction" },
               { "$ref": "#/definitions/ScrollDownAction" },
               { "$ref": "#/definitions/MoveTabAction" },
+              { "$ref": "#/definitions/FindMatchAction" },
+              { "$ref": "#/definitions/NewWindowAction" },
               { "type": "null" }
             ]
         },
@@ -620,11 +670,26 @@
           "description": "When set to true, tabs are always displayed. When set to false and \"showTabsInTitlebar\" is set to false, tabs only appear after opening a new tab.",
           "type": "boolean"
         },
+        "centerOnLaunch": {
+          "default": false,
+          "description": "When set to `true`, the terminal window will auto-center itself on the display it opens on. The terminal will use the \"initialPosition\" to determine which display to open on.",
+          "type": "boolean"
+        },
+        "inputServiceWarning": {
+          "default": true,
+          "description": "Warning if 'Touch Keyboard and Handwriting Panel Service' is disabled.",
+          "type": "boolean"
+        },
         "copyOnSelect": {
           "default": false,
           "description": "When set to true, a selection is immediately copied to your clipboard upon creation. When set to false, the selection persists and awaits further action.",
           "type": "boolean"
         },
+        "focusFollowMouse": {
+          "default": false,
+          "description": "When set to true, the terminal will focus the pane on mouse hover.",
+          "type": "boolean"
+        },
         "copyFormatting": {
           "default": true,
           "description": "When set to `true`, the color and font formatting of selected text is also copied to your clipboard. When set to `false`, only plain text is copied to your clipboard. An array of specific formats can also be used. Supported array values include `html` and `rtf`. Plain text is always copied.",
@@ -649,6 +714,10 @@
           "description": "Sets the default profile. Opens by clicking the \"+\" icon or typing the key binding assigned to \"newTab\".",
           "type": "string"
         },
+        "startupActions": {
+          "description": "Sets the list of actions to apply if no command line is provided. Uses the same format as command line arguments",
+          "type": "string"
+        },
         "disabledProfileSources": {
           "description": "Disables all the dynamic profile generators in this list, preventing them from adding their profiles to the list of profiles on startup.",
           "items": {
@@ -793,6 +862,16 @@
               "type": "string"
             }
           ]
+        },
+        "windowingBehavior": {
+          "default": "useNew",
+          "description": "Controls how new terminal instances attach to existing windows. \"useNew\" will always create a new window. \"useExisting\" will create new tabs in the most recently used window on this virtual desktop, and \"useAnyExisting\" will create tabs in the most recent window on any desktop.",
+          "enum": [
+            "useNew",
+            "useExisting",
+            "useAnyExisting"
+          ],
+          "type": "string"
         }
       },
       "required": [
@@ -922,9 +1001,10 @@
         },
         "cursorShape": {
           "default": "bar",
-          "description": "Sets the shape of the cursor. Possible values:\n -\"bar\" ( ┃, default )\n -\"emptyBox\" ( ▯ )\n -\"filledBox\" ( █ )\n -\"underscore\" ( ▁ )\n -\"vintage\" ( ▃ )",
+          "description": "Sets the shape of the cursor. Possible values:\n -\"bar\" ( ┃, default )\n -\"doubleUnderscore\" ( ‗ )\n -\"emptyBox\" ( ▯ )\n -\"filledBox\" ( █ )\n -\"underscore\" ( ▁ )\n -\"vintage\" ( ▃ )",
           "enum": [
             "bar",
+            "doubleUnderscore",
             "emptyBox",
             "filledBox",
             "underscore",

doc/specs/#2871 - Pane Navigation/#2871 - Pane Navigation.md

@@ -0,0 +1,302 @@
+---
+author: Mike Griese @zadjii-msft
+created on: 2020-11-23
+last updated: 2020-12-15
+issue id: #2871
+---
+
+# Focus Pane Actions
+
+## Abstract
+
+Currently, the Terminal only allows users to navigate through panes
+_directionally_. However, we might also want to allow a user to navigate through
+panes in most recently used order ("MRU" order), or to navigate directly to a
+specific pane. This spec proposes some additional actions in order to enable
+these sorts of scenarios.
+
+## Background
+
+### Inspiration
+
+`tmux` allows the user to navigate through panes using its `select-pane`
+command. The `select-pane` command works in the following way:
+
+```
+select-pane [-DLlMmRU] [-T title] [-t target-pane]
+
+     Make pane target-pane the active pane in window target-window, or set its
+     style (with -P).  If one of -D, -L, -R, or -U is used, respectively the
+     pane below, to the left, to the right, or above the target pane is used.
+     -l is the same as using the last-pane command.
+
+     -m and -M are used to set and clear the marked pane.  There is one marked
+     pane at a time, setting a new marked pane clears the last.  The marked pane
+     is the default target for -s to join-pane, swap-pane and swap-window.
+```
+_from `man tmux`_.
+
+The Terminal currently allows the user to navigate through panes with the
+`moveFocus` action, which only accepts a `direction` to move in.
+
+Additionally, the Terminal allows movement between tabs with the `nextTab` and
+`prevTab` actions, who move between tabs either in-order or in MRU order.
+Furthermore, these actions may or may not display the "tab switcher" user
+interface, based on the value of `tabSwitcherMode`.
+
+### User Stories
+
+* **Scenario 1**: A user who wants to be able to split the window into 4 equal
+  corners from the commandline. Currently this isn't possible, because the user
+  cannot move focus during the startup actions - `split-pane` actions always end
+  up splitting the current leaf in the tree of panes. (see [#5464])
+* **Scenario 2**: A user who wants to quickly navigate to the previous pane they
+  had opened. (see [#2871])
+* **Scenario 3**: A user who wants to bind a keybinding like <kbd>alt+1</kbd>,
+  <kbd>alt+2</kbd>, etc to immediately focus the first, second, etc. pane in a
+  tab. (see [#5803])
+
+### Future Considerations
+
+There's been talk of updating the advanced tab switcher to also display panes,
+in addition to just tabs. This would allow users to navigate through the ATS
+directly to a pane, and see all the panes in a tab. Currently, `tabSwitcherMode`
+changes the behavior of `nextTab`, `prevTab` - should we just build the
+`paneSwitcherMode` directly into the action we end up designing?
+
+## Solution Design
+
+Does using the pane switcher with a theoretical `focusPane(target=id)` action
+even make sense? Certainly not! That's like `switchToTab(index=id)`, the user
+already knows which tab they want to go to, there's no reason to pop an
+ephemeral UI in front of them.
+
+Similarly, it almost certainly doesn't make sense to display the pane switcher
+while moving focus directionally. Consider moving focus with a key bound to the
+arrow keys. Displaying another UI in front of them while moving focus with the
+arrow keys would be confusing.
+
+Addressing Scenario 1 is relatively easy. So long as we add any of the proposed
+actions, including the existing `moveFocus` action as a subcommand that can be
+passed to `wt.exe`, then the user should be able to navigate through the panes
+they've created with the startup commandline, and build the tree of panes
+however they see fit.
+
+Scenario 2 is more complicated, because MRU switching is always more
+complicated. Without a UI of some sort, there's no way to switch to another pane
+in the MRU order without also updating the MRU order as you go. So this would
+almost certainly necessitate a "pane switcher", like the tab switcher.
+
+
+### Proposal A: Add next, prev to moveFocus
+
+* `moveFocus(direction="up|down|left|right|next|prev")`
+
+* **Pros**:
+  - Definitely gets the "MRU Pane Switching" scenario working
+* **Cons**:
+  - Doesn't really address any of the other scenarios
+  - How will it play with pane switching in the UI?
+  - MRU switching without a dialog to track & display the MRU stack doesn't
+    really work - this only allows to the user to navigate to the most recently
+    used pane, or through all the panes in least-recently-used order. This is
+    because switching to the MRU pane _will update the MRU pane_.
+
+❌ This proposal is no longer being considered.
+
+### Proposal B: focusNextPane, focusPrevPane with order, useSwitcher args
+
+```json
+// Focus pane 1
+// - This is sensible, no arguments here
+{ "command": { "action": "focusPane", "id": 1 } },
+
+// Focus the next MRU pane
+// - Without the switcher, this can only go one pane deep in the MRU stack
+// - presumably once there's a pane switcher, it would default to enabled?
+{ "command": { "action": "focusNextPane", "order": "mru" } },
+
+// Focus the prev inOrder pane
+// - this seems straightforward
+{ "command": { "action": "focusPrevPane", "order": "inOrder" } },
+
+// Focus the next pane, in mru order, explicitly disable the switcher
+// - The user opted in to only being able to MRU switch one deep. That's fine, that's what they want.
+{ "command": { "action": "focusNextPane", "order": "mru", "useSwitcher": false} },
+
+// Focus the prev inOrder pane, explicitly with the switcher
+// - Maybe they disabled the switcher globally, but what it on for this action?
+{ "command": { "action": "focusPrevPane", "order": "inOrder", "useSwitcher": true } },
+```
+_From [discussion in the implementation
+PR](https://github.com/microsoft/terminal/pull/8183#issuecomment-729672645)_
+
+Boiled down, that's three actions:
+* `focusPane(target=id)`
+* `focusNextPane(order="inOrder|mru", useSwitcher=true|false)`
+* `focusPrevPane(order="inOrder|mru", useSwitcher=true|false)`
+
+* **Pros**:
+  - Everything is explicit, including the option to use the pane switcher (when
+    available)
+  - Adds support for in-order pane switching
+  - No "conditional parameters" - where providing one argument makes other
+    arguments invalid or ambiguous.
+* **Cons**:
+  - Doesn't really address any of the other scenarios
+  - What does the "next most-recently-used tab" even mean? How is it different
+    than "previous most-recently-used tab"? Semantically, these are the same
+    thing!
+  - No one's even asked for in-order pane switching. Is that a UX that even
+    really makes sense?
+
+❌ This proposal is no longer being considered.
+
+> 👉 **NOTE**: At this point, we stopped considering navigating in both MRU
+> "directions", since both the next and prev MRU pane are the same thing. We're
+> now using "last" to mean "the previous MRU pane".
+
+### Proposal C: One actions, combine the args
+
+* `moveFocus(target=id|"up|down|left|right|last")`
+
+* **Pros**:
+  - Absolutely the least complicated action to author. There's only one
+    parameter, `target`.
+  - No "conditional parameters".
+* **Cons**:
+  - How do we express this in the Settings UI? Mixed-type enums work fine for
+    the font weight, where each enum value has a distinct integer value it maps
+    to, but in this case, using `id` is entirely different from the other
+    directional values
+
+❌ This proposal is no longer being considered.
+
+### Proposal D: Two actions
+
+* `focusPane(target=id)`
+* `moveFocus(direction="up|down|left|right|last")`
+
+* **Pros**:
+  - Each action does explicitly one thing.
+* **Cons**:
+  - two actions for _similar_ behavior
+  - This now forks the "Direction" enum into "MoveFocusDirection" and
+    "ResizeDirection" (because `resizePane(last)` doesn't make any sense).
+
+This proposal doesn't really have any special consideration for the pane
+switcher UX. Neither of these actions would summon the pane switcher UX.
+
+### Proposal E: Three actions
+
+* `focusPane(target=id)`
+* `moveFocus(direction="up|down|left|right")`
+* `focusLastPane(usePaneSwitcher=false|true)`
+
+In this design, neither `focusPane` nor `moveFocus` will summon the pane
+switcher UI (even once it's added). However, the `focusLastPane` one _could_,
+and subsequent keypresses could pop you through the MRU stack, while it's
+visible? The pane switcher could then display the panes for the tab in MRU
+order, and the user could just use the arrow keys to navigate the list if they
+so choose.
+
+* **Pros**:
+  - Each action does explicitly one thing.
+  - Design accounts for future pane switcher UX
+* **Cons**:
+  - Three separate actions for similar behavior
+
+❌ This proposal is no longer being considered.
+
+### Proposal F: It's literally just tmux
+
+_Also known as the "one action to rule them all" proposal_
+
+`focusPane(target=id, direction="up|down|left|right|last")`
+
+Previously, this design was avoided, because what does `focusPane(target=4,
+direction=down)` do? Does it focus pane 4, or does it move focus down?
+
+`tmux` solves this in one action by just doing both!
+
+```
+Make pane target-pane the active pane ...  If one of -D, -L, -R, or -U is used,
+respectively the pane below, to the left, to the right, or above the target pane
+is used.
+```
+_from `man tmux`_.
+
+So `focusPane(target=1, direction=up)` will attempt to focus the pane above pane
+1. This action would not summon the pane switcher UX, even for
+`focusPane(direction=last)`
+
+* **Pros**:
+  - Fewest redundant actions
+* **Cons**:
+  - Is this intuitive? That combining the params would do both, with `target`
+    happening "first"?
+  - Assumes that there will be a separate action added in the future for "Open
+    the pane switcher (with some given ordering)"
+
+
+> 👉 **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
+> 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.
+
+❌ This proposal is no longer being considered.
+
+## Conclusion
+
+After much discussion as a team, we decided that **Proposal D** would be the
+best option. We felt that there wasn't a need to add any extra configuration to
+invoke the "pane switcher" as anything different than the "tab switcher". The
+"pane switcher" should really just exist as a part of the functionality of the
+advanced tab switcher, not as it's own thing.
+
+Additionally, we concurred that the new "direction" value should be `prev`, not
+`last`, for consistency's sake.
+
+## UI/UX Design
+
+The only real UX being added with the agreed upon design is allowing the user to
+execute an action to move to the previously active pane within a single tab. No
+additional UX (including the pane switcher) is being prescribed in this spec at
+this time.
+
+## Potential Issues
+
+<table>
+<tr>
+<td><strong>Compatibility</strong></td>
+<td>
+
+We've only adding a single enum value to an existing enum. Since we're not
+changing the meaning of any of the existing values, we do not expect any
+compatibility issues there. Additionally, we're not changing the default value
+of the `direction` param of the `moveFocus` action, so there are no further
+compatibility concerns there. Furthermore, no additional parameters are being
+added to the `moveFocus` action that would potentially give it a different
+meaning.
+
+</td>
+</tr>
+</table>
+
+In the current design, there's no way to move through all the panes with a
+single keybinding. For example, if a user wanted to bind <kbd>Alt+]</kbd> to
+move to the "next" pane, and <kbd>Alt+[</kbd> to move to the "previous" one.
+These movements would necessarily need to be in-order traversals, since there's
+no way of doing multiple MRU steps.
+
+Fortunately, no one's really asked for traversing the panes in-order, so we're
+not really worried about this. Otherwise, it would maybe make sense for `last`
+to be the "previous MRU pane", and reserve `next`/`prev` for in-order traversal.
+
+
+[#2871]: https://github.com/microsoft/terminal/issues/2871
+[#5464]: https://github.com/microsoft/terminal/issues/5464
+[#5803]: https://github.com/microsoft/terminal/issues/5803
+
+

doc/specs/#3062 - Appearance configuration object for profiles.md

@@ -0,0 +1,128 @@
+---
+author: Pankaj Bhojwani, pabhojwa@microsoft.com
+created on: 2020-11-20
+last updated: 2021-2-5
+issue id: #8345
+---
+
+# Appearance configuration objects for profiles
+
+## Abstract
+
+This spec outlines how we can support 'configuration objects' in our profiles, which
+will allow us to render differently depending on the state of the control. For example, a
+control can be rendered differently if it's focused as compared to when it's unfocused.
+
+## Inspiration
+
+Reference: [#3062](https://github.com/microsoft/terminal/issues/3062)
+
+Users want there to be a more visible indicator than the one we have currently for which
+pane is focused and which panes are unfocused. This change would grant us that feature.
+
+## Solution Design
+
+The implementation design for appearance config objects centers around the recent change where inheritance was added to the
+`TerminalSettings` class in the Terminal Settings Model - i.e. different `TerminalSettings` objects can inherit from each other.
+The reason for this change was that we did not want a settings reload to erase any overrides `TermControl` may have made
+to the settings during runtime. By instead passing a child of the `TerminalSettings` object to the control, we can change
+the parent of the child during a settings reload without the overrides being erased (since those overrides live in the child).
+
+The idea behind unfocused appearance configurations is similar. We will pass in another `TerminalSettings` object to the control,
+which is simply a child that already has some overrides in it. When the control gains or loses focus, it simply switches between
+the two settings objects appropriately.
+
+### Allowed parameters
+
+For now, these states are meant to be entirely appearance-based. So, not all parameters which can be
+defined in a `Profile` can be defined in this new object (for example, we do not want parameters which
+would cause a resize in this object.) Here is the list of parameters we will allow:
+
+- Anything regarding colors: `colorScheme`, `foreground`, `background`, `cursorColor` etc
+- Anything regarding background image: `path`, `opacity`, `alignment`, `stretchMode`
+- `cursorShape`
+
+We may wish to allow further parameters in these objects in the future (like `bellStyle`?). The addition
+of further parameters can be discussed in the future and is out of scope for this spec.
+
+### Inheritance
+
+The inheritance model can be thought of as an 'all-or-nothing' approach in the sense that the `unfocusedAppearance` object
+is considered as a *single* setting instead of an object with many settings. We have chosen this model because it is cleaner
+and easier to understand than the alternative, where each setting within an `unfocusedAppearance` object has a parent from which
+it obtains its value.
+
+Note that when `TerminalApp` initializes a control, it creates a `TerminalSettings` object for that profile and passes the
+control a child of that object (so that the control can store overrides in the child, as described earlier). If an unfocused
+config is defined in the profile (or in globals/profile defaults), then `TerminalApp` will create a *child of that child*,
+put the relevant overrides in it, and pass that into the control as well. Thus, the inheritance of any undefined parameters
+in the unfocused config will be as follows:
+
+1. The unfocused config specified in the profile (or in globals/profile defaults)
+2. Overrides made by the terminal control
+3. The parent profile
+
+## UI/UX Design
+
+Users will be able to add a new setting to their profiles that will look like this:
+
+```
+"unfocusedAppearance":
+{
+    "colorScheme": "Campbell",
+    "cursorColor": "#888",
+    "cursorShape": "emptyBox",
+    "foreground": "#C0C0C0",
+    "background": "#000000"
+}
+```
+
+When certain appearance settings are changed via OSC sequences (such as the background color), only the focused/regular
+appearance will change and the unfocused one will remain unchanged. However, since the unfocused settings object inherits
+from the regular one, it will still apply the change (provided it does not define its own value for that setting).
+
+## Capabilities
+
+### Accessibility
+
+Does not affect accessibility.
+
+### Security
+
+Does not affect security.
+
+### Reliability
+
+This is another location in the settings where parsing/loading the settings may fail. However, this is the case
+for any new setting we add so I would say that this is a reasonable cost for this feature.
+
+### Compatibility
+
+Should not affect compatibility.
+
+### Performance, Power, and Efficiency
+
+Rapidly switching between many panes, causing several successive appearance changes in a short period of time, could
+potentially impact performance. However, regular/reasonable pane switching should not have a noticeable effect.
+
+## Potential Issues
+
+Inactive tabs will be 'rendered' in the background with the `UnfocusedRenderingParams` object, we need to make
+sure that switching to an inactive tab (and so causing the renderer to update with the 'normal' parameters)
+does not cause the window to flash/show a jarring indicator that the rendering values changed.
+
+## Future considerations
+
+We will need to decide how this will look in the settings UI.
+
+We may wish to add more states in the future (like 'elevated'). When that happens, we will need to deal with how
+these appearance objects can scale/layer over each other. We had a lot of discussion about this and could not find
+a suitable solution to the problem of multiple states being valid at the same time (like unfocused and elevated).
+This, along with the fact that it is uncertain if there even will be more states we would want to add led us to
+the conclusion that we should only support the unfocused state for now, and come back to this issue later. If there
+are no more states other than unfocused and elevated, we could allow combining them (like having an 'unfocused elevated' state).
+If there are more states, we could do the implementation as an extension rather than inherently supporting it.
+
+## Resources
+
+

doc/specs/#5000 - Process Model 2.0/#4472 - Windows Terminal Session Management.md

@@ -0,0 +1,562 @@
+---
+author: Mike Griese @zadjii-msft
+created on: 2020-10-30
+last updated: 2020-02-05
+issue id: #4472
+---
+
+# Windows Terminal Session Management
+
+## Abstract
+This document is intended to serve as an addition to the [Process Model 2.0
+Spec]. That document provides a big-picture overview of changes to the entirety
+of the Windows Terminal process architecture, including both the split of
+window/content processes, as well as the introduction of monarch/peasant
+processes. The focus of that document was to identify solutions to a set of
+scenarios that were closely intertwined, and establish these solutions would
+work together, without preventing any one scenario from working. What that
+document did not do was prescribe specific solutions to the given scenarios.
+
+This document offers a deeper dive on a subset of the issues in [#5000], to
+describe specifics for managing multiple windows with the Windows Terminal. This
+includes features such as:
+
+* Run `wt` in the current window ([#4472])
+* Single Instance Mode ([#2227])
+
+## Solution Design
+
+### Monarch and Peasant Processes
+
+This document assumes the reader is already familiar with the "Monarch and
+Peasant" architecture as detailed in the [Windows Terminal Process Model 2.0
+Spec]. As a quick summary:
+
+* Every Windows Terminal window is a "Peasant" process.
+* One of the Windows Terminal window processes is also the "Monarch" process.
+  The Monarch is picked randomly from the Terminal windows, and there is only
+  ever one Monarch process at a time.
+* Peasants can communicate with the monarch when certain state changes (such as
+  their window being activated), and the monarch can send commands to any of the
+  peasants.
+
+This architecture will be used to enable each of the following scenarios.
+
+### Scenario: Open new tabs in most recently used window
+
+A common feature of many browsers is that when a web URL is clicked somewhere,
+the web page is opened as a new tab in the most recently used window of the
+browser. This functionality is often referred to as "glomming", as the new tab
+"gloms" onto the existing window.
+
+Currently, the terminal does not support such a feature - every `wt` invocation
+creates a new window. With the monarch/peasant architecture, it'll now be
+possible to enable such a scenario.
+
+As each window is activated, it will call a method on the `Monarch` object
+(hosted by the monarch process) which will indicate that "I am peasant N, and
+I've been focused". The monarch will use those method calls to update its own
+internal stack of the most recently used windows.
+
+Whenever a new `wt.exe` process is launched, that process will _first_ ask the
+monarch if it should run the commandline in an existing window, or create its
+own window.
+
+![auto-glom-wt-exe](auto-glom-wt-exe.png)
+
+If glomming is enabled, the monarch will dispatch the commandline to the
+appropriate window for them to handle instead. To the user, it'll seem as if the
+tab just opened in the most recent window.
+
+Users should certainly be able to specify if they want new instances to glom
+onto the MRU window or not. You could imagine that currently, we default to the
+hypothetical value `"windowingBehavior": "useNew"`, meaning that each new wt gets
+its own new window.
+
+If glomming is disabled, then the Monarch will call back to the peasant and tell
+it to run the provided commandline. The monarch will use the return value of
+`ExecuteCommandline` to indicate that the calling process should create a window
+and become a peasant process, and run the commandline itself.
+
+#### Glomming within the same virtual desktop
+
+When links are opened in the new Edge browser, they will only glom onto an
+existing window if that window is open in the current virtual desktop. This
+seems like a good idea of a feature for the Terminal to follow as well.
+
+There must be some way for an application to determine which virtual desktop it
+is open on. We could use that information to have the monarch track the last
+active window _per-desktop_, and only glom when there's one on the current
+desktop.
+
+We could make the `windowingBehavior` property accept a variety of
+configurations:
+
+- `"useExisting"`: always glom to the most recent window, regardless of desktop.
+- `"useExistingOnSameDesktop"`: Only glom if there's an existing window on this
+  virtual desktop, otherwise create a new window. This will be the new default
+  value.
+- `"useNew"`: Never glom, always create a new window. This is technically the
+  current behavior of the Terminal.
+
+### Handling the current working directory
+
+Consider the following scenario: the user runs `wt -d .` in the address bar of
+explorer, and the monarch determines that this new tab should be created in an
+existing window. For clarity during this example, we will label the existing
+window WT[1], and the second `wt.exe` process WT[2].
+
+An example of this scenario is given in the following diagram:
+
+![single-instance-mode-cwd](single-instance-mode-cwd.png)
+
+In this scenario, we want the new tab to be spawned in the current working
+directory of WT[2], not WT[1]. So when WT[1] is about to run the commands that
+were passed to WT[2], WT[1] will need to:
+
+* First, stash its own CWD
+* Change to the CWD of WT[2]
+* Run the commands from WT[2]
+* Then return to its original CWD.
+
+So, as a part of the interface that a peasant uses to communicate the startup
+commandline to the monarch, we should also include the current working
+directory.
+
+### Scenario: Run `wt` in the current window
+
+One often requested scenario is the ability to run a `wt.exe` commandline in the
+current window, as opposed to always creating a new window. Presume we have the
+ability to communicate between different window processes. The logical extension
+of this scenario would be "run a `wt` commandline in _any_ given WT window".
+
+Each window process will have its own unique ID assigned to it by the monarch.
+This ID will be a positive number. Windows can also have names assigned to them.
+These names are strings that the user specifies. A window will always have an
+ID, but not necessarily a name. Running a command in a given window with ID N
+should be as easy as something like:
+
+```sh
+wt.exe --window N new-tab ; split-pane
+```
+
+(or for shorthand, `wt -w N new-tab ; split-pane`).
+
+More formally, we will add the following parameter to the top-level `wt`
+command:
+
+#### `--window,-w <window-id>`
+Run these commands in the given Windows Terminal session. This enables opening
+new tabs, splits, etc. in already running Windows Terminal windows.
+* If `window-id` is `0`, run the given commands in _the current window_.
+* If `window-id` is a negative number, or the reserved name `new`, run the
+  commands in a _new_ Terminal window.
+* If `window-id` is the ID or name of an existing window, then run the
+  commandline in that window.
+* If `window-id` is _not_ the ID or name of an existing window, create a new
+  window. That window will be assigned the ID or name provided in the
+  commandline. The provided subcommands will be run in that new window.
+* If `window-id` is omitted, then obey the value of `windowingBehavior` when
+  determining which window to run the command in.
+
+_Whenever_ `wt.exe` is started, it must _always_ pass the provided commandline
+first to the monarch process for handling. This is important for glomming
+scenarios (as noted above). The monarch will parse the commandline, determine
+which window the commandline is destined for, then call `ExecuteCommandline` on
+that peasant, who will then run the command.
+
+#### Running commands in the current window:`wt --window 0`
+
+If `wt -w 0 <commands>` is run _outside_ a WT instance, it could attempt to glom
+onto _the most recent WT window_ instead. This seems more logical than something
+like `wt --window last` or some other special value indicating "run this in the
+MRU window".<sup>[[2]](#footnote-2)</sup>
+
+That might be a simple, but **wrong**, implementation for "the current window".
+If the peasants always raise an event when their window is focused, and the
+monarch keeps track of the MRU order for peasants, then one could naively assume
+that the execution of `wt -w 0 <commands>` would always return the window the
+user was typing in, the current one. However, if someone were to do something
+like `sleep 10 ; wt -w 0 <commands>`, then the user could easily focus another
+WT window during the sleep, which would cause the MRU window to not be the same
+as the window executing the command.
+
+To solve this issue, we'll  other than
+attempting to use the `WT_SESSION` environment variable. If a `wt.exe` process
+is spawned and that's in its environment variables, it could try and ask the
+monarch for the peasant who's hosting the session corresponding to that GUID.
+This is more of a theoretical solution than anything else.
+
+In the past we've been reluctant to rely too heavily on `WT_SESSION`. However,
+an environment variable does seem to be the only reliable way to be confident
+where the window was created from. We could introduce another environment
+variable instead - `WT_WINDOW_ID`. That would allow us to shortcut the session
+ID lookup. However, I worry about exposing the window ID as an environment
+variable. If we do that, users will inevitably use that instead of the `wt -0`
+alias, which should take care of the work for them. Additionally, `WT_WINDOW_ID`
+wouldn't update in the child processes as tabs are torn out of windows to create
+new windows.
+
+Both solutions are prone to the user changing the value of the variable to some
+garbage value. If they do that, this lookup will most certainly not work as
+expected. Using the session ID (a GUID) instead of the window ID (an int) makes
+it less likely that they guess the ID of an existing instance.
+
+#### Running commands in a new window:`wt --window -1` / `wt --window new`
+
+If the user passes a negative number, or the reserved name `new` to the
+`--window` parameter, then we will always create a new window for that
+commandline, regardless of the value of `windowingBehavior`. This will allow
+users to do something like `wt -w -1 new-tab` to _always_ create a new window.
+
+#### `--window` in subcommands
+
+The `--window` parameter is a setting to `wt.exe` itself, not to one of its
+subcommands (like `new-tab` or `split-pane`). This means that all of the
+subcommands in a particular `wt` commandline will all be handled by the same
+session. For example, let us consider a user who wants to open a new tab in
+window 2, and split a new pane in window 3, all at once. The user _cannot_ do
+something like:
+
+```cmd
+wt -w 2 new-tab ; -w 3 split-pane
+```
+
+Instead, the user will need to separate the commands (by whatever their shell's
+own command delimiter is) and run two different `wt.exe` instances:
+
+```cmd
+wt -w 2 new-tab & wt -w 3 split-pane
+```
+
+This is done to make the parsing of the subcommands easier, and for the internal
+passing of arguments simpler. If the `--window` parameter were a part of each
+subcommand, then each individual subcommand's parser would need to be
+enlightened about that parameter, and then it would need to be possible for any
+single part of the commandline to call out to another process. It would be
+especially tricky then to coordinate the work being done across process here.
+The source process would need some sort of way to wait for the other process to
+notify the source that a particular subcommand completed, before allowing the
+source to dispatch the next part of the commandline.
+
+Overall, this is seen as unnecessarily complex, and dispatching whole sets of
+commands as a simpler solution.
+
+### Naming Windows
+
+It's not user-friendly to rely on automatically generated, invisible numbers to
+identify windows. There's not a great way of identifying which window is which.
+The user would need to track the IDs in their head manually. Instead, we'll
+allow the user to provide a string name for the window. This name can be used to
+address a window in addition to the ID.
+
+Names can be provided on the commandline, in the original commandline. For
+example, `wt -w foo nt` would name the new window "foo". Names can also be set
+with a new action, `NameWindow`<sup>[[3]](#footnote-3)</sup>. `name-window`
+could also be used as a subcommand. For example, `wt -w 4 name-window bar` would
+name window 4 "bar".
+
+To keep identities mentally distinct, we will disallow names that are integers
+(positive or negative). This will prevent users from renaming a window to `2`,
+then having `wt -w 2` be ambiguous as to which window it refers to.
+
+Names must also be unique. If a user attempts to set the name of the window to
+an already-used name, we'll need to ignore the name change. We could also
+display a "toast" or some other type of low-impact message to the user. That
+message would have some text like: "Unable to rename window. Another window with
+that name already exists".
+
+The Terminal will reserve the name `new`. It will also reserve any names
+starting with the character `_`. The user will not be allowed to set the window
+name to any of these reserved names. Reserving `_*` allows us to add other
+keywords in the future, without introducing a breaking change.
+
+## UI/UX Design
+
+### `windowingBehavior` details
+
+The following list gives greater breakdown of the values of `windowingBehavior`,
+and how they operate:
+
+* `"windowingBehavior": "useExisting", "useExistingOnSameDesktop"`:
+  **Browser-like glomming**
+  - New instances open in the current window by default.
+  - `newWindow` opens a new window.
+  - Tabs can be torn out to create new windows.
+  - `wt -w -1` opens a new window.
+* `"windowingBehavior": "useNew"`: No auto-glomming. This is **the current
+  behavior** of the Terminal.
+  - New instances open in new windows by default
+  - `newWindow` opens a new window
+  - Tabs can be torn out to create new windows.
+  - `wt -w -1` opens a new window.
+
+We'll be changing the default behavior from `useNew` to
+`useExistingOnSameDesktop`. This will be more consistent with other tabbed
+applications.
+
+## Concerns
+
+<table>
+<tr>
+<td><strong>Accessibility</strong></td>
+<td>
+
+There is no expected accessibility impact from this feature. Each window will
+handle UIA access as it normally does.
+
+In the future, we could consider exposing the window IDs and/or names via UIA.
+
+</td>
+</tr>
+<tr>
+<td><strong>Security</strong></td>
+<td>
+
+Many security concerns have already be covered in greater detail in the parent
+spec, [Process Model 2.0 Spec].
+
+When attempting to instantiate the Monarch, COM will only return the object from
+a server running at the same elevation level. We don't need to worry about
+unelevated peasants connecting to the elevated Monarch, or vice-versa.
+
+</td>
+</tr>
+<tr>
+<td><strong>Reliability</strong></td>
+<td>
+
+We will need to be careful when working with objects hosted by another process.
+Any work we do with it MUST be in a try/catch, because at _any_ time, the other
+process could be killed. At any point, a window process could be killed. Both
+the monarch and peasant code will need to be redundant to such a scenario, and
+if the other process is killed, make sure to display an appropriate error and
+either recover or exit gracefully.
+
+In any and all these situations, we will want to try and be as verbose as
+possible in the logging. This will make tracking which process had the error
+occur easier.
+
+</td>
+</tr>
+<tr>
+<td><strong>Compatibility</strong></td>
+<td>
+
+We will be changing the default behavior of the Terminal to auto-glom to the
+most-recently used window on the same desktop in the course of this work, which
+will be a breaking UX change. This is behavior that can be reverted with the
+`"windowingBehavior": "useNew"` setting.
+
+We acknowledge that this is a pretty massive change to the default experience of
+the Terminal. We're planning on doing some polling of users to determine which
+behavior they want by default. Additionally, we'll be staging the rollout of
+this feature, using the Preview builds of the Terminal. The release notes that
+first include it will call extra attention to this feature. We'll ask that users
+provide their feedback in a dedicated thread, so we have time to collect
+opinions from users before rolling the change out to all users.
+
+We may choose to only change the default to `useExistingOnSameDesktop` once tab
+tear out is available, so users who are particularly unhappy about this change
+can still tear out the tab (if they can't be bothered to change the setting).
+
+</td>
+</tr>
+<tr>
+<td><strong>Performance, Power, and Efficiency</strong></td>
+<td>
+
+There's no dramatic change expected here. There may be a minor delay in the
+spawning of new terminal instances, due to requiring cross-process hops for the
+communication between monarch and peasant processes.
+
+</td>
+</tr>
+</table>
+
+## Potential Issues
+
+### Mixed Elevation Levels
+
+As of December 2020, we're no longer pursuing a "mixed-elevation" scenario for
+the Terminal. This makes many of the cross-elevation scenarios simpler. Elevated
+and unelevated `wt` instances will always remain separate. The different
+elevation levels will maintain separate lists of window IDs. If the user is
+running both an elevated and unelevated window, then there will be two monarchs.
+One elevated, and the other unelevated.
+
+There will also be some edge cases when handling the commandline that will need
+special care. Say the user wanted to open a new tab in the elevated window, from
+and unelevated `explorer.exe`. That would be a commandline like:
+
+```sh
+wt -w 0 new-tab -d . --elevated
+```
+
+Typically we first determine which window the commandline is intended for, then
+dispatch it to that window. In this case, the `-w 0` will cause us to pass the
+commandline to the current unelevated window. Then, that window will try to open
+an elevated tab, fail, and create a new `wt.exe` process. This second `wt.exe`
+process will lose the `-w 0` context. It won't inform the elevated monarch that
+this commandline should be run in the active session.
+
+We will need to make sure that special care is taken when creating elevated
+instances that we maintain the `--window` parameter passed to the Terminal.
+
+### `wt` Startup Commandline Options
+
+There are a few commandline options which can be provided to `wt.exe` which
+don't make sense to pass to another session. These options include (but are not
+limited to):
+
+* `--initialSize r,c`
+* `--initialPosition x,y`
+* `--fullscreen`, `--maximized`, etc.
+
+When we're passing a commandline to another instance to handle, these arguments
+will be ignored. they only apply to the initial creation of a window.
+`--initialSize 32, 120` doesn't make sense if the window already has a size.
+
+On startup of a new window, we currently assume that the first command is always
+`new-tab`. When passing commandlines to existing windows, we won't need to make
+that assumption anymore. There will already be existing tabs.
+
+### Monarch MRU Window Tracking
+
+As stated above, the monarch is responsible for tracking the MRU window stack.
+However, when the monarch is closed, this state will be lost. The new monarch
+will be elected, but it will be unable to ask the old monarch for the MRU
+order of the windows.
+
+We had previously considered an _acceptable_ UX when this would occur. We would
+randomize the order (with the new monarch becoming the MRU window). If someone
+noticed this bug and complained, then we had a theoretical solution prepared.
+The peasants could inform not only the monarch, but _all other peasants_ when
+they become activated. This would mean all peasants are simultaneously tracking
+the MRU stack. This would mean that any given peasant would be prepared always
+to become the monarch.
+
+A simpler solution though would be to not track the MRU stack in the Monarch at
+all. Instead, each peasant could just track internally when they were last
+activated. The Monarch wouldn't track any state itself. It would be distributed
+across all the peasants. The Monarch could then iterate over the list of
+peasants and find the one with the newest `LastActivated` timestamp.
+
+Now, when a Monarch dies, the new Peasant doesn't have to come up with the stack
+itself. All the other Peasants keep their state. The new Monarch can query them
+and get the same answer the old Monarch would have.
+
+We could further optimize this by having the Monarch also track the stack. Then,
+the monarch could query the MRU window quickly. The `LastActivated` timestamps
+would only be used by a new Monarch when it is elected, to reconstruct the MRU
+stack.
+
+## Implementation Plan
+
+This is a list of actionable tasks generated as described by this spec:
+
+* [ ] Add support for `wt.exe` processes to be Monarchs and Peasants, and
+  communicate that state between themselves. This task does not otherwise add
+  any user-facing features, merely an architectural update.
+* [ ] Add support for the `windowingBehavior` setting as a boolean. Opening new
+  WT windows will conditionally glom to existing windows.
+* [ ] Add support for per-desktop `windowingBehavior`, by adding the support for
+  the enum values `"useExisting"`, `"useExistingOnSameDesktop"` and `"useNew"`.
+* [ ] Add support for `wt.exe` to pass commandlines intended for another window
+  to the monarch, then to the intended window, with the `--window,-w
+  window-id` commandline parameter.
+* [ ] Add support for targeting and naming windows via the `-w` parameter on the
+  commandline
+* [ ] Add a `NameWindow` action, subcommand that allows the user to set the name
+  for the window.
+* [ ] Add an action that will cause all windows to briefly display a overlay
+  with the current window ID and name. This would be something like the
+  "identify" feature of the Windows "Display" settings.
+
+## Future considerations
+
+* What if the user wanted to pipe a command to a pane in an existing window?
+  ```sh
+  man ping > wt -w 0 split-pane cat
+  ```
+  Is there some way for WT to pass its stdin/out handles to the child process
+  it's creating? This is _not_ related to the current spec at hand, just
+  something the author considered while writing the spec. This likely belongs
+  over in [#492], or in its own spec.
+  - Or I suppose, with less confusion, someone could run `wt -w 0 split-pane --
+    man ping > cat`. That's certainly more sensible, and wouldn't require any
+    extra work.
+* "Single Instance Mode" is a scenario in which there is only ever one single WT
+  window. A user might want this functionality to only ever allow a single
+  terminal window to be open on their desktop. This is especially frequently
+  requested in combination with "quake mode", as discussed in [#653]. When Single
+  Instance Mode is active, and the user runs a new `wt.exe` commandline, it will
+  always end up running in the existing window, if there is one.
+
+  An earlier version of this spec proposed a new value of `glomToLastWindow`.
+  (`glomToLastWindow` was later renamed `windowingBehavior`). The `always` value
+  would disable tab tear out<sup>[[1]](#footnote-1)</sup>. It would additionally
+  disable the `newWindow` action, and prevent `wt -w new` from opening a new
+  window.
+
+  In discussion, it was concluded that this setting didn't make sense. Why did the
+  `glomToLastWindow` setting change the behavior of tear out? Single Instance Mode
+  is most frequently requested in regards to quake mode. We're leaving the
+  implementation of true single instance mode to that spec.
+* It was suggested in review that we could auto-generate names for windows, from
+  some list of words. Prior art could be the URLS for gfycat.com or
+  what3words.com, which use three random words. I believe `docker` also assigns
+  names from a random selection of `adjective`+`name`. This is an interesting
+  idea, and something that could be pursued in the future.
+    - This would be a massive pain to localize though, hence why this is left as
+      a future consideration.
+* We will _need_ to provide a commandline tool to list windows and their IDs &
+  names. We're thinking a list of windows, their IDs, names, PIDs, and the title
+  of the window.
+
+  Currently we're stuck with `wt.exe` which is a GUI application, and cannot
+  print to the console. Our need is now fairly high for the ability to print
+  info to the console. To remedy this, we'll need to ship another helper exe as
+  a commandline tool for working with the terminal. The design for this is left
+  for the future.
+
+## Footnotes
+
+<a name="footnote-1"><a>[1]: While tear-out is a separate track of work from
+session management in general, this setting could be implemented along with this
+set of features, and later used to control tear out as well.
+
+<a name="footnote-2"><a>[2]: Since we're reserving the keyword `new` to mean "a
+new window", then we could also reserve `last` or `current` as an alias for "the
+current window".
+
+<a name="footnote-3"><a>[3]: We currently have two actions for renaming _tabs_
+in the Terminal: `renameTab(name)`, and `openTabRenamer()`. We will likely
+similarly need `nameWindow(name)` and `openWindowNamer()`. `openWindowNamer`
+could display a dialog to allow the user to rename the current window at
+runtime.
+
+
+## Resources
+
+* [Tab Tear-out in the community toolkit] - this document proved invaluable to
+  the background of tearing a tab out of an application to create a new window.
+
+<!-- Footnotes -->
+
+[#5000]: https://github.com/microsoft/terminal/issues/5000
+[#1256]: https://github.com/microsoft/terminal/issues/1256
+[#4472]: https://github.com/microsoft/terminal/issues/4472
+[#2227]: https://github.com/microsoft/terminal/issues/2227
+[#653]: https://github.com/microsoft/terminal/issues/653
+[#1032]: https://github.com/microsoft/terminal/issues/1032
+[#632]: https://github.com/microsoft/terminal/issues/632
+[#492]: https://github.com/microsoft/terminal/issues/492
+[#4000]: https://github.com/microsoft/terminal/issues/4000
+[#7972]: https://github.com/microsoft/terminal/pull/7972
+[#961]: https://github.com/microsoft/terminal/issues/961
+[`30b8335`]: https://github.com/microsoft/terminal/commit/30b833547928d6dcbf88d49df0dbd5b3f6a7c879
+[Tab Tear-out in the community toolkit]: https://github.com/windows-toolkit/Sample-TabView-TearOff
+[Quake mode scenarios]: https://github.com/microsoft/terminal/issues/653#issuecomment-661370107
+[`ISwapChainPanelNative2::SetSwapChainHandle`]: https://docs.microsoft.com/en-us/windows/win32/api/windows.ui.xaml.media.dxinterop/nf-windows-ui-xaml-media-dxinterop-iswapchainpanelnative2-setswapchainhandle
+[Process Model 2.0 Spec]: https://github.com/microsoft/terminal/blob/main/doc/specs/%235000%20-%20Process%20Model%202.0/%235000%20-%20Process%20Model%202.0.md

doc/specs/#597 - Tab Sizing.md

@@ -0,0 +1,95 @@
+---
+author: Kayla Cinnamon @cinnamon-msft
+created on: 2020-01-03
+last updated: 2020-01-03
+issue id: 597
+---
+
+# Tab Sizing
+
+## Abstract
+
+This spec outlines the tab sizing feature. This is an application-level feature that is not profile-specific (at least for now).
+
+Global properties that encompass tab sizing:
+
+* `tabWidthMode` (accepts pre-defined values for tab sizing behavior)
+* `tabWidthMin` (can never be smaller than the icon width)
+* `tabWidthMax` (can never be wider than the tab bar)
+
+Acceptable values for `tabWidthMode`:
+
+* [default] `equal` (all tabs are sized the same, regardless of tab title length)
+* `titleLength` (width of tab contains entire tab title)
+
+## Inspiration
+
+Other browsers and terminals have varying tab width behavior, so we should give people options.
+
+## Solution Design
+
+`tabWidthMode` will be a global setting that will accept the following strings:
+
+* `equal`
+    * All tabs are equal in width
+    * If the tab bar has filled, tabs will shrink as additional tabs are added
+    * Utilizes the `equal` setting from WinUI's TabView
+
+* `titleLength`
+    * Tab width varies depending on title length
+    * Width of tab will fit the whole tab title
+    * Utilizes the `sizeToContent` setting from WinUI's TabView
+
+In addition to `tabWidthMode`, the following global properties will also be available:
+
+* `tabWidthMin`
+    * Accepts an integer
+    * Value correlates to the minimum amount of pixels the tab width can be
+    * If value is less than the width of the icon, the minimum width will be the width of the icon
+    * If value is greater than the width of the tab bar, the maximum width will be the width of the tab bar
+    * If not set, the tab will have the system-defined minimum width
+
+* `tabWidthMax`
+    * Accepts an integer
+    * Value correlates to the maximum amount of pixels the tab width can be
+    * If value is less than the width of the icon, the minimum width will be the width of the icon
+    * If value is greater than the width of the tab bar, the maximum width will be the width of the tab bar
+    * If not set, the tab will have the system-defined maximum width
+
+If `tabWidthMode` is set to `titleLength`, the tab widths will fall between the `tabWidthMin` and `tabWidthMax` values if they are set, depending on the length of the tab title.
+
+If `tabWidthMode` isn't set, the default experience will be `equal`. Justification for the default experience is the results from this [twitter poll](https://twitter.com/cinnamon_msft/status/1203093459055210496).
+
+## UI/UX Design
+
+[This tweet](https://twitter.com/cinnamon_msft/status/1203094776117022720) displays how the `equal` and `titleLength` values behave for the `tabWidthMode` property.
+
+## Capabilities
+
+### Accessibility
+
+This feature could impact accessibility if the tab title isn't stored within the metadata of the tab. If the tab width is the width of the icon, then the title isn't visible. The tab title will have to be accessible by a screen reader.
+
+### Security
+
+This feature will not impact security.
+
+### Reliability
+
+This feature will not impact reliability. It provides users with additional customization options.
+
+### Compatibility
+
+This feature will not break existing compatibility.
+
+### Performance, Power, and Efficiency
+
+## Potential Issues
+
+This feature will not impact performance, power, nor efficiency.
+
+## Future considerations
+
+* Provide tab sizing options per-profile
+* A `tabWidthMode` value that will evenly divide the entirety of the tab bar by the number of open tabs
+    * i.e. One tab will take the full width of the tab bar, two tabs will each take up half the width of the tab bar, etc.

res/README.md

@@ -17,5 +17,5 @@ Please consult the [license](https://raw.githubusercontent.com/microsoft/cascadi
 
 ### Fonts Included
 
-* Cascadia Code, Cascadia Mono (2009.21)
-   * from microsoft/cascadia-code@32f84124db1970fa5d032f0fe9019e6922961beb
+* Cascadia Code, Cascadia Mono (2102.25)
+   * from microsoft/cascadia-code@911dc421f333e3b72b97381d16fee5b71eb48f04

res/terminal/Terminal.svg

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M0 13H16V6H2C0.9 6 0 6.9 0 8V13Z" fill="#CCCCCC"/>
 <path d="M32 6H16V13H32V6Z" fill="#999999"/>

res/terminal/Terminal_Dev_HC.svg

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
 <defs>
 <linearGradient id="foreground"><stop stop-color="#000000"/></linearGradient>

res/terminal/Terminal_HC.svg

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
 <defs>
 <linearGradient id="foreground"><stop stop-color="#000000"/></linearGradient>

samples/PixelShaders/Animate_breathe.hlsl

@@ -0,0 +1,42 @@
+// A simple animated shader that fades the terminal background back and forth between two colours
+
+// The terminal graphics as a texture
+Texture2D shaderTexture;
+SamplerState samplerState;
+
+// Terminal settings such as the resolution of the texture
+cbuffer PixelShaderSettings
+{
+    // The number of seconds since the pixel shader was enabled
+    float Time;
+    // UI Scale
+    float Scale;
+    // Resolution of the shaderTexture
+    float2 Resolution;
+    // Background color as rgba
+    float4 Background;
+};
+
+// pi and tau (2 * pi) are useful constants when using trigonometric functions
+#define TAU 6.28318530718
+
+// A pixel shader is a program that given a texture coordinate (tex) produces a color.
+// tex is an x,y tuple that ranges from 0,0 (top left) to 1,1 (bottom right).
+// Just ignore the pos parameter.
+float4 main(float4 pos : SV_POSITION, float2 tex : TEXCOORD) : SV_TARGET
+{
+	// Read the color value at the current texture coordinate (tex)
+    float4 sample = shaderTexture.Sample(samplerState, tex);
+    
+    // The number of seconds the breathing effect should span
+    float duration = 5.0;
+    
+    float3 color1 = float3(0.3, 0.0, 0.5);  // indigo
+    float3 color2 = float3(0.1, 0.1, 0.44); // midnight blue
+    
+    // Set background colour based on the time
+    float4 backgroundColor = float4(lerp(color1, color2, 0.5 * cos(TAU / duration * Time) + 0.5), 1.0);
+    
+    // Draw the terminal graphics over the background
+    return lerp(backgroundColor, sample, sample.w);
+}

samples/PixelShaders/Animate_scan.hlsl

@@ -0,0 +1,45 @@
+// A simple animated shader that draws an inverted line that scrolls down the screen
+
+// The terminal graphics as a texture
+Texture2D shaderTexture;
+SamplerState samplerState;
+
+// Terminal settings such as the resolution of the texture
+cbuffer PixelShaderSettings
+{
+    // The number of seconds since the pixel shader was enabled
+    float Time;
+    // UI Scale
+    float Scale;
+    // Resolution of the shaderTexture
+    float2 Resolution;
+    // Background color as rgba
+    float4 Background;
+};
+
+// A pixel shader is a program that given a texture coordinate (tex) produces a color.
+// tex is an x,y tuple that ranges from 0,0 (top left) to 1,1 (bottom right).
+// Just ignore the pos parameter.
+float4 main(float4 pos : SV_POSITION, float2 tex : TEXCOORD) : SV_TARGET
+{
+    // Read the color value at the current texture coordinate (tex)
+    float4 color = shaderTexture.Sample(samplerState, tex);
+    
+    // Here we spread the animation over 5 seconds. We use time modulo 5 because we want
+    // the timer to count to five repeatedly. We then divide the result by five again
+    // to get a value between 0.0 and 1.0, which maps to our texture coordinate.
+    float linePosition = Time % 5 / 5;
+    
+    // Since TEXCOORD ranges from 0.0 to 1.0, we need to divide 1.0 by the height of the
+    // texture to find out the size of a single pixel
+    float lineWidth = 1.0 / Resolution.y;
+	
+    // If the current texture coordinate is in the range of our line on the Y axis: 
+    if (tex.y > linePosition - lineWidth && tex.y < linePosition)
+    {
+        // Invert the sampled color
+        color.rgb = 1.0 - color.rgb;
+    }
+    
+    return color;
+}

samples/PixelShaders/Grayscale.hlsl

@@ -6,7 +6,7 @@ SamplerState samplerState;
 
 // Terminal settings such as the resolution of the texture
 cbuffer PixelShaderSettings {
-  // Time since pixel shader was enabled
+  // The number of seconds since the pixel shader was enabled
   float  Time;
   // UI Scale
   float  Scale;
@@ -16,8 +16,9 @@ cbuffer PixelShaderSettings {
   float4 Background;
 };
 
-// A pixel shader is a program that given a texture coordinate (tex) produces a color
-//  Just ignore the pos parameter
+// A pixel shader is a program that given a texture coordinate (tex) produces a color.
+// tex is an x,y tuple that ranges from 0,0 (top left) to 1,1 (bottom right).
+// Just ignore the pos parameter.
 float4 main(float4 pos : SV_POSITION, float2 tex : TEXCOORD) : SV_TARGET
 {
     // Read the color value at the current texture coordinate (tex)

samples/PixelShaders/Invert.hlsl

@@ -6,7 +6,7 @@ SamplerState samplerState;
 
 // Terminal settings such as the resolution of the texture
 cbuffer PixelShaderSettings {
-  // Time since pixel shader was enabled
+  // The number of seconds since the pixel shader was enabled
   float  Time;
   // UI Scale
   float  Scale;
@@ -16,8 +16,9 @@ cbuffer PixelShaderSettings {
   float4 Background;
 };
 
-// A pixel shader is a program that given a texture coordinate (tex) produces a color
-//  Just ignore the pos parameter
+// A pixel shader is a program that given a texture coordinate (tex) produces a color.
+// tex is an x,y tuple that ranges from 0,0 (top left) to 1,1 (bottom right).
+// Just ignore the pos parameter.
 float4 main(float4 pos : SV_POSITION, float2 tex : TEXCOORD) : SV_TARGET
 {
     // Read the color value at the current texture coordinate (tex)

samples/PixelShaders/README.md

@@ -20,7 +20,7 @@ SamplerState samplerState;
 
 // Terminal settings such as the resolution of the texture
 cbuffer PixelShaderSettings {
-  // Time since pixel shader was enabled
+  // The number of seconds since the pixel shader was enabled
   float  Time;
   // UI Scale
   float  Scale;
@@ -30,8 +30,9 @@ cbuffer PixelShaderSettings {
   float4 Background;
 };
 
-// A pixel shader is a program that given a texture coordinate (tex) produces a color
-//  Just ignore the pos parameter
+// A pixel shader is a program that given a texture coordinate (tex) produces a color.
+// tex is an x,y tuple that ranges from 0,0 (top left) to 1,1 (bottom right).
+// Just ignore the pos parameter.
 float4 main(float4 pos : SV_POSITION, float2 tex : TEXCOORD) : SV_TARGET
 {
     // Read the color value at the current texture coordinate (tex)
@@ -49,16 +50,22 @@ float4 main(float4 pos : SV_POSITION, float2 tex : TEXCOORD) : SV_TARGET
 Save this file as `C:\temp\invert.hlsl`, then update a profile with the setting:
 
 ```
-"experimental.pixelShaderEffect": "C:\\temp\\invert.hlsl"
+"experimental.pixelShaderPath": "C:\\temp\\invert.hlsl"
 ```
 
 Once the settings file is saved, open a terminal with the changed profile. It should now invert the colors of the screen!
 
+
+ Default Terminal | Inverted Terminal 
+---------|---------
+ ![Default Terminal](Screenshots/TerminalDefault.PNG) | ![Inverted Terminal](Screenshots/TerminalInvert.PNG) 
+
+
 If your shader fails to compile, the Terminal will display a warning dialog and ignore it temporarily. After fixing your shader, touch the `settings.json` file again, or open a new tab, and the Terminal will try loading the shader again.
 
 ## HLSL
 
-The language we use to write pixel shaders is called `HLSL`. It a `C`-like language, with some restrictions.You can't allocate memory, use pointers or recursion.
+The language we use to write pixel shaders is called `HLSL`. It's a `C`-like language, with some restrictions. You can't allocate memory, use pointers or recursion.
 What you get access to is computing power in the teraflop range on decently recent GPUs. This means writing real-time raytracers or other cool effects are in the realm of possibility.
 
 [shadertoy](https://shadertoy.com/) is a great site that show case what's possible with pixel shaders (albeit in `GLSL`). For example this [menger sponge](https://www.shadertoy.com/view/4scXzn). Converting from `GLSL` to `HLSL` isn't overly hard once you gotten the hang of it.
@@ -76,7 +83,7 @@ SamplerState samplerState;
 
 // Terminal settings such as the resolution of the texture
 cbuffer PixelShaderSettings {
-  // Time since pixel shader was enabled
+  // The number of seconds since the pixel shader was enabled
   float  Time;
   // UI Scale
   float  Scale;
@@ -86,8 +93,9 @@ cbuffer PixelShaderSettings {
   float4 Background;
 };
 
-// A pixel shader is a program that given a texture coordinate (tex) produces a color
-//  Just ignore the pos parameter
+// A pixel shader is a program that given a texture coordinate (tex) produces a color.
+// tex is an x,y tuple that ranges from 0,0 (top left) to 1,1 (bottom right).
+// Just ignore the pos parameter.
 float4 main(float4 pos : SV_POSITION, float2 tex : TEXCOORD) : SV_TARGET
 {
     // Read the color value at the current texture coordinate (tex)
@@ -130,7 +138,83 @@ float4 main(float4 pos : SV_POSITION, float2 tex : TEXCOORD) : SV_TARGET
 
 Once reloaded, it should show some retro raster bars in the background, with a drop shadow to make the text more readable.
 
+ ![Rasterbars](Screenshots/TerminalRasterbars.PNG)
+
 ## Retro Terminal Effect
 
-As a more complicated example, the Terminal's built-in `experimental.retroTerminalEffect` is included as the `Retro.hlsl` file in this directory. Feel free to modify and experiment!
+As a more complicated example, the Terminal's built-in `experimental.retroTerminalEffect` is included as the `Retro.hlsl` file in this directory. 
+
+![Retro](Screenshots/TerminalRetro.PNG)
+
+## Animated Effects
+
+You can use the `Time` value in the shader input settings to drive animated effects. `Time` is the number of seconds since the shader first loaded. Here’s a simple example with a line of inverted pixels that scrolls down the terminal (`Animate_scan.hlsl`):
+
+```hlsl
+float4 main(float4 pos : SV_POSITION, float2 tex : TEXCOORD) : SV_TARGET
+{
+    // Read the color value at the current texture coordinate (tex)
+    float4 color = shaderTexture.Sample(samplerState, tex);
+    
+    // Here we spread the animation over 5 seconds. We use time modulo 5 because we want
+    // the timer to count to five repeatedly. We then divide the result by five again
+    // to get a value between 0.0 and 1.0, which maps to our texture coordinate.
+    float linePosition = Time % 5 / 5;
+    
+    // Since TEXCOORD ranges from 0.0 to 1.0, we need to divide 1.0 by the height of the
+    // texture to find out the size of a single pixel
+    float lineWidth = 1.0 / Resolution.y;
+	
+    // If the current texture coordinate is in the range of our line on the Y axis: 
+    if (tex.y > linePosition - lineWidth && tex.y < linePosition)
+    {
+        // Invert the sampled color
+        color.rgb = 1.0 - color.rgb;
+    }
+    
+    return color;
+}
+```
+What if we want an animation that goes backwards and forwards? In this example (`Animate_breathe.hlsl`), we'll make the background fade between two colours. Our `Time` value only ever goes up, so we need a way to generate a value that sweeps back and forth from `0.0` to `1.0`. Trigonometric functions like cosine are perfect for this and are very frequently used in shaders. 
+
+`cos()` outputs a value between `-1.0` and `1.0`. We can adjust the wave with the following formula:
+
+```
+a * cos(b * (x - c)) + d
+```
+
+Where `a` adjusts the amplitude, `b` adjusts the wavelength/frequency, `c` adjusts the offset along the x axis, and `d` adjusts the offset along the y axis. You can use a graphing calculator (such as the Windows Calculator) to help visualize the output and experiment:
+
+![Cosine](Screenshots/GraphCosine.png)
+
+As shown above, by halving the output and then adding `0.5`, we can shift the range of the function to `0.0` - `1.0`. Because `cos()` takes input in radians, if we multiply `x` (`Time`) by tau (`2*pi`), we are effectively setting the wavelength to `1.0`. 
+
+In other words, our full animation will be one second long. We can modify this duration by dividing tau by the number of seconds we want the animation to run for. In this case, we’ll go for five seconds.
+
+Finally we use linear interpolation to achieve our breathing effect by selecting a color between our two chosen colors based on the output from our cosine.
+
+```hlsl
+// pi and tau (2 * pi) are useful constants when using trigonometric functions
+#define TAU 6.28318530718
+
+float4 main(float4 pos : SV_POSITION, float2 tex : TEXCOORD) : SV_TARGET
+{
+    // Read the color value at the current texture coordinate (tex)
+    float4 sample = shaderTexture.Sample(samplerState, tex);
+    
+    // The number of seconds the breathing effect should span
+    float duration = 5.0;
+    
+    float3 color1 = float3(0.3, 0.0, 0.5);  // indigo
+    float3 color2 = float3(0.1, 0.1, 0.44); // midnight blue
+    
+    // Set background colour based on the time
+    float4 backgroundColor = float4(lerp(color1, color2, 0.5 * cos(TAU / duration * Time) + 0.5), 1.0);
+    
+    // Draw the terminal graphics over the background
+    return lerp(backgroundColor, sample, sample.w);
+}
+```
+
+Feel free to modify and experiment!
 

samples/PixelShaders/Rasterbars.hlsl

@@ -6,7 +6,7 @@ SamplerState samplerState;
 
 // Terminal settings such as the resolution of the texture
 cbuffer PixelShaderSettings {
-  // Time since pixel shader was enabled
+  // The number of seconds since the pixel shader was enabled
   float  Time;
   // UI Scale
   float  Scale;
@@ -16,8 +16,9 @@ cbuffer PixelShaderSettings {
   float4 Background;
 };
 
-// A pixel shader is a program that given a texture coordinate (tex) produces a color
-//  Just ignore the pos parameter
+// A pixel shader is a program that given a texture coordinate (tex) produces a color.
+// tex is an x,y tuple that ranges from 0,0 (top left) to 1,1 (bottom right).
+// Just ignore the pos parameter.
 float4 main(float4 pos : SV_POSITION, float2 tex : TEXCOORD) : SV_TARGET
 {
     // Read the color value at the current texture coordinate (tex)

src/buffer/out/AttrRow.cpp

@@ -11,10 +11,16 @@
 // - attr - the default text attribute
 // Return Value:
 // - constructed object
-// Note: will throw exception if unable to allocate memory for text attribute storage
-ATTR_ROW::ATTR_ROW(const UINT cchRowWidth, const TextAttribute attr)
+ATTR_ROW::ATTR_ROW(const UINT cchRowWidth, const TextAttribute attr) noexcept
 {
-    _list.push_back(TextAttributeRun(cchRowWidth, attr));
+    try
+    {
+        _list.emplace_back(TextAttributeRun(cchRowWidth, attr));
+    }
+    catch (...)
+    {
+        FAIL_FAST_CAUGHT_EXCEPTION();
+    }
     _cchRowWidth = cchRowWidth;
 }
 
@@ -25,7 +31,7 @@ ATTR_ROW::ATTR_ROW(const UINT cchRowWidth, const TextAttribute attr)
 void ATTR_ROW::Reset(const TextAttribute attr)
 {
     _list.clear();
-    _list.push_back(TextAttributeRun(_cchRowWidth, attr));
+    _list.emplace_back(TextAttributeRun(_cchRowWidth, attr));
 }
 
 // Routine Description:
@@ -178,15 +184,15 @@ size_t ATTR_ROW::FindAttrIndex(const size_t index, size_t* const pApplies) const
 // Routine Description:
 // - Finds the hyperlink IDs present in this row and returns them
 // Return value:
-// - An unordered set containing the hyperlink IDs present in this row
-std::unordered_set<uint16_t> ATTR_ROW::GetHyperlinks()
+// - The hyperlink IDs present in this row
+std::vector<uint16_t> ATTR_ROW::GetHyperlinks()
 {
-    std::unordered_set<uint16_t> ids;
+    std::vector<uint16_t> ids;
     for (const auto& run : _list)
     {
         if (run.GetAttributes().IsHyperlink())
         {
-            ids.emplace(run.GetAttributes().GetHyperlinkId());
+            ids.emplace_back(run.GetAttributes().GetHyperlinkId());
         }
     }
     return ids;
@@ -402,7 +408,7 @@ void ATTR_ROW::ReplaceAttrs(const TextAttribute& toBeReplacedAttr, const TextAtt
     // The original run was 3 long. The insertion run was 1 long. We need 1 more for the
     // fact that an existing piece of the run was split in half (to hold the latter half).
     const size_t cNewRun = _list.size() + newAttrs.size() + 1;
-    std::vector<TextAttributeRun> newRun;
+    decltype(_list) newRun;
     newRun.reserve(cNewRun);
 
     // We will start analyzing from the beginning of our existing run.
@@ -595,8 +601,7 @@ std::vector<TextAttributeRun> ATTR_ROW::PackAttrs(const std::vector<TextAttribut
     {
         if (runs.empty() || runs.back().GetAttributes() != attr)
         {
-            const TextAttributeRun run(1, attr);
-            runs.push_back(run);
+            runs.emplace_back(TextAttributeRun(1, attr));
         }
         else
         {

src/buffer/out/AttrRow.hpp

@@ -28,9 +28,16 @@ class ATTR_ROW final
 public:
     using const_iterator = typename AttrRowIterator;
 
-    ATTR_ROW(const UINT cchRowWidth, const TextAttribute attr);
+    ATTR_ROW(const UINT cchRowWidth, const TextAttribute attr)
+    noexcept;
 
-    void Reset(const TextAttribute attr);
+    ~ATTR_ROW() = default;
+
+    ATTR_ROW(const ATTR_ROW&) = default;
+    ATTR_ROW& operator=(const ATTR_ROW&) = default;
+    ATTR_ROW(ATTR_ROW&&)
+    noexcept = default;
+    ATTR_ROW& operator=(ATTR_ROW&&) noexcept = default;
 
     TextAttribute GetAttrByColumn(const size_t column) const;
     TextAttribute GetAttrByColumn(const size_t column,
@@ -41,7 +48,7 @@ public:
     size_t FindAttrIndex(const size_t index,
                          size_t* const pApplies) const;
 
-    std::unordered_set<uint16_t> GetHyperlinks();
+    std::vector<uint16_t> GetHyperlinks();
 
     bool SetAttrToEnd(const UINT iStart, const TextAttribute attr);
     void ReplaceAttrs(const TextAttribute& toBeReplacedAttr, const TextAttribute& replaceWith) noexcept;
@@ -63,12 +70,16 @@ public:
 
     friend bool operator==(const ATTR_ROW& a, const ATTR_ROW& b) noexcept;
     friend class AttrRowIterator;
+    friend class ROW;
 
 private:
-    std::vector<TextAttributeRun> _list;
+    void Reset(const TextAttribute attr);
+
+    boost::container::small_vector<TextAttributeRun, 1> _list;
     size_t _cchRowWidth;
 
 #ifdef UNIT_TESTING
     friend class AttrRowTests;
+    friend class CommonState;
 #endif
 };

src/buffer/out/AttrRowIterator.cpp

@@ -39,19 +39,6 @@ bool AttrRowIterator::operator!=(const AttrRowIterator& it) const noexcept
     return !(*this == it);
 }
 
-AttrRowIterator& AttrRowIterator::operator++() noexcept
-{
-    _increment(1);
-    return *this;
-}
-
-AttrRowIterator AttrRowIterator::operator++(int) noexcept
-{
-    auto copy = *this;
-    _increment(1);
-    return copy;
-}
-
 AttrRowIterator& AttrRowIterator::operator+=(const ptrdiff_t& movement)
 {
     if (!_exceeded)
@@ -74,19 +61,6 @@ AttrRowIterator& AttrRowIterator::operator-=(const ptrdiff_t& movement)
     return this->operator+=(-movement);
 }
 
-AttrRowIterator& AttrRowIterator::operator--() noexcept
-{
-    _decrement(1);
-    return *this;
-}
-
-AttrRowIterator AttrRowIterator::operator--(int) noexcept
-{
-    auto copy = *this;
-    _decrement(1);
-    return copy;
-}
-
 const TextAttribute* AttrRowIterator::operator->() const
 {
     THROW_HR_IF(E_BOUNDS, _exceeded);

src/buffer/out/AttrRowIterator.hpp

@@ -38,20 +38,38 @@ public:
     bool operator==(const AttrRowIterator& it) const noexcept;
     bool operator!=(const AttrRowIterator& it) const noexcept;
 
-    AttrRowIterator& operator++() noexcept;
-    AttrRowIterator operator++(int) noexcept;
+    AttrRowIterator& operator++() noexcept
+    {
+        _increment(1);
+        return *this;
+    }
+    AttrRowIterator operator++(int) noexcept
+    {
+        auto copy = *this;
+        _increment(1);
+        return copy;
+    }
 
     AttrRowIterator& operator+=(const ptrdiff_t& movement);
     AttrRowIterator& operator-=(const ptrdiff_t& movement);
 
-    AttrRowIterator& operator--() noexcept;
-    AttrRowIterator operator--(int) noexcept;
+    AttrRowIterator& operator--() noexcept
+    {
+        _decrement(1);
+        return *this;
+    }
+    AttrRowIterator operator--(int) noexcept
+    {
+        auto copy = *this;
+        _decrement(1);
+        return copy;
+    }
 
     const TextAttribute* operator->() const;
     const TextAttribute& operator*() const;
 
 private:
-    std::vector<TextAttributeRun>::const_iterator _run;
+    boost::container::small_vector_base<TextAttributeRun>::const_iterator _run;
     const ATTR_ROW* _pAttrRow;
     size_t _currentAttributeIndex; // index of TextAttribute within the current TextAttributeRun
     bool _exceeded;

src/buffer/out/CharRow.cpp

@@ -15,57 +15,14 @@
 // Return Value:
 // - instantiated object
 // Note: will through if unable to allocate char/attribute buffers
-CharRow::CharRow(size_t rowWidth, ROW* const pParent) :
-    _wrapForced{ false },
-    _doubleBytePadded{ false },
+#pragma warning(push)
+#pragma warning(disable : 26447) // small_vector's constructor says it can throw but it should not given how we use it.  This suppresses this error for the AuditMode build.
+CharRow::CharRow(size_t rowWidth, ROW* const pParent) noexcept :
     _data(rowWidth, value_type()),
     _pParent{ FAIL_FAST_IF_NULL(pParent) }
 {
 }
-
-// Routine Description:
-// - Sets the wrap status for the current row
-// Arguments:
-// - wrapForced - True if the row ran out of space and we forced to wrap to the next row. False otherwise.
-// Return Value:
-// - <none>
-void CharRow::SetWrapForced(const bool wrapForced) noexcept
-{
-    _wrapForced = wrapForced;
-}
-
-// Routine Description:
-// - Gets the wrap status for the current row
-// Arguments:
-// - <none>
-// Return Value:
-// - True if the row ran out of space and we were forced to wrap to the next row. False otherwise.
-bool CharRow::WasWrapForced() const noexcept
-{
-    return _wrapForced;
-}
-
-// Routine Description:
-// - Sets the double byte padding for the current row
-// Arguments:
-// - fWrapWasForced - True if the row ran out of space for a double byte character and we padded out the row. False otherwise.
-// Return Value:
-// - <none>
-void CharRow::SetDoubleBytePadded(const bool doubleBytePadded) noexcept
-{
-    _doubleBytePadded = doubleBytePadded;
-}
-
-// Routine Description:
-// - Gets the double byte padding status for the current row.
-// Arguments:
-// - <none>
-// Return Value:
-// - True if the row didn't have space for a double byte character and we were padded out the row. False otherwise.
-bool CharRow::WasDoubleBytePadded() const noexcept
-{
-    return _doubleBytePadded;
-}
+#pragma warning(pop)
 
 // Routine Description:
 // - gets the size of the row, in glyph cells
@@ -90,9 +47,6 @@ void CharRow::Reset() noexcept
     {
         cell.Reset();
     }
-
-    _wrapForced = false;
-    _doubleBytePadded = false;
 }
 
 // Routine Description:
@@ -141,7 +95,7 @@ typename CharRow::const_iterator CharRow::cend() const noexcept
 // - The calculated left boundary of the internal string.
 size_t CharRow::MeasureLeft() const noexcept
 {
-    std::vector<value_type>::const_iterator it = _data.cbegin();
+    const_iterator it = _data.cbegin();
     while (it != _data.cend() && it->IsSpace())
     {
         ++it;
@@ -155,9 +109,9 @@ size_t CharRow::MeasureLeft() const noexcept
 // - <none>
 // Return Value:
 // - The calculated right boundary of the internal string.
-size_t CharRow::MeasureRight() const noexcept
+size_t CharRow::MeasureRight() const
 {
-    std::vector<value_type>::const_reverse_iterator it = _data.crbegin();
+    const_reverse_iterator it = _data.crbegin();
     while (it != _data.crend() && it->IsSpace())
     {
         ++it;

src/buffer/out/CharRow.hpp

@@ -49,27 +49,21 @@ class CharRow final
 public:
     using glyph_type = typename wchar_t;
     using value_type = typename CharRowCell;
-    using iterator = typename std::vector<value_type>::iterator;
-    using const_iterator = typename std::vector<value_type>::const_iterator;
+    using iterator = typename boost::container::small_vector_base<value_type>::iterator;
+    using const_iterator = typename boost::container::small_vector_base<value_type>::const_iterator;
+    using const_reverse_iterator = typename boost::container::small_vector_base<value_type>::const_reverse_iterator;
     using reference = typename CharRowCellReference;
 
-    CharRow(size_t rowWidth, ROW* const pParent);
+    CharRow(size_t rowWidth, ROW* const pParent) noexcept;
 
-    void SetWrapForced(const bool wrap) noexcept;
-    bool WasWrapForced() const noexcept;
-    void SetDoubleBytePadded(const bool doubleBytePadded) noexcept;
-    bool WasDoubleBytePadded() const noexcept;
     size_t size() const noexcept;
-    void Reset() noexcept;
     [[nodiscard]] HRESULT Resize(const size_t newSize) noexcept;
     size_t MeasureLeft() const noexcept;
-    size_t MeasureRight() const noexcept;
-    void ClearCell(const size_t column);
+    size_t MeasureRight() const;
     bool ContainsText() const noexcept;
     const DbcsAttribute& DbcsAttrAt(const size_t column) const;
     DbcsAttribute& DbcsAttrAt(const size_t column);
     void ClearGlyph(const size_t column);
-    std::wstring GetText() const;
 
     const DelimiterClass DelimiterClassAt(const size_t column, const std::wstring_view wordDelimiters) const;
 
@@ -80,9 +74,11 @@ public:
     // iterators
     iterator begin() noexcept;
     const_iterator cbegin() const noexcept;
+    const_iterator begin() const noexcept { return cbegin(); }
 
     iterator end() noexcept;
     const_iterator cend() const noexcept;
+    const_iterator end() const noexcept { return cend(); }
 
     UnicodeStorage& GetUnicodeStorage() noexcept;
     const UnicodeStorage& GetUnicodeStorage() const noexcept;
@@ -91,29 +87,21 @@ public:
     void UpdateParent(ROW* const pParent);
 
     friend CharRowCellReference;
-    friend constexpr bool operator==(const CharRow& a, const CharRow& b) noexcept;
+    friend class ROW;
+
+private:
+    void Reset() noexcept;
+    void ClearCell(const size_t column);
+    std::wstring GetText() const;
 
 protected:
-    // Occurs when the user runs out of text in a given row and we're forced to wrap the cursor to the next line
-    bool _wrapForced;
-
-    // Occurs when the user runs out of text to support a double byte character and we're forced to the next line
-    bool _doubleBytePadded;
-
     // storage for glyph data and dbcs attributes
-    std::vector<value_type> _data;
+    boost::container::small_vector<value_type, 120> _data;
 
     // ROW that this CharRow belongs to
     ROW* _pParent;
 };
 
-constexpr bool operator==(const CharRow& a, const CharRow& b) noexcept
-{
-    return (a._wrapForced == b._wrapForced &&
-            a._doubleBytePadded == b._doubleBytePadded &&
-            a._data == b._data);
-}
-
 template<typename InputIt1, typename InputIt2>
 void OverwriteColumns(InputIt1 startChars, InputIt1 endChars, InputIt2 startAttrs, CharRow::iterator outIt)
 {

src/buffer/out/CharRowCell.cpp

@@ -8,18 +8,6 @@
 // default glyph value, used for resetting the character data portion of a cell
 static constexpr wchar_t DefaultValue = UNICODE_SPACE;
 
-CharRowCell::CharRowCell() noexcept :
-    _wch{ DefaultValue },
-    _attr{}
-{
-}
-
-CharRowCell::CharRowCell(const wchar_t wch, const DbcsAttribute attr) noexcept :
-    _wch{ wch },
-    _attr{ attr }
-{
-}
-
 // Routine Description:
 // - "erases" the glyph. really sets it back to the default "empty" value
 void CharRowCell::EraseChars() noexcept

src/buffer/out/CharRowCell.hpp

@@ -17,6 +17,7 @@ Author(s):
 #pragma once
 
 #include "DbcsAttribute.hpp"
+#include "unicode.hpp"
 
 #if (defined(_M_IX86) || defined(_M_AMD64))
 // currently CharRowCell's fields use 3 bytes of memory, leaving the 4th byte in unused. this leads
@@ -27,8 +28,13 @@ Author(s):
 class CharRowCell final
 {
 public:
-    CharRowCell() noexcept;
-    CharRowCell(const wchar_t wch, const DbcsAttribute attr) noexcept;
+    CharRowCell() noexcept = default;
+    CharRowCell(const wchar_t wch, const DbcsAttribute attr) noexcept
+        :
+        _wch(wch),
+        _attr(attr)
+    {
+    }
 
     void EraseChars() noexcept;
     void Reset() noexcept;
@@ -44,8 +50,8 @@ public:
     friend constexpr bool operator==(const CharRowCell& a, const CharRowCell& b) noexcept;
 
 private:
-    wchar_t _wch;
-    DbcsAttribute _attr;
+    wchar_t _wch{ UNICODE_SPACE };
+    DbcsAttribute _attr{};
 };
 
 #if (defined(_M_IX86) || defined(_M_AMD64))

src/buffer/out/CharRowCellReference.hpp

@@ -32,8 +32,8 @@ public:
     }
 
     ~CharRowCellReference() = default;
-    CharRowCellReference(const CharRowCellReference&) = default;
-    CharRowCellReference(CharRowCellReference&&) = default;
+    CharRowCellReference(const CharRowCellReference&) noexcept = default;
+    CharRowCellReference(CharRowCellReference&&) noexcept = default;
 
     void operator=(const CharRowCellReference&) = delete;
     void operator=(CharRowCellReference&&) = delete;

src/buffer/out/LineRendition.hpp

@@ -0,0 +1,36 @@
+/*++
+Copyright (c) Microsoft Corporation
+Licensed under the MIT license.
+
+Module Name:
+- LineRendition.hpp
+
+Abstract:
+- Enumerated type for the VT line rendition attribute. This determines the
+  width and height scaling with which each line is rendered.
+
+--*/
+
+#pragma once
+
+enum class LineRendition
+{
+    SingleWidth,
+    DoubleWidth,
+    DoubleHeightTop,
+    DoubleHeightBottom
+};
+
+constexpr SMALL_RECT ScreenToBufferLine(const SMALL_RECT& line, const LineRendition lineRendition)
+{
+    // Use shift right to quickly divide the Left and Right by 2 for double width lines.
+    const auto scale = lineRendition == LineRendition::SingleWidth ? 0 : 1;
+    return { line.Left >> scale, line.Top, line.Right >> scale, line.Bottom };
+}
+
+constexpr SMALL_RECT BufferToScreenLine(const SMALL_RECT& line, const LineRendition lineRendition)
+{
+    // Use shift left to quickly multiply the Left and Right by 2 for double width lines.
+    const SHORT scale = lineRendition == LineRendition::SingleWidth ? 0 : 1;
+    return { line.Left << scale, line.Top, (line.Right << scale) + scale, line.Bottom };
+}

src/buffer/out/Row.cpp

@@ -16,50 +16,18 @@
 // - pParent - the text buffer that this row belongs to
 // Return Value:
 // - constructed object
-ROW::ROW(const SHORT rowId, const short rowWidth, const TextAttribute fillAttribute, TextBuffer* const pParent) :
+ROW::ROW(const SHORT rowId, const unsigned short rowWidth, const TextAttribute fillAttribute, TextBuffer* const pParent) noexcept :
     _id{ rowId },
-    _rowWidth{ gsl::narrow<size_t>(rowWidth) },
-    _charRow{ gsl::narrow<size_t>(rowWidth), this },
-    _attrRow{ gsl::narrow<UINT>(rowWidth), fillAttribute },
+    _rowWidth{ rowWidth },
+    _charRow{ rowWidth, this },
+    _attrRow{ rowWidth, fillAttribute },
+    _lineRendition{ LineRendition::SingleWidth },
+    _wrapForced{ false },
+    _doubleBytePadded{ false },
     _pParent{ pParent }
 {
 }
 
-size_t ROW::size() const noexcept
-{
-    return _rowWidth;
-}
-
-const CharRow& ROW::GetCharRow() const noexcept
-{
-    return _charRow;
-}
-
-CharRow& ROW::GetCharRow() noexcept
-{
-    return _charRow;
-}
-
-const ATTR_ROW& ROW::GetAttrRow() const noexcept
-{
-    return _attrRow;
-}
-
-ATTR_ROW& ROW::GetAttrRow() noexcept
-{
-    return _attrRow;
-}
-
-SHORT ROW::GetId() const noexcept
-{
-    return _id;
-}
-
-void ROW::SetId(const SHORT id) noexcept
-{
-    _id = id;
-}
-
 // Routine Description:
 // - Sets all properties of the ROW to default values
 // Arguments:
@@ -68,6 +36,9 @@ void ROW::SetId(const SHORT id) noexcept
 // - <none>
 bool ROW::Reset(const TextAttribute Attr)
 {
+    _lineRendition = LineRendition::SingleWidth;
+    _wrapForced = false;
+    _doubleBytePadded = false;
     _charRow.Reset();
     try
     {
@@ -87,7 +58,7 @@ bool ROW::Reset(const TextAttribute Attr)
 // - width - the new width, in cells
 // Return Value:
 // - S_OK if successful, otherwise relevant error
-[[nodiscard]] HRESULT ROW::Resize(const size_t width)
+[[nodiscard]] HRESULT ROW::Resize(const unsigned short width)
 {
     RETURN_IF_FAILED(_charRow.Resize(width));
     try
@@ -113,25 +84,6 @@ void ROW::ClearColumn(const size_t column)
     _charRow.ClearCell(column);
 }
 
-// Routine Description:
-// - gets the text of the row as it would be shown on the screen
-// Return Value:
-// - wstring containing text for the row
-std::wstring ROW::GetText() const
-{
-    return _charRow.GetText();
-}
-
-RowCellIterator ROW::AsCellIter(const size_t startIndex) const
-{
-    return AsCellIter(startIndex, size() - startIndex);
-}
-
-RowCellIterator ROW::AsCellIter(const size_t startIndex, const size_t count) const
-{
-    return RowCellIterator(*this, startIndex, count);
-}
-
 UnicodeStorage& ROW::GetUnicodeStorage() noexcept
 {
     return _pParent->GetUnicodeStorage();
@@ -213,7 +165,7 @@ OutputCellIterator ROW::WriteCells(OutputCellIterator it, const size_t index, co
                 else if (fillingLastColumn && it->DbcsAttr().IsLeading())
                 {
                     _charRow.ClearCell(currentIndex);
-                    _charRow.SetDoubleBytePadded(true);
+                    SetDoubleBytePadded(true);
                 }
                 // Otherwise, copy the data given and increment the iterator.
                 else
@@ -231,7 +183,7 @@ OutputCellIterator ROW::WriteCells(OutputCellIterator it, const size_t index, co
                 if (wrap.has_value() && fillingLastColumn)
                 {
                     // set wrap status on the row to parameter's value.
-                    _charRow.SetWrapForced(wrap.value());
+                    SetWrapForced(*wrap);
                 }
             }
             else

src/buffer/out/Row.hpp

@@ -21,10 +21,10 @@ Revision History:
 #pragma once
 
 #include "AttrRow.hpp"
+#include "LineRendition.hpp"
 #include "OutputCell.hpp"
 #include "OutputCellIterator.hpp"
 #include "CharRow.hpp"
-#include "RowCellIterator.hpp"
 #include "UnicodeStorage.hpp"
 
 class TextBuffer;
@@ -32,52 +32,63 @@ class TextBuffer;
 class ROW final
 {
 public:
-    ROW(const SHORT rowId, const short rowWidth, const TextAttribute fillAttribute, TextBuffer* const pParent);
+    ROW(const SHORT rowId, const unsigned short rowWidth, const TextAttribute fillAttribute, TextBuffer* const pParent)
+    noexcept;
 
-    size_t size() const noexcept;
+    size_t size() const noexcept { return _rowWidth; }
 
-    const CharRow& GetCharRow() const noexcept;
-    CharRow& GetCharRow() noexcept;
+    void SetWrapForced(const bool wrap) noexcept { _wrapForced = wrap; }
+    bool WasWrapForced() const noexcept { return _wrapForced; }
 
-    const ATTR_ROW& GetAttrRow() const noexcept;
-    ATTR_ROW& GetAttrRow() noexcept;
+    void SetDoubleBytePadded(const bool doubleBytePadded) noexcept { _doubleBytePadded = doubleBytePadded; }
+    bool WasDoubleBytePadded() const noexcept { return _doubleBytePadded; }
 
-    SHORT GetId() const noexcept;
-    void SetId(const SHORT id) noexcept;
+    const CharRow& GetCharRow() const noexcept { return _charRow; }
+    CharRow& GetCharRow() noexcept { return _charRow; }
+
+    const ATTR_ROW& GetAttrRow() const noexcept { return _attrRow; }
+    ATTR_ROW& GetAttrRow() noexcept { return _attrRow; }
+
+    LineRendition GetLineRendition() const noexcept { return _lineRendition; }
+    void SetLineRendition(const LineRendition lineRendition) noexcept { _lineRendition = lineRendition; }
+
+    SHORT GetId() const noexcept { return _id; }
+    void SetId(const SHORT id) noexcept { _id = id; }
 
     bool Reset(const TextAttribute Attr);
-    [[nodiscard]] HRESULT Resize(const size_t width);
+    [[nodiscard]] HRESULT Resize(const unsigned short width);
 
     void ClearColumn(const size_t column);
-    std::wstring GetText() const;
-
-    RowCellIterator AsCellIter(const size_t startIndex) const;
-    RowCellIterator AsCellIter(const size_t startIndex, const size_t count) const;
+    std::wstring GetText() const { return _charRow.GetText(); }
 
     UnicodeStorage& GetUnicodeStorage() noexcept;
     const UnicodeStorage& GetUnicodeStorage() const noexcept;
 
     OutputCellIterator WriteCells(OutputCellIterator it, const size_t index, const std::optional<bool> wrap = std::nullopt, std::optional<size_t> limitRight = std::nullopt);
 
-    friend bool operator==(const ROW& a, const ROW& b) noexcept;
-
 #ifdef UNIT_TESTING
+    friend constexpr bool operator==(const ROW& a, const ROW& b) noexcept;
     friend class RowTests;
 #endif
 
 private:
     CharRow _charRow;
     ATTR_ROW _attrRow;
+    LineRendition _lineRendition;
     SHORT _id;
-    size_t _rowWidth;
+    unsigned short _rowWidth;
+    // Occurs when the user runs out of text in a given row and we're forced to wrap the cursor to the next line
+    bool _wrapForced;
+    // Occurs when the user runs out of text to support a double byte character and we're forced to the next line
+    bool _doubleBytePadded;
     TextBuffer* _pParent; // non ownership pointer
 };
 
-inline bool operator==(const ROW& a, const ROW& b) noexcept
+#ifdef UNIT_TESTING
+constexpr bool operator==(const ROW& a, const ROW& b) noexcept
 {
-    return (a._charRow == b._charRow &&
-            a._attrRow == b._attrRow &&
-            a._rowWidth == b._rowWidth &&
-            a._pParent == b._pParent &&
+    // comparison is only used in the tests; this should suffice.
+    return (a._pParent == b._pParent &&
             a._id == b._id);
 }
+#endif

src/buffer/out/RowCellIterator.cpp

@@ -1,110 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-#include "precomp.h"
-
-#include "RowCellIterator.hpp"
-#include "Row.hpp"
-
-#include "../../types/inc/convert.hpp"
-#include "../../types/inc/Utf16Parser.hpp"
-
-RowCellIterator::RowCellIterator(const ROW& row, const size_t start, const size_t length) :
-    _row(row),
-    _start(start),
-    _length(length),
-    _pos(start),
-    _view(s_GenerateView(row, start))
-{
-}
-
-RowCellIterator::operator bool() const noexcept
-{
-    // In lieu of using start and end, this custom iterator type simply becomes bool false
-    // when we run out of items to iterate over.
-    return _pos < (_start + _length);
-}
-
-bool RowCellIterator::operator==(const RowCellIterator& it) const noexcept
-{
-    return _row == it._row &&
-           _start == it._start &&
-           _length == it._length &&
-           _pos == it._pos;
-}
-bool RowCellIterator::operator!=(const RowCellIterator& it) const noexcept
-{
-    return !(*this == it);
-}
-
-RowCellIterator& RowCellIterator::operator+=(const ptrdiff_t& movement) noexcept
-{
-    _pos += movement;
-
-    return (*this);
-}
-
-RowCellIterator& RowCellIterator::operator++() noexcept
-{
-    return this->operator+=(1);
-}
-
-RowCellIterator RowCellIterator::operator++(int) noexcept
-{
-    auto temp(*this);
-    operator++();
-    return temp;
-}
-
-RowCellIterator RowCellIterator::operator+(const ptrdiff_t& movement) noexcept
-{
-    auto temp(*this);
-    temp += movement;
-    return temp;
-}
-
-const OutputCellView& RowCellIterator::operator*() const noexcept
-{
-    return _view;
-}
-
-const OutputCellView* RowCellIterator::operator->() const noexcept
-{
-    return &_view;
-}
-
-// Routine Description:
-// - Member function to update the view to the current position in the buffer with
-//   the data held on this object.
-// Arguments:
-// - <none>
-// Return Value:
-// - <none>
-void RowCellIterator::_RefreshView()
-{
-    _view = s_GenerateView(_row, _pos);
-}
-
-// Routine Description:
-// - Static function to create a view.
-// - It's pulled out statically so it can be used during construction with just the given
-//   variables (so OutputCellView doesn't need an empty default constructor)
-// - This will infer the width of the glyph and apply the appropriate attributes to the view.
-// Arguments:
-// - view - View representing characters corresponding to a single glyph
-// - attr - Color attributes to apply to the text
-// Return Value:
-// - Object representing the view into this cell
-OutputCellView RowCellIterator::s_GenerateView(const ROW& row,
-                                               const size_t pos)
-{
-    const auto& charRow = row.GetCharRow();
-
-    const auto glyph = charRow.GlyphAt(pos);
-    const auto dbcsAttr = charRow.DbcsAttrAt(pos);
-
-    const auto textAttr = row.GetAttrRow().GetAttrByColumn(pos);
-    const auto behavior = TextAttributeBehavior::Stored;
-
-    return OutputCellView(glyph, dbcsAttr, textAttr, behavior);
-}

src/buffer/out/RowCellIterator.hpp

@@ -1,59 +0,0 @@
-/*++
-Copyright (c) Microsoft Corporation
-Licensed under the MIT license.
-
-Module Name:
-- RowCellIterator.hpp
-
-Abstract:
-- Read-only view into cells already in the input buffer.
-- This is done for performance reasons (avoid heap allocs and copies).
-
-Author:
-- Michael Niksa (MiNiksa) 12-Oct-2018
-
---*/
-
-#pragma once
-
-#include "OutputCellView.hpp"
-class ROW;
-
-class RowCellIterator final
-{
-public:
-    using iterator_category = std::forward_iterator_tag;
-    using value_type = OutputCellView;
-    using difference_type = ptrdiff_t;
-    using pointer = OutputCellView*;
-    using reference = OutputCellView&;
-
-    RowCellIterator(const ROW& row, const size_t start, const size_t length);
-    ~RowCellIterator() = default;
-
-    RowCellIterator& operator=(const RowCellIterator& it) = delete;
-
-    operator bool() const noexcept;
-
-    bool operator==(const RowCellIterator& it) const noexcept;
-    bool operator!=(const RowCellIterator& it) const noexcept;
-
-    RowCellIterator& operator+=(const ptrdiff_t& movement) noexcept;
-    RowCellIterator& operator++() noexcept;
-    RowCellIterator operator++(int) noexcept;
-    RowCellIterator operator+(const ptrdiff_t& movement) noexcept;
-
-    const OutputCellView& operator*() const noexcept;
-    const OutputCellView* operator->() const noexcept;
-
-private:
-    const ROW& _row;
-    const size_t _start;
-    const size_t _length;
-
-    size_t _pos;
-    OutputCellView _view;
-
-    void _RefreshView();
-    static OutputCellView s_GenerateView(const ROW& row, const size_t pos);
-};

src/buffer/out/TextAttributeRun.cpp

@@ -1,47 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-#include "precomp.h"
-#include "TextAttributeRun.hpp"
-
-TextAttributeRun::TextAttributeRun() noexcept :
-    _cchLength(0)
-{
-    SetAttributes(TextAttribute(0));
-}
-
-TextAttributeRun::TextAttributeRun(const size_t cchLength, const TextAttribute attr) noexcept :
-    _cchLength(cchLength)
-{
-    SetAttributes(attr);
-}
-
-size_t TextAttributeRun::GetLength() const noexcept
-{
-    return _cchLength;
-}
-
-void TextAttributeRun::SetLength(const size_t cchLength) noexcept
-{
-    _cchLength = cchLength;
-}
-
-void TextAttributeRun::IncrementLength() noexcept
-{
-    _cchLength++;
-}
-
-void TextAttributeRun::DecrementLength() noexcept
-{
-    _cchLength--;
-}
-
-const TextAttribute& TextAttributeRun::GetAttributes() const noexcept
-{
-    return _attributes;
-}
-
-void TextAttributeRun::SetAttributes(const TextAttribute textAttribute) noexcept
-{
-    _attributes = textAttribute;
-}

src/buffer/out/TextAttributeRun.hpp

@@ -25,20 +25,24 @@ Revision History:
 class TextAttributeRun final
 {
 public:
-    TextAttributeRun() noexcept;
-    TextAttributeRun(const size_t cchLength, const TextAttribute attr) noexcept;
+    TextAttributeRun() = default;
+    TextAttributeRun(const size_t cchLength, const TextAttribute attr) noexcept :
+        _cchLength(gsl::narrow<unsigned int>(cchLength))
+    {
+        SetAttributes(attr);
+    }
 
-    size_t GetLength() const noexcept;
-    void SetLength(const size_t cchLength) noexcept;
-    void IncrementLength() noexcept;
-    void DecrementLength() noexcept;
+    size_t GetLength() const noexcept { return _cchLength; }
+    void SetLength(const size_t cchLength) noexcept { _cchLength = gsl::narrow<unsigned int>(cchLength); }
+    void IncrementLength() noexcept { _cchLength++; }
+    void DecrementLength() noexcept { _cchLength--; }
 
-    const TextAttribute& GetAttributes() const noexcept;
-    void SetAttributes(const TextAttribute textAttribute) noexcept;
+    const TextAttribute& GetAttributes() const noexcept { return _attributes; }
+    void SetAttributes(const TextAttribute textAttribute) noexcept { _attributes = textAttribute; }
 
 private:
-    size_t _cchLength;
-    TextAttribute _attributes;
+    unsigned int _cchLength{ 0 };
+    TextAttribute _attributes{ 0 };
 
 #ifdef UNIT_TESTING
     friend class AttrRowTests;

src/buffer/out/lib/bufferout.vcxproj

@@ -6,7 +6,7 @@
     <RootNamespace>bufferout</RootNamespace>
     <ProjectName>BufferOut</ProjectName>
     <TargetName>ConBufferOut</TargetName>
-    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
   </PropertyGroup>
   <Import Project="$(SolutionDir)src\common.build.pre.props" />
   <ItemGroup>
@@ -18,11 +18,9 @@
     <ClCompile Include="..\OutputCellRect.cpp" />
     <ClCompile Include="..\OutputCellView.cpp" />
     <ClCompile Include="..\Row.cpp" />
-    <ClCompile Include="..\RowCellIterator.cpp" />
     <ClCompile Include="..\search.cpp" />
     <ClCompile Include="..\TextColor.cpp" />
     <ClCompile Include="..\TextAttribute.cpp" />
-    <ClCompile Include="..\TextAttributeRun.cpp" />
     <ClCompile Include="..\textBuffer.cpp" />
     <ClCompile Include="..\textBufferCellIterator.cpp" />
     <ClCompile Include="..\textBufferTextIterator.cpp" />
@@ -40,12 +38,12 @@
     <ClInclude Include="..\cursor.h" />
     <ClInclude Include="..\DbcsAttribute.hpp" />
     <ClInclude Include="..\ICharRow.hpp" />
+    <ClInclude Include="..\LineRendition.hpp" />
     <ClInclude Include="..\OutputCell.hpp" />
     <ClInclude Include="..\OutputCellIterator.hpp" />
     <ClInclude Include="..\OutputCellRect.hpp" />
     <ClInclude Include="..\OutputCellView.hpp" />
     <ClInclude Include="..\Row.hpp" />
-    <ClInclude Include="..\RowCellIterator.hpp" />
     <ClInclude Include="..\search.h" />
     <ClInclude Include="..\TextColor.h" />
     <ClInclude Include="..\TextAttribute.h" />

src/buffer/out/search.cpp

@@ -97,7 +97,12 @@ bool Search::FindNext()
 // - Takes the found word and selects it in the screen buffer
 void Search::Select() const
 {
-    _uiaData.SelectNewRegion(_coordSelStart, _coordSelEnd);
+    // Convert buffer selection offsets into the equivalent screen coordinates
+    // required by SelectNewRegion, taking line renditions into account.
+    const auto& textBuffer = _uiaData.GetTextBuffer();
+    const auto selStart = textBuffer.BufferToScreenPosition(_coordSelStart);
+    const auto selEnd = textBuffer.BufferToScreenPosition(_coordSelEnd);
+    _uiaData.SelectNewRegion(selStart, selEnd);
 }
 
 // Routine Description:
@@ -141,7 +146,10 @@ COORD Search::s_GetInitialAnchor(IUiaData& uiaData, const Direction direction)
     const COORD textBufferEndPosition = uiaData.GetTextBufferEndPosition();
     if (uiaData.IsSelectionActive())
     {
-        auto anchor = uiaData.GetSelectionAnchor();
+        // Convert the screen position of the selection anchor into an equivalent
+        // buffer position to start searching, taking line rendition into account.
+        auto anchor = textBuffer.ScreenToBufferPosition(uiaData.GetSelectionAnchor());
+
         if (direction == Direction::Forward)
         {
             textBuffer.GetSize().IncrementInBoundsCircular(anchor);

src/buffer/out/sources.inc

@@ -37,10 +37,8 @@ SOURCES= \
     ..\OutputCellRect.cpp \
     ..\OutputCellView.cpp \
     ..\Row.cpp \
-    ..\RowCellIterator.cpp \
     ..\TextColor.cpp \
     ..\TextAttribute.cpp \
-    ..\TextAttributeRun.cpp \
     ..\textBuffer.cpp \
     ..\textBufferCellIterator.cpp \
     ..\textBufferTextIterator.cpp \

src/buffer/out/textBuffer.cpp

@@ -42,6 +42,7 @@ TextBuffer::TextBuffer(const COORD screenBufferSize,
     _currentPatternId{ 0 }
 {
     // initialize ROWs
+    _storage.reserve(static_cast<size_t>(screenBufferSize.Y));
     for (size_t i = 0; i < static_cast<size_t>(screenBufferSize.Y); ++i)
     {
         _storage.emplace_back(static_cast<SHORT>(i), screenBufferSize.X, _currentAttributes, this);
@@ -253,7 +254,7 @@ bool TextBuffer::_AssertValidDoubleByteSequence(const DbcsAttribute dbcsAttribut
         // Erase previous character into an N type.
         try
         {
-            prevRow.GetCharRow().ClearCell(coordPrevPosition.X);
+            prevRow.ClearColumn(coordPrevPosition.X);
         }
         catch (...)
         {
@@ -289,14 +290,15 @@ bool TextBuffer::_PrepareForDoubleByteSequence(const DbcsAttribute dbcsAttribute
     // We only need to compensate for leading bytes
     if (dbcsAttribute.IsLeading())
     {
-        short const sBufferWidth = GetSize().Width();
+        const auto cursorPosition = GetCursor().GetPosition();
+        const auto lineWidth = GetLineWidth(cursorPosition.Y);
 
         // If we're about to lead on the last column in the row, we need to add a padding space
-        if (GetCursor().GetPosition().X == sBufferWidth - 1)
+        if (cursorPosition.X == lineWidth - 1)
         {
             // set that we're wrapping for double byte reasons
-            CharRow& charRow = GetRowByOffset(GetCursor().GetPosition().Y).GetCharRow();
-            charRow.SetDoubleBytePadded(true);
+            auto& row = GetRowByOffset(cursorPosition.Y);
+            row.SetDoubleBytePadded(true);
 
             // then move the cursor forward and onto the next row
             fSuccess = IncrementCursor();
@@ -479,7 +481,7 @@ void TextBuffer::_AdjustWrapOnCurrentRow(const bool fSet)
     const UINT uiCurrentRowOffset = GetCursor().GetPosition().Y;
 
     // Set the wrap status as appropriate
-    GetRowByOffset(uiCurrentRowOffset).GetCharRow().SetWrapForced(fSet);
+    GetRowByOffset(uiCurrentRowOffset).SetWrapForced(fSet);
 }
 
 //Routine Description:
@@ -495,7 +497,7 @@ bool TextBuffer::IncrementCursor()
     // Cursor position is stored as logical array indices (starts at 0) for the window
     // Buffer Size is specified as the "length" of the array. It would say 80 for valid values of 0-79.
     // So subtract 1 from buffer size in each direction to find the index of the final column in the buffer
-    const short iFinalColumnIndex = GetSize().RightInclusive();
+    const short iFinalColumnIndex = GetLineWidth(GetCursor().GetPosition().Y) - 1;
 
     // Move the cursor one position to the right
     GetCursor().IncrementXPosition(1);
@@ -634,7 +636,7 @@ COORD TextBuffer::GetLastNonSpaceCharacter(std::optional<const Microsoft::Consol
 // Return Value:
 // - Coordinate position in screen coordinates of the character just before the cursor.
 // - NOTE: Will return 0,0 if already in the top left corner
-COORD TextBuffer::_GetPreviousFromCursor() const noexcept
+COORD TextBuffer::_GetPreviousFromCursor() const
 {
     COORD coordPosition = GetCursor().GetPosition();
 
@@ -648,11 +650,11 @@ COORD TextBuffer::_GetPreviousFromCursor() const noexcept
         // Otherwise, only if we're not on the top row (e.g. we don't move anywhere in the top left corner. there is no previous)
         if (coordPosition.Y > 0)
         {
-            // move the cursor to the right edge
-            coordPosition.X = GetSize().RightInclusive();
-
-            // and up one line
+            // move the cursor up one line
             coordPosition.Y--;
+
+            // and to the right edge
+            coordPosition.X = GetLineWidth(coordPosition.Y) - 1;
         }
     }
 
@@ -800,6 +802,78 @@ void TextBuffer::SetCurrentAttributes(const TextAttribute& currentAttributes) no
     _currentAttributes = currentAttributes;
 }
 
+void TextBuffer::SetCurrentLineRendition(const LineRendition lineRendition)
+{
+    const auto cursorPosition = GetCursor().GetPosition();
+    const auto rowIndex = cursorPosition.Y;
+    auto& row = GetRowByOffset(rowIndex);
+    if (row.GetLineRendition() != lineRendition)
+    {
+        row.SetLineRendition(lineRendition);
+        // If the line rendition has changed, the row can no longer be wrapped.
+        row.SetWrapForced(false);
+        // And if it's no longer single width, the right half of the row should be erased.
+        if (lineRendition != LineRendition::SingleWidth)
+        {
+            const auto fillChar = L' ';
+            auto fillAttrs = GetCurrentAttributes();
+            fillAttrs.SetStandardErase();
+            const size_t fillOffset = GetLineWidth(rowIndex);
+            const size_t fillLength = GetSize().Width() - fillOffset;
+            const auto fillData = OutputCellIterator{ fillChar, fillAttrs, fillLength };
+            row.WriteCells(fillData, fillOffset, false);
+            // We also need to make sure the cursor is clamped within the new width.
+            GetCursor().SetPosition(ClampPositionWithinLine(cursorPosition));
+        }
+        _NotifyPaint(Viewport::FromDimensions({ 0, rowIndex }, { GetSize().Width(), 1 }));
+    }
+}
+
+void TextBuffer::ResetLineRenditionRange(const size_t startRow, const size_t endRow)
+{
+    for (auto row = startRow; row < endRow; row++)
+    {
+        GetRowByOffset(row).SetLineRendition(LineRendition::SingleWidth);
+    }
+}
+
+LineRendition TextBuffer::GetLineRendition(const size_t row) const
+{
+    return GetRowByOffset(row).GetLineRendition();
+}
+
+bool TextBuffer::IsDoubleWidthLine(const size_t row) const
+{
+    return GetLineRendition(row) != LineRendition::SingleWidth;
+}
+
+SHORT TextBuffer::GetLineWidth(const size_t row) const
+{
+    // Use shift right to quickly divide the width by 2 for double width lines.
+    const auto scale = IsDoubleWidthLine(row) ? 1 : 0;
+    return GetSize().Width() >> scale;
+}
+
+COORD TextBuffer::ClampPositionWithinLine(const COORD position) const
+{
+    const SHORT rightmostColumn = GetLineWidth(position.Y) - 1;
+    return { std::min(position.X, rightmostColumn), position.Y };
+}
+
+COORD TextBuffer::ScreenToBufferPosition(const COORD position) const
+{
+    // Use shift right to quickly divide the X pos by 2 for double width lines.
+    const auto scale = IsDoubleWidthLine(position.Y) ? 1 : 0;
+    return { position.X >> scale, position.Y };
+}
+
+COORD TextBuffer::BufferToScreenPosition(const COORD position) const
+{
+    // Use shift left to quickly multiply the X pos by 2 for double width lines.
+    const auto scale = IsDoubleWidthLine(position.Y) ? 1 : 0;
+    return { position.X << scale, position.Y };
+}
+
 // Routine Description:
 // - Resets the text contents of this buffer with the default character
 //   and the default current color attributes
@@ -809,8 +883,7 @@ void TextBuffer::Reset()
 
     for (auto& row : _storage)
     {
-        row.GetCharRow().Reset();
-        row.GetAttrRow().Reset(attr);
+        row.Reset(attr);
     }
 }
 
@@ -837,11 +910,10 @@ void TextBuffer::Reset()
         const SHORT TopRowIndex = (GetFirstRowIndex() + TopRow) % currentSize.Y;
 
         // rotate rows until the top row is at index 0
-        const ROW& newTopRow = _storage.at(TopRowIndex);
-        while (&newTopRow != &_storage.front())
+        for (int i = 0; i < TopRowIndex; i++)
         {
-            _storage.push_back(std::move(_storage.front()));
-            _storage.pop_front();
+            _storage.emplace_back(std::move(_storage.front()));
+            _storage.erase(_storage.begin());
         }
 
         _SetFirstRowIndex(0);
@@ -1230,9 +1302,15 @@ void TextBuffer::_PruneHyperlinks()
     // If the buffer does not contain the same reference, we can remove that hyperlink from our map
     // This way, obsolete hyperlink references are cleared from our hyperlink map instead of hanging around
     // Get all the hyperlink references in the row we're erasing
-    auto firstRowRefs = _storage.at(_firstRow).GetAttrRow().GetHyperlinks();
-    if (!firstRowRefs.empty())
+    const auto hyperlinks = _storage.at(_firstRow).GetAttrRow().GetHyperlinks();
+
+    if (!hyperlinks.empty())
     {
+        // Move to unordered set so we can use hashed lookup of IDs instead of linear search.
+        // Only make it an unordered set now because set always heap allocates but vector
+        // doesn't when the set is empty (saving an allocation in the common case of no links.)
+        std::unordered_set<uint16_t> firstRowRefs{ hyperlinks.cbegin(), hyperlinks.cend() };
+
         const auto total = TotalRowCount();
         // Loop through all the rows in the buffer except the first row -
         // we have found all hyperlink references in the first row and put them in refs,
@@ -1254,12 +1332,12 @@ void TextBuffer::_PruneHyperlinks()
                 break;
             }
         }
-    }
 
-    // Now delete obsolete references from our map
-    for (auto hyperlinkReference : firstRowRefs)
-    {
-        RemoveHyperlinkFromMap(hyperlinkReference);
+        // Now delete obsolete references from our map
+        for (auto hyperlinkReference : firstRowRefs)
+        {
+            RemoveHyperlinkFromMap(hyperlinkReference);
+        }
     }
 }
 
@@ -1420,9 +1498,11 @@ bool TextBuffer::MoveToPreviousGlyph(til::point& pos) const
 // - blockSelection: when enabled, only get the rectangular text region,
 //                   as opposed to the text extending to the left/right
 //                   buffer margins
+// - bufferCoordinates: when enabled, treat the coordinates as relative to
+//                      the buffer rather than the screen.
 // Return Value:
 // - the delimiter class for the given char
-const std::vector<SMALL_RECT> TextBuffer::GetTextRects(COORD start, COORD end, bool blockSelection) const
+const std::vector<SMALL_RECT> TextBuffer::GetTextRects(COORD start, COORD end, bool blockSelection, bool bufferCoordinates) const
 {
     std::vector<SMALL_RECT> textRects;
 
@@ -1456,6 +1536,13 @@ const std::vector<SMALL_RECT> TextBuffer::GetTextRects(COORD start, COORD end, b
             textRow.Right = (row == lowerCoord.Y) ? lowerCoord.X : bufferSize.RightInclusive();
         }
 
+        // If we were passed screen coordinates, convert the given range into
+        // equivalent buffer offsets, taking line rendition into account.
+        if (!bufferCoordinates)
+        {
+            textRow = ScreenToBufferLine(textRow, GetLineRendition(row));
+        }
+
         _ExpandTextRow(textRow);
         textRects.emplace_back(textRow);
     }
@@ -1582,7 +1669,7 @@ const TextBuffer::TextAndColor TextBuffer::GetText(const bool includeCRLF,
         }
 
         // We apply formatting to rows if the row was NOT wrapped or formatting of wrapped rows is allowed
-        const bool shouldFormatRow = formatWrappedRows || !GetRowByOffset(iRow).GetCharRow().WasWrapForced();
+        const bool shouldFormatRow = formatWrappedRows || !GetRowByOffset(iRow).WasWrapForced();
 
         if (trimTrailingWhitespace)
         {
@@ -2039,7 +2126,6 @@ HRESULT TextBuffer::Reflow(TextBuffer& oldBuffer,
     const COORD cOldLastChar = oldBuffer.GetLastNonSpaceCharacter(lastCharacterViewport);
 
     const short cOldRowsTotal = cOldLastChar.Y + 1;
-    const short cOldColsTotal = oldBuffer.GetSize().Width();
 
     COORD cNewCursorPos = { 0 };
     bool fFoundCursorPos = false;
@@ -2051,9 +2137,19 @@ HRESULT TextBuffer::Reflow(TextBuffer& oldBuffer,
     {
         // Fetch the row and its "right" which is the last printable character.
         const ROW& row = oldBuffer.GetRowByOffset(iOldRow);
+        const short cOldColsTotal = oldBuffer.GetLineWidth(iOldRow);
         const CharRow& charRow = row.GetCharRow();
         short iRight = gsl::narrow_cast<short>(charRow.MeasureRight());
 
+        // If we're starting a new row, try and preserve the line rendition
+        // from the row in the original buffer.
+        const auto newBufferPos = newBuffer.GetCursor().GetPosition();
+        if (newBufferPos.X == 0)
+        {
+            auto& newRow = newBuffer.GetRowByOffset(newBufferPos.Y);
+            newRow.SetLineRendition(row.GetLineRendition());
+        }
+
         // There is a special case here. If the row has a "wrap"
         // flag on it, but the right isn't equal to the width (one
         // index past the final valid index in the row) then there
@@ -2063,7 +2159,7 @@ HRESULT TextBuffer::Reflow(TextBuffer& oldBuffer,
         // included.)
         // As such, adjust the "right" to be the width of the row
         // to capture all these spaces
-        if (charRow.WasWrapForced())
+        if (row.WasWrapForced())
         {
             iRight = cOldColsTotal;
 
@@ -2072,7 +2168,7 @@ HRESULT TextBuffer::Reflow(TextBuffer& oldBuffer,
             // piece of padding because of a double byte LEADING
             // character, then remove one from the "right" to
             // leave this padding out of the copy process.
-            if (charRow.WasDoubleBytePadded())
+            if (row.WasDoubleBytePadded())
             {
                 iRight--;
             }
@@ -2136,7 +2232,7 @@ HRESULT TextBuffer::Reflow(TextBuffer& oldBuffer,
             // Only do so if we were not forced to wrap. If we did
             // force a word wrap, then the existing line break was
             // only because we ran out of space.
-            if (iRight < cOldColsTotal && !charRow.WasWrapForced())
+            if (iRight < cOldColsTotal && !row.WasWrapForced())
             {
                 if (iRight == cOldCursorPos.X && iOldRow == cOldCursorPos.Y)
                 {
@@ -2180,7 +2276,7 @@ HRESULT TextBuffer::Reflow(TextBuffer& oldBuffer,
                     const COORD coordNewCursor = newCursor.GetPosition();
                     if (coordNewCursor.X == 0 && coordNewCursor.Y > 0)
                     {
-                        if (newBuffer.GetRowByOffset(gsl::narrow_cast<size_t>(coordNewCursor.Y) - 1).GetCharRow().WasWrapForced())
+                        if (newBuffer.GetRowByOffset(gsl::narrow_cast<size_t>(coordNewCursor.Y) - 1).WasWrapForced())
                         {
                             hr = newBuffer.NewlineCursor() ? hr : E_OUTOFMEMORY;
                         }
@@ -2213,7 +2309,7 @@ HRESULT TextBuffer::Reflow(TextBuffer& oldBuffer,
 
             // If the last row of the new buffer wrapped, there's going to be one less newline needed,
             //   because the cursor is already on the next line
-            if (newBuffer.GetRowByOffset(cNewLastChar.Y).GetCharRow().WasWrapForced())
+            if (newBuffer.GetRowByOffset(cNewLastChar.Y).WasWrapForced())
             {
                 iNewlines = std::max(iNewlines - 1, 0);
             }
@@ -2221,7 +2317,7 @@ HRESULT TextBuffer::Reflow(TextBuffer& oldBuffer,
             {
                 // if this buffer didn't wrap, but the old one DID, then the d(columns) of the
                 //   old buffer will be one more than in this buffer, so new need one LESS.
-                if (oldBuffer.GetRowByOffset(cOldLastChar.Y).GetCharRow().WasWrapForced())
+                if (oldBuffer.GetRowByOffset(cOldLastChar.Y).WasWrapForced())
                 {
                     iNewlines = std::max(iNewlines - 1, 0);
                 }
@@ -2410,8 +2506,8 @@ PointTree TextBuffer::GetPatterns(const size_t firstRow, const size_t lastRow) c
     // all the text into one string and find the patterns in that string
     for (auto i = firstRow; i <= lastRow; ++i)
     {
-        auto row = GetRowByOffset(i);
-        concatAll += row.GetCharRow().GetText();
+        auto& row = GetRowByOffset(i);
+        concatAll += row.GetText();
     }
 
     // for each pattern we know of, iterate through the string

src/buffer/out/textBuffer.hpp

@@ -49,6 +49,8 @@ filling in the last row, and updating the screen.
 
 #pragma once
 
+#include <vector>
+
 #include "cursor.h"
 #include "Row.hpp"
 #include "TextAttribute.hpp"
@@ -120,6 +122,16 @@ public:
 
     void SetCurrentAttributes(const TextAttribute& currentAttributes) noexcept;
 
+    void SetCurrentLineRendition(const LineRendition lineRendition);
+    void ResetLineRenditionRange(const size_t startRow, const size_t endRow);
+    LineRendition GetLineRendition(const size_t row) const;
+    bool IsDoubleWidthLine(const size_t row) const;
+
+    SHORT GetLineWidth(const size_t row) const;
+    COORD ClampPositionWithinLine(const COORD position) const;
+    COORD ScreenToBufferPosition(const COORD position) const;
+    COORD BufferToScreenPosition(const COORD position) const;
+
     void Reset();
 
     [[nodiscard]] HRESULT ResizeTraditional(const COORD newSize) noexcept;
@@ -139,7 +151,7 @@ public:
     bool MoveToNextGlyph(til::point& pos, bool allowBottomExclusive = false) const;
     bool MoveToPreviousGlyph(til::point& pos) const;
 
-    const std::vector<SMALL_RECT> GetTextRects(COORD start, COORD end, bool blockSelection = false) const;
+    const std::vector<SMALL_RECT> GetTextRects(COORD start, COORD end, bool blockSelection, bool bufferCoordinates) const;
 
     void AddHyperlinkToMap(std::wstring_view uri, uint16_t id);
     std::wstring GetHyperlinkUriFromId(uint16_t id) const;
@@ -190,7 +202,7 @@ public:
 private:
     void _UpdateSize();
     Microsoft::Console::Types::Viewport _size;
-    std::deque<ROW> _storage;
+    std::vector<ROW> _storage;
     Cursor _cursor;
 
     SHORT _firstRow; // indexes top row (not necessarily 0)
@@ -210,7 +222,7 @@ private:
 
     void _SetFirstRowIndex(const SHORT FirstRowIndex) noexcept;
 
-    COORD _GetPreviousFromCursor() const noexcept;
+    COORD _GetPreviousFromCursor() const;
 
     void _SetWrapOnCurrentRow();
     void _AdjustWrapOnCurrentRow(const bool fSet);

src/buffer/out/ut_textbuffer/AttrRowTests.cpp

@@ -3,14 +3,9 @@
 
 #include "precomp.h"
 #include "WexTestClass.h"
-#include "../../inc/consoletaeftemplates.hpp"
+#include "../../../inc/consoletaeftemplates.hpp"
 
-#include "CommonState.hpp"
-
-#include "globals.h"
-#include "../buffer/out/textBuffer.hpp"
-
-#include "input.h"
+#include "../textBuffer.hpp"
 
 using namespace WEX::Common;
 using namespace WEX::Logging;
@@ -170,64 +165,54 @@ class AttrRowTests
                       _Inout_ std::unique_ptr<TextAttributeRun[]>& outAttrRun,
                       _Out_ size_t* const cOutAttrRun)
     {
-        NTSTATUS status = STATUS_SUCCESS;
+        RETURN_HR_IF(E_NOT_SUFFICIENT_BUFFER, cRowLength == 0);
 
-        if (cRowLength == 0)
+        // first count up the deltas in the array
+        size_t cDeltas = 1;
+
+        const TextAttribute* pPrevAttr = &rgAttrs[0];
+
+        for (size_t i = 1; i < cRowLength; i++)
         {
-            status = STATUS_BUFFER_TOO_SMALL;
-        }
+            const TextAttribute* pCurAttr = &rgAttrs[i];
 
-        if (NT_SUCCESS(status))
-        {
-            // first count up the deltas in the array
-            size_t cDeltas = 1;
-
-            const TextAttribute* pPrevAttr = &rgAttrs[0];
-
-            for (size_t i = 1; i < cRowLength; i++)
+            if (*pCurAttr != *pPrevAttr)
             {
-                const TextAttribute* pCurAttr = &rgAttrs[i];
-
-                if (*pCurAttr != *pPrevAttr)
-                {
-                    cDeltas++;
-                }
-
-                pPrevAttr = pCurAttr;
+                cDeltas++;
             }
 
-            // This whole situation was too complicated with a one off holder for one row run
-            // new method:
-            // delete the old buffer
-            // make a new buffer, one run + one run for each change
-            // set the values for each run one run index at a time
+            pPrevAttr = pCurAttr;
+        }
 
-            std::unique_ptr<TextAttributeRun[]> attrRun = std::make_unique<TextAttributeRun[]>(cDeltas);
-            status = NT_TESTNULL(attrRun.get());
-            if (NT_SUCCESS(status))
+        // This whole situation was too complicated with a one off holder for one row run
+        // new method:
+        // delete the old buffer
+        // make a new buffer, one run + one run for each change
+        // set the values for each run one run index at a time
+
+        std::unique_ptr<TextAttributeRun[]> attrRun = std::make_unique<TextAttributeRun[]>(cDeltas);
+        RETURN_HR_IF_NULL(E_OUTOFMEMORY, attrRun);
+
+        TextAttributeRun* pCurrentRun = attrRun.get();
+        pCurrentRun->SetAttributes(rgAttrs[0]);
+        pCurrentRun->SetLength(1);
+        for (size_t i = 1; i < cRowLength; i++)
+        {
+            if (pCurrentRun->GetAttributes() == rgAttrs[i])
             {
-                TextAttributeRun* pCurrentRun = attrRun.get();
-                pCurrentRun->SetAttributes(rgAttrs[0]);
+                pCurrentRun->SetLength(pCurrentRun->GetLength() + 1);
+            }
+            else
+            {
+                pCurrentRun++;
+                pCurrentRun->SetAttributes(rgAttrs[i]);
                 pCurrentRun->SetLength(1);
-                for (size_t i = 1; i < cRowLength; i++)
-                {
-                    if (pCurrentRun->GetAttributes() == rgAttrs[i])
-                    {
-                        pCurrentRun->SetLength(pCurrentRun->GetLength() + 1);
-                    }
-                    else
-                    {
-                        pCurrentRun++;
-                        pCurrentRun->SetAttributes(rgAttrs[i]);
-                        pCurrentRun->SetLength(1);
-                    }
-                }
-                attrRun.swap(outAttrRun);
-                *cOutAttrRun = cDeltas;
             }
         }
+        attrRun.swap(outAttrRun);
+        *cOutAttrRun = cDeltas;
 
-        return HRESULT_FROM_NT(status);
+        return S_OK;
     }
 
     NoThrowString LogRunElement(_In_ TextAttributeRun& run)
@@ -235,6 +220,24 @@ class AttrRowTests
         return NoThrowString().Format(L"%wc%d", run.GetAttributes().GetLegacyAttributes(), run.GetLength());
     }
 
+    void LogChain(_In_ PCWSTR pwszPrefix,
+                  boost::container::small_vector_base<TextAttributeRun>& chain)
+    {
+        NoThrowString str(pwszPrefix);
+
+        if (chain.size() > 0)
+        {
+            str.Append(LogRunElement(chain[0]));
+
+            for (size_t i = 1; i < chain.size(); i++)
+            {
+                str.AppendFormat(L"->%s", (const wchar_t*)(LogRunElement(chain[i])));
+            }
+        }
+
+        Log::Comment(str);
+    }
+
     void LogChain(_In_ PCWSTR pwszPrefix,
                   std::vector<TextAttributeRun>& chain)
     {
@@ -707,10 +710,6 @@ class AttrRowTests
 
     TEST_METHOD(TestResize)
     {
-        CommonState state;
-        state.PrepareGlobalFont();
-        state.PrepareGlobalScreenBuffer();
-
         pSingle->Resize(240);
         pChain->Resize(240);
 
@@ -728,8 +727,5 @@ class AttrRowTests
 
         VERIFY_THROWS_SPECIFIC(pSingle->Resize(0), wil::ResultException, [](wil::ResultException& e) { return e.GetErrorCode() == E_INVALIDARG; });
         VERIFY_THROWS_SPECIFIC(pChain->Resize(0), wil::ResultException, [](wil::ResultException& e) { return e.GetErrorCode() == E_INVALIDARG; });
-
-        state.CleanupGlobalScreenBuffer();
-        state.CleanupGlobalFont();
     }
 };

src/buffer/out/ut_textbuffer/ReflowTests.cpp

@@ -0,0 +1,856 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+#include "precomp.h"
+#include "WexTestClass.h"
+#include "../../inc/consoletaeftemplates.hpp"
+
+#include "../textBuffer.hpp"
+#include "../../renderer/inc/DummyRenderTarget.hpp"
+#include "../../types/inc/Utf16Parser.hpp"
+#include "../../types/inc/GlyphWidth.hpp"
+
+#include <IDataSource.h>
+
+template<>
+class WEX::TestExecution::VerifyOutputTraits<wchar_t>
+{
+public:
+    static WEX::Common::NoThrowString ToString(const wchar_t& wch)
+    {
+        return WEX::Common::NoThrowString().Format(L"'%c'", wch);
+    }
+};
+
+using namespace WEX::Common;
+using namespace WEX::Logging;
+using namespace WEX::TestExecution;
+
+namespace
+{
+    struct TestRow
+    {
+        std::wstring_view text;
+        bool wrap;
+    };
+
+    struct TestBuffer
+    {
+        COORD size;
+        std::vector<TestRow> rows;
+        COORD cursor;
+    };
+
+    struct TestCase
+    {
+        std::wstring_view name;
+        std::vector<TestBuffer> buffers;
+    };
+
+    static constexpr auto true_due_to_exact_wrap_bug{ true };
+
+    static const TestCase testCases[] = {
+        TestCase{
+            L"No reflow required",
+            {
+                TestBuffer{
+                    { 6, 5 },
+                    {
+                        { L"AB    ", false },
+                        { L"$     ", false },
+                        { L"CD    ", false },
+                        { L"EFG   ", false },
+                        { L"      ", false },
+                    },
+                    { 0, 1 } // cursor on $
+                },
+                TestBuffer{
+                    { 5, 5 }, // reduce width by 1
+                    {
+                        { L"AB   ", false },
+                        { L"$    ", false },
+                        { L"CD   ", false },
+                        { L"EFG  ", false },
+                        { L"     ", false },
+                    },
+                    { 0, 1 } // cursor on $
+                },
+                TestBuffer{
+                    { 4, 5 },
+                    {
+                        { L"AB  ", false },
+                        { L"$   ", false },
+                        { L"CD  ", false },
+                        { L"EFG ", false },
+                        { L"    ", false },
+                    },
+                    { 0, 1 } // cursor on $
+                },
+            },
+        },
+        TestCase{
+            L"SBCS, cursor remains in buffer, no circling, no original wrap",
+            {
+                TestBuffer{
+                    { 6, 5 },
+                    {
+                        { L"ABCDEF", false },
+                        { L"$     ", false },
+                        { L"      ", false },
+                        { L"      ", false },
+                        { L"      ", false },
+                    },
+                    { 0, 1 } // cursor on $
+                },
+                TestBuffer{
+                    { 5, 5 }, // reduce width by 1
+                    {
+                        { L"ABCDE", true },
+                        { L"F$   ", false }, // [BUG] EXACT WRAP. $ should be alone on next line.
+                        { L"     ", false },
+                        { L"     ", false },
+                        { L"     ", false },
+                    },
+                    { 1, 1 } // cursor on $
+                },
+                TestBuffer{
+                    { 6, 5 }, // grow width back to original
+                    {
+                        { L"ABCDEF", true_due_to_exact_wrap_bug },
+                        { L"$     ", false },
+                        { L"      ", false },
+                        { L"      ", false },
+                        { L"      ", false },
+                    },
+                    { 0, 1 } // cursor on $
+                },
+                TestBuffer{
+                    { 7, 5 }, // grow width wider than original
+                    {
+                        { L"ABCDEF$", true_due_to_exact_wrap_bug }, // EXACT WRAP BUG: $ should be alone on next line
+                        { L"       ", false },
+                        { L"       ", false },
+                        { L"       ", false },
+                        { L"       ", false },
+                    },
+                    { 6, 0 } // cursor on $
+                },
+            },
+        },
+        TestCase{
+            L"SBCS, cursor remains in buffer, no circling, with original wrap",
+            {
+                TestBuffer{
+                    { 6, 5 },
+                    {
+                        { L"ABCDEF", true },
+                        { L"G$    ", false },
+                        { L"      ", false },
+                        { L"      ", false },
+                        { L"      ", false },
+                    },
+                    { 1, 1 } // cursor on $
+                },
+                TestBuffer{
+                    { 5, 5 }, // reduce width by 1
+                    {
+                        { L"ABCDE", true },
+                        { L"FG$  ", false },
+                        { L"     ", false },
+                        { L"     ", false },
+                        { L"     ", false },
+                    },
+                    { 2, 1 } // cursor on $
+                },
+                TestBuffer{
+                    { 6, 5 }, // grow width back to original
+                    {
+                        { L"ABCDEF", true },
+                        { L"G$    ", false },
+                        { L"      ", false },
+                        { L"      ", false },
+                        { L"      ", false },
+                    },
+                    { 1, 1 } // cursor on $
+                },
+                TestBuffer{
+                    { 7, 5 }, // grow width wider than original
+                    {
+                        { L"ABCDEFG", true },
+                        { L"$      ", false },
+                        { L"       ", false },
+                        { L"       ", false },
+                        { L"       ", false },
+                    },
+                    { 0, 1 } // cursor on $
+                },
+            },
+        },
+        TestCase{
+            L"SBCS line padded with spaces (to wrap)",
+            {
+                TestBuffer{
+                    { 6, 5 },
+                    {
+                        { L"AB    ", true }, // AB    $     CD is one long wrapped line
+                        { L"$     ", true },
+                        { L"CD    ", false },
+                        { L"EFG   ", false },
+                        { L"      ", false },
+                    },
+                    { 0, 1 } // cursor on $
+                },
+                TestBuffer{
+                    { 7, 5 }, // reduce width by 1
+                    {
+                        { L"AB    $", true },
+                        { L"     CD", true_due_to_exact_wrap_bug },
+                        { L"       ", false },
+                        { L"EFG    ", false },
+                        { L"       ", false },
+                    },
+                    { 6, 0 } // cursor on $
+                },
+                TestBuffer{
+                    { 8, 5 },
+                    {
+                        { L"AB    $ ", true },
+                        { L"    CD  ", false }, // Goes to false because we hit the end of ..CD
+                        { L"EFG     ", false }, // [BUG] EFG moves up due to exact wrap bug above
+                        { L"        ", false },
+                        { L"        ", false },
+                    },
+                    { 6, 0 } // cursor on $
+                },
+            },
+        },
+        TestCase{
+            L"DBCS, cursor remains in buffer, no circling, with original wrap",
+            {
+                TestBuffer{
+                    { 6, 5 },
+                    {
+                        //--0123456--
+                        { L"カタカ", true }, // KA TA KA
+                        { L"ナ$   ", false }, // NA
+                        { L"      ", false },
+                        { L"      ", false },
+                        { L"      ", false },
+                    },
+                    { 2, 1 } // cursor on $
+                },
+                TestBuffer{
+                    { 5, 5 }, // reduce width by 1
+                    {
+                        //--012345--
+                        { L"カタ ", true }, // KA TA [FORCED SPACER]
+                        { L"カナ$", true_due_to_exact_wrap_bug }, // KA NA
+                        { L"     ", false },
+                        { L"     ", false },
+                        { L"     ", false },
+                    },
+                    { 4, 1 } // cursor on $
+                },
+                TestBuffer{
+                    { 6, 5 }, // grow width back to original
+                    {
+                        //--0123456--
+                        { L"カタカ", true }, // KA TA KA
+                        { L"ナ$   ", false }, // NA
+                        { L"      ", false },
+                        { L"      ", false },
+                        { L"      ", false },
+                    },
+                    { 2, 1 } // cursor on $
+                },
+                TestBuffer{
+                    { 7, 5 }, // grow width wider than original (by one; no visible change!)
+                    {
+                        //--0123456--
+                        { L"カタカ ", true }, // KA TA KA [FORCED SPACER]
+                        { L"ナ$    ", false }, // NA
+                        { L"       ", false },
+                        { L"       ", false },
+                        { L"       ", false },
+                    },
+                    { 2, 1 } // cursor on $
+                },
+                TestBuffer{
+                    { 8, 5 }, // grow width enough to fit second DBCS
+                    {
+                        //--01234567--
+                        { L"カタカナ", true }, // KA TA KA NA
+                        { L"$       ", false },
+                        { L"        ", false },
+                        { L"        ", false },
+                        { L"        ", false },
+                    },
+                    { 0, 1 } // cursor on $
+                },
+            },
+        },
+        TestCase{
+            L"SBCS, cursor remains in buffer, with circling, no original wrap",
+            {
+                TestBuffer{
+                    { 6, 5 },
+                    {
+                        { L"ABCDEF", false },
+                        { L"$     ", false },
+                        { L"GHIJKL", false },
+                        { L"MNOPQR", false },
+                        { L"STUVWX", false },
+                    },
+                    { 0, 1 } // cursor on $
+                },
+                TestBuffer{
+                    { 5, 5 }, // reduce width by 1
+                    {
+                        { L"F$   ", false },
+                        { L"GHIJK", true }, // [BUG] We should see GHIJK\n L\n MNOPQ\n R\n
+                        { L"LMNOP", true }, // The wrapping here is irregular
+                        { L"QRSTU", true },
+                        { L"VWX  ", false },
+                    },
+                    { 1, 1 } // [BUG] cursor moves to 1,1 instead of sticking with the $
+                },
+                TestBuffer{
+                    { 6, 5 }, // going back to 6,5, the data lost has been destroyed
+                    {
+                        //{ L"F$    ", false }, // [BUG] this line is erroneously destroyed too!
+                        { L"GHIJKL", true },
+                        { L"MNOPQR", true },
+                        { L"STUVWX", true },
+                        { L"      ", false },
+                        { L"      ", false }, // [BUG] this line is added
+                    },
+                    { 1, 1 }, // [BUG] cursor does not follow [H], it sticks at 1,1
+                },
+                TestBuffer{
+                    { 7, 5 }, // a number of errors are carried forward from the previous buffer
+                    {
+                        { L"GHIJKLM", true },
+                        { L"NOPQRST", true },
+                        { L"UVWX   ", false }, // [BUG] This line loses wrap for some reason
+                        { L"       ", false },
+                        { L"       ", false },
+                    },
+                    { 0, 1 }, // [BUG] The cursor moves to 0, 1 now, sticking with the [N] from before
+                },
+            },
+        },
+        TestCase{
+            // The cursor is not found during character insertion.
+            // Instead, it is found off the right edge of the text. This triggers
+            // a separate cursor found codepath in the original algorithm.
+            L"SBCS, cursor off rightmost char in non-wrapped line",
+            {
+                TestBuffer{
+                    { 6, 5 },
+                    {
+                        { L"ABCDEF", false },
+                        { L"$     ", false },
+                        { L"      ", false },
+                        { L"      ", false },
+                        { L"      ", false },
+                    },
+                    { 1, 1 } // cursor *after* $
+                },
+                TestBuffer{
+                    { 5, 5 }, // reduce width by 1
+                    {
+                        { L"ABCDE", true },
+                        { L"F$   ", false }, // [BUG] EXACT WRAP. $ should be alone on next line.
+                        { L"     ", false },
+                        { L"     ", false },
+                        { L"     ", false },
+                    },
+                    { 2, 1 } // cursor follows space after $ to next line
+                },
+            },
+        },
+        TestCase{
+            L"SBCS, cursor off rightmost char in wrapped line, which is then pushed off bottom",
+            {
+                TestBuffer{
+                    { 6, 5 },
+                    {
+                        { L"ABCDEF", true },
+                        { L"GHIJKL", true },
+                        { L"MNOPQR", true },
+                        { L"STUVWX", true },
+                        { L"YZ0 $ ", false },
+                    },
+                    { 5, 4 } // cursor *after* $
+                },
+                TestBuffer{
+                    { 5, 5 }, // reduce width by 1
+                    {
+                        { L"FGHIJ", true },
+                        { L"KLMNO", true },
+                        { L"PQRST", true },
+                        { L"UVWXY", true },
+                        { L"Z0 $ ", false },
+                    },
+                    { 4, 4 } // cursor follows space after $ to newly introduced bottom line
+                },
+            },
+        },
+        TestCase{
+            L"SBCS, cursor off in space to far right of text (end of buffer content)",
+            {
+                TestBuffer{
+                    { 6, 5 },
+                    {
+                        { L"ABCDEF", false },
+                        //       v cursor
+                        { L"$     ", false },
+                        //       ^ cursor
+                        { L"      ", false },
+                        { L"      ", false },
+                        { L"      ", false },
+                    },
+                    { 5, 1 } // cursor in space far after $
+                },
+                TestBuffer{
+                    { 5, 5 }, // reduce width by 1
+                    {
+                        { L"ABCDE", true },
+                        { L"F$   ", true }, // [BUG] This line is marked wrapped, and I do not know why
+                        //   v cursor
+                        { L"     ", false },
+                        //   ^ cursor
+                        { L"     ", false },
+                        { L"     ", false },
+                    },
+                    { 1, 2 } // cursor stays same linear distance from $
+                },
+                TestBuffer{
+                    { 6, 5 }, // grow back to original size
+                    {
+                        { L"ABCDEF", true_due_to_exact_wrap_bug },
+                        //      v cursor [BUG] cursor does not retain linear distance from $
+                        { L"$     ", false },
+                        //      ^ cursor
+                        { L"      ", false },
+                        { L"      ", false },
+                        { L"      ", false },
+                    },
+                    { 4, 1 } // cursor stays same linear distance from $
+                },
+            },
+        },
+        TestCase{
+            L"SBCS, cursor off in space to far right of text (middle of buffer content)",
+            {
+                TestBuffer{
+                    { 6, 5 },
+                    {
+                        { L"ABCDEF", false },
+                        //       v cursor
+                        { L"$     ", false },
+                        //       ^ cursor
+                        { L"BLAH  ", false },
+                        { L"BLAH  ", false },
+                        { L"      ", false },
+                    },
+                    { 5, 1 } // cursor in space far after $
+                },
+                TestBuffer{
+                    { 5, 5 }, // reduce width by 1
+                    {
+                        { L"ABCDE", true },
+                        { L"F$   ", false },
+                        { L"BLAH ", false },
+                        { L"BLAH ", true }, // [BUG] this line wraps, no idea why
+                        //  v cursor [BUG] cursor erroneously moved to end of all content
+                        { L"     ", false },
+                        //  ^ cursor
+                    },
+                    { 0, 4 } },
+                TestBuffer{
+                    { 6, 5 }, // grow back to original size
+                    {
+                        { L"ABCDEF", true },
+                        { L"$     ", false },
+                        { L"BLAH  ", false },
+                        //       v cursor [BUG] cursor is pulled up to previous line because it was marked wrapped
+                        { L"BLAH  ", false },
+                        //       ^ cursor
+                        { L"      ", false },
+                    },
+                    { 5, 3 } },
+            },
+        },
+        TestCase{
+            // Shrinking the buffer this much forces a multi-line wrap before the cursor
+            L"SBCS, cursor off in space to far right of text (end of buffer content), aggressive shrink",
+            {
+                TestBuffer{
+                    { 6, 5 },
+                    {
+                        { L"ABCDEF", false },
+                        //       v cursor
+                        { L"$     ", false },
+                        //       ^ cursor
+                        { L"      ", false },
+                        { L"      ", false },
+                        { L"      ", false },
+                    },
+                    { 5, 1 } // cursor in space far after $
+                },
+                TestBuffer{
+                    { 2, 5 }, // reduce width aggressively
+                    {
+                        { L"CD", true },
+                        { L"EF", true },
+                        { L"$ ", true },
+                        { L"  ", true },
+                        //   v cursor
+                        { L"  ", false },
+                        //   ^ cursor
+                    },
+                    { 1, 4 } },
+            },
+        },
+        TestCase{
+            L"SBCS, cursor off in space to far right of text (end of buffer content), fully wrapped, aggressive shrink",
+            {
+                TestBuffer{
+                    { 6, 5 },
+                    {
+                        { L"ABCDEF", true },
+                        //       v cursor
+                        { L"$     ", true },
+                        //       ^ cursor
+                        { L"      ", true },
+                        { L"      ", true },
+                        { L"      ", true },
+                    },
+                    { 5, 1 } // cursor in space far after $
+                },
+                TestBuffer{
+                    { 2, 5 }, // reduce width aggressively
+                    {
+                        { L"EF", true },
+                        { L"$ ", true },
+                        { L"  ", true },
+                        { L"  ", true },
+                        //   v cursor [BUG] cursor does not maintain linear distance from $
+                        { L"  ", false },
+                        //   ^ cursor
+                    },
+                    { 1, 4 } },
+            },
+        },
+        TestCase{
+            L"SBCS, cursor off in space to far right of text (middle of buffer content), fully wrapped, aggressive shrink",
+            {
+                TestBuffer{
+                    { 6, 5 },
+                    {
+                        { L"ABCDEF", true },
+                        //       v cursor
+                        { L"$     ", true },
+                        //       ^ cursor
+                        { L"      ", true },
+                        { L"      ", true },
+                        { L"     Q", true },
+                    },
+                    { 5, 1 } // cursor in space far after $
+                },
+                TestBuffer{
+                    { 2, 5 }, // reduce width aggressively
+                    {
+                        { L"  ", true },
+                        { L"  ", true },
+                        { L"  ", true },
+                        { L" Q", true },
+                        //   v cursor [BUG] cursor jumps to end of world
+                        { L"  ", false }, // POTENTIAL [BUG] a whole new blank line is added for the cursor
+                        //   ^ cursor
+                    },
+                    { 1, 4 } },
+            },
+        },
+        TestCase{
+            L"SBCS, cursor off in space to far right of text (middle of buffer content), partially wrapped, aggressive shrink",
+            {
+                TestBuffer{
+                    { 6, 5 },
+                    {
+                        { L"ABCDEF", false },
+                        //       v cursor
+                        { L"$     ", false },
+                        //       ^ cursor
+                        { L"      ", false },
+                        { L"      ", true },
+                        { L"     Q", true },
+                    },
+                    { 5, 1 } // cursor in space far after $
+                },
+                TestBuffer{
+                    { 2, 5 }, // reduce width aggressively
+                    {
+                        { L"  ", true },
+                        { L"  ", true },
+                        { L"  ", true },
+                        { L" Q", true },
+                        //  v  cursor [BUG] cursor jumps to different place than fully wrapped case
+                        { L"  ", false },
+                        //  ^  cursor
+                    },
+                    { 0, 4 } },
+            },
+        },
+        TestCase{
+            // This triggers the cursor being walked forward w/ newlines to maintain
+            // distance from the last char in the buffer
+            L"SBCS, cursor at end of buffer, otherwise same as previous test",
+            {
+                TestBuffer{
+                    { 6, 5 },
+                    {
+                        { L"ABCDEF", false },
+                        { L"$     ", false },
+                        { L"     Q", true },
+                        { L"      ", true },
+                        //       v cursor
+                        { L"      ", true },
+                        //       ^ cursor
+                    },
+                    { 5, 4 } // cursor at end of buffer
+                },
+                TestBuffer{
+                    { 2, 5 }, // reduce width aggressively
+                    {
+                        { L"  ", true },
+                        { L"  ", true },
+                        { L" Q", true },
+                        { L"  ", false },
+                        //  v  cursor [BUG] cursor loses linear distance from Q; is this important?
+                        { L"  ", false },
+                        //  ^  cursor
+                    },
+                    { 0, 4 } },
+            },
+        },
+    };
+
+#pragma region TAEF hookup for the test case array above
+    struct ArrayIndexTaefAdapterRow : public Microsoft::WRL::RuntimeClass<Microsoft::WRL::RuntimeClassFlags<Microsoft::WRL::ClassicCom | Microsoft::WRL::InhibitFtmBase>, IDataRow>
+    {
+        HRESULT RuntimeClassInitialize(const size_t index)
+        {
+            _index = index;
+            return S_OK;
+        }
+
+        STDMETHODIMP GetTestData(BSTR /*pszName*/, SAFEARRAY** ppData) override
+        {
+            const auto indexString{ wil::str_printf<std::wstring>(L"%zu", _index) };
+            auto safeArray{ SafeArrayCreateVector(VT_BSTR, 0, 1) };
+            LONG index{ 0 };
+            auto indexBstr{ wil::make_bstr(indexString.c_str()) };
+            (void)SafeArrayPutElement(safeArray, &index, indexBstr.release());
+            *ppData = safeArray;
+            return S_OK;
+        }
+
+        STDMETHODIMP GetMetadataNames(SAFEARRAY** ppMetadataNames) override
+        {
+            *ppMetadataNames = nullptr;
+            return S_FALSE;
+        }
+
+        STDMETHODIMP GetMetadata(BSTR /*pszName*/, SAFEARRAY** ppData) override
+        {
+            *ppData = nullptr;
+            return S_FALSE;
+        }
+
+        STDMETHODIMP GetName(BSTR* ppszRowName) override
+        {
+            *ppszRowName = nullptr;
+            return S_FALSE;
+        }
+
+    private:
+        size_t _index;
+    };
+
+    struct ArrayIndexTaefAdapterSource : public Microsoft::WRL::RuntimeClass<Microsoft::WRL::RuntimeClassFlags<Microsoft::WRL::ClassicCom | Microsoft::WRL::InhibitFtmBase>, IDataSource>
+    {
+        STDMETHODIMP Advance(IDataRow** ppDataRow) override
+        {
+            if (_index < std::extent<decltype(testCases)>::value)
+            {
+                Microsoft::WRL::MakeAndInitialize<ArrayIndexTaefAdapterRow>(ppDataRow, _index++);
+            }
+            else
+            {
+                *ppDataRow = nullptr;
+            }
+            return S_OK;
+        }
+
+        STDMETHODIMP Reset() override
+        {
+            _index = 0;
+            return S_OK;
+        }
+
+        STDMETHODIMP GetTestDataNames(SAFEARRAY** names) override
+        {
+            auto safeArray{ SafeArrayCreateVector(VT_BSTR, 0, 1) };
+            LONG index{ 0 };
+            auto dataNameBstr{ wil::make_bstr(L"index") };
+            (void)SafeArrayPutElement(safeArray, &index, dataNameBstr.release());
+            *names = safeArray;
+            return S_OK;
+        }
+
+        STDMETHODIMP GetTestDataType(BSTR /*name*/, BSTR* type) override
+        {
+            *type = nullptr;
+            return S_OK;
+        }
+
+    private:
+        size_t _index{ 0 };
+    };
+#pragma endregion
+}
+
+extern "C" HRESULT __declspec(dllexport) __cdecl ReflowTestDataSource(IDataSource** ppDataSource, void*)
+{
+    auto source{ Microsoft::WRL::Make<ArrayIndexTaefAdapterSource>() };
+    return source.CopyTo(ppDataSource);
+}
+
+class ReflowTests
+{
+    TEST_CLASS(ReflowTests);
+
+    static DummyRenderTarget target;
+    static std::unique_ptr<TextBuffer> _textBufferFromTestBuffer(const TestBuffer& testBuffer)
+    {
+        auto buffer = std::make_unique<TextBuffer>(testBuffer.size, TextAttribute{ 0x7 }, 0, target);
+
+        size_t i{};
+        for (const auto& testRow : testBuffer.rows)
+        {
+            auto& row{ buffer->GetRowByOffset(i) };
+
+            auto& charRow{ row.GetCharRow() };
+            row.SetWrapForced(testRow.wrap);
+
+            size_t j{};
+            for (auto it{ charRow.begin() }; it != charRow.end(); ++it)
+            {
+                // Yes, we're about to manually create a buffer. It is unpleasant.
+                const auto ch{ til::at(testRow.text, j) };
+                it->Char() = ch;
+                if (IsGlyphFullWidth(ch))
+                {
+                    it->DbcsAttr().SetLeading();
+                    it++;
+                    it->Char() = ch;
+                    it->DbcsAttr().SetTrailing();
+                }
+                else
+                {
+                    it->DbcsAttr().SetSingle();
+                }
+                j++;
+            }
+            i++;
+        }
+
+        buffer->GetCursor().SetPosition(testBuffer.cursor);
+        return buffer;
+    }
+
+    static std::unique_ptr<TextBuffer> _textBufferByReflowingTextBuffer(TextBuffer& originalBuffer, const COORD newSize)
+    {
+        auto buffer = std::make_unique<TextBuffer>(newSize, TextAttribute{ 0x7 }, 0, target);
+        TextBuffer::Reflow(originalBuffer, *buffer, std::nullopt, std::nullopt);
+        return buffer;
+    }
+
+    static void _compareTextBufferAgainstTestBuffer(const TextBuffer& buffer, const TestBuffer& testBuffer)
+    {
+        VERIFY_ARE_EQUAL(testBuffer.cursor, buffer.GetCursor().GetPosition());
+        VERIFY_ARE_EQUAL(testBuffer.size, buffer.GetSize().Dimensions());
+
+        size_t i{};
+        for (const auto& testRow : testBuffer.rows)
+        {
+            NoThrowString indexString;
+            const auto& row{ buffer.GetRowByOffset(i) };
+
+            const auto& charRow{ row.GetCharRow() };
+
+            indexString.Format(L"[Row %d]", i);
+            VERIFY_ARE_EQUAL(testRow.wrap, row.WasWrapForced(), indexString);
+
+            size_t j{};
+            for (auto it{ charRow.begin() }; it != charRow.end(); ++it)
+            {
+                indexString.Format(L"[Cell %d, %d; Text line index %d]", it - charRow.begin(), i, j);
+                // Yes, we're about to manually create a buffer. It is unpleasant.
+                const auto ch{ til::at(testRow.text, j) };
+                if (IsGlyphFullWidth(ch))
+                {
+                    // Char is full width in test buffer, so
+                    // ensure that real buffer is LEAD, TRAIL (ch)
+                    VERIFY_IS_TRUE(it->DbcsAttr().IsLeading(), indexString);
+                    VERIFY_ARE_EQUAL(ch, it->Char(), indexString);
+
+                    it++;
+                    VERIFY_IS_TRUE(it->DbcsAttr().IsTrailing(), indexString);
+                }
+                else
+                {
+                    VERIFY_IS_TRUE(it->DbcsAttr().IsSingle(), indexString);
+                }
+
+                VERIFY_ARE_EQUAL(ch, it->Char(), indexString);
+                j++;
+            }
+            i++;
+        }
+    }
+
+    TEST_METHOD(TestReflowCases)
+    {
+        BEGIN_TEST_METHOD_PROPERTIES()
+            TEST_METHOD_PROPERTY(L"DataSource", L"Export:ReflowTestDataSource")
+        END_TEST_METHOD_PROPERTIES()
+
+        WEX::TestExecution::DisableVerifyExceptions disableVerifyExceptions{};
+        WEX::TestExecution::SetVerifyOutput verifyOutputScope{ WEX::TestExecution::VerifyOutputSettings::LogOnlyFailures };
+
+        unsigned int i{};
+        TestData::TryGetValue(L"index", i); // index is produced by the ArrayIndexTaefAdapterSource above
+        const auto& testCase{ testCases[i] };
+        Log::Comment(NoThrowString().Format(L"[%zu.0] Test case \"%.*s\"", i, testCase.name.size(), testCase.name.data()));
+
+        // Create initial text buffer from Buffer 0
+        auto textBuffer{ _textBufferFromTestBuffer(testCase.buffers.front()) };
+        for (size_t bufferIndex{ 1 }; bufferIndex < testCase.buffers.size(); ++bufferIndex)
+        {
+            const auto& testBuffer{ til::at(testCase.buffers, bufferIndex) };
+            Log::Comment(NoThrowString().Format(L"[%zu.%zu] Resizing to %dx%d", i, bufferIndex, testBuffer.size.X, testBuffer.size.Y));
+
+            auto newBuffer{ _textBufferByReflowingTextBuffer(*textBuffer, testBuffer.size) };
+
+            // All future operations are based on the new buffer
+            std::swap(textBuffer, newBuffer);
+
+            _compareTextBufferAgainstTestBuffer(*textBuffer, testBuffer);
+        }
+    }
+};
+
+DummyRenderTarget ReflowTests::target{};

src/buffer/out/ut_textbuffer/TextBuffer.Unit.Tests.vcxproj

@@ -10,6 +10,8 @@
   </PropertyGroup>
   <Import Project="$(SolutionDir)src\common.build.pre.props" />
   <ItemGroup>
+    <ClCompile Include="AttrRowTests.cpp" />
+    <ClCompile Include="ReflowTests.cpp" />
     <ClCompile Include="TextColorTests.cpp" />
     <ClCompile Include="TextAttributeTests.cpp" />
     <ClCompile Include="UnicodeStorageTests.cpp" />
@@ -18,6 +20,9 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\..\types\lib\types.vcxproj">
+      <Project>{18d09a24-8240-42d6-8cb6-236eee820263}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\lib\bufferout.vcxproj">
       <Project>{0cf235bd-2da0-407e-90ee-c467e8bbc714}</Project>
     </ProjectReference>

src/buffer/out/ut_textbuffer/sources

@@ -14,12 +14,15 @@ DLLDEF                  =
 
 SOURCES = \
     $(SOURCES) \
+    AttrRowTests.cpp \
+    ReflowTests.cpp \
     TextColorTests.cpp \
     TextAttributeTests.cpp \
     DefaultResource.rc \
 
 TARGETLIBS = \
     $(CONSOLE_OBJ_PATH)\buffer\out\lib\$(O)\ConBufferOut.lib \
+    $(CONSOLE_OBJ_PATH)\types\lib\$(O)\ConTypes.lib \
     $(TARGETLIBS) \
 
 # -------------------------------------

src/cascadia/CascadiaPackage/CascadiaPackage.wapproj

@@ -3,8 +3,6 @@
   <Import Project="..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
   <Import Project="$(OpenConsoleDir)src\wap-common.build.pre.props" />
   <PropertyGroup Label="Configuration">
-    <!-- This is necessary so the build system doesn't think we're a .NET project... -->
-    <TargetRuntime>Native</TargetRuntime>
     <TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
     <!--
@@ -17,6 +15,10 @@
     <AppxOSMaxVersionTestedReplaceManifestVersion>false</AppxOSMaxVersionTestedReplaceManifestVersion>
     <OCExecutionAliasName Condition="'$(WindowsTerminalBranding)'==''">wtd</OCExecutionAliasName>
     <OCExecutionAliasName Condition="'$(OCExecutionAliasName)'==''">wt</OCExecutionAliasName>
+    <!-- VS 16.8 causes WAP projects to accidentally package System.Core.dll (from the CLR).
+         This has been fixed in VS 16.9 using the property below. It's safe for us to include
+         it here, even after 16.9 comes out. -->
+    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
   </PropertyGroup>
   <PropertyGroup>
     <ProjectGuid>CA5CAD1A-224A-4171-B13A-F16E576FDD12</ProjectGuid>

src/cascadia/CascadiaPackage/Package-Dev.appxmanifest

@@ -12,7 +12,7 @@
   xmlns:desktop5="http://schemas.microsoft.com/appx/manifest/desktop/windows10/5"
   xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
   xmlns:uap5="http://schemas.microsoft.com/appx/manifest/uap/windows10/5"
-  IgnorableNamespaces="uap mp rescap">
+  IgnorableNamespaces="uap mp rescap uap3">
 
   <Identity
     Name="WindowsTerminalDev"
@@ -69,6 +69,11 @@
             Enabled="false"
             DisplayName="ms-resource:AppNameDev" />
         </uap5:Extension>
+        <uap3:Extension Category="windows.appExtensionHost">
+              <uap3:AppExtensionHost>
+                <uap3:Name>com.microsoft.windows.terminal.settings</uap3:Name>
+              </uap3:AppExtensionHost>
+        </uap3:Extension>
 
         <com:Extension Category="windows.comServer">
             <com:ComServer>
@@ -82,14 +87,9 @@
                 <desktop5:ItemType Type="Directory">
                     <desktop5:Verb Id="Command1" Clsid="9f156763-7844-4dc4-b2b1-901f640f5155" />
                 </desktop5:ItemType>
-                <!-- Due to a bug in the OS, this doesn't actually work right -
-                we'll get a nullptr in our implementation. So this is disabled
-                temporarily. See MSFT:24623699 for more details.
-
                 <desktop5:ItemType Type="Directory\Background">
-                    <desktop5:Verb Id="Command2" Clsid="9f156763-7844-4dc4-b2b1-901f640f5155" />
-                </desktop5:ItemType>
-                -->
+                  <desktop5:Verb Id="Command2" Clsid="9f156763-7844-4dc4-b2b1-901f640f5155" />
+                </desktop5:ItemType>                
             </desktop4:FileExplorerContextMenus>
         </desktop4:Extension>
 

src/cascadia/CascadiaPackage/Package-Pre.appxmanifest

@@ -13,7 +13,7 @@
   xmlns:desktop4="http://schemas.microsoft.com/appx/manifest/desktop/windows10/4"
   xmlns:desktop5="http://schemas.microsoft.com/appx/manifest/desktop/windows10/5"
   xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
-  IgnorableNamespaces="uap mp rescap">
+  IgnorableNamespaces="uap mp rescap uap3">
 
   <Identity
     Name="Microsoft.WindowsTerminalPreview"
@@ -64,6 +64,11 @@
             <desktop:ExecutionAlias Alias="wt.exe" />
           </uap3:AppExecutionAlias>
         </uap3:Extension>
+        <uap3:Extension Category="windows.appExtensionHost">
+          <uap3:AppExtensionHost>
+            <uap3:Name>com.microsoft.windows.terminal.settings</uap3:Name>
+          </uap3:AppExtensionHost>
+        </uap3:Extension>
         <uap5:Extension Category="windows.startupTask">
           <uap5:StartupTask
             TaskId="StartTerminalOnLoginTask"
@@ -82,15 +87,9 @@
                 <desktop5:ItemType Type="Directory">
                     <desktop5:Verb Id="Command1" Clsid="9f156763-7844-4dc4-b2b1-901f640f5155" />
                 </desktop5:ItemType>
-                <!-- Due to a bug in the OS, this doesn't actually work right -
-                we'll get a nullptr in our implementation. So this is disabled
-                temporarily. See MSFT:24623699 for more details.
-
                 <desktop5:ItemType Type="Directory\Background">
-                    <desktop5:Verb Id="Command2" Clsid="9f156763-7844-4dc4-b2b1-901f640f5155" />
+                  <desktop5:Verb Id="Command2" Clsid="9f156763-7844-4dc4-b2b1-901f640f5155" />
                 </desktop5:ItemType>
-                -->
-
             </desktop4:FileExplorerContextMenus>
         </desktop4:Extension>
 

src/cascadia/CascadiaPackage/Package.appxmanifest

@@ -13,7 +13,7 @@
   xmlns:desktop4="http://schemas.microsoft.com/appx/manifest/desktop/windows10/4"
   xmlns:desktop5="http://schemas.microsoft.com/appx/manifest/desktop/windows10/5"
   xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
-  IgnorableNamespaces="uap mp rescap">
+  IgnorableNamespaces="uap mp rescap uap3">
 
   <Identity
     Name="Microsoft.WindowsTerminal"
@@ -64,6 +64,11 @@
             <desktop:ExecutionAlias Alias="wt.exe" />
           </uap3:AppExecutionAlias>
         </uap3:Extension>
+        <uap3:Extension Category="windows.appExtensionHost">
+          <uap3:AppExtensionHost>
+            <uap3:Name>com.microsoft.windows.terminal.settings</uap3:Name>
+          </uap3:AppExtensionHost>
+        </uap3:Extension>
         <uap5:Extension Category="windows.startupTask">
           <uap5:StartupTask
             TaskId="StartTerminalOnLoginTask"
@@ -83,14 +88,9 @@
                 <desktop5:ItemType Type="Directory">
                     <desktop5:Verb Id="Command1" Clsid="9f156763-7844-4dc4-b2b1-901f640f5155" />
                 </desktop5:ItemType>
-                <!-- Due to a bug in the OS, this doesn't actually work right -
-                we'll get a nullptr in our implementation. So this is disabled
-                temporarily. See MSFT:24623699 for more details.
-
                 <desktop5:ItemType Type="Directory\Background">
-                    <desktop5:Verb Id="Command2" Clsid="9f156763-7844-4dc4-b2b1-901f640f5155" />
+                  <desktop5:Verb Id="Command2" Clsid="9f156763-7844-4dc4-b2b1-901f640f5155" />
                 </desktop5:ItemType>
-                -->
             </desktop4:FileExplorerContextMenus>
         </desktop4:Extension>
 

src/cascadia/LocalTests_SettingsModel/ColorSchemeTests.cpp

@@ -35,6 +35,7 @@ namespace SettingsModelLocalTests
         TEST_METHOD(CanLayerColorScheme);
         TEST_METHOD(LayerColorSchemeProperties);
         TEST_METHOD(LayerColorSchemesOnArray);
+        TEST_METHOD(UpdateSchemeReferences);
 
         TEST_CLASS_SETUP(ClassSetup)
         {
@@ -290,4 +291,81 @@ namespace SettingsModelLocalTests
             VERIFY_ARE_EQUAL(ARGB(0, 7, 7, 7), scheme2->_Background);
         }
     }
+
+    void ColorSchemeTests::UpdateSchemeReferences()
+    {
+        const std::string settingsString{ R"json({
+                                                "defaultProfile": "Inherited reference",
+                                                "profiles": {
+                                                    "defaults": {
+                                                        "colorScheme": "Scheme 1"
+                                                    },
+                                                    "list": [
+                                                        {
+                                                            "name": "Explicit scheme reference",
+                                                            "colorScheme": "Scheme 1"
+                                                        },
+                                                        {
+                                                            "name": "Explicit reference; hidden",
+                                                            "colorScheme": "Scheme 1",
+                                                            "hidden": true
+                                                        },
+                                                        {
+                                                            "name": "Inherited reference"
+                                                        },
+                                                        {
+                                                            "name": "Different reference",
+                                                            "colorScheme": "Scheme 2"
+                                                        }
+                                                    ]
+                                                },
+                                                "schemes": [
+                                                    { "name": "Scheme 1" },
+                                                    { "name": "Scheme 2" },
+                                                    { "name": "Scheme 1 (renamed)" }
+                                                ]
+                                            })json" };
+
+        auto settings{ winrt::make_self<CascadiaSettings>(false) };
+        settings->_ParseJsonString(settingsString, false);
+        settings->_ApplyDefaultsFromUserSettings();
+        settings->LayerJson(settings->_userSettings);
+        settings->_ValidateSettings();
+
+        // update all references to "Scheme 1"
+        const auto newName{ L"Scheme 1 (renamed)" };
+        settings->UpdateColorSchemeReferences(L"Scheme 1", newName);
+
+        // verify profile defaults
+        Log::Comment(L"Profile Defaults");
+        VERIFY_ARE_EQUAL(newName, settings->ProfileDefaults().ColorSchemeName());
+        VERIFY_IS_TRUE(settings->ProfileDefaults().HasColorSchemeName());
+
+        // verify all other profiles
+        const auto& profiles{ settings->AllProfiles() };
+        {
+            const auto& prof{ profiles.GetAt(0) };
+            Log::Comment(prof.Name().c_str());
+            VERIFY_ARE_EQUAL(newName, prof.ColorSchemeName());
+            VERIFY_IS_TRUE(prof.HasColorSchemeName());
+        }
+        {
+            const auto& prof{ profiles.GetAt(1) };
+            Log::Comment(prof.Name().c_str());
+            VERIFY_ARE_EQUAL(newName, prof.ColorSchemeName());
+            VERIFY_IS_TRUE(prof.HasColorSchemeName());
+        }
+        {
+            const auto& prof{ profiles.GetAt(2) };
+            Log::Comment(prof.Name().c_str());
+            VERIFY_ARE_EQUAL(newName, prof.ColorSchemeName());
+            VERIFY_IS_FALSE(prof.HasColorSchemeName());
+        }
+        {
+            const auto& prof{ profiles.GetAt(3) };
+            Log::Comment(prof.Name().c_str());
+            VERIFY_ARE_EQUAL(L"Scheme 2", prof.ColorSchemeName());
+            VERIFY_IS_TRUE(prof.HasColorSchemeName());
+        }
+    }
 }

src/cascadia/LocalTests_SettingsModel/CommandTests.cpp

@@ -37,10 +37,13 @@ namespace SettingsModelLocalTests
         TEST_METHOD(ManyCommandsSameAction);
         TEST_METHOD(LayerCommand);
         TEST_METHOD(TestSplitPaneArgs);
+        TEST_METHOD(TestSplitPaneBadSize);
         TEST_METHOD(TestResourceKeyName);
         TEST_METHOD(TestAutogeneratedName);
         TEST_METHOD(TestLayerOnAutogeneratedName);
 
+        TEST_METHOD(TestGenerateCommandline);
+
         TEST_CLASS_SETUP(ClassSetup)
         {
             InitializeJsonReader();
@@ -147,7 +150,8 @@ namespace SettingsModelLocalTests
             { "name": "command1", "command": { "action": "splitPane", "split": "vertical" } },
             { "name": "command2", "command": { "action": "splitPane", "split": "horizontal" } },
             { "name": "command4", "command": { "action": "splitPane" } },
-            { "name": "command5", "command": { "action": "splitPane", "split": "auto" } }
+            { "name": "command5", "command": { "action": "splitPane", "split": "auto" } },
+            { "name": "command6", "command": { "action": "splitPane", "size": 0.25 } },
         ])" };
 
         const auto commands0Json = VerifyParseSucceeded(commands0String);
@@ -156,7 +160,7 @@ namespace SettingsModelLocalTests
         VERIFY_ARE_EQUAL(0u, commands.Size());
         auto warnings = implementation::Command::LayerJson(commands, commands0Json);
         VERIFY_ARE_EQUAL(0u, warnings.size());
-        VERIFY_ARE_EQUAL(4u, commands.Size());
+        VERIFY_ARE_EQUAL(5u, commands.Size());
 
         {
             auto command = commands.Lookup(L"command1");
@@ -167,6 +171,7 @@ namespace SettingsModelLocalTests
             VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
             VERIFY_ARE_EQUAL(SplitState::Vertical, realArgs.SplitStyle());
+            VERIFY_ARE_EQUAL(0.5, realArgs.SplitSize());
         }
         {
             auto command = commands.Lookup(L"command2");
@@ -177,6 +182,7 @@ namespace SettingsModelLocalTests
             VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
             VERIFY_ARE_EQUAL(SplitState::Horizontal, realArgs.SplitStyle());
+            VERIFY_ARE_EQUAL(0.5, realArgs.SplitSize());
         }
         {
             auto command = commands.Lookup(L"command4");
@@ -187,6 +193,7 @@ namespace SettingsModelLocalTests
             VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
             VERIFY_ARE_EQUAL(SplitState::Automatic, realArgs.SplitStyle());
+            VERIFY_ARE_EQUAL(0.5, realArgs.SplitSize());
         }
         {
             auto command = commands.Lookup(L"command5");
@@ -197,8 +204,51 @@ namespace SettingsModelLocalTests
             VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
             VERIFY_ARE_EQUAL(SplitState::Automatic, realArgs.SplitStyle());
+            VERIFY_ARE_EQUAL(0.5, realArgs.SplitSize());
+        }
+        {
+            auto command = commands.Lookup(L"command6");
+            VERIFY_IS_NOT_NULL(command);
+            VERIFY_IS_NOT_NULL(command.Action());
+            VERIFY_ARE_EQUAL(ShortcutAction::SplitPane, command.Action().Action());
+            const auto& realArgs = command.Action().Args().try_as<SplitPaneArgs>();
+            VERIFY_IS_NOT_NULL(realArgs);
+            // Verify the args have the expected value
+            VERIFY_ARE_EQUAL(SplitState::Automatic, realArgs.SplitStyle());
+            VERIFY_ARE_EQUAL(0.25, realArgs.SplitSize());
         }
     }
+
+    void CommandTests::TestSplitPaneBadSize()
+    {
+        const std::string commands0String{ R"([
+            { "name": "command1", "command": { "action": "splitPane", "size": 0.25 } },
+            { "name": "command2", "command": { "action": "splitPane", "size": 1.0 } },
+            { "name": "command3", "command": { "action": "splitPane", "size": 0 } },
+            { "name": "command4", "command": { "action": "splitPane", "size": 50 } },
+        ])" };
+
+        const auto commands0Json = VerifyParseSucceeded(commands0String);
+
+        IMap<winrt::hstring, Command> commands = winrt::single_threaded_map<winrt::hstring, Command>();
+        VERIFY_ARE_EQUAL(0u, commands.Size());
+        auto warnings = implementation::Command::LayerJson(commands, commands0Json);
+        VERIFY_ARE_EQUAL(3u, warnings.size());
+        VERIFY_ARE_EQUAL(1u, commands.Size());
+
+        {
+            auto command = commands.Lookup(L"command1");
+            VERIFY_IS_NOT_NULL(command);
+            VERIFY_IS_NOT_NULL(command.Action());
+            VERIFY_ARE_EQUAL(ShortcutAction::SplitPane, command.Action().Action());
+            const auto& realArgs = command.Action().Args().try_as<SplitPaneArgs>();
+            VERIFY_IS_NOT_NULL(realArgs);
+            // Verify the args have the expected value
+            VERIFY_ARE_EQUAL(SplitState::Automatic, realArgs.SplitStyle());
+            VERIFY_ARE_EQUAL(0.25, realArgs.SplitSize());
+        }
+    }
+
     void CommandTests::TestResourceKeyName()
     {
         // This test checks looking up a name from a resource key.
@@ -227,14 +277,6 @@ namespace SettingsModelLocalTests
 
     void CommandTests::TestAutogeneratedName()
     {
-        // Tests run in Helix can't report Skipped until GH#7286 is resolved.
-        // Set ignore flag to make Helix run completely overlook it.
-        BEGIN_TEST_METHOD_PROPERTIES()
-            TEST_METHOD_PROPERTY(L"Ignore", L"True")
-        END_TEST_METHOD_PROPERTIES()
-
-        // This test to be corrected as a part of GH#7281
-
         // This test ensures that we'll correctly create commands for actions
         // that don't have given names, pursuant to the spec in GH#6532.
 
@@ -321,4 +363,145 @@ namespace SettingsModelLocalTests
             VERIFY_ARE_EQUAL(SplitState::Vertical, realArgs.SplitStyle());
         }
     }
+
+    void CommandTests::TestGenerateCommandline()
+    {
+        const WEX::TestExecution::DisableVerifyExceptions disableExceptionsScope;
+
+        const std::string commands0String{ R"([
+            {
+                "name":"action0",
+                "command": { "action": "newWindow" }
+            },
+            {
+                "name":"action1",
+                "command": { "action": "newTab", "profile": "foo" }
+            },
+            {
+                "name":"action2",
+                "command": { "action": "newWindow", "profile": "foo" }
+            },
+            {
+                "name":"action3",
+                "command": { "action": "newWindow", "commandline": "bar.exe" }
+            },
+            {
+                "name":"action4",
+                "command": { "action": "newWindow", "commandline": "pop.exe ya ha ha" }
+            },
+            {
+                "name":"action5",
+                "command": { "action": "newWindow", "commandline": "pop.exe \"ya ha ha\"" }
+            },
+            {
+                "name":"action6",
+                "command": { "action": "newWindow", "startingDirectory":"C:\\foo", "commandline": "bar.exe" }
+            },
+        ])" };
+
+        const auto commands0Json = VerifyParseSucceeded(commands0String);
+
+        IMap<winrt::hstring, Command> commands = winrt::single_threaded_map<winrt::hstring, Command>();
+        VERIFY_ARE_EQUAL(0u, commands.Size());
+        auto warnings = implementation::Command::LayerJson(commands, commands0Json);
+        VERIFY_ARE_EQUAL(0u, warnings.size());
+        VERIFY_ARE_EQUAL(7u, commands.Size());
+
+        {
+            auto command = commands.Lookup(L"action0");
+            VERIFY_IS_NOT_NULL(command);
+            VERIFY_IS_NOT_NULL(command.Action());
+            VERIFY_ARE_EQUAL(ShortcutAction::NewWindow, command.Action().Action());
+            const auto& realArgs = command.Action().Args().try_as<NewWindowArgs>();
+            VERIFY_IS_NOT_NULL(realArgs);
+            const auto& terminalArgs = realArgs.TerminalArgs();
+            VERIFY_IS_NOT_NULL(terminalArgs);
+            auto cmdline = terminalArgs.ToCommandline();
+            VERIFY_ARE_EQUAL(L"", cmdline);
+        }
+
+        {
+            auto command = commands.Lookup(L"action1");
+            VERIFY_IS_NOT_NULL(command);
+            VERIFY_IS_NOT_NULL(command.Action());
+            VERIFY_ARE_EQUAL(ShortcutAction::NewTab, command.Action().Action());
+            const auto& realArgs = command.Action().Args().try_as<NewTabArgs>();
+            VERIFY_IS_NOT_NULL(realArgs);
+            const auto& terminalArgs = realArgs.TerminalArgs();
+            VERIFY_IS_NOT_NULL(terminalArgs);
+            auto cmdline = terminalArgs.ToCommandline();
+            VERIFY_ARE_EQUAL(L"--profile \"foo\"", cmdline);
+        }
+
+        {
+            auto command = commands.Lookup(L"action2");
+            VERIFY_IS_NOT_NULL(command);
+            VERIFY_IS_NOT_NULL(command.Action());
+            VERIFY_ARE_EQUAL(ShortcutAction::NewWindow, command.Action().Action());
+            const auto& realArgs = command.Action().Args().try_as<NewWindowArgs>();
+            VERIFY_IS_NOT_NULL(realArgs);
+            const auto& terminalArgs = realArgs.TerminalArgs();
+            VERIFY_IS_NOT_NULL(terminalArgs);
+            auto cmdline = terminalArgs.ToCommandline();
+            VERIFY_ARE_EQUAL(L"--profile \"foo\"", cmdline);
+        }
+
+        {
+            auto command = commands.Lookup(L"action3");
+            VERIFY_IS_NOT_NULL(command);
+            VERIFY_IS_NOT_NULL(command.Action());
+            VERIFY_ARE_EQUAL(ShortcutAction::NewWindow, command.Action().Action());
+            const auto& realArgs = command.Action().Args().try_as<NewWindowArgs>();
+            VERIFY_IS_NOT_NULL(realArgs);
+            const auto& terminalArgs = realArgs.TerminalArgs();
+            VERIFY_IS_NOT_NULL(terminalArgs);
+            auto cmdline = terminalArgs.ToCommandline();
+            VERIFY_ARE_EQUAL(L"-- \"bar.exe\"", cmdline);
+        }
+
+        {
+            auto command = commands.Lookup(L"action4");
+            VERIFY_IS_NOT_NULL(command);
+            VERIFY_IS_NOT_NULL(command.Action());
+            VERIFY_ARE_EQUAL(ShortcutAction::NewWindow, command.Action().Action());
+            const auto& realArgs = command.Action().Args().try_as<NewWindowArgs>();
+            VERIFY_IS_NOT_NULL(realArgs);
+            const auto& terminalArgs = realArgs.TerminalArgs();
+            VERIFY_IS_NOT_NULL(terminalArgs);
+            auto cmdline = terminalArgs.ToCommandline();
+            Log::Comment(NoThrowString().Format(
+                L"cmdline: \"%s\"", cmdline.c_str()));
+            VERIFY_ARE_EQUAL(L"-- \"pop.exe ya ha ha\"", terminalArgs.ToCommandline());
+        }
+
+        {
+            auto command = commands.Lookup(L"action5");
+            VERIFY_IS_NOT_NULL(command);
+            VERIFY_IS_NOT_NULL(command.Action());
+            VERIFY_ARE_EQUAL(ShortcutAction::NewWindow, command.Action().Action());
+            const auto& realArgs = command.Action().Args().try_as<NewWindowArgs>();
+            VERIFY_IS_NOT_NULL(realArgs);
+            const auto& terminalArgs = realArgs.TerminalArgs();
+            VERIFY_IS_NOT_NULL(terminalArgs);
+            auto cmdline = terminalArgs.ToCommandline();
+            Log::Comment(NoThrowString().Format(
+                L"cmdline: \"%s\"", cmdline.c_str()));
+            VERIFY_ARE_EQUAL(L"-- \"pop.exe \"ya ha ha\"\"", terminalArgs.ToCommandline());
+        }
+
+        {
+            auto command = commands.Lookup(L"action6");
+            VERIFY_IS_NOT_NULL(command);
+            VERIFY_IS_NOT_NULL(command.Action());
+            VERIFY_ARE_EQUAL(ShortcutAction::NewWindow, command.Action().Action());
+            const auto& realArgs = command.Action().Args().try_as<NewWindowArgs>();
+            VERIFY_IS_NOT_NULL(realArgs);
+            const auto& terminalArgs = realArgs.TerminalArgs();
+            VERIFY_IS_NOT_NULL(terminalArgs);
+            auto cmdline = terminalArgs.ToCommandline();
+            Log::Comment(NoThrowString().Format(
+                L"cmdline: \"%s\"", cmdline.c_str()));
+            VERIFY_ARE_EQUAL(L"--startingDirectory \"C:\\foo\" -- \"bar.exe\"", terminalArgs.ToCommandline());
+        }
+    }
 }

src/cascadia/LocalTests_SettingsModel/SerializationTests.cpp

@@ -84,7 +84,7 @@ namespace SettingsModelLocalTests
                 "initialPosition": ",",
                 "launchMode": "default",
                 "alwaysOnTop": false,
-
+                "inputServiceWarning": true,
                 "copyOnSelect": false,
                 "copyFormatting": "all",
                 "wordDelimiters": " /\\()\"'-.,:;<>~!@#$%^&*|+=[]{}~?\u2502",
@@ -226,6 +226,7 @@ namespace SettingsModelLocalTests
         const std::string settingsString{ R"({
                                                 "$schema": "https://aka.ms/terminal-profiles-schema",
                                                 "defaultProfile": "{61c54bbd-1111-5271-96e7-009a87ff44bf}",
+                                                "disabledProfileSources": [ "Windows.Terminal.Wsl" ],
 
                                                 "profiles": {
                                                     "defaults": {

src/cascadia/LocalTests_SettingsModel/pch.h

@@ -34,6 +34,7 @@ Author(s):
 #include <WexTestClass.h>
 #include <json.h>
 #include "consoletaeftemplates.hpp"
+#include "winrtTaefTemplates.hpp"
 
 #include <winrt/Windows.ApplicationModel.Resources.Core.h>
 #include "winrt/Windows.UI.Xaml.Markup.h"

src/cascadia/LocalTests_TerminalApp/CommandlineTest.cpp

@@ -6,16 +6,24 @@
 
 #include "../types/inc/utils.hpp"
 #include "../TerminalApp/TerminalPage.h"
+#include "../TerminalApp/AppLogic.h"
 #include "../TerminalApp/AppCommandlineArgs.h"
+#include "../inc/WindowingBehavior.h"
 
 using namespace WEX::Logging;
 using namespace WEX::Common;
 using namespace WEX::TestExecution;
 
+using namespace winrt;
 using namespace winrt::Microsoft::Terminal::Settings::Model;
 using namespace winrt::TerminalApp;
 using namespace ::TerminalApp;
 
+namespace winrt
+{
+    namespace appImpl = TerminalApp::implementation;
+}
+
 namespace TerminalAppLocalTests
 {
     // TODO:microsoft/terminal#3838:
@@ -47,6 +55,7 @@ namespace TerminalAppLocalTests
         TEST_METHOD(ParseSplitPaneIntoArgs);
         TEST_METHOD(ParseComboCommandlineIntoArgs);
         TEST_METHOD(ParseFocusTabArgs);
+        TEST_METHOD(ParseMoveFocusArgs);
         TEST_METHOD(ParseArgumentsWithParsingTerminators);
 
         TEST_METHOD(ParseNoCommandIsNewTab);
@@ -61,6 +70,12 @@ namespace TerminalAppLocalTests
         TEST_METHOD(TestLaunchMode);
         TEST_METHOD(TestLaunchModeWithNoCommand);
 
+        TEST_METHOD(TestMultipleSplitPaneSizes);
+
+        TEST_METHOD(TestFindTargetWindow);
+        TEST_METHOD(TestFindTargetWindowHelp);
+        TEST_METHOD(TestFindTargetWindowVersion);
+
     private:
         void _buildCommandlinesHelper(AppCommandlineArgs& appArgs,
                                       const size_t expectedSubcommands,
@@ -76,6 +91,23 @@ namespace TerminalAppLocalTests
             appArgs.ValidateStartupCommands();
         }
 
+        void _buildCommandlinesExpectFailureHelper(AppCommandlineArgs& appArgs,
+                                                   const size_t expectedSubcommands,
+                                                   std::vector<const wchar_t*>& rawCommands)
+        {
+            auto commandlines = AppCommandlineArgs::BuildCommands(rawCommands);
+            VERIFY_ARE_EQUAL(expectedSubcommands, commandlines.size());
+            for (auto& cmdBlob : commandlines)
+            {
+                const auto result = appArgs.ParseCommand(cmdBlob);
+                VERIFY_ARE_NOT_EQUAL(0, result);
+                VERIFY_ARE_NOT_EQUAL("", appArgs._exitMessage);
+                Log::Comment(NoThrowString().Format(
+                    L"Exit Message:\n%hs",
+                    appArgs._exitMessage.c_str()));
+            }
+        }
+
         void _logCommandline(std::vector<const wchar_t*>& rawCommands)
         {
             std::wstring buffer;
@@ -600,7 +632,7 @@ namespace TerminalAppLocalTests
         {
             AppCommandlineArgs appArgs{};
             std::vector<const wchar_t*> rawCommands{ L"wt.exe", subcommand, L"--tabColor", L"#009999" };
-            const auto expectedColor = Microsoft::Console::Utils::ColorFromHexString("#009999");
+            const auto expectedColor = ::Microsoft::Console::Utils::ColorFromHexString("#009999");
 
             _buildCommandlinesHelper(appArgs, 1u, rawCommands);
 
@@ -995,6 +1027,124 @@ namespace TerminalAppLocalTests
         }
     }
 
+    void CommandlineTest::ParseMoveFocusArgs()
+    {
+        BEGIN_TEST_METHOD_PROPERTIES()
+            TEST_METHOD_PROPERTY(L"Data:useShortForm", L"{false, true}")
+        END_TEST_METHOD_PROPERTIES()
+
+        INIT_TEST_PROPERTY(bool, useShortForm, L"If true, use `mf` instead of `move-focus`");
+        const wchar_t* subcommand = useShortForm ? L"mf" : L"move-focus";
+
+        {
+            AppCommandlineArgs appArgs{};
+            std::vector<const wchar_t*> rawCommands{ L"wt.exe", subcommand };
+            Log::Comment(NoThrowString().Format(
+                L"Just the subcommand, without a direction, should fail."));
+
+            _buildCommandlinesExpectFailureHelper(appArgs, 1u, rawCommands);
+        }
+        {
+            AppCommandlineArgs appArgs{};
+            std::vector<const wchar_t*> rawCommands{ L"wt.exe", subcommand, L"left" };
+            _buildCommandlinesHelper(appArgs, 1u, rawCommands);
+
+            VERIFY_ARE_EQUAL(2u, appArgs._startupActions.size());
+
+            // The first action is going to always be a new-tab action
+            VERIFY_ARE_EQUAL(ShortcutAction::NewTab, appArgs._startupActions.at(0).Action());
+
+            auto actionAndArgs = appArgs._startupActions.at(1);
+            VERIFY_ARE_EQUAL(ShortcutAction::MoveFocus, actionAndArgs.Action());
+            VERIFY_IS_NOT_NULL(actionAndArgs.Args());
+            auto myArgs = actionAndArgs.Args().try_as<MoveFocusArgs>();
+            VERIFY_IS_NOT_NULL(myArgs);
+            VERIFY_ARE_EQUAL(FocusDirection::Left, myArgs.FocusDirection());
+        }
+        {
+            AppCommandlineArgs appArgs{};
+            std::vector<const wchar_t*> rawCommands{ L"wt.exe", subcommand, L"right" };
+            _buildCommandlinesHelper(appArgs, 1u, rawCommands);
+
+            VERIFY_ARE_EQUAL(2u, appArgs._startupActions.size());
+
+            // The first action is going to always be a new-tab action
+            VERIFY_ARE_EQUAL(ShortcutAction::NewTab, appArgs._startupActions.at(0).Action());
+
+            auto actionAndArgs = appArgs._startupActions.at(1);
+            VERIFY_ARE_EQUAL(ShortcutAction::MoveFocus, actionAndArgs.Action());
+            VERIFY_IS_NOT_NULL(actionAndArgs.Args());
+            auto myArgs = actionAndArgs.Args().try_as<MoveFocusArgs>();
+            VERIFY_IS_NOT_NULL(myArgs);
+            VERIFY_ARE_EQUAL(FocusDirection::Right, myArgs.FocusDirection());
+        }
+        {
+            AppCommandlineArgs appArgs{};
+            std::vector<const wchar_t*> rawCommands{ L"wt.exe", subcommand, L"up" };
+            _buildCommandlinesHelper(appArgs, 1u, rawCommands);
+
+            VERIFY_ARE_EQUAL(2u, appArgs._startupActions.size());
+
+            // The first action is going to always be a new-tab action
+            VERIFY_ARE_EQUAL(ShortcutAction::NewTab, appArgs._startupActions.at(0).Action());
+
+            auto actionAndArgs = appArgs._startupActions.at(1);
+            VERIFY_ARE_EQUAL(ShortcutAction::MoveFocus, actionAndArgs.Action());
+            VERIFY_IS_NOT_NULL(actionAndArgs.Args());
+            auto myArgs = actionAndArgs.Args().try_as<MoveFocusArgs>();
+            VERIFY_IS_NOT_NULL(myArgs);
+            VERIFY_ARE_EQUAL(FocusDirection::Up, myArgs.FocusDirection());
+        }
+        {
+            AppCommandlineArgs appArgs{};
+            std::vector<const wchar_t*> rawCommands{ L"wt.exe", subcommand, L"down" };
+            _buildCommandlinesHelper(appArgs, 1u, rawCommands);
+
+            VERIFY_ARE_EQUAL(2u, appArgs._startupActions.size());
+
+            // The first action is going to always be a new-tab action
+            VERIFY_ARE_EQUAL(ShortcutAction::NewTab, appArgs._startupActions.at(0).Action());
+
+            auto actionAndArgs = appArgs._startupActions.at(1);
+            VERIFY_ARE_EQUAL(ShortcutAction::MoveFocus, actionAndArgs.Action());
+            VERIFY_IS_NOT_NULL(actionAndArgs.Args());
+            auto myArgs = actionAndArgs.Args().try_as<MoveFocusArgs>();
+            VERIFY_IS_NOT_NULL(myArgs);
+            VERIFY_ARE_EQUAL(FocusDirection::Down, myArgs.FocusDirection());
+        }
+        {
+            AppCommandlineArgs appArgs{};
+            std::vector<const wchar_t*> rawCommands{ L"wt.exe", subcommand, L"badDirection" };
+            Log::Comment(NoThrowString().Format(
+                L"move-focus with an invalid direction should fail."));
+            _buildCommandlinesExpectFailureHelper(appArgs, 1u, rawCommands);
+        }
+        {
+            AppCommandlineArgs appArgs{};
+            std::vector<const wchar_t*> rawCommands{ L"wt.exe", subcommand, L"left", L";", subcommand, L"right" };
+            _buildCommandlinesHelper(appArgs, 2u, rawCommands);
+
+            VERIFY_ARE_EQUAL(3u, appArgs._startupActions.size());
+
+            // The first action is going to always be a new-tab action
+            VERIFY_ARE_EQUAL(ShortcutAction::NewTab, appArgs._startupActions.at(0).Action());
+
+            auto actionAndArgs = appArgs._startupActions.at(1);
+            VERIFY_ARE_EQUAL(ShortcutAction::MoveFocus, actionAndArgs.Action());
+            VERIFY_IS_NOT_NULL(actionAndArgs.Args());
+            auto myArgs = actionAndArgs.Args().try_as<MoveFocusArgs>();
+            VERIFY_IS_NOT_NULL(myArgs);
+            VERIFY_ARE_EQUAL(FocusDirection::Left, myArgs.FocusDirection());
+
+            actionAndArgs = appArgs._startupActions.at(2);
+            VERIFY_ARE_EQUAL(ShortcutAction::MoveFocus, actionAndArgs.Action());
+            VERIFY_IS_NOT_NULL(actionAndArgs.Args());
+            myArgs = actionAndArgs.Args().try_as<MoveFocusArgs>();
+            VERIFY_IS_NOT_NULL(myArgs);
+            VERIFY_ARE_EQUAL(FocusDirection::Right, myArgs.FocusDirection());
+        }
+    }
+
     void CommandlineTest::ValidateFirstCommandIsNewTab()
     {
         AppCommandlineArgs appArgs{};
@@ -1124,7 +1274,7 @@ namespace TerminalAppLocalTests
     void CommandlineTest::TestSimpleExecuteCommandlineAction()
     {
         ExecuteCommandlineArgs args{ L"new-tab" };
-        auto actions = implementation::TerminalPage::ConvertExecuteCommandlineToActions(args);
+        auto actions = winrt::TerminalApp::implementation::TerminalPage::ConvertExecuteCommandlineToActions(args);
         VERIFY_ARE_EQUAL(1u, actions.size());
         auto actionAndArgs = actions.at(0);
         VERIFY_ARE_EQUAL(ShortcutAction::NewTab, actionAndArgs.Action());
@@ -1143,7 +1293,7 @@ namespace TerminalAppLocalTests
     void CommandlineTest::TestMultipleCommandExecuteCommandlineAction()
     {
         ExecuteCommandlineArgs args{ L"new-tab ; split-pane" };
-        auto actions = implementation::TerminalPage::ConvertExecuteCommandlineToActions(args);
+        auto actions = winrt::TerminalApp::implementation::TerminalPage::ConvertExecuteCommandlineToActions(args);
         VERIFY_ARE_EQUAL(2u, actions.size());
         {
             auto actionAndArgs = actions.at(0);
@@ -1179,7 +1329,7 @@ namespace TerminalAppLocalTests
     {
         // -H and -V cannot be combined.
         ExecuteCommandlineArgs args{ L"split-pane -H -V" };
-        auto actions = implementation::TerminalPage::ConvertExecuteCommandlineToActions(args);
+        auto actions = winrt::TerminalApp::implementation::TerminalPage::ConvertExecuteCommandlineToActions(args);
         VERIFY_ARE_EQUAL(0u, actions.size());
     }
 
@@ -1325,4 +1475,221 @@ namespace TerminalAppLocalTests
             VERIFY_ARE_EQUAL(L"powershell.exe", myArgs.TerminalArgs().Commandline());
         }
     }
+
+    void CommandlineTest::TestMultipleSplitPaneSizes()
+    {
+        BEGIN_TEST_METHOD_PROPERTIES()
+            TEST_METHOD_PROPERTY(L"Data:useShortForm", L"{false, true}")
+        END_TEST_METHOD_PROPERTIES()
+
+        INIT_TEST_PROPERTY(bool, useShortForm, L"If true, use `sp` instead of `split-pane`");
+        const wchar_t* subcommand = useShortForm ? L"sp" : L"split-pane";
+
+        {
+            AppCommandlineArgs appArgs{};
+            std::vector<const wchar_t*> rawCommands{ L"wt.exe", subcommand };
+            _buildCommandlinesHelper(appArgs, 1u, rawCommands);
+
+            VERIFY_ARE_EQUAL(2u, appArgs._startupActions.size());
+
+            // The first action is going to always be a new-tab action
+            VERIFY_ARE_EQUAL(ShortcutAction::NewTab, appArgs._startupActions.at(0).Action());
+
+            // The one we actually want to test here is the SplitPane action we created
+            auto actionAndArgs = appArgs._startupActions.at(1);
+            VERIFY_ARE_EQUAL(ShortcutAction::SplitPane, actionAndArgs.Action());
+            VERIFY_IS_NOT_NULL(actionAndArgs.Args());
+            auto myArgs = actionAndArgs.Args().try_as<SplitPaneArgs>();
+            VERIFY_IS_NOT_NULL(myArgs);
+            VERIFY_ARE_EQUAL(SplitState::Automatic, myArgs.SplitStyle());
+            VERIFY_ARE_EQUAL(0.5f, myArgs.SplitSize());
+            VERIFY_IS_NOT_NULL(myArgs.TerminalArgs());
+        }
+        {
+            AppCommandlineArgs appArgs{};
+            std::vector<const wchar_t*> rawCommands{ L"wt.exe", subcommand, L"-s", L".3" };
+            _buildCommandlinesHelper(appArgs, 1u, rawCommands);
+
+            VERIFY_ARE_EQUAL(2u, appArgs._startupActions.size());
+
+            // The first action is going to always be a new-tab action
+            VERIFY_ARE_EQUAL(ShortcutAction::NewTab, appArgs._startupActions.at(0).Action());
+
+            // The one we actually want to test here is the SplitPane action we created
+            auto actionAndArgs = appArgs._startupActions.at(1);
+            VERIFY_ARE_EQUAL(ShortcutAction::SplitPane, actionAndArgs.Action());
+            VERIFY_IS_NOT_NULL(actionAndArgs.Args());
+            auto myArgs = actionAndArgs.Args().try_as<SplitPaneArgs>();
+            VERIFY_IS_NOT_NULL(myArgs);
+            VERIFY_ARE_EQUAL(SplitState::Automatic, myArgs.SplitStyle());
+            VERIFY_ARE_EQUAL(0.3f, myArgs.SplitSize());
+            VERIFY_IS_NOT_NULL(myArgs.TerminalArgs());
+        }
+        {
+            AppCommandlineArgs appArgs{};
+            std::vector<const wchar_t*> rawCommands{ L"wt.exe", subcommand, L"-s", L".3", L";", subcommand };
+            _buildCommandlinesHelper(appArgs, 2u, rawCommands);
+
+            VERIFY_ARE_EQUAL(3u, appArgs._startupActions.size());
+
+            // The first action is going to always be a new-tab action
+            VERIFY_ARE_EQUAL(ShortcutAction::NewTab, appArgs._startupActions.at(0).Action());
+
+            {
+                // The one we actually want to test here is the SplitPane action we created
+                auto actionAndArgs = appArgs._startupActions.at(1);
+                VERIFY_ARE_EQUAL(ShortcutAction::SplitPane, actionAndArgs.Action());
+                VERIFY_IS_NOT_NULL(actionAndArgs.Args());
+                auto myArgs = actionAndArgs.Args().try_as<SplitPaneArgs>();
+                VERIFY_IS_NOT_NULL(myArgs);
+                VERIFY_ARE_EQUAL(SplitState::Automatic, myArgs.SplitStyle());
+                VERIFY_ARE_EQUAL(0.3f, myArgs.SplitSize());
+                VERIFY_IS_NOT_NULL(myArgs.TerminalArgs());
+            }
+            {
+                auto actionAndArgs = appArgs._startupActions.at(2);
+                VERIFY_ARE_EQUAL(ShortcutAction::SplitPane, actionAndArgs.Action());
+                VERIFY_IS_NOT_NULL(actionAndArgs.Args());
+                auto myArgs = actionAndArgs.Args().try_as<SplitPaneArgs>();
+                VERIFY_IS_NOT_NULL(myArgs);
+                VERIFY_ARE_EQUAL(SplitState::Automatic, myArgs.SplitStyle());
+                VERIFY_ARE_EQUAL(0.5f, myArgs.SplitSize());
+                VERIFY_IS_NOT_NULL(myArgs.TerminalArgs());
+            }
+        }
+        {
+            AppCommandlineArgs appArgs{};
+            std::vector<const wchar_t*> rawCommands{ L"wt.exe", subcommand, L"-s", L".3", L";", subcommand, L"-s", L".7" };
+            _buildCommandlinesHelper(appArgs, 2u, rawCommands);
+
+            VERIFY_ARE_EQUAL(3u, appArgs._startupActions.size());
+
+            // The first action is going to always be a new-tab action
+            VERIFY_ARE_EQUAL(ShortcutAction::NewTab, appArgs._startupActions.at(0).Action());
+
+            {
+                // The one we actually want to test here is the SplitPane action we created
+                auto actionAndArgs = appArgs._startupActions.at(1);
+                VERIFY_ARE_EQUAL(ShortcutAction::SplitPane, actionAndArgs.Action());
+                VERIFY_IS_NOT_NULL(actionAndArgs.Args());
+                auto myArgs = actionAndArgs.Args().try_as<SplitPaneArgs>();
+                VERIFY_IS_NOT_NULL(myArgs);
+                VERIFY_ARE_EQUAL(SplitState::Automatic, myArgs.SplitStyle());
+                VERIFY_ARE_EQUAL(0.3f, myArgs.SplitSize());
+                VERIFY_IS_NOT_NULL(myArgs.TerminalArgs());
+            }
+            {
+                auto actionAndArgs = appArgs._startupActions.at(2);
+                VERIFY_ARE_EQUAL(ShortcutAction::SplitPane, actionAndArgs.Action());
+                VERIFY_IS_NOT_NULL(actionAndArgs.Args());
+                auto myArgs = actionAndArgs.Args().try_as<SplitPaneArgs>();
+                VERIFY_IS_NOT_NULL(myArgs);
+                VERIFY_ARE_EQUAL(SplitState::Automatic, myArgs.SplitStyle());
+                VERIFY_ARE_EQUAL(0.7f, myArgs.SplitSize());
+                VERIFY_IS_NOT_NULL(myArgs.TerminalArgs());
+            }
+        }
+    }
+
+    void CommandlineTest::TestFindTargetWindow()
+    {
+        {
+            std::vector<winrt::hstring> args{ L"wt.exe" };
+            VERIFY_ARE_EQUAL(WindowingBehaviorUseNew,
+                             appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseNew));
+
+            VERIFY_ARE_EQUAL(WindowingBehaviorUseExisting,
+                             appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseExisting));
+
+            VERIFY_ARE_EQUAL(WindowingBehaviorUseAnyExisting,
+                             appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseAnyExisting));
+        }
+        {
+            std::vector<winrt::hstring> args{ L"wt.exe", L"-w", L"-1" };
+            VERIFY_ARE_EQUAL(WindowingBehaviorUseNew,
+                             appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseNew));
+
+            VERIFY_ARE_EQUAL(WindowingBehaviorUseNew,
+                             appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseExisting));
+
+            VERIFY_ARE_EQUAL(WindowingBehaviorUseNew,
+                             appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseAnyExisting));
+        }
+        {
+            std::vector<winrt::hstring> args{ L"wt.exe", L"-w", L"-12345" };
+            VERIFY_ARE_EQUAL(WindowingBehaviorUseNew,
+                             appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseNew));
+
+            VERIFY_ARE_EQUAL(WindowingBehaviorUseNew,
+                             appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseExisting));
+
+            VERIFY_ARE_EQUAL(WindowingBehaviorUseNew,
+                             appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseAnyExisting));
+        }
+        {
+            std::vector<winrt::hstring> args{ L"wt.exe", L"-w", L"0" };
+            VERIFY_ARE_EQUAL(WindowingBehaviorUseCurrent,
+                             appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseNew));
+
+            VERIFY_ARE_EQUAL(WindowingBehaviorUseCurrent,
+                             appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseExisting));
+
+            VERIFY_ARE_EQUAL(WindowingBehaviorUseCurrent,
+                             appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseAnyExisting));
+        }
+        {
+            std::vector<winrt::hstring> args{ L"wt.exe", L"new-tab" };
+            VERIFY_ARE_EQUAL(WindowingBehaviorUseNew,
+                             appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseNew));
+
+            VERIFY_ARE_EQUAL(WindowingBehaviorUseExisting,
+                             appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseExisting));
+
+            VERIFY_ARE_EQUAL(WindowingBehaviorUseAnyExisting,
+                             appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseAnyExisting));
+        }
+    }
+
+    void CommandlineTest::TestFindTargetWindowHelp()
+    {
+        Log::Comment(L"--help should always create a new window");
+
+        // This is a little helper to make sure that these args _always_ return
+        // UseNew, regardless of the windowing behavior.
+        auto testHelper = [](auto&& args) {
+            VERIFY_ARE_EQUAL(WindowingBehaviorUseNew,
+                             appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseNew));
+
+            VERIFY_ARE_EQUAL(WindowingBehaviorUseNew,
+                             appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseExisting));
+
+            VERIFY_ARE_EQUAL(WindowingBehaviorUseNew,
+                             appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseAnyExisting));
+        };
+
+        testHelper(std::vector<winrt::hstring>{ L"wt.exe", L"--help" });
+        testHelper(std::vector<winrt::hstring>{ L"wt.exe", L"new-tab", L"--help" });
+        testHelper(std::vector<winrt::hstring>{ L"wt.exe", L"-w", L"0", L"new-tab", L"--help" });
+        testHelper(std::vector<winrt::hstring>{ L"wt.exe", L"new-tab", L";", L"--help" });
+    }
+
+    void CommandlineTest::TestFindTargetWindowVersion()
+    {
+        Log::Comment(L"--version should always create a new window");
+
+        // This is a little helper to make sure that these args _always_ return
+        // UseNew, regardless of the windowing behavior.
+        auto testHelper = [](auto&& args) {
+            VERIFY_ARE_EQUAL(WindowingBehaviorUseNew,
+                             appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseNew));
+
+            VERIFY_ARE_EQUAL(WindowingBehaviorUseNew,
+                             appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseExisting));
+
+            VERIFY_ARE_EQUAL(WindowingBehaviorUseNew,
+                             appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseAnyExisting));
+        };
+
+        testHelper(std::vector<winrt::hstring>{ L"wt.exe", L"--version" });
+    }
 }