Migrate spelling-0.0.21 changes from main

There are two code paths for Ctrl+Tab and for everything else:

Ctrl + Tab is working perfectly
* On the first tab navigation TerminalPage::_SelectNextTab resets the
  tab commands, and since palette is not visible selects the relevant
  tab index
* On the second navigation Ctrl+Tab is intercepted by
  CommandPalette::_previewKeyDownHandler and everything works fine

But with custom binding things are screwed:
* On the first tab navigation TerminalPage::_SelectNextTab resets the
  tab commands, and since palette is not visible selects the relevant
  tab index
* On the second navigation keys are not intercepted and thus
  TerminalPage::_SelectNextTab is called again. It resets the commands,
  but now since the palette is visible we simply invoke
  CommandPalette::SelectNextItem. Which in turn misbehaves because no
  item is selected.

The approach for the solution is not to reset anything if the command
palette is already open.

* Manual testing of both custom and non-custom bindings with different
  amount of tabs.

Closes #8247

(cherry picked from commit 0437fe9d8e)

.clang-format

@@ -1,17 +1,19 @@
 
 AccessModifierOffset: -4
 AlignAfterOpenBracket: Align
-#AllowAllArgumentsOnNextLine: false
+AllowAllArgumentsOnNextLine: true
+AlignConsecutiveMacros: false
 AlignConsecutiveAssignments: false
 AlignConsecutiveDeclarations: false
-#AllowAllConstructorInitializersOnNextLine: false
+AllowAllConstructorInitializersOnNextLine: true
 AlignEscapedNewlines: Left
 AlignOperands: true
 AlignTrailingComments: false
 AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortBlocksOnASingleLine: Never
 AllowShortFunctionsOnASingleLine: Inline
 AllowShortCaseLabelsOnASingleLine: false
-AllowShortIfStatementsOnASingleLine: false
+AllowShortIfStatementsOnASingleLine: Never
 #AllowShortLambdasOnASingleLine: Inline
 AllowShortLoopsOnASingleLine: false
 AlwaysBreakAfterReturnType: None
@@ -20,6 +22,7 @@ AlwaysBreakTemplateDeclarations: Yes
 BinPackArguments: false
 BinPackParameters: false
 BraceWrapping:
+  AfterCaseLabel: true
   AfterClass: true
   AfterControlStatement: true
   AfterEnum: true
@@ -47,6 +50,7 @@ ConstructorInitializerAllOnOneLineOrOnePerLine: true
 ConstructorInitializerIndentWidth: 4
 ContinuationIndentWidth: 4
 Cpp11BracedListStyle: false
+DeriveLineEnding: true
 DerivePointerAlignment: false
 FixNamespaceComments: false
 IncludeBlocks: Regroup
@@ -73,7 +77,7 @@ ReflowComments: false
 SortIncludes: false
 SortUsingDeclarations: true
 SpaceAfterCStyleCast: false
-#SpaceAfterLogicalNot: false
+SpaceAfterLogicalNot: false
 SpaceAfterTemplateKeyword: false
 SpaceBeforeAssignmentOperators: true
 SpaceBeforeCpp11BracedList: false
@@ -88,6 +92,6 @@ SpacesInCStyleCastParentheses: false
 SpacesInContainerLiterals: false
 SpacesInParentheses: false
 SpacesInSquareBrackets: false
-Standard: Cpp11
+Standard: Latest
 TabWidth: 4
 UseTab: Never

.github/actions/spell-check/advice.txt

@@ -1,25 +0,0 @@
-<details>
-<summary>
-:pencil2: Contributor please read this
-</summary>
-
-By default the command suggestion will generate a file named based on your commit. That's generally ok as long as you add the file to your commit. Someone can reorganize it later.
-
-:warning: The command is written for posix shells. You can copy the contents of each `perl` command excluding the outer `'` marks and dropping any `'"`/`"'` quotation mark pairs into a file and then run `perl file.pl` from the root of the repository to run the code. Alternatively, you can manually insert the items...
-
-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/`.
-
-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:
-
-</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/spell-check/dictionary/apis.txt

@@ -1,54 +0,0 @@
-ACCEPTFILES
-ACCESSDENIED
-alignof
-bitfield
-bitfields
-CLASSNOTAVAILABLE
-environstrings
-EXPCMDFLAGS
-EXPCMDSTATE
-fullkbd
-futex
-Hashtable
-href
-IAsync
-IBind
-IBox
-IClass
-IComparable
-ICustom
-IDialog
-IDirect
-IExplorer
-IMap
-IObject
-IStorage
-llabs
-LCID
-lround
-LSHIFT
-NCHITTEST
-NCLBUTTONDBLCLK
-NCRBUTTONDBLCLK
-NOAGGREGATION
-NOREDIRECTIONBITMAP
-oaidl
-ocidl
-otms
-OUTLINETEXTMETRICW
-PAGESCROLL
-RETURNCMD
-rfind
-roundf
-RSHIFT
-rx
-serializer
-SIZENS
-spsc
-STDCPP
-syscall
-tmp
-tx
-userenv
-XDocument
-XElement

.github/actions/spell-check/dictionary/math.txt

@@ -1,3 +0,0 @@
-powf
-sqrtf
-isnan

.github/actions/spell-check/dictionary/microsoft.txt

@@ -1,37 +0,0 @@
-ACLs
-altform
-appendwttlogging
-backplating
-DACL
-DACLs
-dotnetfeed
-DWINRT
-enablewttlogging
-LKG
-mfcribbon
-microsoft
-microsoftonline
-netcore
-osgvsowi
-pgc
-pgo
-pgosweep
-powerrename
-powershell
-pscustomobject
-robocopy
-SACLs
-Shobjidl
-Skype
-sysnative
-systemroot
-taskkill
-tasklist
-tdbuildteamid
-vcruntime
-visualstudio
-wlk
-wslpath
-wtl
-wtt
-wttlog

.github/actions/spell-check/excludes.txt

@@ -1,63 +0,0 @@
-(?:^|/)dirs$
-(?:^|/)go\.mod$
-(?:^|/)go\.sum$
-(?:^|/)package-lock\.json$
-(?:^|/)sources(?:|\.dep)$
-SUMS$
-\.ai$
-\.bmp$
-\.cer$
-\.class$
-\.crl$
-\.crt$
-\.csr$
-\.dll$
-\.DS_Store$
-\.eot$
-\.eps$
-\.exe$
-\.gif$
-\.graffle$
-\.gz$
-\.icns$
-\.ico$
-\.jar$
-\.jpeg$
-\.jpg$
-\.key$
-\.lib$
-\.lock$
-\.map$
-\.min\..
-\.mp3$
-\.mp4$
-\.otf$
-\.pbxproj$
-\.pdf$
-\.pem$
-\.png$
-\.psd$
-\.runsettings$
-\.sig$
-\.so$
-\.svg$
-\.svgz$
-\.tar$
-\.tgz$
-\.ttf$
-\.woff
-\.xcf$
-\.xls
-\.xpm$
-\.yml$
-\.zip$
-^consolegit2gitfilters\.json$
-^dep/
-^oss/
-^doc/reference/UTF8-torture-test\.txt$
-^src/interactivity/onecore/BgfxEngine\.
-^src/renderer/wddmcon/WddmConRenderer\.
-^src/terminal/parser/ft_fuzzer/VTCommandFuzzer\.cpp$
-^src/tools/U8U16Test/(?:fr|ru|zh)\.txt$
-^\.github/actions/spell-check/
-^\.gitignore$

.github/actions/spell-check/expect/web.txt

@@ -1,15 +0,0 @@
-http
-td
-www
-ecma
-rapidtables
-WCAG
-freedesktop
-ycombinator
-robertelder
-kovidgoyal
-leonerd
-fixterms
-uk
-winui
-appshellintegration

.github/actions/spell-check/patterns/patterns.txt

@@ -1,22 +0,0 @@
-https://(?:(?:[-a-zA-Z0-9?&=]*\.|)microsoft\.com)/[-a-zA-Z0-9?&=_#\/.]*
-https://aka\.ms/[-a-zA-Z0-9?&=\/_]*
-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?&=_\/.]*
-[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
-microsoft/cascadia-code\@[0-9a-fA-F]{40}
-\d+x\d+Logo
-Scro\&ll
-# selectionInput.cpp
- :\\windows\\syste\b
-TestUtils::VerifyExpectedString\(tb, L"[^"]+"
-(?:hostSm|mach)\.ProcessString\(L"[^"]+"
-\b([A-Za-z])\1{3,}\b
-Base64::s_(?:En|De)code\(L"[^"]+"
-VERIFY_ARE_EQUAL\(L"[^"]+"
-L"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789\+/"
-std::memory_order_[\w]+

.github/actions/spelling/README.md

@@ -0,0 +1,15 @@
+# check-spelling/check-spelling configuration
+
+File | Purpose | Format | Info
+-|-|-|-
+[allow/*.txt](allow/) | Add words to the dictionary | one word per line (only letters and `'`s allowed) | [allow](https://github.com/check-spelling/check-spelling/wiki/Configuration#allow)
+[reject.txt](reject.txt) | Remove words from the dictionary (after allow) | grep pattern matching whole dictionary words | [reject](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-reject)
+[excludes.txt](excludes.txt) | Files to ignore entirely | perl regular expression | [excludes](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-excludes)
+[patterns/*.txt](patterns/) | Patterns to ignore from checked lines | perl regular expression (order matters, first match wins) | [patterns](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-patterns)
+[candidate.patterns](candidate.patterns) | Patterns that might be worth adding to [patterns.txt](patterns.txt) | perl regular expression with optional comment block introductions (all matches will be suggested) | [candidates](https://github.com/check-spelling/check-spelling/wiki/Feature:-Suggest-patterns)
+[line_forbidden.patterns](line_forbidden.patterns) | Patterns to flag in checked lines | perl regular expression (order matters, first match wins) | [patterns](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-patterns)
+[expect/*.txt](expect.txt) | Expected words that aren't in the dictionary | one word per line (sorted, alphabetically) | [expect](https://github.com/check-spelling/check-spelling/wiki/Configuration#expect)
+[advice.md](advice.md) | Supplement for GitHub comment when unrecognized words are found | GitHub Markdown | [advice](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-advice)
+
+Note: you can replace any of these files with a directory by the same name (minus the suffix)
+and then include multiple files inside that directory (with that suffix) to merge multiple files together.

.github/actions/spelling/advice.md

@@ -0,0 +1,48 @@
+<!-- See https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-advice --> <!-- markdownlint-disable MD033 MD041 -->
+<details>
+<summary>
+:pencil2: Contributor please read this
+</summary>
+
+By default the command suggestion will generate a file named based on your commit. That's generally ok as long as you add the file to your commit. Someone can reorganize it later.
+
+:warning: The command is written for posix shells. If it doesn't work for you, you can manually _add_ (one word per line) / _remove_ items to `expect.txt` and the `excludes.txt` files.
+
+If the listed items are:
+
+* ... **misspelled**, then please *correct* them instead of using the command.
+* ... *names*, please add them to `.github/actions/spelling/allow/names.txt`.
+* ... APIs, you can add them to a file in `.github/actions/spelling/allow/`.
+* ... 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:
+
+
+<details><summary>If the flagged items are :exploding_head: false positives</summary>
+
+If items relate to a ...
+* binary file (or some other file you wouldn't want to check at all).
+
+  Please add a file path to the `excludes.txt` file matching the containing file.
+
+  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](
+../tree/HEAD/README.md) (on whichever branch you're using).
+
+* well-formed pattern.
+
+  If you can write a [pattern](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples:-patterns) that would match it,
+  try adding it to the `patterns.txt` file.
+
+  Patterns are Perl 5 Regular Expressions - you can [test](
+https://www.regexplanet.com/advanced/perl/) yours before committing to verify it will match your lines.
+
+  Note that patterns can't match multiline strings.
+</details>
+
+</details>

.github/actions/spelling/allow/README.md

@@ -1,6 +1,6 @@
-# Dictionaries are lists of words to accept unconditionally
+# Allow files 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.
 
@@ -8,13 +8,14 @@ E.g., you could include a list of system APIs here, or potential
 contributors (so that if a future commit includes their name,
 it'll be accepted).
 
-### Files
+## Files
 
 | File | Description |
 | ---- | ----------- |
-| [Dictionary](dictionary.txt) | Primary US English dictionary |
+| [Allow](allow.txt) | Supplements to the dictionary |
 | [Chinese](chinese.txt) | Chinese words |
 | [Japanese](japanese.txt) | Japanese words |
 | [Microsoft](microsoft.txt) | Microsoft brand items |
 | [Fonts](fonts.txt) | Font names |
 | [Names](names.txt) | Names of people |
+| [Colors](colors.txt) | Names of color |

.github/actions/spelling/allow/allow.txt

@@ -0,0 +1,108 @@
+admins
+allcolors
+Apc
+apc
+breadcrumb
+breadcrumbs
+bsd
+calt
+ccmp
+changelog
+clickable
+clig
+CMMI
+copyable
+cybersecurity
+dalet
+Dcs
+dcs
+dialytika
+dje
+downside
+downsides
+dze
+dzhe
+EDDB
+EDDC
+Enum'd
+Fitt
+formattings
+FTCS
+ftp
+fvar
+gantt
+gcc
+geeksforgeeks
+ghe
+github
+gje
+godbolt
+hostname
+hostnames
+https
+hyperlink
+hyperlinking
+hyperlinks
+iconify
+img
+inlined
+It'd
+kje
+libfuzzer
+libuv
+liga
+lje
+Llast
+llvm
+Lmid
+locl
+lol
+lorem
+Lorigin
+maxed
+minimalistic
+mkmk
+mnt
+mru
+nje
+noreply
+ogonek
+ok'd
+overlined
+pipeline
+postmodern
+ptys
+qof
+qps
+rclt
+reimplementation
+reserialization
+reserialize
+reserializes
+rlig
+runtimes
+shcha
+slnt
+Sos
+ssh
+timeline
+timelines
+timestamped
+TLDR
+tokenizes
+tonos
+toolset
+tshe
+ubuntu
+uiatextrange
+UIs
+und
+unregister
+versioned
+vsdevcmd
+We'd
+wildcards
+XBox
+YBox
+yeru
+zhe

.github/actions/spelling/allow/apis.txt

@@ -0,0 +1,248 @@
+ACCEPTFILES
+ACCESSDENIED
+acl
+aclapi
+alignas
+alignof
+APPLYTOSUBMENUS
+appxrecipe
+bitfield
+bitfields
+BUILDBRANCH
+BUILDMSG
+BUILDNUMBER
+BYCOMMAND
+BYPOSITION
+charconv
+CLASSNOTAVAILABLE
+CLOSEAPP
+cmdletbinding
+COLORPROPERTY
+colspan
+COMDLG
+commandlinetoargv
+comparand
+cstdint
+CXICON
+CYICON
+Dacl
+dataobject
+dcomp
+DERR
+dlldata
+DNE
+DONTADDTORECENT
+DWMSBT
+DWMWA
+DWMWA
+DWORDLONG
+endfor
+ENDSESSION
+enumset
+environstrings
+EXPCMDFLAGS
+EXPCMDSTATE
+filetime
+FILTERSPEC
+FORCEFILESYSTEM
+FORCEMINIMIZE
+frac
+fullkbd
+futex
+GETDESKWALLPAPER
+GETHIGHCONTRAST
+GETMOUSEHOVERTIME
+Hashtable
+HIGHCONTRASTON
+HIGHCONTRASTW
+hotkeys
+href
+hrgn
+HTCLOSE
+hwinsta
+HWINSTA
+IActivation
+IApp
+IAppearance
+IAsync
+IBind
+IBox
+IClass
+IComparable
+IComparer
+IConnection
+ICustom
+IDialog
+IDirect
+IExplorer
+IFACEMETHOD
+IFile
+IGraphics
+IInheritable
+IMap
+IMonarch
+IObject
+iosfwd
+IPackage
+IPeasant
+ISetup
+isspace
+IStorage
+istream
+IStringable
+ITab
+ITaskbar
+itow
+IUri
+IVirtual
+KEYSELECT
+LCID
+llabs
+llu
+localtime
+lround
+Lsa
+lsass
+LSHIFT
+LTGRAY
+MAINWINDOW
+memchr
+memicmp
+MENUCOMMAND
+MENUDATA
+MENUINFO
+MENUITEMINFOW
+mmeapi
+MOUSELEAVE
+mov
+mptt
+msappx
+MULTIPLEUSE
+NCHITTEST
+NCLBUTTONDBLCLK
+NCMOUSELEAVE
+NCMOUSEMOVE
+NCRBUTTONDBLCLK
+NIF
+NIN
+NOAGGREGATION
+NOASYNC
+NOCHANGEDIR
+NOPROGRESS
+NOREDIRECTIONBITMAP
+NOREPEAT
+NOTIFYBYPOS
+NOTIFYICON
+NOTIFYICONDATA
+ntprivapi
+oaidl
+ocidl
+ODR
+offsetof
+ofstream
+onefuzz
+osver
+OSVERSIONINFOEXW
+otms
+OUTLINETEXTMETRICW
+overridable
+PACL
+PAGESCROLL
+PATINVERT
+PEXPLICIT
+PICKFOLDERS
+pmr
+ptstr
+QUERYENDSESSION
+rcx
+REGCLS
+RETURNCMD
+rfind
+ROOTOWNER
+roundf
+RSHIFT
+SACL
+schandle
+semver
+serializer
+SETVERSION
+SHELLEXECUTEINFOW
+shobjidl
+SHOWHIDE
+SHOWMINIMIZED
+SHOWTIP
+SINGLEUSE
+SIZENS
+smoothstep
+snprintf
+spsc
+sregex
+SRWLOC
+SRWLOCK
+STDCPP
+STDMETHOD
+strchr
+strcpy
+streambuf
+strtoul
+Stubless
+Subheader
+Subpage
+syscall
+SYSTEMBACKDROP
+TABROW
+TASKBARCREATED
+TBPF
+THEMECHANGED
+tlg
+TME
+tmp
+tmpdir
+tolower
+toupper
+TRACKMOUSEEVENT
+TTask
+TVal
+UChar
+UFIELD
+ULARGE
+UOI
+UPDATEINIFILE
+userenv
+USEROBJECTFLAGS
+Viewbox
+virtualalloc
+wcsstr
+wcstoui
+winmain
+winsta
+winstamin
+wmemcmp
+wpc
+WSF
+wsregex
+wwinmain
+xchg
+XDocument
+XElement
+xfacet
+xhash
+XIcon
+xiosbase
+xlocale
+xlocbuf
+xlocinfo
+xlocmes
+xlocmon
+xlocnum
+xloctime
+XMax
+xmemory
+XParse
+xpath
+xstddef
+xstring
+xtree
+xutility
+YIcon
+YMax

.github/actions/spelling/allow/colors.txt

@@ -0,0 +1,117 @@
+alice
+aliceblue
+antiquewhite
+blanchedalmond
+blueviolet
+burlywood
+cadetblue
+cornflowerblue
+cornsilk
+cyan
+darkblue
+darkcyan
+darkgoldenrod
+darkgray
+darkgreen
+darkgrey
+darkkhaki
+darkmagenta
+darkolivegreen
+darkorange
+darkorchid
+darkred
+darksalmon
+darkseagreen
+darkslateblue
+darkslategray
+darkslategrey
+darkturquoise
+darkviolet
+deeppink
+deepskyblue
+dimgray
+dimgrey
+dodgerblue
+firebrick
+floralwhite
+forestgreen
+gainsboro
+ghostwhite
+greenyellow
+hotpink
+indian
+indianred
+lavenderblush
+lawngreen
+lemonchiffon
+lightblue
+lightcoral
+lightcyan
+lightgoldenrod
+lightgoldenrodyellow
+lightgray
+lightgreen
+lightgrey
+lightpink
+lightsalmon
+lightseagreen
+lightskyblue
+lightslateblue
+lightslategray
+lightslategrey
+lightsteelblue
+lightyellow
+limegreen
+mediumaquamarine
+mediumblue
+mediumorchid
+mediumpurple
+mediumseagreen
+mediumslateblue
+mediumspringgreen
+mediumturquoise
+mediumvioletred
+midnightblue
+mintcream
+mistyrose
+navajo
+navajowhite
+navyblue
+oldlace
+olivedrab
+orangered
+palegoldenrod
+palegreen
+paleturquoise
+palevioletred
+papayawhip
+peachpuff
+peru
+powderblue
+rebecca
+rebeccapurple
+rosybrown
+royalblue
+saddlebrown
+sandybrown
+seagreen
+sienna
+skyblue
+slateblue
+slategray
+slategrey
+springgreen
+steelblue
+violetred
+webgray
+webgreen
+webgrey
+webmaroon
+webpurple
+whitesmoke
+xaroon
+xray
+xreen
+xrey
+xurple
+yellowgreen

.github/actions/spelling/allow/fonts.txt

@@ -1,8 +1,10 @@
 Consolas
 emoji
+emojis
 Extralight
 Gabriola
 Iosevka
 MDL
 Monofur
 Segoe
+wght

.github/actions/spelling/allow/math.txt

@@ -0,0 +1,11 @@
+atan
+CPrime
+HBar
+HPrime
+isnan
+LPrime
+LStep
+powf
+RSub
+sqrtf
+ULP

.github/actions/spelling/allow/microsoft.txt

@@ -0,0 +1,85 @@
+ACLs
+ADMINS
+advapi
+altform
+altforms
+appendwttlogging
+appx
+appxbundle
+appxerror
+appxmanifest
+ATL
+backplating
+bitmaps
+BOMs
+CPLs
+cpptools
+cppvsdbg
+CPRs
+cryptbase
+DACL
+DACLs
+defaultlib
+diffs
+disposables
+dotnetfeed
+DTDs
+DWINRT
+enablewttlogging
+Intelli
+IVisual
+libucrt
+libucrtd
+LKG
+LOCKFILE
+Lxss
+mfcribbon
+microsoft
+microsoftonline
+MSAA
+msixbundle
+MSVC
+MSVCP
+muxc
+netcore
+Onefuzz
+osgvsowi
+PFILETIME
+pgc
+pgo
+pgosweep
+powerrename
+powershell
+propkey
+pscustomobject
+QWORD
+regedit
+robocopy
+SACLs
+sdkddkver
+Shobjidl
+Skype
+SRW
+sxs
+Sysinternals
+sysnative
+systemroot
+taskkill
+tasklist
+tdbuildteamid
+ucrt
+ucrtd
+unvirtualized
+VCRT
+vcruntime
+Virtualization
+visualstudio
+vscode
+VSTHRD
+winsdkver
+wlk
+wslpath
+wtl
+wtt
+wttlog
+Xamarin

.github/actions/spelling/allow/names.txt

@@ -1,44 +1,66 @@
 Anup
 austdi
+arkthur
 Ballmer
 bhoj
 Bhojwani
+Bluloco
 carlos
 dhowett
 Diviness
 dsafa
 duhowett
+DXP
+ekg
+eryksun
 ethanschoonover
 Firefox
 Gatta
+glsl
+Gravell
 Grie
 Griese
 Hernan
 Howett
 Illhardt
+iquilezles
+italo
 jantari
 jerrysh
 Kaiyu
 kimwalisch
 KMehrain
+KODELIFE
+Kodelife
 Kourosh
 kowalczyk
 leonmsft
 Lepilleur
+lhecker
 lukesampson
+Macbook
 Manandhar
+masserano
 mbadolato
 Mehrain
+menger
 mgravell
 michaelniksa
+michkap
 migrie
 mikegr
 mikemaccana
+miloush
 miniksa
 niksa
+nvaccess
+nvda
 oising
 oldnewthing
+opengl
 osgwiki
+pabhojwa
+panos
 paulcam
 pauldotknopf
 PGP
@@ -46,11 +68,18 @@ Pham
 Rincewind
 rprichard
 Schoonover
+shadertoy
+Shomnipotence
+simioni
 Somuah
 sonph
 sonpham
 stakx
+talo
+thereses
 Walisch
+WDX
+Wellons
 Wirt
 Wojciech
 zadjii

.github/actions/spelling/candidate.patterns

@@ -0,0 +1,523 @@
+# marker to ignore all code on line
+^.*/\* #no-spell-check-line \*/.*$
+# marker for ignoring a comment to the end of the line
+// #no-spell-check.*$
+
+# patch hunk comments
+^\@\@ -\d+(?:,\d+|) \+\d+(?:,\d+|) \@\@ .*
+# git index header
+index [0-9a-z]{7,40}\.\.[0-9a-z]{7,40}
+
+# cid urls
+(['"])cid:.*?\g{-1}
+
+# data url in parens
+\(data:[^)]*?(?:[A-Z]{3,}|[A-Z][a-z]{2,}|[a-z]{3,})[^)]*\)
+# data url in quotes
+([`'"])data:.*?(?:[A-Z]{3,}|[A-Z][a-z]{2,}|[a-z]{3,}).*\g{-1}
+# data url
+data:[-a-zA-Z=;:/0-9+]*,\S*
+
+# mailto urls
+mailto:[-a-zA-Z=;:/?%&0-9+@.]{3,}
+
+# magnet urls
+magnet:[?=:\w]+
+
+# magnet urls
+"magnet:[^"]+"
+
+# obs:
+"obs:[^"]*"
+
+# The `\b` here means a break, it's the fancy way to handle urls, but it makes things harder to read
+# In this examples content, I'm using a number of different ways to match things to show various approaches
+# asciinema
+\basciinema\.org/a/[0-9a-zA-Z]+
+
+# apple
+\bdeveloper\.apple\.com/[-\w?=/]+
+# Apple music
+\bembed\.music\.apple\.com/fr/playlist/usr-share/[-\w.]+
+
+# appveyor api
+\bci\.appveyor\.com/api/projects/status/[0-9a-z]+
+# appveyor project
+\bci\.appveyor\.com/project/(?:[^/\s"]*/){2}builds?/\d+/job/[0-9a-z]+
+
+# Amazon
+
+# Amazon
+\bamazon\.com/[-\w]+/(?:dp/[0-9A-Z]+|)
+# AWS S3
+\b\w*\.s3[^.]*\.amazonaws\.com/[-\w/&#%_?:=]*
+# AWS execute-api
+\b[0-9a-z]{10}\.execute-api\.[-0-9a-z]+\.amazonaws\.com\b
+# AWS ELB
+\b\w+\.[-0-9a-z]+\.elb\.amazonaws\.com\b
+# AWS SNS
+\bsns\.[-0-9a-z]+.amazonaws\.com/[-\w/&#%_?:=]*
+# AWS VPC
+vpc-\w+
+
+# While you could try to match `http://` and `https://` by using `s?` in `https?://`, sometimes there
+# YouTube url
+\b(?:(?:www\.|)youtube\.com|youtu.be)/(?:channel/|embed/|user/|playlist\?list=|watch\?v=|v/|)[-a-zA-Z0-9?&=_%]*
+# YouTube music
+\bmusic\.youtube\.com/youtubei/v1/browse(?:[?&]\w+=[-a-zA-Z0-9?&=_]*)
+# YouTube tag
+<\s*youtube\s+id=['"][-a-zA-Z0-9?_]*['"]
+# YouTube image
+\bimg\.youtube\.com/vi/[-a-zA-Z0-9?&=_]*
+# Google Accounts
+\baccounts.google.com/[-_/?=.:;+%&0-9a-zA-Z]*
+# Google Analytics
+\bgoogle-analytics\.com/collect.[-0-9a-zA-Z?%=&_.~]*
+# Google APIs
+\bgoogleapis\.(?:com|dev)/[a-z]+/(?:v\d+/|)[a-z]+/[-@:./?=\w+|&]+
+# Google Storage
+\b[-a-zA-Z0-9.]*\bstorage\d*\.googleapis\.com(?:/\S*|)
+# Google Calendar
+\bcalendar\.google\.com/calendar(?:/u/\d+|)/embed\?src=[@./?=\w&%]+
+\w+\@group\.calendar\.google\.com\b
+# Google DataStudio
+\bdatastudio\.google\.com/(?:(?:c/|)u/\d+/|)(?:embed/|)(?:open|reporting|datasources|s)/[-0-9a-zA-Z]+(?:/page/[-0-9a-zA-Z]+|)
+# The leading `/` here is as opposed to the `\b` above
+# ... a short way to match `https://` or `http://` since most urls have one of those prefixes
+# Google Docs
+/docs\.google\.com/[a-z]+/(?:ccc\?key=\w+|(?:u/\d+|d/(?:e/|)[0-9a-zA-Z_-]+/)?(?:edit\?[-\w=#.]*|/\?[\w=&]*|))
+# Google Drive
+\bdrive\.google\.com/(?:file/d/|open)[-0-9a-zA-Z_?=]*
+# Google Groups
+\bgroups\.google\.com/(?:(?:forum/#!|d/)(?:msg|topics?|searchin)|a)/[^/\s"]+/[-a-zA-Z0-9$]+(?:/[-a-zA-Z0-9]+)*
+# Google Maps
+\bmaps\.google\.com/maps\?[\w&;=]*
+# Google themes
+themes\.googleusercontent\.com/static/fonts/[^/\s"]+/v\d+/[^.]+.
+# Google CDN
+\bclients2\.google(?:usercontent|)\.com[-0-9a-zA-Z/.]*
+# Goo.gl
+/goo\.gl/[a-zA-Z0-9]+
+# Google Chrome Store
+\bchrome\.google\.com/webstore/detail/[-\w]*(?:/\w*|)
+# Google Books
+\bgoogle\.(?:\w{2,4})/books(?:/\w+)*\?[-\w\d=&#.]*
+# Google Fonts
+\bfonts\.(?:googleapis|gstatic)\.com/[-/?=:;+&0-9a-zA-Z]*
+# Google Forms
+\bforms\.gle/\w+
+# Google Scholar
+\bscholar\.google\.com/citations\?user=[A-Za-z0-9_]+
+# Google Colab Research Drive
+\bcolab\.research\.google\.com/drive/[-0-9a-zA-Z_?=]*
+
+# GitHub SHAs (api)
+\bapi.github\.com/repos(?:/[^/\s"]+){3}/[0-9a-f]+\b
+# GitHub SHAs (markdown)
+(?:\[`?[0-9a-f]+`?\]\(https:/|)/(?:www\.|)github\.com(?:/[^/\s"]+){2,}(?:/[^/\s")]+)(?:[0-9a-f]+(?:[-0-9a-zA-Z/#.]*|)\b|)
+# GitHub SHAs
+\bgithub\.com(?:/[^/\s"]+){2}[@#][0-9a-f]+\b
+# GitHub wiki
+\bgithub\.com/(?:[^/]+/){2}wiki/(?:(?:[^/]+/|)_history|[^/]+(?:/_compare|)/[0-9a-f.]{40,})\b
+# githubusercontent
+/[-a-z0-9]+\.githubusercontent\.com/[-a-zA-Z0-9?&=_\/.]*
+# githubassets
+\bgithubassets.com/[0-9a-f]+(?:[-/\w.]+)
+# gist github
+\bgist\.github\.com/[^/\s"]+/[0-9a-f]+
+# git.io
+\bgit\.io/[0-9a-zA-Z]+
+# GitHub JSON
+"node_id": "[-a-zA-Z=;:/0-9+]*"
+# Contributor
+\[[^\]]+\]\(https://github\.com/[^/\s"]+\)
+# GHSA
+GHSA(?:-[0-9a-z]{4}){3}
+
+# GitLab commit
+\bgitlab\.[^/\s"]*/\S+/\S+/commit/[0-9a-f]{7,16}#[0-9a-f]{40}\b
+# GitLab merge requests
+\bgitlab\.[^/\s"]*/\S+/\S+/-/merge_requests/\d+/diffs#[0-9a-f]{40}\b
+# GitLab uploads
+\bgitlab\.[^/\s"]*/uploads/[-a-zA-Z=;:/0-9+]*
+# GitLab commits
+\bgitlab\.[^/\s"]*/(?:[^/\s"]+/){2}commits?/[0-9a-f]+\b
+
+# binanace
+accounts.binance.com/[a-z/]*oauth/authorize\?[-0-9a-zA-Z&%]*
+
+# bitbucket diff
+\bapi\.bitbucket\.org/\d+\.\d+/repositories/(?:[^/\s"]+/){2}diff(?:stat|)(?:/[^/\s"]+){2}:[0-9a-f]+
+# bitbucket repositories commits
+\bapi\.bitbucket\.org/\d+\.\d+/repositories/(?:[^/\s"]+/){2}commits?/[0-9a-f]+
+# bitbucket commits
+\bbitbucket\.org/(?:[^/\s"]+/){2}commits?/[0-9a-f]+
+
+# bit.ly
+\bbit\.ly/\w+
+
+# bitrise
+\bapp\.bitrise\.io/app/[0-9a-f]*/[\w.?=&]*
+
+# bootstrapcdn.com
+\bbootstrapcdn\.com/[-./\w]+
+
+# cdn.cloudflare.com
+\bcdnjs\.cloudflare\.com/[./\w]+
+
+# circleci
+\bcircleci\.com/gh(?:/[^/\s"]+){1,5}.[a-z]+\?[-0-9a-zA-Z=&]+
+
+# gitter
+\bgitter\.im(?:/[^/\s"]+){2}\?at=[0-9a-f]+
+
+# gravatar
+\bgravatar\.com/avatar/[0-9a-f]+
+
+# ibm
+[a-z.]*ibm\.com/[-_#=:%!?~.\\/\d\w]*
+
+# imgur
+\bimgur\.com/[^.]+
+
+# Internet Archive
+\barchive\.org/web/\d+/(?:[-\w.?,'/\\+&%$#_:]*)
+
+# discord
+/discord(?:app\.com|\.gg)/(?:invite/)?[a-zA-Z0-9]{7,}
+
+# Disqus
+\bdisqus\.com/[-\w/%.()!?&=_]*
+
+# medium link
+\blink\.medium\.com/[a-zA-Z0-9]+
+# medium
+\bmedium\.com/\@?[^/\s"]+/[-\w]+
+
+# microsoft
+\b(?:https?://|)(?:(?:download\.visualstudio|docs|msdn2?|research)\.microsoft|blogs\.msdn)\.com/[-_a-zA-Z0-9()=./%]*
+# powerbi
+\bapp\.powerbi\.com/reportEmbed/[^"' ]*
+# vs devops
+\bvisualstudio.com(?::443|)/[-\w/?=%&.]*
+# microsoft store
+\bmicrosoft\.com/store/apps/\w+
+
+# mvnrepository.com
+\bmvnrepository\.com/[-0-9a-z./]+
+
+# now.sh
+/[0-9a-z-.]+\.now\.sh\b
+
+# oracle
+\bdocs\.oracle\.com/[-0-9a-zA-Z./_?#&=]*
+
+# chromatic.com
+/\S+.chromatic.com\S*[")]
+
+# codacy
+\bapi\.codacy\.com/project/badge/Grade/[0-9a-f]+
+
+# compai
+\bcompai\.pub/v1/png/[0-9a-f]+
+
+# mailgun api
+\.api\.mailgun\.net/v3/domains/[0-9a-z]+\.mailgun.org/messages/[0-9a-zA-Z=@]*
+# mailgun
+\b[0-9a-z]+.mailgun.org
+
+# /message-id/
+/message-id/[-\w@./%]+
+
+# Reddit
+\breddit\.com/r/[/\w_]*
+
+# requestb.in
+\brequestb\.in/[0-9a-z]+
+
+# sched
+\b[a-z0-9]+\.sched\.com\b
+
+# Slack url
+slack://[a-zA-Z0-9?&=]+
+# Slack
+\bslack\.com/[-0-9a-zA-Z/_~?&=.]*
+# Slack edge
+\bslack-edge\.com/[-a-zA-Z0-9?&=%./]+
+# Slack images
+\bslack-imgs\.com/[-a-zA-Z0-9?&=%.]+
+
+# shields.io
+\bshields\.io/[-\w/%?=&.:+;,]*
+
+# stackexchange -- https://stackexchange.com/feeds/sites
+\b(?:askubuntu|serverfault|stack(?:exchange|overflow)|superuser).com/(?:questions/\w+/[-\w]+|a/)
+
+# Sentry
+[0-9a-f]{32}\@o\d+\.ingest\.sentry\.io\b
+
+# Twitter markdown
+\[\@[^[/\]:]*?\]\(https://twitter.com/[^/\s"')]*(?:/status/\d+(?:\?[-_0-9a-zA-Z&=]*|)|)\)
+# Twitter hashtag
+\btwitter\.com/hashtag/[\w?_=&]*
+# Twitter status
+\btwitter\.com/[^/\s"')]*(?:/status/\d+(?:\?[-_0-9a-zA-Z&=]*|)|)
+# Twitter profile images
+\btwimg\.com/profile_images/[_\w./]*
+# Twitter media
+\btwimg\.com/media/[-_\w./?=]*
+# Twitter link shortened
+\bt\.co/\w+
+
+# facebook
+\bfburl\.com/[0-9a-z_]+
+# facebook CDN
+\bfbcdn\.net/[\w/.,]*
+# facebook watch
+\bfb\.watch/[0-9A-Za-z]+
+
+# dropbox
+\bdropbox\.com/sh?/[^/\s"]+/[-0-9A-Za-z_.%?=&;]+
+
+# ipfs protocol
+ipfs://[0-9a-z]*
+# ipfs url
+/ipfs/[0-9a-z]*
+
+# w3
+\bw3\.org/[-0-9a-zA-Z/#.]+
+
+# loom
+\bloom\.com/embed/[0-9a-f]+
+
+# regex101
+\bregex101\.com/r/[^/\s"]+/\d+
+
+# figma
+\bfigma\.com/file(?:/[0-9a-zA-Z]+/)+
+
+# freecodecamp.org
+\bfreecodecamp\.org/[-\w/.]+
+
+# image.tmdb.org
+\bimage\.tmdb\.org/[/\w.]+
+
+# mermaid
+\bmermaid\.ink/img/[-\w]+|\bmermaid-js\.github\.io/mermaid-live-editor/#/edit/[-\w]+
+
+# Wikipedia
+\ben\.wikipedia\.org/wiki/[-\w%.#]+
+
+# gitweb
+[^"\s]+/gitweb/\S+;h=[0-9a-f]+
+
+# HyperKitty lists
+/archives/list/[^@/]+\@[^/\s"]*/message/[^/\s"]*/
+
+# lists
+/thread\.html/[^"\s]+
+
+# list-management
+\blist-manage\.com/subscribe(?:[?&](?:u|id)=[0-9a-f]+)+
+
+# kubectl.kubernetes.io/last-applied-configuration
+"kubectl.kubernetes.io/last-applied-configuration": ".*"
+
+# pgp
+\bgnupg\.net/pks/lookup[?&=0-9a-zA-Z]*
+
+# Spotify
+\bopen\.spotify\.com/embed/playlist/\w+
+
+# Mastodon
+\bmastodon\.[-a-z.]*/(?:media/|\@)[?&=0-9a-zA-Z_]*
+
+# scastie
+\bscastie\.scala-lang\.org/[^/]+/\w+
+
+# images.unsplash.com
+\bimages\.unsplash\.com/(?:(?:flagged|reserve)/|)[-\w./%?=%&.;]+
+
+# pastebin
+\bpastebin\.com/[\w/]+
+
+# heroku
+\b\w+\.heroku\.com/source/archive/\w+
+
+# quip
+\b\w+\.quip\.com/\w+(?:(?:#|/issues/)\w+)?
+
+# badgen.net
+\bbadgen\.net/badge/[^")\]'\s]+
+
+# statuspage.io
+\w+\.statuspage\.io\b
+
+# media.giphy.com
+\bmedia\.giphy\.com/media/[^/]+/[\w.?&=]+
+
+# tinyurl
+\btinyurl\.com/\w+
+
+# getopts
+\bgetopts\s+(?:"[^"]+"|'[^']+')
+
+# ANSI color codes
+(?:\\(?:u00|x)1b|\x1b)\[\d+(?:;\d+|)m
+
+# URL escaped characters
+\%[0-9A-F][A-F]
+# IPv6
+\b(?:[0-9a-fA-F]{0,4}:){3,7}[0-9a-fA-F]{0,4}\b
+# c99 hex digits (not the full format, just one I've seen)
+0x[0-9a-fA-F](?:\.[0-9a-fA-F]*|)[pP]
+# Punycode
+\bxn--[-0-9a-z]+
+# sha
+sha\d+:[0-9]*[a-f]{3,}[0-9a-f]*
+# sha-... -- uses a fancy capture
+(['"]|&quot;)[0-9a-f]{40,}\g{-1}
+# hex runs
+\b[0-9a-fA-F]{16,}\b
+# hex in url queries
+=[0-9a-fA-F]*?(?:[A-F]{3,}|[a-f]{3,})[0-9a-fA-F]*?&
+# ssh
+(?:ssh-\S+|-nistp256) [-a-zA-Z=;:/0-9+]{12,}
+
+# PGP
+\b(?:[0-9A-F]{4} ){9}[0-9A-F]{4}\b
+# GPG keys
+\b(?:[0-9A-F]{4} ){5}(?: [0-9A-F]{4}){5}\b
+# Well known gpg keys
+.well-known/openpgpkey/[\w./]+
+
+# uuid:
+\b[0-9a-fA-F]{8}-(?:[0-9a-fA-F]{4}-){3}[0-9a-fA-F]{12}\b
+# hex digits including css/html color classes:
+(?:[\\0][xX]|\\u|[uU]\+|#x?|\%23)[0-9_a-fA-FgGrR]*?[a-fA-FgGrR]{2,}[0-9_a-fA-FgGrR]*(?:[uUlL]{0,3}|u\d+)\b
+# integrity
+integrity="sha\d+-[-a-zA-Z=;:/0-9+]{40,}"
+
+# https://www.gnu.org/software/groff/manual/groff.html
+# man troff content
+\\f[BCIPR]
+# '
+\\\(aq
+
+# .desktop mime types
+^MimeTypes?=.*$
+# .desktop localized entries
+^[A-Z][a-z]+\[[a-z]+\]=.*$
+# Localized .desktop content
+Name\[[^\]]+\]=.*
+
+# IServiceProvider
+\bI(?=(?:[A-Z][a-z]{2,})+\b)
+
+# crypt
+"\$2[ayb]\$.{56}"
+
+# scrypt / argon
+\$(?:scrypt|argon\d+[di]*)\$\S+
+
+# Input to GitHub JSON
+content: "[-a-zA-Z=;:/0-9+]*="
+
+# Python stringprefix / binaryprefix
+# Note that there's a high false positive rate, remove the `?=` and search for the regex to see if the matches seem like reasonable strings
+(?<!')\b(?:B|BR|Br|F|FR|Fr|R|RB|RF|Rb|Rf|U|UR|Ur|b|bR|br|f|fR|fr|r|rB|rF|rb|rf|u|uR|ur)'(?:[A-Z]{3,}|[A-Z][a-z]{2,}|[a-z]{3,})
+
+# Regular expressions for (P|p)assword
+\([A-Z]\|[a-z]\)[a-z]+
+
+# JavaScript regular expressions
+# javascript test regex
+/.*/[gim]*\.test\(
+# javascript match regex
+\.match\(/[^/\s"]*/[gim]*\s*
+# javascript match regex
+\.match\(/\\[b].*?/[gim]*\s*\)(?:;|$)
+# javascript regex
+^\s*/\\[b].*/[gim]*\s*(?:\)(?:;|$)|,$)
+# javascript replace regex
+\.replace\(/[^/\s"]*/[gim]*\s*,
+
+# Go regular expressions
+regexp?\.MustCompile\(`[^`]*`\)
+
+# sed regular expressions
+sed 's/(?:[^/]*?[a-zA-Z]{3,}[^/]*?/){2}
+
+# go install
+go install(?:\s+[a-z]+\.[-@\w/.]+)+
+
+# kubernetes pod status lists
+# https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#pod-phase
+\w+(?:-\w+)+\s+\d+/\d+\s+(?:Running|Pending|Succeeded|Failed|Unknown)\s+
+
+# kubectl - pods in CrashLoopBackOff
+\w+-[0-9a-f]+-\w+\s+\d+/\d+\s+CrashLoopBackOff\s+
+
+# kubernetes object suffix
+-[0-9a-f]{10}-\w{5}\s
+
+# posthog secrets
+posthog\.init\((['"])phc_[^"',]+\g{-1},
+
+# xcode
+
+# xcodeproject scenes
+(?:Controller|ID|id)="\w{3}-\w{2}-\w{3}"
+
+# xcode api botches
+customObjectInstantitationMethod
+
+# font awesome classes
+\.fa-[-a-z0-9]+
+
+# Update Lorem based on your content (requires `ge` and `w` from https://github.com/jsoref/spelling; and `review` from https://github.com/check-spelling/check-spelling/wiki/Looking-for-items-locally )
+# grep '^[^#].*lorem' .github/actions/spelling/patterns.txt|perl -pne 's/.*i..\?://;s/\).*//' |tr '|' "\n"|sort -f |xargs -n1 ge|perl -pne 's/^[^:]*://'|sort -u|w|sed -e 's/ .*//'|w|review -
+# Warning, while `(?i)` is very neat and fancy, if you have some binary files that aren't proper unicode, you might run into:
+## Operation "substitution (s///)" returns its argument for non-Unicode code point 0x1C19AE (the code point will vary).
+## You could manually change `(?i)X...` to use `[Xx]...`
+## or you could add the files to your `excludes` file (a version after 0.0.19 should identify the file path)
+# Lorem
+(?:\w|\s|[,.])*\b(?i)(?:amet|consectetur|cursus|dolor|eros|ipsum|lacus|libero|ligula|lorem|magna|neque|nulla|suscipit|tempus)\b(?:\w|\s|[,.])*
+
+# Non-English
+[a-zA-Z]*[ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýÿĀāŁłŃńŅņŒœŚśŠšŜŝŸŽžź][a-zA-Z]{3}[a-zA-ZÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýÿĀāŁłŃńŅņŒœŚśŠšŜŝŸŽžź]*
+
+# French
+# This corpus only had capital letters, but you probably want lowercase ones as well.
+\b[LN]'+[a-z]{2,}\b
+
+# latex
+\\(?:n(?:ew|ormal|osub)|r(?:enew)|t(?:able(?:of|)|he|itle))(?=[a-z]+)
+
+# the negative lookahead here is to allow catching 'templatesz' as a misspelling
+# but to otherwise recognize a Windows path with \templates\foo.template or similar:
+\\(?:necessary|r(?:eport|esolve[dr]?|esult)|t(?:arget|emplates?))(?![a-z])
+# ignore long runs of a single character:
+\b([A-Za-z])\g{-1}{3,}\b
+# Note that the next example is no longer necessary if you are using
+# to match a string starting with a `#`, use a character-class:
+[#]backwards
+# version suffix <word>v#
+(?:(?<=[A-Z]{2})V|(?<=[a-z]{2}|[A-Z]{2})v)\d+(?:\b|(?=[a-zA-Z_]))
+# Compiler flags (Scala)
+(?:^|[\t ,>"'`=(])-J-[DPWXY](?=[A-Z]{2,}|[A-Z][a-z]|[a-z]{2,})
+# Compiler flags
+#(?:^|[\t ,"'`=(])-[DPWXYLlf](?=[A-Z]{2,}|[A-Z][a-z]|[a-z]{2,})
+
+# Compiler flags (linker)
+,-B
+# curl arguments
+\b(?:\\n|)curl(?:\s+-[a-zA-Z]{1,2}\b)*(?:\s+-[a-zA-Z]{3,})(?:\s+-[a-zA-Z]+)*
+# set arguments
+\bset(?:\s+-[abefimouxE]{1,2})*\s+-[abefimouxE]{3,}(?:\s+-[abefimouxE]+)*
+# tar arguments
+\b(?:\\n|)g?tar(?:\.exe|)(?:(?:\s+--[-a-zA-Z]+|\s+-[a-zA-Z]+|\s[ABGJMOPRSUWZacdfh-pr-xz]+\b)(?:=[^ ]*|))+
+# tput arguments -- https://man7.org/linux/man-pages/man5/terminfo.5.html -- technically they can be more than 5 chars long...
+\btput\s+(?:(?:-[SV]|-T\s*\w+)\s+)*\w{3,5}\b
+# macOS temp folders
+/var/folders/\w\w/[+\w]+/(?:T|-Caches-)/

.github/actions/spelling/excludes.txt

@@ -0,0 +1,117 @@
+# See https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples:-excludes
+(?:(?i)\.png$)
+(?:^|/)(?i)COPYRIGHT
+(?:^|/)(?i)LICEN[CS]E
+(?:^|/)3rdparty/
+(?:^|/)dirs$
+(?:^|/)go\.mod$
+(?:^|/)go\.sum$
+(?:^|/)package(?:-lock|)\.json$
+(?:^|/)sources(?:|\.dep)$
+(?:^|/)vendor/
+\.a$
+\.ai$
+\.avi$
+\.bmp$
+\.bz2$
+\.cer$
+\.class$
+\.crl$
+\.crt$
+\.csr$
+\.dll$
+\.docx?$
+\.drawio$
+\.DS_Store$
+\.eot$
+\.eps$
+\.exe$
+\.gif$
+\.gitattributes$
+\.graffle$
+\.gz$
+\.icns$
+\.ico$
+\.jar$
+\.jks$
+\.jpeg$
+\.jpg$
+\.key$
+\.lib$
+\.lock$
+\.map$
+\.min\..
+\.mod$
+\.mp3$
+\.mp4$
+\.o$
+\.ocf$
+\.otf$
+\.pbxproj$
+\.pdf$
+\.pem$
+\.png$
+\.psd$
+\.pyc$
+\.runsettings$
+\.s$
+\.sig$
+\.so$
+\.svg$
+\.svgz$
+\.svgz?$
+\.tar$
+\.tgz$
+\.tiff?$
+\.ttf$
+\.vsdx$
+\.wav$
+\.webm$
+\.webp$
+\.woff
+\.woff2?$
+\.xcf$
+\.xls
+\.xlsx?$
+\.xpm$
+\.yml$
+\.zip$
+^\.github/actions/spelling/
+^\.github/fabricbot.json$
+^\.gitignore$
+^\Q.git-blame-ignore-revs\E$
+^\Q.github/workflows/spelling.yml\E$
+^\Qdoc/reference/windows-terminal-logo.ans\E$
+^\Qsamples/ConPTY/EchoCon/EchoCon/EchoCon.vcxproj.filters\E$
+^\Qsrc/host/exe/Host.EXE.vcxproj.filters\E$
+^\Qsrc/host/ft_host/chafa.txt\E$
+^\Qsrc/tools/closetest/CloseTest.vcxproj.filters\E$
+^\XamlStyler.json$
+^build/config/
+^consolegit2gitfilters\.json$
+^dep/
+^doc/reference/master-sequence-list.csv$
+^doc/reference/UTF8-torture-test\.txt$
+^oss/
+^src/host/ft_uia/run\.bat$
+^src/host/runft\.bat$
+^src/host/runut\.bat$
+^src/interactivity/onecore/BgfxEngine\.
+^src/renderer/atlas/
+^src/renderer/wddmcon/WddmConRenderer\.
+^src/terminal/adapter/ut_adapter/run\.bat$
+^src/terminal/parser/delfuzzpayload\.bat$
+^src/terminal/parser/ft_fuzzer/run\.bat$
+^src/terminal/parser/ft_fuzzer/VTCommandFuzzer\.cpp$
+^src/terminal/parser/ft_fuzzwrapper/run\.bat$
+^src/terminal/parser/ut_parser/Base64Test.cpp$
+^src/terminal/parser/ut_parser/run\.bat$
+^src/tools/integrity/packageuwp/ConsoleUWP\.appxSources$
+^src/tools/lnkd/lnkd\.bat$
+^src/tools/pixels/pixels\.bat$
+^src/tools/texttests/fira\.txt$
+^src/tools/U8U16Test/(?:fr|ru|zh)\.txt$
+^src/types/ut_types/UtilsTests.cpp$
+^tools/ReleaseEngineering/ServicingPipeline.ps1$
+ignore$
+SUMS$

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

@@ -1,16 +1,23 @@
+AAAa
+AAAAA
+AAAAAAAAAAAAA
+AAAAAABBBBBBCCC
+AAAAABBBBBBCCC
+abcd
 abcd
-abcde
-abcdef
-ABCDEFG
-ABCDEFGH
 ABCDEFGHIJ
 abcdefghijk
+ABCDEFGHIJKLMNO
 abcdefghijklmnop
 ABCDEFGHIJKLMNOPQRST
-abcdefghijklmnopqrstuvwxyz
+ABCG
 ABE
+abf
+BBBBB
+BBBBBBBB
+BBBBBCCC
+BBBBCCCCC
 BBGGRR
-BBBBBBBBBBBBBBDDDD
 EFG
 EFGh
 QQQQQQQQQQABCDEFGHIJ
@@ -19,7 +26,6 @@ QQQQQQQQQQABCDEFGHIJKLMNOPQRSTQQQQQQQQQQ
 QQQQQQQQQQABCDEFGHIJPQRSTQQQQQQQQQQ
 qrstuvwxyz
 qwerty
-QWERTYUIOP
 qwertyuiopasdfg
 YYYYYYYDDDDDDDDDDD
 ZAAZZ
@@ -31,3 +37,4 @@ ZYXWVUT
 ZZBBZ
 ZZZBB
 ZZZBZ
+ZZZZZ

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

@@ -0,0 +1,6 @@
+WCAG
+winui
+appshellintegration
+mdtauk
+gfycat
+Guake

.github/actions/spelling/line_forbidden.patterns

@@ -0,0 +1,62 @@
+# reject `m_data` as there's a certain OS which has evil defines that break things if it's used elsewhere
+# \bm_data\b
+
+# If you have a framework that uses `it()` for testing and `fit()` for debugging a specific test,
+# you might not want to check in code where you were debugging w/ `fit()`, in which case, you might want
+# to use this:
+#\bfit\(
+
+# s.b. GitHub
+\bGithub\b
+
+# s.b. GitLab
+\bGitlab\b
+
+# s.b. JavaScript
+\bJavascript\b
+
+# s.b. Microsoft
+\bMicroSoft\b
+
+# s.b. another
+\ban[- ]other\b
+
+# s.b. greater than
+\bgreater then\b
+
+# s.b. into
+#\sin to\s
+
+# s.b. opt-in
+\sopt in\s
+
+# s.b. less than
+\bless then\b
+
+# s.b. otherwise
+\bother[- ]wise\b
+
+# s.b. nonexistent
+\bnon existing\b
+\b[Nn]o[nt][- ]existent\b
+
+# s.b. preexisting
+[Pp]re[- ]existing
+
+# s.b. preempt
+[Pp]re[- ]empt\b
+
+# s.b. preemptively
+[Pp]re[- ]emptively
+
+# s.b. reentrancy
+[Rr]e[- ]entrancy
+
+# s.b. reentrant
+[Rr]e[- ]entrant
+
+# s.b. workaround(s)
+#\bwork[- ]arounds?\b
+
+# Reject duplicate words
+\s([A-Z]{3,}|[A-Z][a-z]{2,}|[a-z]{3,})\s\g{-1}\s

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

@@ -0,0 +1,96 @@
+# See https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples:-patterns
+
+https?://\S+
+[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
+microsoft/cascadia-code\@[0-9a-fA-F]{40}
+\d+x\d+Logo
+Scro\&ll
+# selectionInput.cpp
+ :\\windows\\syste\b
+TestUtils::VerifyExpectedString\(tb, L"[^"]+"
+(?:hostSm|mach)\.ProcessString\(L"[^"]+"
+\b([A-Za-z])\g{-1}{3,}\b
+0x[0-9A-Za-z]+
+Base64::s_(?:En|De)code\(L"[^"]+"
+VERIFY_ARE_EQUAL\(L"[^"]+"
+"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789\+/"
+std::memory_order_[\w]+
+D2DERR_SHADER_COMPILE_FAILED
+TIL_FEATURE_[0-9A-Z_]+
+vcvars\w*
+ROY\sG\.\sBIV
+!(?:(?i)ESC)!\[
+!(?:(?i)CSI)!(?:\d+(?:;\d+|)m|[ABCDF])
+
+# Python stringprefix / binaryprefix
+\b(?:B|BR|Br|F|FR|Fr|R|RB|RF|Rb|Rf|U|UR|Ur|b|bR|br|f|fR|fr|r|rB|rF|rb|rf|u|uR|ur)'
+
+# Automatically suggested patterns
+# hit-count: 3831 file-count: 582
+# IServiceProvider
+\bI(?=(?:[A-Z][a-z]{2,})+\b)
+
+# hit-count: 71 file-count: 35
+# Compiler flags
+(?:^|[\t ,"'`=(])-[D](?=[A-Z]{2,}|[A-Z][a-z])
+(?:^|[\t ,"'`=(])-[X](?=[A-Z]{2,}|[A-Z][a-z]|[a-z]{2,})
+
+# hit-count: 41 file-count: 28
+# version suffix <word>v#
+(?:(?<=[A-Z]{2})V|(?<=[a-z]{2}|[A-Z]{2})v)\d+(?:\b|(?=[a-zA-Z_]))
+
+# hit-count: 20 file-count: 9
+# hex runs
+\b[0-9a-fA-F]{16,}\b
+
+# hit-count: 10 file-count: 7
+# uuid:
+\b[0-9a-fA-F]{8}-(?:[0-9a-fA-F]{4}-){3}[0-9a-fA-F]{12}\b
+
+# hit-count: 4 file-count: 4
+# mailto urls
+mailto:[-a-zA-Z=;:/?%&0-9+@.]{3,}
+
+# hit-count: 4 file-count: 1
+# ANSI color codes
+(?:\\(?:u00|x)1b|\x1b)\[\d+(?:;\d+|)m
+
+# hit-count: 2 file-count: 1
+# latex
+\\(?:n(?:ew|ormal|osub)|r(?:enew)|t(?:able(?:of|)|he|itle))(?=[a-z]+)
+
+# hit-count: 1 file-count: 1
+# hex digits including css/html color classes:
+(?:[\\0][xX]|\\u|[uU]\+|#x?|\%23)[0-9_a-fA-FgGrR]*?[a-fA-FgGrR]{2,}[0-9_a-fA-FgGrR]*(?:[uUlL]{0,3}|u\d+)\b
+
+# hit-count: 1 file-count: 1
+# Non-English
+[a-zA-Z]*[ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýÿĀāŁłŃńŅņŒœŚśŠšŜŝŸŽžź][a-zA-Z]{3}[a-zA-ZÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýÿĀāŁłŃńŅņŒœŚśŠšŜŝŸŽžź]*
+
+# hit-count: 1 file-count: 1
+# French
+# This corpus only had capital letters, but you probably want lowercase ones as well.
+\b[LN]'+[a-z]{2,}\b
+
+# acceptable duplicates
+# ls directory listings
+[-bcdlpsw](?:[-r][-w][-sx]){3}\s+\d+\s+(\S+)\s+\g{-1}\s+\d+\s+
+# C/idl types + English ...
+\s(Guid|long|LONG|that) \g{-1}\s
+
+# javadoc / .net
+(?:[\\@](?:groupname|param)|(?:public|private)(?:\s+static|\s+readonly)*)\s+(\w+)\s+\g{-1}\s
+
+# Commit message -- Signed-off-by and friends
+^\s*(?:(?:Based-on-patch|Co-authored|Helped|Mentored|Reported|Reviewed|Signed-off)-by|Thanks-to): (?:[^<]*<[^>]*>|[^<]*)\s*$
+
+# Autogenerated revert commit message
+^This reverts commit [0-9a-f]{40}\.$
+
+# vtmode
+--vtmode\s+(\w+)\s+\g{-1}\s
+
+# ignore long runs of a single character:
+\b([A-Za-z])\g{-1}{3,}\b

.github/actions/spelling/reject.txt

@@ -0,0 +1,12 @@
+^attache$
+^attacher$
+^attachers$
+benefitting
+occurences?
+^dependan.*
+^oer$
+Sorce
+^[Ss]pae.*
+^untill$
+^untilling$
+^wether.*

.github/workflows/spelling.yml

@@ -1,20 +0,0 @@
-name: Spell checking
-on:
-  push:
-  schedule:
-    # * is a special character in YAML so you have to quote this string
-    - cron: '15 * * * *'
-
-jobs:
-  build:
-    name: Spell checking
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2.0.0
-      with:
-        fetch-depth: 5
-    - uses: check-spelling/check-spelling@0.0.16-alpha
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        bucket: .github/actions
-        project: spell-check

.github/workflows/spelling2.yml

@@ -0,0 +1,134 @@
+# spelling.yml is blocked per https://github.com/check-spelling/check-spelling/security/advisories/GHSA-g86g-chm8-7r2p
+name: Spell checking
+
+# Comment management is handled through a secondary job, for details see:
+# https://github.com/check-spelling/check-spelling/wiki/Feature%3A-Restricted-Permissions
+#
+# `jobs.comment-push` runs when a push is made to a repository and the `jobs.spelling` job needs to make a comment
+#   (in odd cases, it might actually run just to collapse a commment, but that's fairly rare)
+#   it needs `contents: write` in order to add a comment.
+#
+# `jobs.comment-pr` runs when a pull_request is made to a repository and the `jobs.spelling` job needs to make a comment
+#   or collapse a comment (in the case where it had previously made a comment and now no longer needs to show a comment)
+#   it needs `pull-requests: write` in order to manipulate those comments.
+
+# Updating pull request branches is managed via comment handling.
+# For details, see: https://github.com/check-spelling/check-spelling/wiki/Feature:-Update-expect-list
+#
+# These elements work together to make it happen:
+#
+# `on.issue_comment`
+#   This event listens to comments by users asking to update the metadata.
+#
+# `jobs.update`
+#   This job runs in response to an issue_comment and will push a new commit
+#   to update the spelling metadata.
+#
+# `with.experimental_apply_changes_via_bot`
+#   Tells the action to support and generate messages that enable it
+#   to make a commit to update the spelling metadata.
+#
+# `with.ssh_key`
+#   In order to trigger workflows when the commit is made, you can provide a
+#   secret (typically, a write-enabled github deploy key).
+#
+#   For background, see: https://github.com/check-spelling/check-spelling/wiki/Feature:-Update-with-deploy-key
+
+on:
+  push:
+    branches:
+    - "**"
+    tags-ignore:
+    - "**"
+  pull_request_target:
+    branches:
+    - "**"
+    tags-ignore:
+    - "**"
+    types:
+    - 'opened'
+    - 'reopened'
+    - 'synchronize'
+  issue_comment:
+    types:
+    - 'created'
+
+jobs:
+  spelling:
+    name: Spell checking
+    permissions:
+      contents: read
+      pull-requests: read
+      actions: read
+    outputs:
+      followup: ${{ steps.spelling.outputs.followup }}
+    runs-on: ubuntu-latest
+    if: "contains(github.event_name, 'pull_request') || github.event_name == 'push'"
+    concurrency:
+      group: spelling-${{ github.event.pull_request.number || github.ref }}
+      # note: If you use only_check_changed_files, you do not want cancel-in-progress
+      cancel-in-progress: true
+    steps:
+    - name: check-spelling
+      id: spelling
+      uses: check-spelling/check-spelling@v0.0.21
+      with:
+        suppress_push_for_open_pull_request: 1
+        checkout: true
+        check_file_names: 1
+        spell_check_this: check-spelling/spell-check-this@prerelease
+        post_comment: 0
+        use_magic_file: 1
+        extra_dictionary_limit: 10
+        extra_dictionaries:
+          cspell:software-terms/src/software-terms.txt
+          cspell:python/src/python/python-lib.txt
+          cspell:node/node.txt
+          cspell:cpp/src/stdlib-c.txt
+          cspell:cpp/src/stdlib-cpp.txt
+          cspell:fullstack/fullstack.txt
+          cspell:filetypes/filetypes.txt
+          cspell:html/html.txt
+          cspell:cpp/src/compiler-msvc.txt
+          cspell:python/src/common/extra.txt
+          cspell:powershell/powershell.txt
+          cspell:aws/aws.txt
+          cspell:cpp/src/lang-keywords.txt
+          cspell:npm/npm.txt
+          cspell:dotnet/dotnet.txt
+          cspell:python/src/python/python.txt
+          cspell:css/css.txt
+          cspell:cpp/src/stdlib-cmath.txt
+        check_extra_dictionaries: ''
+
+  comment-push:
+    name: Report (Push)
+    # If your workflow isn't running on push, you can remove this job
+    runs-on: ubuntu-latest
+    needs: spelling
+    permissions:
+      contents: write
+    if: (success() || failure()) && needs.spelling.outputs.followup && github.event_name == 'push'
+    steps:
+    - name: comment
+      uses: check-spelling/check-spelling@v0.0.21
+      with:
+        checkout: true
+        spell_check_this: check-spelling/spell-check-this@prerelease
+        task: ${{ needs.spelling.outputs.followup }}
+
+  comment-pr:
+    name: Report (PR)
+    # If you workflow isn't running on pull_request*, you can remove this job
+    runs-on: ubuntu-latest
+    needs: spelling
+    permissions:
+      pull-requests: write
+    if: (success() || failure()) && needs.spelling.outputs.followup && contains(github.event_name, 'pull_request')
+    steps:
+    - name: comment
+      uses: check-spelling/check-spelling@v0.0.21
+      with:
+        checkout: true
+        spell_check_this: check-spelling/spell-check-this@prerelease
+        task: ${{ needs.spelling.outputs.followup }}

NOTICE.md

@@ -48,36 +48,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ```
 
-## telnetpp
-
-**Source**: https://github.com/KazDragon/telnetpp
-
-### License 
-
-```
-The MIT License (MIT)
-
-Copyright (c) 2015-2017 Matthew Chaplain a.k.a KazDragon
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-```
-
 ## chromium/base/numerics
 
 **Source**: https://github.com/chromium/chromium/tree/master/base/numerics

build/pipelines/ci.yml

@@ -3,6 +3,7 @@ trigger:
   branches:
     include:
       - master
+      - feature/*
   paths:
     exclude:
       - doc/*
@@ -13,6 +14,7 @@ pr:
   branches:
     include:
       - master
+      - feature/*
   paths:
     exclude:
       - doc/*

custom.props

@@ -5,7 +5,7 @@
     <XesUseOneStoreVersioning>true</XesUseOneStoreVersioning>
     <XesBaseYearForStoreVersion>2020</XesBaseYearForStoreVersion>
     <VersionMajor>1</VersionMajor>
-    <VersionMinor>3</VersionMinor>
+    <VersionMinor>4</VersionMinor>
     <VersionInfoProductName>Windows Terminal</VersionInfoProductName>
   </PropertyGroup>
 </Project>

doc/building.md

@@ -67,12 +67,12 @@ To update the version of a given package, use the following snippet
 
 where:
 - `$PackageName` is the name of the package, e.g. Microsoft.UI.Xaml
-- `$OldVersionNumber` is the version number currently used, e.g. 2.5.0-prerelease.200609001
-- `$NewVersionNumber` is the version number you want to migrate to, e.g. 2.4.200117003-prerelease
+- `$OldVersionNumber` is the version number currently used, e.g. 2.4.0-prerelease.200506002
+- `$NewVersionNumber` is the version number you want to migrate to, e.g. 2.5.0-prerelease.200812002
 
 Example usage:
 
-`git grep -z -l Microsoft.UI.Xaml | xargs -0 sed -i -e 's/2.5.0-prerelease.200609001/2.4.200117003-prerelease/g'`
+`git grep -z -l Microsoft.UI.Xaml | xargs -0 sed -i -e 's/2.4.0-prerelease.200506002/2.5.0-prerelease.200812002/g'`
 
 ## Using .nupkg files instead of downloaded Nuget packages
 If you want to use .nupkg files instead of the downloaded Nuget package, you can do this with the following steps:

doc/cascadia/SettingsSchema.md

@@ -1,211 +1 @@
-# Settings.json Documentation
-
-## Globals
-
-Properties listed below affect the entire window, regardless of the profile settings.
-
-| Property | Necessity | Type | Default | Description |
-| -------- | --------- | ---- | ------- | ----------- |
-| `alwaysShowTabs` | _Required_ | Boolean | `true` | When set to `true`, tabs are always displayed. When set to `false` and `showTabsInTitlebar` is set to `false`, tabs only appear after typing <kbd>Ctrl</kbd> + <kbd>T</kbd>. |
-| `copyOnSelect` | Optional | Boolean | `false` | 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. |
-| `copyFormatting` | Optional | Boolean, Array | `true` | 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. |
-| `largePasteWarning` | Optional | Boolean | `true` | When set to `true`, trying to paste text with more than 5 KiB of characters will display a warning asking you whether to continue or not with the paste. |
-| `multiLinePasteWarning` | Optional | Boolean | `true` | When set to `true`, trying to paste text with a _new line_ character will display a warning asking you whether to continue or not with the paste. |
-| `defaultProfile` | _Required_ | String | PowerShell guid | Sets the default profile. Opens by typing <kbd>Ctrl</kbd> + <kbd>T</kbd> or by clicking the '+' icon. The guid of the desired default profile is used as the value. |
-| `initialCols` | _Required_ | Integer | `120` | The number of columns displayed in the window upon first load. |
-| `initialPosition` | Optional | String | `","` | The position of the top left corner of the window upon first load. On a system with multiple displays, these coordinates are relative to the top left of the primary display. If `launchMode` is set to `"maximized"`, the window will be maximized on the monitor specified by those coordinates. |
-| `initialRows` | _Required_ | Integer | `30` | The number of rows displayed in the window upon first load. |
-| `launchMode` | Optional | String | `default` | Defines whether the Terminal will launch as maximized or not. Possible values: `"default"`, `"maximized"` |
-| `theme` | _Required_ | String | `system` | Sets the theme of the application. Possible values: `"light"`, `"dark"`, `"system"` |
-| `showTerminalTitleInTitlebar` | _Required_ | Boolean | `true` | When set to `true`, titlebar displays the title of the selected tab. When set to `false`, titlebar displays "Windows Terminal". |
-| `showTabsInTitlebar` | Optional | Boolean | `true` | When set to `true`, the tabs are moved into the titlebar and the titlebar disappears. When set to `false`, the titlebar sits above the tabs. |
-| `snapToGridOnResize` | Optional | Boolean | `false` | When set to `true`, the window will snap to the nearest character boundary on resize. When `false`, the window will resize "smoothly" |
-| `tabWidthMode` | Optional | String | `equal` | Sets the width of the tabs. Possible values: <br><ul><li>`"equal"`: sizes each tab to the same width</li><li>`"titleLength"`:  sizes each tab to the length of its title</li><li>`"compact"`: sizes each tab to the length of its title when focused, and shrinks to the size of only the icon when the tab is unfocused.</li></ul> |
-| `wordDelimiters` | Optional | String | <code>&nbsp;&#x2f;&#x5c;&#x28;&#x29;&#x22;&#x27;&#x2d;&#x3a;&#x2c;&#x2e;&#x3b;&#x3c;&#x3e;&#x7e;&#x21;&#x40;&#x23;&#x24;&#x25;&#x5e;&#x26;&#x2a;&#x7c;&#x2b;&#x3d;&#x5b;&#x5d;&#x7b;&#x7d;&#x7e;&#x3f;│</code><br>_(`│` is `U+2502 BOX DRAWINGS LIGHT VERTICAL`)_ | Determines the delimiters used in a double click selection. |
-| `confirmCloseAllTabs` | Optional | Boolean | `true` | When set to `true` closing a window with multiple tabs open WILL require confirmation.  When set to `false` closing a window with multiple tabs open WILL NOT require confirmation. |
-| `startOnUserLogin` | Optional | Boolean | `false` | When set to `true` enables the launch of Windows Terminal at startup. Setting to `false` will disable the startup task entry. Note: if the Windows Terminal startup task entry is disabled either by org policy or by user action this setting will have no effect. |
-| `disabledProfileSources` | Optional | Array[String] | `[]` | Disables all the dynamic profile generators in this list, preventing them from adding their profiles to the list of profiles on startup. This array can contain any combination of `Windows.Terminal.Wsl`, `Windows.Terminal.Azure`, or `Windows.Terminal.PowershellCore`. For more information, see [UsingJsonSettings.md](https://github.com/microsoft/terminal/blob/master/doc/user-docs/UsingJsonSettings.md#dynamic-profiles) |
-| `experimental.rendering.forceFullRepaint` | Optional | Boolean | `false` | When set to true, we will redraw the entire screen each frame. When set to false, we will render only the updates to the screen between frames. |
-| `experimental.rendering.software` | Optional | Boolean | `false` | When set to true, we will use the software renderer (a.k.a. WARP) instead of the hardware one. |
-
-## Profiles
-
-Properties listed below are specific to each unique profile.
-
-| Property | Necessity | Type | Default | Description |
-| -------- | --------- | ---- | ------- | ----------- |
-| `guid` | _Required_ | String | | Unique identifier of the profile. Written in registry format: `"{00000000-0000-0000-0000-000000000000}"`. |
-| `name` | _Required_ | String | | Name of the profile. Displays in the dropdown menu. <br>Additionally, this value will be used as the "title" to pass to the shell on startup. Some shells (like `bash`) may choose to ignore this initial value, while others (`cmd`, `powershell`) may use this value over the lifetime of the application. This "title" behavior can be overridden by using `tabTitle`. |
-| `acrylicOpacity` | Optional | Number | `0.5` | When `useAcrylic` is set to `true`, it sets the transparency of the window for the profile. Accepts floating point values from 0-1. |
-| `antialiasingMode` | Optional | String | `"grayscale"` | Controls how text is antialiased in the renderer. Possible values are "grayscale", "cleartype" and "aliased". Note that changing this setting will require starting a new terminal instance. |
-| `background` | Optional | String | | Sets the background color of the profile. Overrides `background` set in color scheme if `colorscheme` is set. Uses hex color format: `"#rrggbb"`. |
-| `backgroundImage` | Optional | String | | Sets the file location of the Image to draw over the window background. |
-| `backgroundImageAlignment` | Optional | String | `center` | Sets how the background image aligns to the boundaries of the window. Possible values: `"center"`, `"left"`, `"top"`, `"right"`, `"bottom"`, `"topLeft"`, `"topRight"`, `"bottomLeft"`, `"bottomRight"` |
-| `backgroundImageOpacity` | Optional | Number | `1.0` | Sets the transparency of the background image. Accepts floating point values from 0-1. |
-| `backgroundImageStretchMode` | Optional | String | `uniformToFill` | Sets how the background image is resized to fill the window. Possible values: `"none"`, `"fill"`, `"uniform"`, `"uniformToFill"` |
-| `closeOnExit` | Optional | String | `graceful` | Sets how the profile reacts to termination or failure to launch. Possible values: `"graceful"` (close when `exit` is typed or the process exits normally), `"always"` (always close) and `"never"` (never close). `true` and `false` are accepted as synonyms for `"graceful"` and `"never"` respectively. |
-| `colorScheme` | Optional | String | `Campbell` | Name of the terminal color scheme to use. Color schemes are defined under `schemes`. |
-| `commandline` | Optional | String | | Executable used in the profile. |
-| `cursorColor` | Optional | String | | Sets the cursor color of the profile. Overrides `cursorColor` set in color scheme if `colorscheme` is set. Uses hex color format: `"#rrggbb"`. |
-| `cursorHeight` | Optional | Integer | | Sets the percentage height of the cursor starting from the bottom. Only works when `cursorShape` is set to `"vintage"`. Accepts values from 25-100. |
-| `cursorShape` | Optional | String | `bar` | Sets the cursor shape for the profile. Possible values: `"vintage"` ( &#x2583; ), `"bar"` ( &#x2503; ), `"underscore"` ( &#x2581; ), `"filledBox"` ( &#x2588; ), `"emptyBox"` ( &#x25AF; ) |
-| `fontFace` | Optional | String | `Cascadia Mono` | Name of the font face used in the profile. We will try to fallback to Consolas if this can't be found or is invalid. |
-| `fontSize` | Optional | Integer | `12` | Sets the font size. |
-| `fontWeight` | Optional | String | `normal` | Sets the weight (lightness or heaviness of the strokes) for the given font. Possible values: `"thin"`, `"extra-light"`, `"light"`, `"semi-light"`, `"normal"`, `"medium"`, `"semi-bold"`, `"bold"`, `"extra-bold"`, `"black"`, `"extra-black"`, or the corresponding numeric representation of OpenType font weight. |
-| `foreground` | Optional | String | | Sets the foreground color of the profile. Overrides `foreground` set in color scheme if `colorscheme` is set. Uses hex color format: `#rgb` or `"#rrggbb"`. |
-| `hidden` | Optional | Boolean | `false` | If set to true, the profile will not appear in the list of profiles. This can be used to hide default profiles and dynamically generated profiles, while leaving them in your settings file. |
-| `historySize` | Optional | Integer | `9001` | The number of lines above the ones displayed in the window you can scroll back to. |
-| `icon` | Optional | String | | Image file location of the icon used in the profile. Displays within the tab and the dropdown menu. |
-| `padding` | Optional | String | `8, 8, 8, 8` | Sets the padding around the text within the window. Can have three different formats: `"#"` sets the same padding for all sides, `"#, #"` sets the same padding for left-right and top-bottom, and `"#, #, #, #"` sets the padding individually for left, top, right, and bottom. |
-| `scrollbarState` | Optional | String | `"visible"` | Defines the visibility of the scrollbar. Possible values: `"visible"`, `"hidden"` |
-| `selectionBackground` | Optional | String | | Sets the selection background color of the profile. Overrides `selectionBackground` set in color scheme if `colorscheme` is set. Uses hex color format: `"#rrggbb"`. |
-| `snapOnInput` | Optional | Boolean | `true` | When set to `true`, the window will scroll to the command input line when typing. When set to `false`, the window will not scroll when you start typing. |
-| `altGrAliasing` | Optional | Boolean | `true` | By default Windows treats Ctrl+Alt as an alias for AltGr. When altGrAliasing is set to false, this behavior will be disabled. |
-| `source` | Optional | String | | Stores the name of the profile generator that originated this profile. _There are no discoverable values for this field._ |
-| `startingDirectory` | Optional | String | `%USERPROFILE%` | The directory the shell starts in when it is loaded. |
-| `suppressApplicationTitle` | Optional | Boolean | `false` | When set to `true`, `tabTitle` overrides the default title of the tab and any title change messages from the application will be suppressed. When set to `false`, `tabTitle` behaves as normal. |
-| `tabTitle` | Optional | String | | If set, will replace the `name` as the title to pass to the shell on startup. Some shells (like `bash`) may choose to ignore this initial value, while others (`cmd`, `powershell`) may use this value over the lifetime of the application.  |
-| `useAcrylic` | Optional | Boolean | `false` | When set to `true`, the window will have an acrylic background. When set to `false`, the window will have a plain, untextured background. The transparency only applies to focused windows due to OS limitation. |
-| `experimental.retroTerminalEffect` | Optional | Boolean | `false` | When set to `true`, enable retro terminal effects. This is an experimental feature, and its continued existence is not guaranteed. |
-
-## Schemes
-
-Properties listed below are specific to each color scheme. [ColorTool](https://github.com/microsoft/terminal/tree/master/src/tools/ColorTool) is a great tool you can use to create and explore new color schemes. All colors use hex color format.
-
-| Property | Necessity | Type | Description |
-| -------- | ---- | ----------- | ----------- |
-| `name` | _Required_ | String | Name of the color scheme. |
-| `foreground` | _Required_ | String | Sets the foreground color of the color scheme. |
-| `background` | _Required_ | String | Sets the background color of the color scheme. |
-| `selectionBackground` | Optional | String | Sets the selection background color of the color scheme. |
-| `cursorColor` | Optional | String | Sets the cursor color of the color scheme. |
-| `black` | _Required_ | String | Sets the color used as ANSI black. |
-| `blue` | _Required_ | String | Sets the color used as ANSI blue. |
-| `brightBlack` | _Required_ | String | Sets the color used as ANSI bright black. |
-| `brightBlue` | _Required_ | String | Sets the color used as ANSI bright blue. |
-| `brightCyan` | _Required_ | String | Sets the color used as ANSI bright cyan. |
-| `brightGreen` | _Required_ | String | Sets the color used as ANSI bright green. |
-| `brightPurple` | _Required_ | String | Sets the color used as ANSI bright purple. |
-| `brightRed` | _Required_ | String | Sets the color used as ANSI bright red. |
-| `brightWhite` | _Required_ | String | Sets the color used as ANSI bright white. |
-| `brightYellow` | _Required_ | String | Sets the color used as ANSI bright yellow. |
-| `cyan` | _Required_ | String | Sets the color used as ANSI cyan. |
-| `green` | _Required_ | String | Sets the color used as ANSI green. |
-| `purple` | _Required_ | String | Sets the color used as ANSI purple. |
-| `red` | _Required_ | String | Sets the color used as ANSI red. |
-| `white` | _Required_ | String | Sets the color used as ANSI white. |
-| `yellow` | _Required_ | String | Sets the color used as ANSI yellow. |
-
-## Keybindings
-
-Properties listed below are specific to each custom key binding.
-
-| Property | Necessity | Type | Description |
-| -------- | ---- | ----------- | ----------- |
-| `command` | _Required_ | String | The command executed when the associated key bindings are pressed. |
-| `keys` | _Required_ | Array[String] or String | Defines the key combinations used to call the command. |
-| `action` | Optional | String | Adds additional functionality to certain commands. |
-
-### Implemented Commands and Actions
-
-Commands listed below are per the implementation in [`src/cascadia/TerminalApp/AppKeyBindingsSerialization.cpp`](https://github.com/microsoft/terminal/blob/master/src/cascadia/TerminalApp/AppKeyBindingsSerialization.cpp).
-
-Keybindings can be structured in the following manners:
-
-For commands without arguments:
-<br>
-`{ "command": "commandName", "keys": [ "modifiers+key" ] }`
-
-For commands with arguments:
-<br>
-`{ "command": { "action": "commandName", "argument": "value" }, "keys": ["modifiers+key"] }`
-
-| Command | Command Description | Action (*=required) | Action Arguments | Argument Descriptions |
-| ------- | ------------------- | ------ | ---------------- | ----------------- |
-| `adjustFontSize` | Change the text size by a specified point amount. | `delta` | integer | Amount of size change per command invocation. |
-| `closePane` | Close the active pane. | | | |
-| `closeTab` | Close the current tab. | | | |
-| `closeWindow` | Close the current window and all tabs within it. | | | |
-| `copy` | Copy the selected terminal content to your Windows Clipboard. | 1. `singleLine`<br>2. `copyFormatting` | 1. boolean<br>2. boolean, array | 1. When `true`, the copied content will be copied as a single line. When `false`, newlines persist from the selected text.<br>2. 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. Not setting this value inherits the behavior of the `copyFormatting` global setting. |
-| `duplicateTab` | Make a copy and open the current tab. | | | |
-| `find` | Open the search dialog box. | | | |
-| `moveFocus` | Focus on a different pane depending on direction. | `direction`* | `left`, `right`, `up`, `down` | Direction in which the focus will move. |
-| `newTab` | Create a new tab. Without any arguments, this will open the default profile in a new tab. | 1. `commandLine`<br>2. `startingDirectory`<br>3. `tabTitle`<br>4. `index`<br>5. `profile` | 1. string<br>2. string<br>3. string<br>4. integer<br>5. string | 1. Executable run within the tab.<br>2. Directory in which the tab will open.<br>3. Title of the new tab.<br>4. Profile that will open based on its position in the dropdown (starting at 0).<br>5. Profile that will open based on its GUID or name. |
-| `nextTab` | Open the tab to the right of the current one. | | | |
-| `openNewTabDropdown` | Open the dropdown menu. | | | |
-| `openSettings` | Open the settings file. | | | |
-| `paste` | Insert the content that was copied onto the clipboard. | | | |
-| `prevTab` | Open the tab to the left of the current one. | | | |
-| `resetFontSize` | Reset the text size to the default value. | | | |
-| `resizePane` | Change the size of the active pane. | `direction`* | `left`, `right`, `up`, `down` | Direction in which the pane will be resized. |
-| `scrollDown` | Move the screen down. | | | |
-| `scrollUp` | Move the screen up. | | | |
-| `scrollUpPage` | Move the screen up a whole page. | | | |
-| `scrollDownPage` | Move the screen down a whole page. | | | |
-| `sendInput` | Sends some text input to the shell. | `input` | string | The text input to feed into the shell.<br>ANSI escape sequences may be used. Escape codes like `\x1b` must be written as `\u001b`.<br>For instance the input `"text\n"` will write "text" followed by a newline. `"\u001b[D"` will behave as if the left arrow button had been pressed. |
-| `splitPane` | Halve the size of the active pane and open another. Without any arguments, this will open the default profile in the new pane. | 1. `split`*<br>2. `commandLine`<br>3. `startingDirectory`<br>4. `tabTitle`<br>5. `index`<br>6. `profile`<br>7. `splitMode` | 1. `vertical`, `horizontal`, `auto`<br>2. string<br>3. string<br>4. string<br>5. integer<br>6. string<br>7. string | 1. How the pane will split. `auto` will split in the direction that provides the most surface area.<br>2. Executable run within the pane.<br>3. Directory in which the pane will open.<br>4. Title of the tab when the new pane is focused.<br>5. Profile that will open based on its position in the dropdown (starting at 0).<br>6. Profile that will open based on its GUID or name.<br>7. Controls how the pane splits. Only accepts `duplicate` which will duplicate the focused pane's profile into a new pane. |
-| `switchToTab` | Open a specific tab depending on index. | `index`* | integer | Tab that will open based on its position in the tab bar (starting at 0). |
-| `toggleFullscreen` | Switch between fullscreen and default window sizes. | | | |
-| `unbound` | Unbind the associated keys from any command. | | | |
-
-### Accepted Modifiers and Keys
-
-#### Modifiers
-`ctrl+`, `shift+`, `alt+`
-
-#### Keys
-
-| Type | Keys |
-| ---- | ---- |
-| Function and Alphanumeric Keys | `f1-f24`, `a-z`, `0-9` |
-| Symbols | ``` ` ```, `-`, `=`, `[`, `]`, `\`, `;`, `'`, `,`, `.`, `/` |
-| Arrow Keys | `down`, `left`, `right`, `up`, `pagedown`, `pageup`, `pgdn`, `pgup`, `end`, `home`, `plus`, `app`, `menu` |
-| Action Keys | `tab`, `enter`, `esc`, `escape`, `space`, `backspace`, `delete`, `insert` |
-| Numpad Keys | `numpad_0-numpad_9`, `numpad0-numpad9`, `numpad_add`, `numpad_plus`, `numpad_decimal`, `numpad_period`, `numpad_divide`, `numpad_minus`, `numpad_subtract`, `numpad_multiply` |
-
-## Background Images and Icons
-
-Some Terminal settings allow you to specify custom background images and icons. It is recommended that custom images and icons are stored in system-provided folders and are referred to using the correct [URI Schemes](https://docs.microsoft.com/en-us/windows/uwp/app-resources/uri-schemes). URI Schemes provide a way to reference files independent of their physical paths (which may change in the future).
-
-The most useful URI schemes to remember when customizing background images and icons are:
-
-| URI Scheme | Corresponding Physical Path | Use / description |
-| --- | --- | ---|
-| `ms-appdata:///Local/` | `%localappdata%\Packages\Microsoft.WindowsTerminal_8wekyb3d8bbwe\LocalState\` | Per-machine files |
-| `ms-appdata:///Roaming/` | `%localappdata%\Packages\Microsoft.WindowsTerminal_8wekyb3d8bbwe\RoamingState\` | Common files |
-
-> ⚠ Note: Do not rely on file references using the `ms-appx` URI Scheme (i.e. icons). These files are considered an internal implementation detail and may change name/location or may be omitted in the future.
-
-### Icons
-
-Terminal displays icons for each of your profiles which Terminal generates for any built-in shells - PowerShell Core, PowerShell, and any installed Linux/WSL distros. Each profile refers to a stock icon via the `ms-appx` URI Scheme.
-
-> ⚠ Note: Do not rely on the files referenced by the `ms-appx` URI Scheme - they are considered an internal implementation detail and may change name/location or may be omitted in the future.
-
-You can refer to you own icons if you wish, e.g.:
-
-```json
-    "icon" : "C:\\Users\\richturn\\OneDrive\\WindowsTerminal\\icon-ubuntu-32.png",
-```
-
-> 👉 Tip: Icons should be sized to 32x32px in an appropriate raster image format (e.g. .PNG, .GIF, or .ICO) to avoid having to scale your icons during runtime (causing a noticeable delay and loss of quality.)
-
-### Custom Background Images
-
-You can apply a background image to each of your profiles, allowing you to configure/brand/style each of your profiles independently from one another if you wish.
-
-To do so, specify your preferred `backgroundImage`, position it using `backgroundImageAlignment`, set its opacity with `backgroundImageOpacity`, and/or specify how your image fill the available space using `backgroundImageStretchMode`.
-
-For example:
-```json
-    "backgroundImage": "C:\\Users\\richturn\\OneDrive\\WindowsTerminal\\bg-ubuntu-256.png",
-    "backgroundImageAlignment": "bottomRight",
-    "backgroundImageOpacity": 0.1,
-    "backgroundImageStretchMode": "none"
-```
-
-> 👉 Tip: You can easily roam your collection of images and icons across all your machines by storing your icons and images in OneDrive (as shown above).
-
-With these settings, your Terminal's Ubuntu profile would look similar to this:
-
-![Custom icon and background image](../images/custom-icon-and-background-image.jpg)
+⚠ This document has moved to [the Customize Settings section of the Windows Terminal documentation](https://docs.microsoft.com/windows/terminal/customize-settings/global-settings).

doc/cascadia/profiles.schema.json

@@ -370,7 +370,7 @@
           }
         }
       ],
-      "required": [ "name" ]
+      "required": [ "colorScheme" ]
     },
     "WtAction": {
       "description": "Arguments corresponding to a wt Action",
@@ -397,14 +397,16 @@
           "properties": {
             "action": { "type": "string", "pattern": "closeOtherTabs" },
             "index": {
-              "type": "integer",
+              "oneOf": [
+                { "type": "integer" },
+                { "type": null }
+              ],
               "default": "",
-              "description": "close the tabs following the tab at this index"
+              "description": "Close the tabs other than the one at this index. If no index is provided, use the focused tab's index."
             }
           }
         }
-      ],
-      "required": [ "index" ]
+      ]
     },
     "CloseTabsAfterAction": {
       "description": "Arguments for a closeTabsAfter action",
@@ -414,14 +416,16 @@
           "properties": {
             "action": { "type": "string", "pattern": "closeTabsAfter" },
             "index": {
-              "type": "integer",
+              "oneOf": [
+                { "type": "integer" },
+                { "type": null }
+              ],
               "default": "",
-              "description": "close the tabs other than the one at this index"
+              "description": "Close the tabs following the tab at this index. If no index is provided, use the focused tab's index."
             }
           }
         }
-      ],
-      "required": [ "index" ]
+      ]
     },
     "Keybinding": {
       "additionalProperties": false,
@@ -616,7 +620,7 @@
           "type": "boolean"
         },
         "useTabSwitcher": {
-          "default": true,
+          "default": false,
           "description": "When set to \"true\", the \"nextTab\" and \"prevTab\" commands will use the tab switcher UI.",
           "type": "boolean"
         }

doc/specs/#1564 - Settings UI/design.md

@@ -0,0 +1,112 @@
+---
+author: Kayla Cinnamon @cinnamon-msft
+created on: 2020-07-13
+last updated: 2020-08-11
+issue id: #1564
+---
+
+# Settings UI Design
+
+## Abstract
+
+This design document describes how each page of the settings UI will be laid out along with design mockups to display how the UI will appear. The mock ups are for appearance purposes and some layouts and naming may be different in this doc. This doc should be considered the final say.
+
+## UI Design
+
+### Overall navigation with Startup page
+
+This is the list of the top-level navigation items that will appear on the left nav bar:
+
+- General
+    - Startup
+    - Interaction
+    - Rendering
+- Appearance
+    - Global
+    - Color schemes
+    - Themes*
+- Profiles
+    - Defaults
+    - Enumerate profiles
+    - Add new
+- Keyboard
+- Mouse*
+- Command Palette*
+- Marketplace*
+
+\* Themes, mouse, command palette, and marketplace will be added once they're implemented.
+
+![Overall navigation](./navigation-2.png)
+
+### Profile appearance page
+
+This page requires special design because it includes the TerminalControl window to preview appearance changes. This preview window will appear on the following pages:
+
+- Appearance - Color Schemes
+- Profiles - Appearance
+
+![Appearance page](./appearance.png)
+
+### Keyboard page
+
+The keyboard page will list the enabled key bindings and provide a way for users to add and remove them.
+
+![Keyboard page](./keyboard.png)
+
+When someone hovers over one of the items in the table, the Edit and Delete buttons will appear. Below is what the modal looks like if they were to click Edit on a command that does not have any arguments/actions. In the future, we would want this text box to be able to listen for key combinations. This would add a "listen" button to the UI.
+
+![Keyboard page modal](./keyboard-modal.png)
+
+If the command they select has additional arguments/actions, the modal will dynamically size as arguments/actions are added.
+
+![Keyboard page modal add new arguments](./keyboard-modal-add.png)
+
+![Keyboard page modal arguments](./keyboard-modal-args.png)
+
+## Settings layout
+
+Below is the list of all settings on their respective pages in the settings UI. The title row aligns with the navigation view on the left of the UI. Bolded headers in those columns align with top nav on the page.
+
+| General - Startup | General - Interaction | General - Rendering | Appearance - Global | Appearance - Color Schemes | Profiles - Global | Profiles - Enumerate profiles | Profiles - Add new |
+| ---------------- | --------------------- | ------------------- | ------------------- | -------------------------- | ----------------- | ----------------------------- | ------------------ |
+| Default profile (dropdown) | Copy after selection is made (checkbox) | Software rendering (checkbox) | Theme (radio) | Name (text box) | **General** | **General** | **General** | **General** |
+| Launch on startup (checkbox) | Copy formatting (checkbox) | Screen redrawing (checkbox) | Show/Hide the title bar (checkbox) | Cursor color (color picker) | Command line (text box) | Scrollbar visibility (radio) | Scrollbar visibility (radio) |
+| Launch size (radio) | Word delimiters (text box) | | Show terminal title in title bar (checkbox) | Selection background (color picker) | Starting directory (browse button) | Command line (browse button) | Command line (browse button) |
+| Launch position (text box) | Window resize behavior (checkbox) | | Always show tabs (checkbox) | Background (color picker) | Icon (browse button) | Starting directory (browse button) | Starting directory (browse button) |
+| Columns on first launch (number picker) | | | Tab width mode (radio) | Foreground (color picker) | Tab title (text box) | Name (text box) | Name (text box) |
+| Rows on first launch (number picker) | | | Hide close all tabs popup (checkbox) | Black (color picker) | Scrollbar visibility (radio) | Icon (browse button) | Icon (browse button) |
+| Automatically create new profiles when new shells are installed (checkbox) | | | | Blue (color picker) | **Appearance** | Tab title (text box) | Tab title (text box) |
+| | | | | Cyan (color picker) | Font face (text box) | **Appearance** | **Appearance** |
+| | | | | Green (color picker) | Font size (number picker) | Retro terminal effects (checkbox) | Retro terminal effects (checkbox) |
+| | | | | Purple (color picker) | Font weight (dropdown) | Font face (text box) | Font face (text box) |
+| | | | | Red (color picker) | Padding (text box) | Font size (number picker) | Font size (number picker) |
+| | | | | White (color picker) | Cursor shape (radio) | Font weight (dropdown) | Font weight (dropdown) |
+| | | | | Yellow (color picker) | Cursor color (color picker) | Padding (text box) | Padding (text box) |
+| | | | | Bright black (color picker) | Cursor height (number picker) | Cursor shape (radio) | Cursor shape (radio) |
+| | | | | Bright blue (color picker) | Color scheme (dropdown) | Cursor color (color picker) | Cursor color (color picker) |
+| | | | | Bright cyan (color picker) | Foreground color (color picker) | Cursor height (number picker) | Cursor height (number picker) |
+| | | | | Bright green (color picker) | Background color (color picker) | Color scheme (dropdown) | Color scheme (dropdown) |
+| | | | | Bright purple (color picker) | Selection background color (color picker) | Foreground color (color picker) | Foreground color (color picker) |
+| | | | | Bright red (color picker) | Enable acrylic (checkbox) | Background color (color picker) | Background color (color picker) |
+| | | | | Bright white (color picker) | Acrylic opacity (number picker) | Selection background color (color picker) | Selection background color (color picker) |
+| | | | | Bright yellow (color picker) | Background image (browse button) | Enable acrylic (checkbox) | Enable acrylic (checkbox) |
+| | | | | | Background image stretch mode (radio) | Acrylic opacity (number picker) | Acrylic opacity (number picker) |
+| | | | | | Background image alignment (dropdown) | Background image (browse button) | Background image (browse button) |
+| | | | | | Background image opacity (number picker) | Background image stretch mode (radio) | Background image stretch mode (radio) |
+| | | | | | Retro terminal effects (checkbox) | Background image alignment (dropdown) | Background image alignment (dropdown) |
+| | | | | | **Advanced** | Background image opacity (number picker) | Background image opacity (number picker) |
+| | | | | | Hide profile from dropdown (checkbox) | **Advanced** | **Advanced** |
+| | | | | | Suppress title changes (checkbox) | GUID (text box) | GUID (text box) |
+| | | | | | Antialiasing text (radio) | Hide profile from dropdown (checkbox) | Hide profile from dropdown (checkbox) |
+| | | | | | AltGr aliasing (checkbox) | Suppress title changes (checkbox) | Suppress title changes (checkbox) |
+| | | | | | Scroll to input when typing (checkbox) | Antialiasing text (radio) | Antialiasing text (radio) |
+| | | | | | History size (number picker) | AltGr aliasing (checkbox) | AltGr aliasing (checkbox) |
+| | | | | | How the profile closes (radio) | Scroll to input when typing (checkbox) | Scroll to input when typing (checkbox) |
+| | | | | | | History size (number picker) | History size (number picker) |
+| | | | | | | How the profile closes (radio) | How the profile closes (radio) |
+
+## Potential Issues
+
+## Future considerations
+
+## Resources

doc/specs/#1564 - Settings UI/spec.md

@@ -0,0 +1,122 @@
+---
+author: Kayla Cinnamon @cinnamon-msft
+created on: 2020-06-29
+last updated: 2020-08-10
+issue id: #1564
+---
+
+# Settings UI Implementation
+
+## Abstract
+
+This spec describes the basic functionality of the settings UI, including disabling it, the navigation items, launch methods, and editing of settings. The specific layout of each page will defined in later design reviews.
+
+## Inspiration
+
+We have been wanting a settings UI since the dawn of Terminal time, so we need to define how it will interact with the application and how users should expect to interact with it.
+
+## Solution Design
+
+The settings UI will be the default experience. We will provide users an option to skip the settings UI and edit the raw JSON file.
+
+### Ability to disable displaying the settings UI
+
+Some users don't want a UI for the settings. We can update the `openSettings` key binding with a `settingsUI` option.
+
+If people still like the UI but want to access the JSON file, we can provide an "Open the JSON file" button at the bottom of the navigation menu.
+
+### Launch method: launch in a new tab
+
+Clicking the settings button in the dropdown menu will open the settings UI in a new tab. This helps us take steps toward supporting non-terminal content in a tab. Users will be able to see their visual changes by using the preview window inside the settings UI on relevant pages.
+
+#### We also considered: launch in a new window
+
+Clicking the settings button in the dropdown menu will open the settings UI in a new window. This allows the user to edit their settings and see the Terminal live update with their changes.
+
+In the Windows taskbar, the icon will appear as if Terminal has multiple windows open.
+
+### Editing and saving settings: implement a save button
+
+Users will only see their settings changes take place once they click "Save". Clicking "Save" will write to the settings.json file. This aligns with the functionality that exists today by editing the settings.json file in a text editor and saving it.
+
+We will also be adding a TerminalControl inside the settings UI to preview what the changes will look like before actually saving them to the settings.json file.
+
+#### We also considered: automatically save settings
+
+As users edit fields in the settings UI, they are automatically saved and written to the JSON file. This allows the user to see their settings changes taking place in real time.
+
+## UI/UX Design
+
+Layout of all of the settings per page can be found in the [design doc](./design.md).
+
+### Top-level navigation: more descriptive navigation
+
+The navigation menu is broken up into more digestible sections. This aligns more closely to other terminals. The following are the proposed navigation items:
+
+- General
+    - Startup
+    - Interaction
+    - Rendering
+- Appearance
+    - Global
+    - Color schemes
+    - Themes*
+- Profiles
+    - Defaults
+    - Enumerate profiles
+    - Add new
+- Keyboard
+- Mouse*
+- Command Palette*
+- Marketplace*
+
+\* Themes, mouse, command palette, and marketplace will be added once they're implemented.
+
+![Settings UI navigation 2](./navigation-2.png)
+
+#### We also considered: align with JSON
+
+The settings UI could have top-level navigation that aligns with the overall structure of the settings.json file. The following are the proposed navigation items:
+
+- Globals
+- Profiles
+- Color schemes
+- Bindings
+
+For Bindings, it would have key bindings, mouse bindings, and command palette inside it.
+
+![Settings UI navigation 1](./navigation.png)
+
+## Capabilities
+
+### Accessibility
+
+This will have to undergo full accessibility testing because it is a new UI element. All items inside the settings UI should be accessible by a screen reader and the keyboard. Additionally, all of the settings UI will have to be localized.
+
+### Security
+
+This does not impact security.
+
+### Reliability
+
+This will not improve reliability.
+
+### Compatibility
+
+This will change the default experience to open the UI, rather than the JSON file in a text editor. This behavior can be reverted with the setting listed [above](#ability-to-disable-displaying-the-settings-ui).
+
+### Performance, Power, and Efficiency
+
+This does not affect performance, power, nor efficiency.
+
+## Potential Issues
+
+## Future considerations
+
+- We will have to have design reviews for all of the content pages.
+- The `hidden` property will need special consideration. Ideally, all profiles will appear in the settings regardless if `hidden` is set to `true`.
+- We should have undo functionality. In a text editor, you can type `Ctrl+Z` however the settings UI is a bit more complex.
+- Once we have a marketplace for themes and extensions, this should be added to the top-level navigation.
+- As we add more features, the top-level navigation is subject to change in favor of improved usability.
+
+## Resources

doc/user-docs/ThirdPartyToolProfiles.md

@@ -1,13 +1,7 @@
 # Adding profiles for third-party tools
 
-This doc will hopefully provide a useful guide for adding profiles for common
-third-party tools to your
-[settings.json](https://github.com/microsoft/terminal/blob/master/doc/user-docs/UsingJsonSettings.md)
-file.
-
-All of these profiles are provided _without_ their `guid` set. If you'd like to
-set any of these profiles as your _default_ profile, you'll need to make sure to
-[generate a unique guid](https://www.guidgenerator.com/) for them manually.
+This doc will hopefully provide a useful guide for adding profiles for common third-party tools to your
+[settings.json](https://docs.microsoft.com/en-us/windows/terminal/customize-settings/profile-settings) file.
 
 ## Anaconda
 
@@ -15,10 +9,10 @@ Assuming that you've installed Anaconda into `%USERPROFILE%\Anaconda3`:
 
 ```json
 {
-    "commandline" : "cmd.exe /k \"%USERPROFILE%\\Anaconda3\\Scripts\\activate.bat %USERPROFILE%\\Anaconda3\"",
-    "icon" : "%USERPROFILE%/Anaconda3/Menu/anaconda-navigator.ico",
-    "name" : "Anaconda3",
-    "startingDirectory" : "%USERPROFILE%"
+    "commandline": "cmd.exe /k \"%USERPROFILE%\\Anaconda3\\Scripts\\activate.bat %USERPROFILE%\\Anaconda3\"",
+    "icon": "%USERPROFILE%\\Anaconda3\\Menu\\anaconda-navigator.ico",
+    "name": "Anaconda3",
+    "startingDirectory": "%USERPROFILE%"
 }
 ```
 
@@ -28,23 +22,23 @@ Assuming that you've installed cmder into `%CMDER_ROOT%`:
 
 ```json
 {
-    "commandline" : "cmd.exe /k \"%CMDER_ROOT%\\vendor\\init.bat\"",
-    "name" : "cmder",
-    "icon" : "%CMDER_ROOT%/icons/cmder.ico",
-    "startingDirectory" : "%USERPROFILE%"
+    "commandline": "cmd.exe /k \"%CMDER_ROOT%\\vendor\\init.bat\"",
+    "name": "cmder",
+    "icon": "%CMDER_ROOT%\\icons\\cmder.ico",
+    "startingDirectory": "%USERPROFILE%"
 }
 ```
 
 ## Cygwin
 
-Assuming that you've installed Cygwin into `C:/Cygwin`:
+Assuming that you've installed Cygwin into `C:\Cygwin`:
 
 ```json
 {
-    "name" : "Cygwin",
-    "commandline" : "C:/Cygwin/bin/bash --login -i",
-    "icon" : "C:/Cygwin/Cygwin.ico",
-    "startingDirectory" : "C:/Cygwin/bin"
+    "name": "Cygwin",
+    "commandline": "C:\\Cygwin\\bin\\bash --login -i",
+    "icon": "C:\\Cygwin\\Cygwin.ico",
+    "startingDirectory": "C:\\Cygwin\\bin"
 }
 ```
 
@@ -58,49 +52,49 @@ Assuming that you've installed Far into `c:\Program Files\Far Manager`:
 
 ```json
 {
-    "name" : "Far",
-    "commandline" : "\"c:\\program files\\far manager\\far.exe\"",
-    "startingDirectory" : "%USERPROFILE%",
-    "useAcrylic" : false
+    "name": "Far",
+    "commandline": "\"c:\\program files\\far manager\\far.exe\"",
+    "startingDirectory": "%USERPROFILE%",
+    "useAcrylic": false
 },
 ```
 
 ## Git Bash
 
-Assuming that you've installed Git Bash into `C:/Program Files/Git`:
+Assuming that you've installed Git Bash into `C:\\Program Files\\Git`:
 
 ```json
 {
-    "name" : "Git Bash",
-    "commandline" : "C:/Program Files/Git/bin/bash.exe -li",
-    "icon" : "C:/Program Files/Git/mingw64/share/git/git-for-windows.ico",
-    "startingDirectory" : "%USERPROFILE%"
+    "name": "Git Bash",
+    "commandline": "C:\\Program Files\\Git\\bin\\bash.exe -li",
+    "icon": "C:\\Program Files\\Git\\mingw64\\share\\git\\git-for-windows.ico",
+    "startingDirectory": "%USERPROFILE%"
 }
 ````
 
 ## Git Bash (WOW64)
 
-Assuming that you've installed Git Bash into `C:/Program Files (x86)/Git`:
+Assuming that you've installed Git Bash into `C:\\Program Files (x86)\\Git`:
 
 ```json
 {
-    "name" : "Git Bash",
-    "commandline" : "%ProgramFiles(x86)%/Git/bin/bash.exe -li",
-    "icon" : "%ProgramFiles(x86)%/Git/mingw32/share/git/git-for-windows.ico",
-    "startingDirectory" : "%USERPROFILE%"
+    "name": "Git Bash",
+    "commandline": "%ProgramFiles(x86)%\\Git\\bin\\bash.exe -li",
+    "icon": "%ProgramFiles(x86)%\\Git\\mingw32\\share\\git\\git-for-windows.ico",
+    "startingDirectory": "%USERPROFILE%"
 }
 ```
 
 ## MSYS2
 
-Assuming that you've installed MSYS2 into `C:/msys64`:
+Assuming that you've installed MSYS2 into `C:\\msys64`:
 
 ```json
 {
-    "name" : "MSYS2",
-    "commandline" : "C:/msys64/msys2_shell.cmd -defterm -no-start -mingw64",
-    "icon": "C:/msys64/msys2.ico",
-    "startingDirectory" : "C:/msys64/home/user"
+    "name": "MSYS2",
+    "commandline": "C:\\msys64\\msys2_shell.cmd -defterm -no-start -mingw64",
+    "icon": "C:\\msys64\\msys2.ico",
+    "startingDirectory": "C:\\msys64\\home\\user"
 }
 ````
 
@@ -110,9 +104,9 @@ Assuming that you've installed VS 2019 Professional:
 
 ```json
 {
-    "name" : "Developer Command Prompt for VS 2019",
-    "commandline" : "cmd.exe /k \"C:/Program Files (x86)/Microsoft Visual Studio/2019/Professional/Common7/Tools/VsDevCmd.bat\"",
-    "startingDirectory" : "%USERPROFILE%"
+    "name": "Developer Command Prompt for VS 2019",
+    "commandline": "cmd.exe /k \"C:/Program Files (x86)/Microsoft Visual Studio/2019/Professional/Common7/Tools/VsDevCmd.bat\"",
+    "startingDirectory": "%USERPROFILE%"
 }
 ```
 

doc/user-docs/UsingCommandlineArguments.md

@@ -1,201 +1 @@
----
-author: Mike Griese @zadjii-msft
-created on: 2020-01-16
-last updated: 2020-01-17
----
-
-# Using the `wt.exe` Commandline
-
-As of [#4023], the Windows Terminal now supports accepting arguments on the
-commandline, to enable launching the Terminal in a non-default configuration.
-This document serves as a reference for all the parameters you can currently
-pass, and gives some examples of how to use the `wt` commandline.
-
-> NOTE: If you're running the Terminal built straight from the repo, you'll need
-> to use `wtd.exe` and `wtd` instead of `wt.exe` and `wt`.
-
-1. [Commandline Reference](#Reference)
-1. [Commandline Examples](#Examples)
-
-## Reference
-
-### Options
-
-#### `--help,-h,-?,/?,`
-
-Display the help message.
-
-## Subcommands
-
-#### `new-tab`
-
-`new-tab [terminal_parameters]`
-
-Opens a new tab with the given customizations. On its _first_ invocation, also
-opens a new window. Subsequent `new-tab` commands will all open new tabs in the
-same window. <sup>[[1](#footnote-1)]</sup>
-
-**Parameters**:
-
-* `[terminal_parameters]`: See [[terminal_parameters]](#terminal_parameters).
-
-#### `split-pane`
-
-`split-pane [-H,--horizontal|-V,--vertical] [terminal_parameters]`
-
-Creates a new pane in the currently focused tab by splitting the given pane
-vertically or horizontally. <sup>[[1](#footnote-1)]</sup>
-
-**Parameters**:
-
-* `-H,--horizontal`, `-V,--vertical`: Used to indicate which direction to split
-  the pane. `-V` is "vertically" (think `[|]`), and `-H` is "horizontally"
-  (think `[-]`). If omitted, defaults to "auto", which splits the current pane
-  in whatever the larger dimension is. If both `-H` and `-V` are provided,
-  defaults to vertical.
-* `[terminal_parameters]`: See [[terminal_parameters]](#terminal_parameters).
-
-#### `focus-tab`
-
-`focus-tab [--target,-t tab-index]|[--next,-n]|[--previous,-p]`
-
-Moves focus to a given tab.
-
-**Parameters**:
-
-* `--target,-t tab-index`: moves focus to the tab at index `tab-index`. If
-  omitted, defaults to `0` (the first tab). Will display an error if combined
-  with either of `--next` or `--previous`.
-* `-n,--next`: Move focus to the next tab. Will display an error if combined
-  with either of `--previous` or `--target`.
-* `-p,--previous`: Move focus to the previous tab. Will display an error if
-  combined with either of `--next` or `--target`.
-
-#### `[terminal_parameters]`
-
-Some of the preceding commands are used to create a new terminal instance.
-These commands are listed above as accepting `[terminal_parameters]` as a
-parameter. For these commands, `[terminal_parameters]` can be any of the
-following:
-
-`[--profile,-p profile-name] [--startingDirectory,-d starting-directory] [commandline]`
-
-* `--profile,-p profile-name`: Use the given profile to open the new tab/pane,
-  where `profile-name` is the `name` or `guid` of a profile. If `profile-name`
-  does not match _any_ profiles, uses the default.
-* `--startingDirectory,-d starting-directory`: Overrides the value of
-  `startingDirectory` of the specified profile, to start in `starting-directory`
-  instead.
-* `commandline`: A commandline to replace the default commandline of the
-  selected profile. If the user wants to use a `;` in this commandline, it
-  should be escaped as `\;`.
-
-### Notes
-
-* <span id="footnote-1"></span> [1]: If you try to run a `wt` commandline while running in a Windows Terminal window, the commandline will _always_ create a new window by default. Being able to run `wt` commandlines in the _current_ window is planned in the future - for more information, refer to [#4472].
-
-## Examples
-
-### Open Windows Terminal in the current directory
-
-```powershell
-wt -d .
-```
-
-This will launch a new Windows Terminal window in the current working directory.
-It will use your default profile, but instead of using the `startingDirectory`
-property from that it will use the current path. This is especially useful for
-launching the Windows Terminal in a directory you currently have open in an
-`explorer.exe` window.
-
-### Opening with multiple panes
-
-If you want to open with multiple panes in the same tab all at once, you can use
-the `split-pane` command to create new panes.
-
-Consider the following commandline:
-
-```powershell
-wt ; split-pane -p "Windows PowerShell" ; split-pane -H wsl.exe
-```
-
-This creates a new Windows Terminal window with one tab, and 3 panes:
-
-* `wt`: Creates the new tab with the default profile
-* `split-pane -p "Windows PowerShell"`: This will create a new pane, split from
-  the parent with the default profile. This pane will open with the "Windows
-  PowerShell" profile
-* `split-pane -H wsl.exe`: This will create a third pane, split _horizontally_
-  from the "Windows PowerShell" pane. It will be running the default profile,
-  and will use `wsl.exe` as the commandline (instead of the default profile's
-  `commandline`).
-
-
-### Using multiple commands from PowerShell
-
-The Windows Terminal uses the semicolon character `;` as a delimiter for
-separating subcommands in the `wt` commandline. Unfortunately, `powershell` also
-uses `;` as a command separator. To work around this you can use the following
-tricks to help run multiple wt sub commands from powershell. In all the
-following examples, we'll be creating a new Terminal window with three panes -
-one running `cmd`, one with `powershell`, and a last one running `wsl`.
-
-In each of the following examples, we're using the `Start-Process` command to
-run `wt`. For more information on why we're using `Start-Process`, see ["Using
-`start`"](#using-start) below.
-
-#### Single quoted parameters (if you aren't calculating anything):
-
-In this example, we'll wrap all the parameters to `wt` in single quotes (`'`)
-
-```PowerShell
-start wt 'new-tab "cmd"; split-pane -p "Windows PowerShell" ; split-pane -H wsl.exe'
-```
-
-#### Escaped quotes (if you need variables):
-
-If you'd like to pass a value contained in a variable to the `wt` commandline,
-instead use the following syntax:
-
-```PowerShell
-$ThirdPane = "wsl.exe"
-start wt "new-tab cmd; split-pane -p `"Windows PowerShell`" ; split-pane -H $ThirdPane"
-```
-
-Note the usage of  `` ` `` to escape the double-quotes (`"`) around "Windows
-Powershell" in the `-p` parameter to the `split-pane` sub-command.
-
-#### Using `start`
-
-All the above examples explicitly used `start` to launch the Terminal.
-
-In the following examples, we're going to not use `start` to run the
-commandline. Instead, we'll try two other methods of escaping the commandline:
-* Only escaping the semicolons so that `powershell` will ignore them and pass
-  them straight to `wt`.
-* Using `--%`, so powershell will treat the rest of the commandline as arguments
-  to the application.
-
-```PowerShell
-wt new-tab "cmd" `; split-pane -p "Windows PowerShell" `; split-pane -H wsl.exe
-```
-
-```Powershell
-wt --% new-tab cmd ; split-pane -p "Windows PowerShell" ; split-pane -H wsl.exe
-```
-
-In both these examples, the newly created Windows Terminal window will create
-the window by correctly parsing all the provided commandline arguments.
-
-However, these methods are _not_ recommended currently, as Powershell will wait
-for the newly-created Terminal window to be closed before returning control to
-Powershell. By default, Powershell will always wait for Windows Store
-applications (like the Windows Terminal) to close before returning to the
-prompt. Note that this is different than the behavior of `cmd`, which will return
-to the prompt immediately. See
-[Powershell/PowerShell#9970](https://github.com/PowerShell/PowerShell/issues/9970)
-for more details on this bug.
-
-
-[#4023]: https://github.com/microsoft/terminal/pull/4023
-[#4472]: https://github.com/microsoft/terminal/issues/4472
+⚠ This document has moved to [Using command-line arguments for Windows Terminal](https://docs.microsoft.com/windows/terminal/command-line-arguments).

doc/user-docs/UsingJsonSettings.md

@@ -1,483 +1 @@
-# Editing Windows Terminal JSON Settings
-
-One way (currently the only way) to configure Windows Terminal is by editing the
-`settings.json` settings file. At the time of writing you can open the settings
-file in your default editor by selecting `Settings` from the WT pull down menu.
-
-The settings are stored in the file `$env:LocalAppData\Packages\Microsoft.WindowsTerminal_8wekyb3d8bbwe\LocalState\settings.json`.
-
-As of [#2515](https://github.com/microsoft/terminal/pull/2515), the settings are
-split into _two_ files: a hardcoded `defaults.json`, and `settings.json`, which
-contains the user settings. Users should only be concerned with the contents of
-the `settings.json`, which contains their customizations. The `defaults.json`
-file is only provided as a reference of what the default settings are. For more
-details on how these two files work, see [Settings
-Layering](#settings-layering). To view the default settings file, click on the
-"Settings" button while holding the <kbd>Alt</kbd> key.
-
-Details of specific settings can be found [here](../cascadia/SettingsSchema.md).
-A general introduction is provided below.
-
-The settings are grouped under four headings:
-
-1. Global: Settings that apply to the whole application e.g. Default profile, initial size etc.
-2. Key Bindings: Actually a sub field of the global settings, but worth discussing separately
-3. Profiles: A group of settings to be applied to a tab when it is opened using that profile. E.g. shell to use, cursor shape etc.
-4. Schemes: Sets of colors for background, text etc. that can be used by profiles
-
-## Global Settings
-
-These settings define startup defaults, and application-wide settings that might
-not affect a particular terminal instance.
-
-* Theme
-* Title Bar options
-* Initial size
-* Default profile used when the Windows Terminal is started
-
-Example settings include
-
-```json
-{
-    "defaultProfile" : "{58ad8b0c-3ef8-5f4d-bc6f-13e4c00f2530}",
-    "initialCols" : 120,
-    "initialRows" : 50,
-    "theme" : "system",
-    "keybindings" : []
-    ...
-}
-```
-
-These global properties should exist in the root json object.
-
-## Key Bindings
-
-This is an array of key chords and shortcuts to invoke various commands.
-Each command can have more than one key binding.
-
-> 👉 **Note**: Key bindings is a subfield of the global settings and
-> key bindings apply to all profiles in the same manner.
-
-For example, here's a sample of the default keybindings:
-
-```json
-{
-    "keybindings":
-    [
-        { "command": "closePane", "keys": ["ctrl+shift+w"] },
-        { "command": "copy", "keys": ["ctrl+shift+c"] },
-        { "command": "newTab", "keys": ["ctrl+shift+t"] },
-        // etc.
-    ]
-}
-```
-
-You can also use a single key chord string as the value of `"keys"`.
-It will be treated as a chord of length one.
-This will allow you to simplify the above snippet as follows:
-
-```json
-{
-    "keybindings":
-    [
-        { "command": "closePane", "keys": "ctrl+shift+w" },
-        { "command": "copy", "keys": "ctrl+shift+c" },
-        { "command": "newTab", "keys": "ctrl+shift+t" },
-        // etc.
-    ]
-}
-```
-
-A list of default key bindings is available [here](https://github.com/microsoft/terminal/blob/master/src/cascadia/TerminalApp/defaults.json#L204).
-
-### Unbinding keys
-
-If you ever come across a key binding that you're unhappy with, it's possible to
-easily change the keybindings. For example, vim uses <kbd>Ctrl+^</kbd> as a
-binding for "switch to previous buffer", which conflicts with the Terminal's
-default keybinding for "open a new tab with the sixth profile". If you'd like to
-unbind that keybinding, and allow the keystroke to fall through to vim, you can
-add the following to your keybindings:
-
-```json
-{
-    "command" : null, "keys" : ["ctrl+shift+6"]
-},
-```
-
-This will _unbind_ <kbd>Ctrl+Shift+6</kbd>, allowing vim to use the keystroke
-instead of the terminal.
-
-### Binding multiple keys
-
-You can have multiple key chords bound to the same action. To do this, simply
-add multiple bindings for the same action. For example:
-
-```json
-    "keybindings" :
-    [
-        { "command": "copy", "keys": "ctrl+shift+c" },
-        { "command": "copy", "keys": "ctrl+c" },
-        { "command": "copy", "keys": "enter" }
-    ]
-```
-
-In this snippet, all three of <kbd>ctrl+shift+c</kbd>, <kbd>ctrl+c</kbd> and <kbd>enter</kbd> are bound to `copy`.
-
-## Profiles
-
-A profile contains the settings applied when a new WT tab is opened. Each
-profile is identified by a GUID and contains a number of other fields.
-
-> 👉 **Note**: The `guid` property is the unique identifier for a profile. If
-> multiple profiles all have the same `guid` value, you may see unexpected
-> behavior.
-
-* Which command to execute on startup - this can include arguments.
-* Starting directory
-* Which color scheme to use (see Schemes below)
-* Font face and size
-* Various settings to control appearance. E.g. Opacity, icon, cursor appearance, display name etc.
-* Other behavioral settings. E.g. Close on exit, snap on input, .....
-
-Example settings include
-
-```json
-    "closeOnExit" : true,
-    "colorScheme" : "Campbell",
-    "commandline" : "wsl.exe -d Debian",
-    "cursorColor" : "#FFFFFF",
-    "cursorShape" : "bar",
-    "fontFace" : "Hack",
-    "fontSize" : 9,
-    "guid" : "{58ad8b0c-3ef8-5f4d-bc6f-13e4c00f2530}",
-    "name" : "Debian",
-    "startingDirectory" : "%USERPROFILE%\\wslhome"
-    ....
-```
-
-> 👉 **Note**: To use backslashes in any path field, you'll need to escape them following JSON escaping rules (like shown above). As an alternative, you can use forward slashes ("%USERPROFILE%/wslhome").
-
-The profile GUID is used to reference the default profile in the global settings.
-
-The values for background image stretch mode are documented [here](https://docs.microsoft.com/en-us/uwp/api/windows.ui.xaml.media.stretch).
-
-### Hiding a profile
-
-If you want to remove a profile from the list of profiles in the new tab
-dropdown, but keep the profile around in your `settings.json` file, you can add
-the property `"hidden": true` to the profile's json. This can also be used to
-remove the default `cmd` and PowerShell profiles, if the user does not wish to
-see them.
-
-## Color Schemes
-
-Each scheme defines the color values to be used for various terminal escape sequences.
-Each schema is identified by the name field. Examples include
-
-```json
-    "name" : "Campbell",
-    "background" : "#0C0C0C",
-    "black" : "#0C0C0C",
-    "blue" : "#0037DA",
-    "foreground" : "#F2F2F2",
-    "green" : "#13A10E",
-    "red" : "#C50F1F",
-    "white" : "#CCCCCC",
-    "yellow" : "#C19C00"
-    ...
-```
-
-The schema name can then be referenced in one or more profiles.
-
-## Settings layering
-
-The runtime settings are actually constructed from _three_ sources:
-
-* The default settings, which are hardcoded into the application, and available
-  in `defaults.json`. This includes the default keybindings, color schemes, and
-  profiles for both Windows PowerShell and Command Prompt (`cmd.exe`).
-* Dynamic Profiles, which are generated at runtime. These include Powershell
-  Core, the Azure Cloud Shell connector, and profiles for and WSL distros.
-* The user settings from `settings.json`.
-
-Settings from each of these sources are "layered" upon the settings from
-previous sources. In this manner, the user settings in `settings.json` can
-contain _only the changes from the default settings_. For example, if a user
-would like to only change the color scheme of the default `cmd` profile to
-"Solarized Dark", you could change your cmd profile to the following:
-
-```js
-        {
-            // Make changes here to the cmd.exe profile
-            "guid": "{0caa0dad-35be-5f56-a8ff-afceeeaa6101}",
-            "colorScheme": "Solarized Dark"
-        }
-```
-
-Here, we know we're changing the `cmd` profile, because the `guid`
-`"{0caa0dad-35be-5f56-a8ff-afceeeaa6101}"` is `cmd`'s unique GUID. Any profiles
-with that GUID will all be treated as the same object. Any changes in that
-profile will overwrite those from the defaults.
-
-Similarly, you can overwrite settings from a color scheme by defining a color
-scheme in `settings.json` with the same name as a default color scheme.
-
-If you'd like to unbind a keystroke that's bound to an action in the default
-keybindings, you can set the `"command"` to `"unbound"` or `null`. This will
-allow the keystroke to fallthrough to the commandline application instead of
-performing the default action.
-
-### Dynamic Profiles
-
-When dynamic profiles are created at runtime, they'll be added to the
-`settings.json` file. You can identify these profiles by the presence of a
-`"source"` property. These profiles are tied to their source - if you uninstall
-a linux distro, then the profile will remain in your `settings.json` file, but
-the profile will be hidden.
-
-The Windows Terminal uses the `guid` property of these dynamically-generated
-profiles to uniquely identify them. If you try to change the `guid` of a
-dynamically-generated profile, the Terminal will automatically recreate a new
-entry for that profile.
-
-If you'd like to disable a particular dynamic profile source, you can add that
-`source` to the global `"disabledProfileSources"` array. For example, if you'd
-like to hide all the WSL profiles, you could add the following setting:
-
-```json
-
-    "disabledProfileSources": ["Windows.Terminal.WSL"],
-    ...
-
-```
-
-> 👉 **NOTE**: On launch, if a dynamic profile generator is enabled, it will
-> always add new profiles it detects to your list of profiles. If you delete a
-> dynamically generated profile from your list of profiles, it will just get
-> re-added the next time the Terminal is launched! To remove a dynamic profile
-> from your list of profiles, make sure to set `"hidden": true` in the profile.
-
-### Default settings
-
-In [#2325](https://github.com/microsoft/terminal/issues/2325), we introduced the
-concept of "Default Profile Settings". These are settings that will apply to all
-of your profiles by default. Profiles can still override these settings
-individually. With default profile settings, you can easily make changes to all
-your profiles at once. For example, given the following settings:
-
-```json
-    "defaultProfile": "{61c54bbd-c2c6-5271-96e7-009a87ff44bf}",
-    "profiles":
-    [
-        {
-            "guid": "{61c54bbd-c2c6-5271-96e7-009a87ff44bf}",
-            "name": "Windows PowerShell",
-            "commandline": "powershell.exe",
-            "fontFace": "Cascadia Code",
-            "fontSize": 14
-        },
-        {
-            "guid": "{0caa0dad-35be-5f56-a8ff-afceeeaa6101}",
-            "name": "cmd",
-            "commandline": "cmd.exe",
-            "fontFace": "Cascadia Code",
-            "fontSize": 14
-        },
-        {
-            "commandline" : "cmd.exe /k %CMDER_ROOT%\\vendor\\init.bat",
-            "name" : "cmder",
-            "startingDirectory" : "%USERPROFILE%",
-            "fontFace": "Cascadia Code",
-            "fontSize": 14
-        }
-    ],
-```
-
-All three of these profiles are using "Cascadia Code" as their `"fontFace"`, and
-14 as their `fontSize`. With default profile settings, you can easily set these
-properties for all your profiles, like so:
-
-```json
-    "defaultProfile": "{61c54bbd-c2c6-5271-96e7-009a87ff44bf}",
-    "profiles": {
-        "defaults":
-        {
-            "fontFace": "Cascadia Code",
-            "fontSize": 14
-        },
-        "list": [
-            {
-                "guid": "{61c54bbd-c2c6-5271-96e7-009a87ff44bf}",
-                "name": "Windows PowerShell",
-                "commandline": "powershell.exe"
-            },
-            {
-                "guid": "{0caa0dad-35be-5f56-a8ff-afceeeaa6101}",
-                "name": "cmd",
-                "commandline": "cmd.exe"
-            },
-            {
-                "commandline" : "cmd.exe /k %CMDER_ROOT%\\vendor\\init.bat",
-                "name" : "cmder",
-                "startingDirectory" : "%USERPROFILE%"
-            }
-        ]
-    },
-```
-
-Note that the `profiles` property has changed in this example from a _list_ of
-profiles, to an _object_ with two properties:
-
-* a `list` that contains the list of all the profiles
-* the new `defaults` object, which contains all the settings that should apply to
-  every profile.
-
-What if I wanted a profile to have a different value for a property other than
-the default? Simply set the property in the profile's entry to override the
-value from `defaults`. Let's say you want the `cmd` profile to have _"Consolas"_
-as the font, but the rest of your profiles to still have _"Cascadia Code"_. You
-could achieve that with the following:
-
-```json
-    "defaultProfile": "{61c54bbd-c2c6-5271-96e7-009a87ff44bf}",
-    "profiles": {
-        "defaults":
-        {
-            "fontFace": "Cascadia Code",
-            "fontSize": 14
-        },
-        "list": [
-            {
-                "guid": "{61c54bbd-c2c6-5271-96e7-009a87ff44bf}",
-                "name": "Windows PowerShell",
-                "commandline": "powershell.exe"
-            },
-            {
-                "guid": "{0caa0dad-35be-5f56-a8ff-afceeeaa6101}",
-                "name": "cmd",
-                "commandline": "cmd.exe",
-                "fontFace": "Consolas"
-            },
-            {
-                "commandline" : "cmd.exe /k %CMDER_ROOT%\\vendor\\init.bat",
-                "name" : "cmder",
-                "startingDirectory" : "%USERPROFILE%"
-            }
-        ]
-    },
-```
-
-In the above settings, the `"fontFace"` in the `cmd.exe` profile overrides the
-`"fontFace"` from the `defaults`.
-
-## Configuration Examples
-
-### Add a custom background to the WSL Debian terminal profile
-
-1. Download the [Debian JPG logo](https://www.debian.org/logos/openlogo-100.jpg)
-2. Put the image in the
- `$env:LocalAppData\Packages\Microsoft.WindowsTerminal_<randomString>\LocalState\`
- directory (same directory as your `settings.json` file).
-
-    __NOTE__:  You can put the image anywhere you like, the above suggestion happens to be convenient.
-3. Open your WT json properties file.
-4. Under the Debian Linux profile, add the following fields:
-
-```json
-    "backgroundImage": "ms-appdata:///Local/openlogo-100.jpg",
-    "backgroundImageOpacity": 1,
-    "backgroundImageStretchMode" : "none",
-    "backgroundImageAlignment" : "topRight",
-```
-
-5. Make sure that `useAcrylic` is `false`.
-6. Save the file.
-7. Jump over to WT and verify your changes.
-
-Notes:
-
-1. You will need to experiment with different color settings
-and schemes to make your terminal text visible on top of your image
-2. If you store the image in the UWP directory (the same directory as your settings.json file),
-then you should use the URI style path name given in the above example.
-More information about UWP URI schemes [here](https://docs.microsoft.com/en-us/windows/uwp/app-resources/uri-schemes).
-3. Instead of using a UWP URI you can use a:
-    1. URL such as
-`http://open.esa.int/files/2017/03/Mayer_and_Bond_craters_seen_by_SMART-1-350x346.jpg`
-    2. Local file location such as `C:\Users\Public\Pictures\openlogo.jpg`
-
-### Adding Copy and Paste Keybindings
-
-As of [#1093](https://github.com/microsoft/terminal/pull/1093) (first available
-in Windows Terminal v0.3), the Windows Terminal now supports copy and paste
-keyboard shortcuts. However, if you installed and ran the terminal before that,
-you won't automatically get the new keybindings added to your settings. If you'd
-like to add shortcuts for copy and paste, you can do so by inserting the
-following objects into your `globals.keybindings` array:
-
-```json
-{ "command": "copy", "keys": ["ctrl+shift+c"] },
-{ "command": "paste", "keys": ["ctrl+shift+v"] }
-```
-
-> 👉 **Note**: you can also add a keybinding for the `copy` command with the argument `"trimWhitespace": true`. This removes newlines as the text is copied to your clipboard.
-
-This will add copy and paste on <kbd>ctrl+shift+c</kbd>
-and <kbd>ctrl+shift+v</kbd> respectively.
-
-You can set the keybindings to whatever you'd like. If you prefer
-<kbd>ctrl+c</kbd> to copy, then set the `keys` to `"ctrl+c"`.
-
-You can even set multiple keybindings for a single action if you'd like. For example:
-
-```json
-
-            {
-                "command" : "paste",
-                "keys" :
-                [
-                    "ctrl+shift+v"
-                ]
-            },
-            {
-                "command" : "paste",
-                "keys" :
-                [
-                    "shift+insert"
-                ]
-            }
-```
-
-will bind both <kbd>ctrl+shift+v</kbd> and
-<kbd>shift+Insert</kbd> to `paste`.
-
-> 👉 **Note**: If you set your copy keybinding to `"ctrl+c"`, you'll only be able to send
-an interrupt to the commandline application using <kbd>Ctrl+C</kbd> when there's
-no text selection. Additionally, if you set `paste` to `"ctrl+v"`, commandline
-applications won't be able to read a ctrl+v from the input. For these reasons,
-we suggest `"ctrl+shift+c"` and `"ctrl+shift+v"`
-
-### Setting the `startingDirectory` of WSL Profiles to `~`
-
-By default, the `startingDirectory` of a profile is `%USERPROFILE%`
-(`C:\Users\<YourUsername>`). This is a Windows path. However, for WSL, you might
-want to use the WSL home path instead. At the time of writing (26decf1 / Nov.
-1st, 2019), `startingDirectory` only accepts a Windows-style path, so setting it
-to start within the WSL distro can be a little tricky.
-
-Fortunately, with Windows 1903, the filesystems of WSL distros can easily be
-addressed using the `\\wsl$\` prefix. For any WSL distro whose name is
-`DistroName`, you can use `\\wsl$\DistroName` as a Windows path that points to
-the root of that distro's filesystem.
-
-For example, the following works as a profile to launch the "Ubuntu-18.04"
-distro in it's home path:
-
-```json
-{
-    "name": "Ubuntu-18.04",
-    "commandline" : "wsl -d Ubuntu-18.04",
-    "startingDirectory" : "//wsl$/Ubuntu-18.04/home/<Your Ubuntu Username>",
-}
-```
+⚠ This document has moved to [the Customize Settings section of the Windows Terminal documentation](https://docs.microsoft.com/windows/terminal/customize-settings/global-settings).

doc/user-docs/index.md

@@ -1,91 +1 @@
-# Windows Terminal User Documentation
-
-NOTE: At the time of writing Windows Terminal is still under active development and many things will
-change. If you notice an error in the docs, please raise an issue. Or better yet, please file a PR with an appropriate update!
-
-## Installing Windows Terminal
-
-### From Source Code
-
-To compile Windows Terminal yourself using the source code, follow the instructions in the [README](/README.md#developer-guidance).
-
-### From the Microsoft Store
-
-1. Make sure you have upgraded to the current Windows 10 release (at least build `1903`). To determine your build number, see [winver](https://docs.microsoft.com/en-us/windows/client-management/windows-version-search).
-2. Open the Windows Terminal listing in the [Microsoft Store](https://aka.ms/install-terminal).
-3. Review the minimum system requirements to confirm you can successfully install Windows Terminal.
-4. Click `Get` to begin the installation process.
-
-## Starting Windows Terminal
-
-1. Locate the _Windows Terminal_ app in your Start menu.
-2. Click _Windows Terminal_ to launch the app. If you need administrative privileges, right-click the entry and click `Run as administrator`. Alternatively, you can highlight the app and press `Ctrl`+`Shift`+`Enter`.
-
-NOTE: The default shell is PowerShell; you can change this using the _Running a Different Shell_ procedure.
-
-### Command line options
-
-Windows Terminal has implemented a rich set of command-line options in part as response to issue [#607](https://github.com/microsoft/terminal/issues/607).  See [UsingCommandlineArguments.md](https://github.com/microsoft/terminal/blob/master/doc/user-docs/UsingCommandlineArguments.md) for details.
-
-## Multiple Tabs
-
-Additional shells can be started by hitting the `+` button from the tab bar -- a new instance of the
-default shell is displayed (default shortcut: <kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>1</kbd>).
-
-## Running a Different Shell
-
-Note: This section assumes you already have _Windows Subsystem for Linux_ (WSL) installed. For more information, see [the installation guide](https://docs.microsoft.com/en-us/windows/wsl/install-win10).
-
-Windows Terminal uses PowerShell as its default shell. You can also use Windows Terminal to launch other shells, such as `cmd.exe` or WSL's `bash`:
-
-1. In the tab bar, click the `⌵` button to view the available shells.
-2. Choose your shell from the dropdown list. The new shell session will open in a new tab.
-
-To customize the shell list, see the _Configuring Windows Terminal_ section below.
-
-## Starting a new PowerShell tab with admin privilege
-
-There is no current plan to support this feature for security reasons. See issue [#632](https://github.com/microsoft/terminal/issues/632)
-
-## Selecting and Copying Text in Windows Terminal
-
-As in ConHost, a selection can be made by left-clicking and dragging the mouse across the terminal. This is a line selection by default, meaning that the selection will wrap to the end of the line and the beginning of the next one. You can select in block mode by holding down the <kbd>Alt</kbd> key when starting a selection.
-
-To copy the text to your clipboard, you can right-click the terminal when a selection is active. As of [#1224](https://github.com/microsoft/terminal/pull/1224) (first available in Windows Terminal v0.4), the Windows Terminal now supports HTML copy. The HTML is automatically copied to your clipboard along with the regular text in any copy operation.
-
-If there is not an active selection, a right-click will paste the text content from your clipboard to the terminal.
-
-Copy and paste operations can also be keybound. For more information on how to bind keys, see [Using Json Settings](UsingJsonSettings.md#adding-copy-and-paste-keybindings).
-
-> 👉 **Note**: If you have the `copyOnSelect` global setting enabled, a selection will persist and immediately copy the selected text to your clipboard. Right-clicking will always paste your clipboard data.
-
-## Add a "Open Windows Terminal Here" to File Explorer
-
-Not currently supported "out of the box" (See issue [#1060](https://github.com/microsoft/terminal/issues/1060)). However, you can open Windows Terminal in current directory by typing `wt -d .` in the Explorer address bar.
-
-## Configuring Windows Terminal
-
-All Windows Terminal settings are currently managed using the `settings.json` file, located within `$env:LocalAppData\Packages\Microsoft.WindowsTerminal_8wekyb3d8bbwe/LocalState`.
-
-To open the settings file from Windows Terminal:
-
-1. Click the `⌵` button in the top bar.
-2. From the dropdown list, click `Settings`. You can also use a shortcut: <kbd>Ctrl</kbd>+<kbd>,</kbd>.
-3. Your default `json` editor will open the settings file.
-
-For an introduction to the various settings, see [Using Json Settings](UsingJsonSettings.md). The list of valid settings can be found in the [settings.json documentation](../cascadia/SettingsSchema.md) section.
-
-## Tips and Tricks
-
-1. In PowerShell you can discover if the Windows Terminal is being used by checking for the existence of the environment variable `WT_SESSION`.
-
-    Under pwsh you can also use
-`(Get-Process -Id $pid).Parent.ProcessName -eq 'WindowsTerminal'`
-
-    (ref [https://twitter.com/r_keith_hill/status/1142871145852440576](https://twitter.com/r_keith_hill/status/1142871145852440576))
-
-2. Terminal zoom can be changed by holding <kbd>Ctrl</kbd> and scrolling with mouse.
-3. Background opacity can be changed by holding <kbd>Ctrl</kbd>+<kbd>Shift</kbd> and scrolling with mouse. Note that acrylic transparency is limited by the OS only to focused windows.
-4. Open Windows Terminal in current directory by typing `wt -d .` in the address bar.
-5. Pin the Windows Terminal to the taskbar. Now it can be launched using the Windows shortcut <kbd>Win</kbd>+<kbd>Number</kbd> (e.g. <kbd>Win</kbd>+<kbd>1</kbd> or any other number based on the position in the taskbar!). Press <kbd>Win</kbd>+<kbd>Shift</kbd>+<kbd>Number</kbd> to always launch a new window.
-6. Please add more Tips and Tricks.
+⚠ Our user-facing documentation has moved to the [Windows Terminal documentation page](https://docs.microsoft.com/windows/terminal/).

oss/xorg_apps_rgb/MAINTAINER_README.md

@@ -0,0 +1,7 @@
+### Notes for Future Maintainers
+
+This manifest anchors our usage of rgb.txt from the X11 distribution.
+
+The provenance information (where it came from and which commit) is stored in the file `cgmanifest.json` in the same directory as this readme.
+Please update the provenance information in that file when ingesting an updated version of the dependent library.
+That provenance file is automatically read and inventoried by Microsoft systems to ensure compliance with appropiate governance standards.

oss/xorg_apps_rgb/cgmanifest.json

@@ -0,0 +1,13 @@
+{"Registrations":[ 
+    {
+      "component": { 
+       "type": "git", 
+       "git": { 
+         "repositoryUrl": "https://gitlab.freedesktop.org/xorg/app/rgb.git", 
+         "commitHash": "97820e748eb496a1f6d3fc3bf89688f0ce1f64f9" 
+         }
+       }
+    }
+ ],
+ "Version": 1
+}

res/README.md

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

src/buffer/out/AttrRow.cpp

@@ -175,6 +175,23 @@ size_t ATTR_ROW::FindAttrIndex(const size_t index, size_t* const pApplies) const
     return runPos - _list.cbegin();
 }
 
+// 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()
+{
+    std::unordered_set<uint16_t> ids;
+    for (const auto& run : _list)
+    {
+        if (run.GetAttributes().IsHyperlink())
+        {
+            ids.emplace(run.GetAttributes().GetHyperlinkId());
+        }
+    }
+    return ids;
+}
+
 // Routine Description:
 // - Sets the attributes (colors) of all character positions from the given position through the end of the row.
 // Arguments:

src/buffer/out/AttrRow.hpp

@@ -41,6 +41,8 @@ public:
     size_t FindAttrIndex(const size_t index,
                          size_t* const pApplies) const;
 
+    std::unordered_set<uint16_t> GetHyperlinks();
+
     bool SetAttrToEnd(const UINT iStart, const TextAttribute attr);
     void ReplaceAttrs(const TextAttribute& toBeReplacedAttr, const TextAttribute& replaceWith) noexcept;
 

src/buffer/out/TextAttribute.cpp

@@ -88,16 +88,18 @@ bool TextAttribute::IsLegacy() const noexcept
 // - defaultFgColor: the default foreground color rgb value.
 // - defaultBgColor: the default background color rgb value.
 // - reverseScreenMode: true if the screen mode is reversed.
+// - blinkingIsFaint: true if blinking should be interpreted as faint.
 // Return Value:
 // - the foreground and background colors that should be displayed.
 std::pair<COLORREF, COLORREF> TextAttribute::CalculateRgbColors(const gsl::span<const COLORREF> colorTable,
                                                                 const COLORREF defaultFgColor,
                                                                 const COLORREF defaultBgColor,
-                                                                const bool reverseScreenMode) const noexcept
+                                                                const bool reverseScreenMode,
+                                                                const bool blinkingIsFaint) const noexcept
 {
     auto fg = _foreground.GetColor(colorTable, defaultFgColor, IsBold());
     auto bg = _background.GetColor(colorTable, defaultBgColor);
-    if (IsFaint())
+    if (IsFaint() || (IsBlinking() && blinkingIsFaint))
     {
         fg = (fg >> 1) & 0x7F7F7F; // Divide foreground color components by two.
     }
@@ -112,6 +114,17 @@ std::pair<COLORREF, COLORREF> TextAttribute::CalculateRgbColors(const gsl::span<
     return { fg, bg };
 }
 
+// Method description:
+// - Tells us whether the text is a hyperlink or not
+// Return value:
+// - True if it is a hyperlink, false otherwise
+bool TextAttribute::IsHyperlink() const noexcept
+{
+    // All non-hyperlink text have a default hyperlinkId of 0 while
+    // all hyperlink text have a non-zero hyperlinkId
+    return _hyperlinkId != 0;
+}
+
 TextColor TextAttribute::GetForeground() const noexcept
 {
     return _foreground;
@@ -122,6 +135,15 @@ TextColor TextAttribute::GetBackground() const noexcept
     return _background;
 }
 
+// Method description:
+// - Retrieves the hyperlink ID of the text
+// Return value:
+// - The hyperlink ID
+uint16_t TextAttribute::GetHyperlinkId() const noexcept
+{
+    return _hyperlinkId;
+}
+
 void TextAttribute::SetForeground(const TextColor foreground) noexcept
 {
     _foreground = foreground;
@@ -174,6 +196,15 @@ void TextAttribute::SetColor(const COLORREF rgbColor, const bool fIsForeground)
     }
 }
 
+// Method description:
+// - Sets the hyperlink ID of the text
+// Arguments:
+// - id - the id we wish to set
+void TextAttribute::SetHyperlinkId(uint16_t id) noexcept
+{
+    _hyperlinkId = id;
+}
+
 bool TextAttribute::IsLeadingByte() const noexcept
 {
     return WI_IsFlagSet(_wAttrLegacy, COMMON_LVB_LEADING_BYTE);
@@ -336,6 +367,14 @@ void TextAttribute::SetDefaultBackground() noexcept
     _background = TextColor();
 }
 
+// Method description:
+// - Resets only the meta and extended attributes
+void TextAttribute::SetDefaultMetaAttrs() noexcept
+{
+    _extendedAttrs = ExtendedAttributes::Normal;
+    _wAttrLegacy = 0;
+}
+
 // Method Description:
 // - Returns true if this attribute indicates its background is the "default"
 //      background. Its _rgbBackground will contain the actual value of the
@@ -356,6 +395,6 @@ bool TextAttribute::BackgroundIsDefault() const noexcept
 //      requires for most erasing and filling operations.
 void TextAttribute::SetStandardErase() noexcept
 {
-    _extendedAttrs = ExtendedAttributes::Normal;
-    _wAttrLegacy = 0;
+    SetDefaultMetaAttrs();
+    _hyperlinkId = 0;
 }

src/buffer/out/TextAttribute.hpp

@@ -36,7 +36,8 @@ public:
         _wAttrLegacy{ 0 },
         _foreground{},
         _background{},
-        _extendedAttrs{ ExtendedAttributes::Normal }
+        _extendedAttrs{ ExtendedAttributes::Normal },
+        _hyperlinkId{ 0 }
     {
     }
 
@@ -44,7 +45,8 @@ public:
         _wAttrLegacy{ gsl::narrow_cast<WORD>(wLegacyAttr & META_ATTRS) },
         _foreground{ s_LegacyIndexOrDefault(wLegacyAttr & FG_ATTRS, s_legacyDefaultForeground) },
         _background{ s_LegacyIndexOrDefault((wLegacyAttr & BG_ATTRS) >> 4, s_legacyDefaultBackground) },
-        _extendedAttrs{ ExtendedAttributes::Normal }
+        _extendedAttrs{ ExtendedAttributes::Normal },
+        _hyperlinkId{ 0 }
     {
         // If we're given lead/trailing byte information with the legacy color, strip it.
         WI_ClearAllFlags(_wAttrLegacy, COMMON_LVB_SBCSDBCS);
@@ -55,7 +57,8 @@ public:
         _wAttrLegacy{ 0 },
         _foreground{ rgbForeground },
         _background{ rgbBackground },
-        _extendedAttrs{ ExtendedAttributes::Normal }
+        _extendedAttrs{ ExtendedAttributes::Normal },
+        _hyperlinkId{ 0 }
     {
     }
 
@@ -66,7 +69,8 @@ public:
     std::pair<COLORREF, COLORREF> CalculateRgbColors(const gsl::span<const COLORREF> colorTable,
                                                      const COLORREF defaultFgColor,
                                                      const COLORREF defaultBgColor,
-                                                     const bool reverseScreenMode = false) const noexcept;
+                                                     const bool reverseScreenMode = false,
+                                                     const bool blinkingIsFaint = false) const noexcept;
 
     bool IsLeadingByte() const noexcept;
     bool IsTrailingByte() const noexcept;
@@ -112,8 +116,11 @@ public:
 
     ExtendedAttributes GetExtendedAttributes() const noexcept;
 
+    bool IsHyperlink() const noexcept;
+
     TextColor GetForeground() const noexcept;
     TextColor GetBackground() const noexcept;
+    uint16_t GetHyperlinkId() const noexcept;
     void SetForeground(const TextColor foreground) noexcept;
     void SetBackground(const TextColor background) noexcept;
     void SetForeground(const COLORREF rgbForeground) noexcept;
@@ -123,9 +130,11 @@ public:
     void SetIndexedForeground256(const BYTE fgIndex) noexcept;
     void SetIndexedBackground256(const BYTE bgIndex) noexcept;
     void SetColor(const COLORREF rgbColor, const bool fIsForeground) noexcept;
+    void SetHyperlinkId(uint16_t id) noexcept;
 
     void SetDefaultForeground() noexcept;
     void SetDefaultBackground() noexcept;
+    void SetDefaultMetaAttrs() noexcept;
 
     bool BackgroundIsDefault() const noexcept;
 
@@ -143,11 +152,14 @@ public:
         return !IsAnyGridLineEnabled() && // grid lines have a visual representation
                // crossed out, doubly and singly underlined have a visual representation
                WI_AreAllFlagsClear(_extendedAttrs, ExtendedAttributes::CrossedOut | ExtendedAttributes::DoublyUnderlined | ExtendedAttributes::Underlined) &&
+               // hyperlinks have a visual representation
+               !IsHyperlink() &&
                // all other attributes do not have a visual representation
                (_wAttrLegacy & META_ATTRS) == (other._wAttrLegacy & META_ATTRS) &&
                ((checkForeground && _foreground == other._foreground) ||
                 (!checkForeground && _background == other._background)) &&
-               _extendedAttrs == other._extendedAttrs;
+               _extendedAttrs == other._extendedAttrs &&
+               IsHyperlink() == other.IsHyperlink();
     }
 
     constexpr bool IsAnyGridLineEnabled() const noexcept
@@ -169,6 +181,8 @@ private:
     TextColor _background;
     ExtendedAttributes _extendedAttrs;
 
+    uint16_t _hyperlinkId;
+
 #ifdef UNIT_TESTING
     friend class TextBufferTests;
     friend class TextAttributeTests;
@@ -182,7 +196,7 @@ private:
 // 4 for _foreground
 // 4 for _background
 // 1 for _extendedAttrs
-static_assert(sizeof(TextAttribute) <= 11 * sizeof(BYTE), "We should only need 11B for an entire TextColor. Any more than that is just waste");
+static_assert(sizeof(TextAttribute) <= 13 * sizeof(BYTE), "We should only need 13B for an entire TextAttribute. We may need to increment this in the future as we add additional attributes");
 
 enum class TextAttributeBehavior
 {
@@ -196,7 +210,8 @@ constexpr bool operator==(const TextAttribute& a, const TextAttribute& b) noexce
     return a._wAttrLegacy == b._wAttrLegacy &&
            a._foreground == b._foreground &&
            a._background == b._background &&
-           a._extendedAttrs == b._extendedAttrs;
+           a._extendedAttrs == b._extendedAttrs &&
+           a._hyperlinkId == b._hyperlinkId;
 }
 
 constexpr bool operator!=(const TextAttribute& a, const TextAttribute& b) noexcept

src/buffer/out/textBuffer.cpp

@@ -34,7 +34,8 @@ TextBuffer::TextBuffer(const COORD screenBufferSize,
     _storage{},
     _unicodeStorage{},
     _renderTarget{ renderTarget },
-    _size{}
+    _size{},
+    _currentHyperlinkId{ 1 }
 {
     // initialize ROWs
     for (size_t i = 0; i < static_cast<size_t>(screenBufferSize.Y); ++i)
@@ -551,7 +552,10 @@ bool TextBuffer::IncrementCircularBuffer(const bool inVtMode)
     // to the logical position 0 in the window (cursor coordinates and all other coordinates).
     _renderTarget.TriggerCircling();
 
-    // First, clean out the old "first row" as it will become the "last row" of the buffer after the circle is performed.
+    // Prune hyperlinks to delete obsolete references
+    _PruneHyperlinks();
+
+    // Second, clean out the old "first row" as it will become the "last row" of the buffer after the circle is performed.
     auto fillAttributes = _currentAttributes;
     if (inVtMode)
     {
@@ -992,19 +996,29 @@ const COORD TextBuffer::GetWordStart(const COORD target, const std::wstring_view
     //  so the words in the example include ["word   ", "other  "]
     // NOTE: the start anchor (this one) is inclusive, whereas the end anchor (GetWordEnd) is exclusive
 
-    // can't expand left
-    if (target.X == GetSize().Left())
+#pragma warning(suppress : 26496)
+    // GH#7664: Treat EndExclusive as EndInclusive so
+    // that it actually points to a space in the buffer
+    auto copy{ target };
+    const auto bufferSize{ GetSize() };
+    if (target == bufferSize.Origin())
     {
+        // can't expand left
         return target;
     }
+    else if (target == bufferSize.EndExclusive())
+    {
+        // treat EndExclusive as EndInclusive
+        copy = { bufferSize.RightInclusive(), bufferSize.BottomInclusive() };
+    }
 
     if (accessibilityMode)
     {
-        return _GetWordStartForAccessibility(target, wordDelimiters);
+        return _GetWordStartForAccessibility(copy, wordDelimiters);
     }
     else
     {
-        return _GetWordStartForSelection(target, wordDelimiters);
+        return _GetWordStartForSelection(copy, wordDelimiters);
     }
 }
 
@@ -1104,9 +1118,16 @@ const COORD TextBuffer::GetWordEnd(const COORD target, const std::wstring_view w
     //  so the words in the example include ["word   ", "other  "]
     // NOTE: the end anchor (this one) is exclusive, whereas the start anchor (GetWordStart) is inclusive
 
+    // Already at the end. Can't move forward.
+    if (target == GetSize().EndExclusive())
+    {
+        return target;
+    }
+
     if (accessibilityMode)
     {
-        return _GetWordEndForAccessibility(target, wordDelimiters);
+        const auto lastCharPos{ GetLastNonSpaceCharacter() };
+        return _GetWordEndForAccessibility(target, wordDelimiters, lastCharPos);
     }
     else
     {
@@ -1119,13 +1140,20 @@ const COORD TextBuffer::GetWordEnd(const COORD target, const std::wstring_view w
 // Arguments:
 // - target - a COORD on the word you are currently on
 // - wordDelimiters - what characters are we considering for the separation of words
+// - lastCharPos - the position of the last nonspace character in the text buffer (to improve performance)
 // Return Value:
 // - The COORD for the first character of the next readable "word". If no next word, return one past the end of the buffer
-const COORD TextBuffer::_GetWordEndForAccessibility(const COORD target, const std::wstring_view wordDelimiters) const
+const COORD TextBuffer::_GetWordEndForAccessibility(const COORD target, const std::wstring_view wordDelimiters, const COORD lastCharPos) const
 {
     const auto bufferSize = GetSize();
     COORD result = target;
 
+    // Check if we're already on/past the last RegularChar
+    if (bufferSize.CompareInBounds(result, lastCharPos, true) >= 0)
+    {
+        return bufferSize.EndExclusive();
+    }
+
     // ignore right boundary. Continue through readable text found
     while (_GetDelimiterClassAt(result, wordDelimiters) == DelimiterClass::RegularChar)
     {
@@ -1135,6 +1163,12 @@ const COORD TextBuffer::_GetWordEndForAccessibility(const COORD target, const st
         }
     }
 
+    // we are already on/past the last RegularChar
+    if (bufferSize.CompareInBounds(result, lastCharPos, true) >= 0)
+    {
+        return bufferSize.EndExclusive();
+    }
+
     // make sure we expand to the beginning of the NEXT word
     while (_GetDelimiterClassAt(result, wordDelimiters) != DelimiterClass::RegularChar)
     {
@@ -1185,6 +1219,46 @@ const COORD TextBuffer::_GetWordEndForSelection(const COORD target, const std::w
     return result;
 }
 
+void TextBuffer::_PruneHyperlinks()
+{
+    // Check the old first row for hyperlink references
+    // If there are any, search the entire buffer for the same reference
+    // 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 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,
+        // now we need to search the rest of the buffer (i.e. all the rows except the first)
+        // to see if those references are anywhere else
+        for (size_t i = 1; i != total; ++i)
+        {
+            const auto nextRowRefs = GetRowByOffset(i).GetAttrRow().GetHyperlinks();
+            for (auto id : nextRowRefs)
+            {
+                if (firstRowRefs.find(id) != firstRowRefs.end())
+                {
+                    firstRowRefs.erase(id);
+                }
+            }
+            if (firstRowRefs.empty())
+            {
+                // No more hyperlink references left to search for, terminate early
+                break;
+            }
+        }
+    }
+
+    // Now delete obsolete references from our map
+    for (auto hyperlinkReference : firstRowRefs)
+    {
+        RemoveHyperlinkFromMap(hyperlinkReference);
+    }
+}
+
 // Method Description:
 // - Update pos to be the position of the first character of the next word. This is used for accessibility
 // Arguments:
@@ -1196,38 +1270,16 @@ const COORD TextBuffer::_GetWordEndForSelection(const COORD target, const std::w
 // - pos - The COORD for the first character on the "word" (inclusive)
 bool TextBuffer::MoveToNextWord(COORD& pos, const std::wstring_view wordDelimiters, COORD lastCharPos) const
 {
-    auto copy = pos;
-    const auto bufferSize = GetSize();
+    // move to the beginning of the next word
+    // NOTE: _GetWordEnd...() returns the exclusive position of the "end of the word"
+    //       This is also the inclusive start of the next word.
+    auto copy{ _GetWordEndForAccessibility(pos, wordDelimiters, lastCharPos) };
 
-    // started on a word, continue until the end of the word
-    while (_GetDelimiterClassAt(copy, wordDelimiters) == DelimiterClass::RegularChar)
-    {
-        if (!bufferSize.IncrementInBounds(copy))
-        {
-            // last char in buffer is a RegularChar
-            // thus there is no next word
-            return false;
-        }
-    }
-
-    // we are already on/past the last RegularChar
-    if (bufferSize.CompareInBounds(copy, lastCharPos) >= 0)
+    if (copy == GetSize().EndExclusive())
     {
         return false;
     }
 
-    // on whitespace, continue until the beginning of the next word
-    while (_GetDelimiterClassAt(copy, wordDelimiters) != DelimiterClass::RegularChar)
-    {
-        if (!bufferSize.IncrementInBounds(copy))
-        {
-            // last char in buffer is a DelimiterChar or ControlChar
-            // there is no next word
-            return false;
-        }
-    }
-
-    // successful move, copy result out
     pos = copy;
     return true;
 }
@@ -1242,33 +1294,17 @@ bool TextBuffer::MoveToNextWord(COORD& pos, const std::wstring_view wordDelimite
 // - pos - The COORD for the first character on the "word" (inclusive)
 bool TextBuffer::MoveToPreviousWord(COORD& pos, std::wstring_view wordDelimiters) const
 {
-    auto copy = pos;
-    auto bufferSize = GetSize();
+    // move to the beginning of the current word
+    auto copy{ GetWordStart(pos, wordDelimiters, true) };
 
-    // started on whitespace/delimiter, continue until the end of the previous word
-    while (_GetDelimiterClassAt(copy, wordDelimiters) != DelimiterClass::RegularChar)
+    if (!GetSize().DecrementInBounds(copy, true))
     {
-        if (!bufferSize.DecrementInBounds(copy))
-        {
-            // first char in buffer is a DelimiterChar or ControlChar
-            // there is no previous word
-            return false;
-        }
+        // can't move behind current word
+        return false;
     }
 
-    // on a word, continue until the beginning of the word
-    while (_GetDelimiterClassAt(copy, wordDelimiters) == DelimiterClass::RegularChar)
-    {
-        if (!bufferSize.DecrementInBounds(copy))
-        {
-            // first char in buffer is a RegularChar
-            // there is no previous word
-            return false;
-        }
-    }
-
-    // successful move, copy result out
-    pos = copy;
+    // move to the beginning of the previous word
+    pos = GetWordStart(copy, wordDelimiters, true);
     return true;
 }
 
@@ -1281,8 +1317,13 @@ bool TextBuffer::MoveToPreviousWord(COORD& pos, std::wstring_view wordDelimiters
 const til::point TextBuffer::GetGlyphStart(const til::point pos) const
 {
     COORD resultPos = pos;
-
     const auto bufferSize = GetSize();
+
+    if (resultPos == bufferSize.EndExclusive())
+    {
+        bufferSize.DecrementInBounds(resultPos, true);
+    }
+
     if (resultPos != bufferSize.EndExclusive() && GetCellDataAt(resultPos)->DbcsAttr().IsTrailing())
     {
         bufferSize.DecrementInBounds(resultPos, true);
@@ -1323,9 +1364,15 @@ const til::point TextBuffer::GetGlyphEnd(const til::point pos) const
 bool TextBuffer::MoveToNextGlyph(til::point& pos, bool allowBottomExclusive) const
 {
     COORD resultPos = pos;
+    const auto bufferSize = GetSize();
+
+    if (resultPos == GetSize().EndExclusive())
+    {
+        // we're already at the end
+        return false;
+    }
 
     // try to move. If we can't, we're done.
-    const auto bufferSize = GetSize();
     const bool success = bufferSize.IncrementInBounds(resultPos, allowBottomExclusive);
     if (resultPos != bufferSize.EndExclusive() && GetCellDataAt(resultPos)->DbcsAttr().IsTrailing())
     {
@@ -1340,20 +1387,19 @@ bool TextBuffer::MoveToNextGlyph(til::point& pos, bool allowBottomExclusive) con
 // - Update pos to be the beginning of the previous glyph/character. This is used for accessibility
 // Arguments:
 // - pos - a COORD on the word you are currently on
-// - allowBottomExclusive - allow the nonexistent end-of-buffer cell to be encountered
 // Return Value:
 // - true, if successfully updated pos. False, if we are unable to move (usually due to a buffer boundary)
 // - pos - The COORD for the first cell of the previous glyph (inclusive)
-bool TextBuffer::MoveToPreviousGlyph(til::point& pos, bool allowBottomExclusive) const
+bool TextBuffer::MoveToPreviousGlyph(til::point& pos) const
 {
     COORD resultPos = pos;
 
     // try to move. If we can't, we're done.
     const auto bufferSize = GetSize();
-    const bool success = bufferSize.DecrementInBounds(resultPos, allowBottomExclusive);
+    const bool success = bufferSize.DecrementInBounds(resultPos, true);
     if (resultPos != bufferSize.EndExclusive() && GetCellDataAt(resultPos)->DbcsAttr().IsLeading())
     {
-        bufferSize.DecrementInBounds(resultPos, allowBottomExclusive);
+        bufferSize.DecrementInBounds(resultPos, true);
     }
 
     pos = resultPos;
@@ -2142,6 +2188,7 @@ HRESULT TextBuffer::Reflow(TextBuffer& oldBuffer,
     {
         // Finish copying remaining parameters from the old text buffer to the new one
         newBuffer.CopyProperties(oldBuffer);
+        newBuffer.CopyHyperlinkMaps(oldBuffer);
 
         // If we found where to put the cursor while placing characters into the buffer,
         //   just put the cursor there. Otherwise we have to advance manually.
@@ -2207,3 +2254,109 @@ HRESULT TextBuffer::Reflow(TextBuffer& oldBuffer,
 
     return hr;
 }
+
+// Method Description:
+// - Adds or updates a hyperlink in our hyperlink table
+// Arguments:
+// - The hyperlink URI, the hyperlink id (could be new or old)
+void TextBuffer::AddHyperlinkToMap(std::wstring_view uri, uint16_t id)
+{
+    _hyperlinkMap[id] = uri;
+}
+
+// Method Description:
+// - Retrieves the URI associated with a particular hyperlink ID
+// Arguments:
+// - The hyperlink ID
+// Return Value:
+// - The URI
+std::wstring TextBuffer::GetHyperlinkUriFromId(uint16_t id) const
+{
+    return _hyperlinkMap.at(id);
+}
+
+// Method description:
+// - Provides the hyperlink ID to be assigned as a text attribute, based on the optional custom id provided
+// Arguments:
+// - The user-defined id
+// Return value:
+// - The internal hyperlink ID
+uint16_t TextBuffer::GetHyperlinkId(std::wstring_view uri, std::wstring_view id)
+{
+    uint16_t numericId = 0;
+    if (id.empty())
+    {
+        // no custom id specified, return our internal count
+        numericId = _currentHyperlinkId;
+        ++_currentHyperlinkId;
+    }
+    else
+    {
+        // assign _currentHyperlinkId if the custom id does not already exist
+        std::wstring newId{ id };
+        // hash the URL and add it to the custom ID - GH#7698
+        newId += L"%" + std::to_wstring(std::hash<std::wstring_view>{}(uri));
+        const auto result = _hyperlinkCustomIdMap.emplace(newId, _currentHyperlinkId);
+        if (result.second)
+        {
+            // the custom id did not already exist
+            ++_currentHyperlinkId;
+        }
+        numericId = (*(result.first)).second;
+    }
+    // _currentHyperlinkId could overflow, make sure its not 0
+    if (_currentHyperlinkId == 0)
+    {
+        ++_currentHyperlinkId;
+    }
+    return numericId;
+}
+
+// Method Description:
+// - Removes a hyperlink from the hyperlink map and the associated
+//   user defined id from the custom id map (if there is one)
+// Arguments:
+// - The ID of the hyperlink to be removed
+void TextBuffer::RemoveHyperlinkFromMap(uint16_t id)
+{
+    _hyperlinkMap.erase(id);
+    for (const auto& customIdPair : _hyperlinkCustomIdMap)
+    {
+        if (customIdPair.second == id)
+        {
+            _hyperlinkCustomIdMap.erase(customIdPair.first);
+            break;
+        }
+    }
+}
+
+// Method Description:
+// - Obtains the custom ID, if there was one, associated with the
+//   uint16_t id of a hyperlink
+// Arguments:
+// - The uint16_t id of the hyperlink
+// Return Value:
+// - The custom ID if there was one, empty string otherwise
+std::wstring TextBuffer::GetCustomIdFromId(uint16_t id) const
+{
+    for (auto customIdPair : _hyperlinkCustomIdMap)
+    {
+        if (customIdPair.second == id)
+        {
+            return customIdPair.first;
+        }
+    }
+    return {};
+}
+
+// Method Description:
+// - Copies the hyperlink/customID maps of the old buffer into this one,
+//   also copies currentHyperlinkId
+// Arguments:
+// - The other buffer
+void TextBuffer::CopyHyperlinkMaps(const TextBuffer& other)
+{
+    _hyperlinkMap = other._hyperlinkMap;
+    _hyperlinkCustomIdMap = other._hyperlinkCustomIdMap;
+    _currentHyperlinkId = other._currentHyperlinkId;
+}

src/buffer/out/textBuffer.hpp

@@ -137,10 +137,17 @@ public:
     const til::point GetGlyphStart(const til::point pos) const;
     const til::point GetGlyphEnd(const til::point pos) const;
     bool MoveToNextGlyph(til::point& pos, bool allowBottomExclusive = false) const;
-    bool MoveToPreviousGlyph(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;
 
+    void AddHyperlinkToMap(std::wstring_view uri, uint16_t id);
+    std::wstring GetHyperlinkUriFromId(uint16_t id) const;
+    uint16_t GetHyperlinkId(std::wstring_view uri, std::wstring_view id);
+    void RemoveHyperlinkFromMap(uint16_t id);
+    std::wstring GetCustomIdFromId(uint16_t id) const;
+    void CopyHyperlinkMaps(const TextBuffer& OtherBuffer);
+
     class TextAndColor
     {
     public:
@@ -188,6 +195,10 @@ private:
     // storage location for glyphs that can't fit into the buffer normally
     UnicodeStorage _unicodeStorage;
 
+    std::unordered_map<uint16_t, std::wstring> _hyperlinkMap;
+    std::unordered_map<std::wstring, uint16_t> _hyperlinkCustomIdMap;
+    uint16_t _currentHyperlinkId;
+
     void _RefreshRowIDs(std::optional<SHORT> newRowWidth);
 
     Microsoft::Console::Render::IRenderTarget& _renderTarget;
@@ -213,9 +224,11 @@ private:
     const DelimiterClass _GetDelimiterClassAt(const COORD pos, const std::wstring_view wordDelimiters) const;
     const COORD _GetWordStartForAccessibility(const COORD target, const std::wstring_view wordDelimiters) const;
     const COORD _GetWordStartForSelection(const COORD target, const std::wstring_view wordDelimiters) const;
-    const COORD _GetWordEndForAccessibility(const COORD target, const std::wstring_view wordDelimiters) const;
+    const COORD _GetWordEndForAccessibility(const COORD target, const std::wstring_view wordDelimiters, const COORD lastCharPos) const;
     const COORD _GetWordEndForSelection(const COORD target, const std::wstring_view wordDelimiters) const;
 
+    void _PruneHyperlinks();
+
 #ifdef UNIT_TESTING
     friend class TextBufferTests;
     friend class UiaTextRangeTests;

src/cascadia/LocalTests_TerminalApp/ColorSchemeTests.cpp

@@ -193,96 +193,96 @@ namespace TerminalAppLocalTests
         const auto scheme2Json = VerifyParseSucceeded(scheme2String);
         const auto scheme3Json = VerifyParseSucceeded(scheme3String);
 
-        CascadiaSettings settings;
+        auto settings = winrt::make_self<winrt::TerminalApp::implementation::CascadiaSettings>();
 
-        VERIFY_ARE_EQUAL(0u, settings._globals.GetColorSchemes().size());
-        VERIFY_IS_NULL(settings._FindMatchingColorScheme(scheme0Json));
-        VERIFY_IS_NULL(settings._FindMatchingColorScheme(scheme1Json));
-        VERIFY_IS_NULL(settings._FindMatchingColorScheme(scheme2Json));
-        VERIFY_IS_NULL(settings._FindMatchingColorScheme(scheme3Json));
+        VERIFY_ARE_EQUAL(0u, settings->_globals->ColorSchemes().Size());
+        VERIFY_IS_NULL(settings->_FindMatchingColorScheme(scheme0Json));
+        VERIFY_IS_NULL(settings->_FindMatchingColorScheme(scheme1Json));
+        VERIFY_IS_NULL(settings->_FindMatchingColorScheme(scheme2Json));
+        VERIFY_IS_NULL(settings->_FindMatchingColorScheme(scheme3Json));
 
-        settings._LayerOrCreateColorScheme(scheme0Json);
+        settings->_LayerOrCreateColorScheme(scheme0Json);
         {
-            for (auto& kv : settings._globals._colorSchemes)
+            for (auto kv : settings->_globals->ColorSchemes())
             {
                 Log::Comment(NoThrowString().Format(
-                    L"kv:%s->%s", kv.first.data(), kv.second.Name().data()));
+                    L"kv:%s->%s", kv.Key().data(), kv.Value().Name().data()));
             }
-            VERIFY_ARE_EQUAL(1u, settings._globals.GetColorSchemes().size());
+            VERIFY_ARE_EQUAL(1u, settings->_globals->ColorSchemes().Size());
 
-            VERIFY_IS_TRUE(settings._globals._colorSchemes.find(L"scheme0") != settings._globals._colorSchemes.end());
-            auto scheme0Proj = settings._globals._colorSchemes.find(L"scheme0")->second;
+            VERIFY_IS_TRUE(settings->_globals->ColorSchemes().HasKey(L"scheme0"));
+            auto scheme0Proj = settings->_globals->ColorSchemes().Lookup(L"scheme0");
             auto scheme0 = winrt::get_self<ColorScheme>(scheme0Proj);
 
-            VERIFY_IS_NOT_NULL(settings._FindMatchingColorScheme(scheme0Json));
-            VERIFY_IS_NULL(settings._FindMatchingColorScheme(scheme1Json));
-            VERIFY_IS_NOT_NULL(settings._FindMatchingColorScheme(scheme2Json));
-            VERIFY_IS_NULL(settings._FindMatchingColorScheme(scheme3Json));
+            VERIFY_IS_NOT_NULL(settings->_FindMatchingColorScheme(scheme0Json));
+            VERIFY_IS_NULL(settings->_FindMatchingColorScheme(scheme1Json));
+            VERIFY_IS_NOT_NULL(settings->_FindMatchingColorScheme(scheme2Json));
+            VERIFY_IS_NULL(settings->_FindMatchingColorScheme(scheme3Json));
             VERIFY_ARE_EQUAL(ARGB(0, 0, 0, 0), scheme0->_defaultForeground);
             VERIFY_ARE_EQUAL(ARGB(0, 1, 1, 1), scheme0->_defaultBackground);
         }
 
-        settings._LayerOrCreateColorScheme(scheme1Json);
+        settings->_LayerOrCreateColorScheme(scheme1Json);
 
         {
-            VERIFY_ARE_EQUAL(2u, settings._globals.GetColorSchemes().size());
+            VERIFY_ARE_EQUAL(2u, settings->_globals->ColorSchemes().Size());
 
-            VERIFY_IS_TRUE(settings._globals._colorSchemes.find(L"scheme0") != settings._globals._colorSchemes.end());
-            auto scheme0Proj = settings._globals._colorSchemes.find(L"scheme0")->second;
+            VERIFY_IS_TRUE(settings->_globals->ColorSchemes().HasKey(L"scheme0"));
+            auto scheme0Proj = settings->_globals->ColorSchemes().Lookup(L"scheme0");
             auto scheme0 = winrt::get_self<ColorScheme>(scheme0Proj);
-            VERIFY_IS_TRUE(settings._globals._colorSchemes.find(L"scheme1") != settings._globals._colorSchemes.end());
-            auto scheme1Proj = settings._globals._colorSchemes.find(L"scheme1")->second;
+            VERIFY_IS_TRUE(settings->_globals->ColorSchemes().HasKey(L"scheme1"));
+            auto scheme1Proj = settings->_globals->ColorSchemes().Lookup(L"scheme1");
             auto scheme1 = winrt::get_self<ColorScheme>(scheme1Proj);
 
-            VERIFY_IS_NOT_NULL(settings._FindMatchingColorScheme(scheme0Json));
-            VERIFY_IS_NOT_NULL(settings._FindMatchingColorScheme(scheme1Json));
-            VERIFY_IS_NOT_NULL(settings._FindMatchingColorScheme(scheme2Json));
-            VERIFY_IS_NULL(settings._FindMatchingColorScheme(scheme3Json));
+            VERIFY_IS_NOT_NULL(settings->_FindMatchingColorScheme(scheme0Json));
+            VERIFY_IS_NOT_NULL(settings->_FindMatchingColorScheme(scheme1Json));
+            VERIFY_IS_NOT_NULL(settings->_FindMatchingColorScheme(scheme2Json));
+            VERIFY_IS_NULL(settings->_FindMatchingColorScheme(scheme3Json));
             VERIFY_ARE_EQUAL(ARGB(0, 0, 0, 0), scheme0->_defaultForeground);
             VERIFY_ARE_EQUAL(ARGB(0, 1, 1, 1), scheme0->_defaultBackground);
             VERIFY_ARE_EQUAL(ARGB(0, 2, 2, 2), scheme1->_defaultForeground);
             VERIFY_ARE_EQUAL(ARGB(0, 3, 3, 3), scheme1->_defaultBackground);
         }
-        settings._LayerOrCreateColorScheme(scheme2Json);
+        settings->_LayerOrCreateColorScheme(scheme2Json);
 
         {
-            VERIFY_ARE_EQUAL(2u, settings._globals.GetColorSchemes().size());
+            VERIFY_ARE_EQUAL(2u, settings->_globals->ColorSchemes().Size());
 
-            VERIFY_IS_TRUE(settings._globals._colorSchemes.find(L"scheme0") != settings._globals._colorSchemes.end());
-            auto scheme0Proj = settings._globals._colorSchemes.find(L"scheme0")->second;
+            VERIFY_IS_TRUE(settings->_globals->ColorSchemes().HasKey(L"scheme0"));
+            auto scheme0Proj = settings->_globals->ColorSchemes().Lookup(L"scheme0");
             auto scheme0 = winrt::get_self<ColorScheme>(scheme0Proj);
-            VERIFY_IS_TRUE(settings._globals._colorSchemes.find(L"scheme1") != settings._globals._colorSchemes.end());
-            auto scheme1Proj = settings._globals._colorSchemes.find(L"scheme1")->second;
+            VERIFY_IS_TRUE(settings->_globals->ColorSchemes().HasKey(L"scheme1"));
+            auto scheme1Proj = settings->_globals->ColorSchemes().Lookup(L"scheme1");
             auto scheme1 = winrt::get_self<ColorScheme>(scheme1Proj);
 
-            VERIFY_IS_NOT_NULL(settings._FindMatchingColorScheme(scheme0Json));
-            VERIFY_IS_NOT_NULL(settings._FindMatchingColorScheme(scheme1Json));
-            VERIFY_IS_NOT_NULL(settings._FindMatchingColorScheme(scheme2Json));
-            VERIFY_IS_NULL(settings._FindMatchingColorScheme(scheme3Json));
+            VERIFY_IS_NOT_NULL(settings->_FindMatchingColorScheme(scheme0Json));
+            VERIFY_IS_NOT_NULL(settings->_FindMatchingColorScheme(scheme1Json));
+            VERIFY_IS_NOT_NULL(settings->_FindMatchingColorScheme(scheme2Json));
+            VERIFY_IS_NULL(settings->_FindMatchingColorScheme(scheme3Json));
             VERIFY_ARE_EQUAL(ARGB(0, 4, 4, 4), scheme0->_defaultForeground);
             VERIFY_ARE_EQUAL(ARGB(0, 5, 5, 5), scheme0->_defaultBackground);
             VERIFY_ARE_EQUAL(ARGB(0, 2, 2, 2), scheme1->_defaultForeground);
             VERIFY_ARE_EQUAL(ARGB(0, 3, 3, 3), scheme1->_defaultBackground);
         }
-        settings._LayerOrCreateColorScheme(scheme3Json);
+        settings->_LayerOrCreateColorScheme(scheme3Json);
 
         {
-            VERIFY_ARE_EQUAL(3u, settings._globals.GetColorSchemes().size());
+            VERIFY_ARE_EQUAL(3u, settings->_globals->ColorSchemes().Size());
 
-            VERIFY_IS_TRUE(settings._globals._colorSchemes.find(L"scheme0") != settings._globals._colorSchemes.end());
-            auto scheme0Proj = settings._globals._colorSchemes.find(L"scheme0")->second;
+            VERIFY_IS_TRUE(settings->_globals->ColorSchemes().HasKey(L"scheme0"));
+            auto scheme0Proj = settings->_globals->ColorSchemes().Lookup(L"scheme0");
             auto scheme0 = winrt::get_self<ColorScheme>(scheme0Proj);
-            VERIFY_IS_TRUE(settings._globals._colorSchemes.find(L"scheme1") != settings._globals._colorSchemes.end());
-            auto scheme1Proj = settings._globals._colorSchemes.find(L"scheme1")->second;
+            VERIFY_IS_TRUE(settings->_globals->ColorSchemes().HasKey(L"scheme1"));
+            auto scheme1Proj = settings->_globals->ColorSchemes().Lookup(L"scheme1");
             auto scheme1 = winrt::get_self<ColorScheme>(scheme1Proj);
-            VERIFY_IS_TRUE(settings._globals._colorSchemes.find(L"") != settings._globals._colorSchemes.end());
-            auto scheme2Proj = settings._globals._colorSchemes.find(L"")->second;
+            VERIFY_IS_TRUE(settings->_globals->ColorSchemes().HasKey(L""));
+            auto scheme2Proj = settings->_globals->ColorSchemes().Lookup(L"");
             auto scheme2 = winrt::get_self<ColorScheme>(scheme2Proj);
 
-            VERIFY_IS_NOT_NULL(settings._FindMatchingColorScheme(scheme0Json));
-            VERIFY_IS_NOT_NULL(settings._FindMatchingColorScheme(scheme1Json));
-            VERIFY_IS_NOT_NULL(settings._FindMatchingColorScheme(scheme2Json));
-            VERIFY_IS_NULL(settings._FindMatchingColorScheme(scheme3Json));
+            VERIFY_IS_NOT_NULL(settings->_FindMatchingColorScheme(scheme0Json));
+            VERIFY_IS_NOT_NULL(settings->_FindMatchingColorScheme(scheme1Json));
+            VERIFY_IS_NOT_NULL(settings->_FindMatchingColorScheme(scheme2Json));
+            VERIFY_IS_NULL(settings->_FindMatchingColorScheme(scheme3Json));
             VERIFY_ARE_EQUAL(ARGB(0, 4, 4, 4), scheme0->_defaultForeground);
             VERIFY_ARE_EQUAL(ARGB(0, 5, 5, 5), scheme0->_defaultBackground);
             VERIFY_ARE_EQUAL(ARGB(0, 2, 2, 2), scheme1->_defaultForeground);

src/cascadia/LocalTests_TerminalApp/KeyBindingsTests.cpp

@@ -5,6 +5,7 @@
 
 #include "../TerminalApp/ColorScheme.h"
 #include "../TerminalApp/CascadiaSettings.h"
+#include "../KeyMapping.h"
 #include "JsonTestClass.h"
 #include "TestUtils.h"
 
@@ -66,18 +67,18 @@ namespace TerminalAppLocalTests
         const auto bindings1Json = VerifyParseSucceeded(bindings1String);
         const auto bindings2Json = VerifyParseSucceeded(bindings2String);
 
-        auto appKeyBindings = winrt::make_self<winrt::TerminalApp::implementation::AppKeyBindings>();
-        VERIFY_IS_NOT_NULL(appKeyBindings);
-        VERIFY_ARE_EQUAL(0u, appKeyBindings->_keyShortcuts.size());
+        auto keymap = winrt::make_self<winrt::TerminalApp::implementation::KeyMapping>();
+        VERIFY_IS_NOT_NULL(keymap);
+        VERIFY_ARE_EQUAL(0u, keymap->_keyShortcuts.size());
 
-        appKeyBindings->LayerJson(bindings0Json);
-        VERIFY_ARE_EQUAL(1u, appKeyBindings->_keyShortcuts.size());
+        keymap->LayerJson(bindings0Json);
+        VERIFY_ARE_EQUAL(1u, keymap->_keyShortcuts.size());
 
-        appKeyBindings->LayerJson(bindings1Json);
-        VERIFY_ARE_EQUAL(2u, appKeyBindings->_keyShortcuts.size());
+        keymap->LayerJson(bindings1Json);
+        VERIFY_ARE_EQUAL(2u, keymap->_keyShortcuts.size());
 
-        appKeyBindings->LayerJson(bindings2Json);
-        VERIFY_ARE_EQUAL(4u, appKeyBindings->_keyShortcuts.size());
+        keymap->LayerJson(bindings2Json);
+        VERIFY_ARE_EQUAL(4u, keymap->_keyShortcuts.size());
     }
 
     void KeyBindingsTests::LayerKeybindings()
@@ -90,18 +91,18 @@ namespace TerminalAppLocalTests
         const auto bindings1Json = VerifyParseSucceeded(bindings1String);
         const auto bindings2Json = VerifyParseSucceeded(bindings2String);
 
-        auto appKeyBindings = winrt::make_self<winrt::TerminalApp::implementation::AppKeyBindings>();
-        VERIFY_IS_NOT_NULL(appKeyBindings);
-        VERIFY_ARE_EQUAL(0u, appKeyBindings->_keyShortcuts.size());
+        auto keymap = winrt::make_self<winrt::TerminalApp::implementation::KeyMapping>();
+        VERIFY_IS_NOT_NULL(keymap);
+        VERIFY_ARE_EQUAL(0u, keymap->_keyShortcuts.size());
 
-        appKeyBindings->LayerJson(bindings0Json);
-        VERIFY_ARE_EQUAL(1u, appKeyBindings->_keyShortcuts.size());
+        keymap->LayerJson(bindings0Json);
+        VERIFY_ARE_EQUAL(1u, keymap->_keyShortcuts.size());
 
-        appKeyBindings->LayerJson(bindings1Json);
-        VERIFY_ARE_EQUAL(1u, appKeyBindings->_keyShortcuts.size());
+        keymap->LayerJson(bindings1Json);
+        VERIFY_ARE_EQUAL(1u, keymap->_keyShortcuts.size());
 
-        appKeyBindings->LayerJson(bindings2Json);
-        VERIFY_ARE_EQUAL(2u, appKeyBindings->_keyShortcuts.size());
+        keymap->LayerJson(bindings2Json);
+        VERIFY_ARE_EQUAL(2u, keymap->_keyShortcuts.size());
     }
 
     void KeyBindingsTests::UnbindKeybindings()
@@ -120,52 +121,52 @@ namespace TerminalAppLocalTests
         const auto bindings4Json = VerifyParseSucceeded(bindings4String);
         const auto bindings5Json = VerifyParseSucceeded(bindings5String);
 
-        auto appKeyBindings = winrt::make_self<winrt::TerminalApp::implementation::AppKeyBindings>();
-        VERIFY_IS_NOT_NULL(appKeyBindings);
-        VERIFY_ARE_EQUAL(0u, appKeyBindings->_keyShortcuts.size());
+        auto keymap = winrt::make_self<winrt::TerminalApp::implementation::KeyMapping>();
+        VERIFY_IS_NOT_NULL(keymap);
+        VERIFY_ARE_EQUAL(0u, keymap->_keyShortcuts.size());
 
-        appKeyBindings->LayerJson(bindings0Json);
-        VERIFY_ARE_EQUAL(1u, appKeyBindings->_keyShortcuts.size());
+        keymap->LayerJson(bindings0Json);
+        VERIFY_ARE_EQUAL(1u, keymap->_keyShortcuts.size());
 
-        appKeyBindings->LayerJson(bindings1Json);
-        VERIFY_ARE_EQUAL(1u, appKeyBindings->_keyShortcuts.size());
+        keymap->LayerJson(bindings1Json);
+        VERIFY_ARE_EQUAL(1u, keymap->_keyShortcuts.size());
 
         Log::Comment(NoThrowString().Format(
             L"Try unbinding a key using `\"unbound\"` to unbind the key"));
-        appKeyBindings->LayerJson(bindings2Json);
-        VERIFY_ARE_EQUAL(0u, appKeyBindings->_keyShortcuts.size());
+        keymap->LayerJson(bindings2Json);
+        VERIFY_ARE_EQUAL(0u, keymap->_keyShortcuts.size());
 
         Log::Comment(NoThrowString().Format(
             L"Try unbinding a key using `null` to unbind the key"));
         // First add back a good binding
-        appKeyBindings->LayerJson(bindings0Json);
-        VERIFY_ARE_EQUAL(1u, appKeyBindings->_keyShortcuts.size());
+        keymap->LayerJson(bindings0Json);
+        VERIFY_ARE_EQUAL(1u, keymap->_keyShortcuts.size());
         // Then try layering in the bad setting
-        appKeyBindings->LayerJson(bindings3Json);
-        VERIFY_ARE_EQUAL(0u, appKeyBindings->_keyShortcuts.size());
+        keymap->LayerJson(bindings3Json);
+        VERIFY_ARE_EQUAL(0u, keymap->_keyShortcuts.size());
 
         Log::Comment(NoThrowString().Format(
             L"Try unbinding a key using an unrecognized command to unbind the key"));
         // First add back a good binding
-        appKeyBindings->LayerJson(bindings0Json);
-        VERIFY_ARE_EQUAL(1u, appKeyBindings->_keyShortcuts.size());
+        keymap->LayerJson(bindings0Json);
+        VERIFY_ARE_EQUAL(1u, keymap->_keyShortcuts.size());
         // Then try layering in the bad setting
-        appKeyBindings->LayerJson(bindings4Json);
-        VERIFY_ARE_EQUAL(0u, appKeyBindings->_keyShortcuts.size());
+        keymap->LayerJson(bindings4Json);
+        VERIFY_ARE_EQUAL(0u, keymap->_keyShortcuts.size());
 
         Log::Comment(NoThrowString().Format(
             L"Try unbinding a key using a straight up invalid value to unbind the key"));
         // First add back a good binding
-        appKeyBindings->LayerJson(bindings0Json);
-        VERIFY_ARE_EQUAL(1u, appKeyBindings->_keyShortcuts.size());
+        keymap->LayerJson(bindings0Json);
+        VERIFY_ARE_EQUAL(1u, keymap->_keyShortcuts.size());
         // Then try layering in the bad setting
-        appKeyBindings->LayerJson(bindings5Json);
-        VERIFY_ARE_EQUAL(0u, appKeyBindings->_keyShortcuts.size());
+        keymap->LayerJson(bindings5Json);
+        VERIFY_ARE_EQUAL(0u, keymap->_keyShortcuts.size());
 
         Log::Comment(NoThrowString().Format(
             L"Try unbinding a key that wasn't bound at all"));
-        appKeyBindings->LayerJson(bindings2Json);
-        VERIFY_ARE_EQUAL(0u, appKeyBindings->_keyShortcuts.size());
+        keymap->LayerJson(bindings2Json);
+        VERIFY_ARE_EQUAL(0u, keymap->_keyShortcuts.size());
     }
 
     void KeyBindingsTests::TestArbitraryArgs()
@@ -189,17 +190,17 @@ namespace TerminalAppLocalTests
 
         const auto bindings0Json = VerifyParseSucceeded(bindings0String);
 
-        auto appKeyBindings = winrt::make_self<implementation::AppKeyBindings>();
-        VERIFY_IS_NOT_NULL(appKeyBindings);
-        VERIFY_ARE_EQUAL(0u, appKeyBindings->_keyShortcuts.size());
-        appKeyBindings->LayerJson(bindings0Json);
-        VERIFY_ARE_EQUAL(10u, appKeyBindings->_keyShortcuts.size());
+        auto keymap = winrt::make_self<winrt::TerminalApp::implementation::KeyMapping>();
+        VERIFY_IS_NOT_NULL(keymap);
+        VERIFY_ARE_EQUAL(0u, keymap->_keyShortcuts.size());
+        keymap->LayerJson(bindings0Json);
+        VERIFY_ARE_EQUAL(10u, keymap->_keyShortcuts.size());
 
         {
             Log::Comment(NoThrowString().Format(
                 L"Verify that `copy` without args parses as Copy(SingleLine=false)"));
             KeyChord kc{ true, false, false, static_cast<int32_t>('C') };
-            auto actionAndArgs = TestUtils::GetActionAndArgs(*appKeyBindings, kc);
+            auto actionAndArgs = TestUtils::GetActionAndArgs(*keymap, kc);
             const auto& realArgs = actionAndArgs.Args().try_as<CopyTextArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
@@ -210,7 +211,7 @@ namespace TerminalAppLocalTests
             Log::Comment(NoThrowString().Format(
                 L"Verify that `copy` with args parses them correctly"));
             KeyChord kc{ true, false, true, static_cast<int32_t>('C') };
-            auto actionAndArgs = TestUtils::GetActionAndArgs(*appKeyBindings, kc);
+            auto actionAndArgs = TestUtils::GetActionAndArgs(*keymap, kc);
             const auto& realArgs = actionAndArgs.Args().try_as<CopyTextArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
@@ -221,7 +222,7 @@ namespace TerminalAppLocalTests
             Log::Comment(NoThrowString().Format(
                 L"Verify that `copy` with args parses them correctly"));
             KeyChord kc{ false, true, true, static_cast<int32_t>('C') };
-            auto actionAndArgs = TestUtils::GetActionAndArgs(*appKeyBindings, kc);
+            auto actionAndArgs = TestUtils::GetActionAndArgs(*keymap, kc);
             const auto& realArgs = actionAndArgs.Args().try_as<CopyTextArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
@@ -232,7 +233,7 @@ namespace TerminalAppLocalTests
             Log::Comment(NoThrowString().Format(
                 L"Verify that `newTab` without args parses as NewTab(Index=null)"));
             KeyChord kc{ true, false, false, static_cast<int32_t>('T') };
-            auto actionAndArgs = TestUtils::GetActionAndArgs(*appKeyBindings, kc);
+            auto actionAndArgs = TestUtils::GetActionAndArgs(*keymap, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::NewTab, actionAndArgs.Action());
             const auto& realArgs = actionAndArgs.Args().try_as<NewTabArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
@@ -244,7 +245,7 @@ namespace TerminalAppLocalTests
             Log::Comment(NoThrowString().Format(
                 L"Verify that `newTab` parses args correctly"));
             KeyChord kc{ true, false, true, static_cast<int32_t>('T') };
-            auto actionAndArgs = TestUtils::GetActionAndArgs(*appKeyBindings, kc);
+            auto actionAndArgs = TestUtils::GetActionAndArgs(*keymap, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::NewTab, actionAndArgs.Action());
             const auto& realArgs = actionAndArgs.Args().try_as<NewTabArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
@@ -258,7 +259,7 @@ namespace TerminalAppLocalTests
                 L"Verify that `newTab` with an index greater than the legacy "
                 L"args afforded parses correctly"));
             KeyChord kc{ true, false, true, static_cast<int32_t>('Y') };
-            auto actionAndArgs = TestUtils::GetActionAndArgs(*appKeyBindings, kc);
+            auto actionAndArgs = TestUtils::GetActionAndArgs(*keymap, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::NewTab, actionAndArgs.Action());
             const auto& realArgs = actionAndArgs.Args().try_as<NewTabArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
@@ -272,7 +273,7 @@ namespace TerminalAppLocalTests
             Log::Comment(NoThrowString().Format(
                 L"Verify that `copy` ignores args it doesn't understand"));
             KeyChord kc{ true, false, true, static_cast<int32_t>('B') };
-            auto actionAndArgs = TestUtils::GetActionAndArgs(*appKeyBindings, kc);
+            auto actionAndArgs = TestUtils::GetActionAndArgs(*keymap, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::CopyText, actionAndArgs.Action());
             const auto& realArgs = actionAndArgs.Args().try_as<CopyTextArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
@@ -284,7 +285,7 @@ namespace TerminalAppLocalTests
             Log::Comment(NoThrowString().Format(
                 L"Verify that `copy` null as it's `args` parses as the default option"));
             KeyChord kc{ true, false, true, static_cast<int32_t>('B') };
-            auto actionAndArgs = TestUtils::GetActionAndArgs(*appKeyBindings, kc);
+            auto actionAndArgs = TestUtils::GetActionAndArgs(*keymap, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::CopyText, actionAndArgs.Action());
             const auto& realArgs = actionAndArgs.Args().try_as<CopyTextArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
@@ -296,7 +297,7 @@ namespace TerminalAppLocalTests
             Log::Comment(NoThrowString().Format(
                 L"Verify that `adjustFontSize` with a positive delta parses args correctly"));
             KeyChord kc{ true, false, false, static_cast<int32_t>('F') };
-            auto actionAndArgs = TestUtils::GetActionAndArgs(*appKeyBindings, kc);
+            auto actionAndArgs = TestUtils::GetActionAndArgs(*keymap, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::AdjustFontSize, actionAndArgs.Action());
             const auto& realArgs = actionAndArgs.Args().try_as<AdjustFontSizeArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
@@ -308,7 +309,7 @@ namespace TerminalAppLocalTests
             Log::Comment(NoThrowString().Format(
                 L"Verify that `adjustFontSize` with a negative delta parses args correctly"));
             KeyChord kc{ true, false, false, static_cast<int32_t>('G') };
-            auto actionAndArgs = TestUtils::GetActionAndArgs(*appKeyBindings, kc);
+            auto actionAndArgs = TestUtils::GetActionAndArgs(*keymap, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::AdjustFontSize, actionAndArgs.Action());
             const auto& realArgs = actionAndArgs.Args().try_as<AdjustFontSizeArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
@@ -329,15 +330,15 @@ namespace TerminalAppLocalTests
 
         const auto bindings0Json = VerifyParseSucceeded(bindings0String);
 
-        auto appKeyBindings = winrt::make_self<implementation::AppKeyBindings>();
-        VERIFY_IS_NOT_NULL(appKeyBindings);
-        VERIFY_ARE_EQUAL(0u, appKeyBindings->_keyShortcuts.size());
-        appKeyBindings->LayerJson(bindings0Json);
-        VERIFY_ARE_EQUAL(5u, appKeyBindings->_keyShortcuts.size());
+        auto keymap = winrt::make_self<winrt::TerminalApp::implementation::KeyMapping>();
+        VERIFY_IS_NOT_NULL(keymap);
+        VERIFY_ARE_EQUAL(0u, keymap->_keyShortcuts.size());
+        keymap->LayerJson(bindings0Json);
+        VERIFY_ARE_EQUAL(5u, keymap->_keyShortcuts.size());
 
         {
             KeyChord kc{ true, false, false, static_cast<int32_t>('C') };
-            auto actionAndArgs = TestUtils::GetActionAndArgs(*appKeyBindings, kc);
+            auto actionAndArgs = TestUtils::GetActionAndArgs(*keymap, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::SplitPane, actionAndArgs.Action());
             const auto& realArgs = actionAndArgs.Args().try_as<SplitPaneArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
@@ -346,7 +347,7 @@ namespace TerminalAppLocalTests
         }
         {
             KeyChord kc{ true, false, false, static_cast<int32_t>('D') };
-            auto actionAndArgs = TestUtils::GetActionAndArgs(*appKeyBindings, kc);
+            auto actionAndArgs = TestUtils::GetActionAndArgs(*keymap, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::SplitPane, actionAndArgs.Action());
             const auto& realArgs = actionAndArgs.Args().try_as<SplitPaneArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
@@ -355,7 +356,7 @@ namespace TerminalAppLocalTests
         }
         {
             KeyChord kc{ true, false, false, static_cast<int32_t>('E') };
-            auto actionAndArgs = TestUtils::GetActionAndArgs(*appKeyBindings, kc);
+            auto actionAndArgs = TestUtils::GetActionAndArgs(*keymap, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::SplitPane, actionAndArgs.Action());
             const auto& realArgs = actionAndArgs.Args().try_as<SplitPaneArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
@@ -364,7 +365,7 @@ namespace TerminalAppLocalTests
         }
         {
             KeyChord kc{ true, false, false, static_cast<int32_t>('G') };
-            auto actionAndArgs = TestUtils::GetActionAndArgs(*appKeyBindings, kc);
+            auto actionAndArgs = TestUtils::GetActionAndArgs(*keymap, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::SplitPane, actionAndArgs.Action());
             const auto& realArgs = actionAndArgs.Args().try_as<SplitPaneArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
@@ -373,7 +374,7 @@ namespace TerminalAppLocalTests
         }
         {
             KeyChord kc{ true, false, false, static_cast<int32_t>('H') };
-            auto actionAndArgs = TestUtils::GetActionAndArgs(*appKeyBindings, kc);
+            auto actionAndArgs = TestUtils::GetActionAndArgs(*keymap, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::SplitPane, actionAndArgs.Action());
             const auto& realArgs = actionAndArgs.Args().try_as<SplitPaneArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
@@ -392,15 +393,15 @@ namespace TerminalAppLocalTests
 
         const auto bindings0Json = VerifyParseSucceeded(bindings0String);
 
-        auto appKeyBindings = winrt::make_self<implementation::AppKeyBindings>();
-        VERIFY_IS_NOT_NULL(appKeyBindings);
-        VERIFY_ARE_EQUAL(0u, appKeyBindings->_keyShortcuts.size());
-        appKeyBindings->LayerJson(bindings0Json);
-        VERIFY_ARE_EQUAL(3u, appKeyBindings->_keyShortcuts.size());
+        auto keymap = winrt::make_self<winrt::TerminalApp::implementation::KeyMapping>();
+        VERIFY_IS_NOT_NULL(keymap);
+        VERIFY_ARE_EQUAL(0u, keymap->_keyShortcuts.size());
+        keymap->LayerJson(bindings0Json);
+        VERIFY_ARE_EQUAL(3u, keymap->_keyShortcuts.size());
 
         {
             KeyChord kc{ true, false, false, static_cast<int32_t>('C') };
-            auto actionAndArgs = TestUtils::GetActionAndArgs(*appKeyBindings, kc);
+            auto actionAndArgs = TestUtils::GetActionAndArgs(*keymap, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::SetTabColor, actionAndArgs.Action());
             const auto& realArgs = actionAndArgs.Args().try_as<SetTabColorArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
@@ -409,7 +410,7 @@ namespace TerminalAppLocalTests
         }
         {
             KeyChord kc{ true, false, false, static_cast<int32_t>('D') };
-            auto actionAndArgs = TestUtils::GetActionAndArgs(*appKeyBindings, kc);
+            auto actionAndArgs = TestUtils::GetActionAndArgs(*keymap, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::SetTabColor, actionAndArgs.Action());
             const auto& realArgs = actionAndArgs.Args().try_as<SetTabColorArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
@@ -420,7 +421,7 @@ namespace TerminalAppLocalTests
         }
         {
             KeyChord kc{ true, false, false, static_cast<int32_t>('F') };
-            auto actionAndArgs = TestUtils::GetActionAndArgs(*appKeyBindings, kc);
+            auto actionAndArgs = TestUtils::GetActionAndArgs(*keymap, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::SetTabColor, actionAndArgs.Action());
             const auto& realArgs = actionAndArgs.Args().try_as<SetTabColorArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
@@ -437,15 +438,15 @@ namespace TerminalAppLocalTests
 
         const auto bindings0Json = VerifyParseSucceeded(bindings0String);
 
-        auto appKeyBindings = winrt::make_self<implementation::AppKeyBindings>();
-        VERIFY_IS_NOT_NULL(appKeyBindings);
-        VERIFY_ARE_EQUAL(0u, appKeyBindings->_keyShortcuts.size());
-        appKeyBindings->LayerJson(bindings0Json);
-        VERIFY_ARE_EQUAL(1u, appKeyBindings->_keyShortcuts.size());
+        auto keymap = winrt::make_self<winrt::TerminalApp::implementation::KeyMapping>();
+        VERIFY_IS_NOT_NULL(keymap);
+        VERIFY_ARE_EQUAL(0u, keymap->_keyShortcuts.size());
+        keymap->LayerJson(bindings0Json);
+        VERIFY_ARE_EQUAL(1u, keymap->_keyShortcuts.size());
 
         {
             KeyChord kc{ true, false, false, static_cast<int32_t>('C') };
-            auto actionAndArgs = TestUtils::GetActionAndArgs(*appKeyBindings, kc);
+            auto actionAndArgs = TestUtils::GetActionAndArgs(*keymap, kc);
             const auto& realArgs = actionAndArgs.Args().try_as<CopyTextArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value

src/cascadia/LocalTests_TerminalApp/ProfileTests.cpp

@@ -9,6 +9,7 @@
 
 using namespace Microsoft::Console;
 using namespace TerminalApp;
+using namespace winrt::TerminalApp;
 using namespace WEX::Logging;
 using namespace WEX::TestExecution;
 using namespace WEX::Common;
@@ -67,27 +68,27 @@ namespace TerminalAppLocalTests
         const auto profile2Json = VerifyParseSucceeded(profile2String);
         const auto profile3Json = VerifyParseSucceeded(profile3String);
 
-        const auto profile0 = Profile::FromJson(profile0Json);
+        const auto profile0 = implementation::Profile::FromJson(profile0Json);
 
-        VERIFY_IS_FALSE(profile0.ShouldBeLayered(profile1Json));
-        VERIFY_IS_TRUE(profile0.ShouldBeLayered(profile2Json));
-        VERIFY_IS_FALSE(profile0.ShouldBeLayered(profile3Json));
+        VERIFY_IS_FALSE(profile0->ShouldBeLayered(profile1Json));
+        VERIFY_IS_TRUE(profile0->ShouldBeLayered(profile2Json));
+        VERIFY_IS_FALSE(profile0->ShouldBeLayered(profile3Json));
 
-        const auto profile1 = Profile::FromJson(profile1Json);
+        const auto profile1 = implementation::Profile::FromJson(profile1Json);
 
-        VERIFY_IS_FALSE(profile1.ShouldBeLayered(profile0Json));
+        VERIFY_IS_FALSE(profile1->ShouldBeLayered(profile0Json));
         // A profile _can_ be layered with itself, though what's the point?
-        VERIFY_IS_TRUE(profile1.ShouldBeLayered(profile1Json));
-        VERIFY_IS_FALSE(profile1.ShouldBeLayered(profile2Json));
-        VERIFY_IS_FALSE(profile1.ShouldBeLayered(profile3Json));
+        VERIFY_IS_TRUE(profile1->ShouldBeLayered(profile1Json));
+        VERIFY_IS_FALSE(profile1->ShouldBeLayered(profile2Json));
+        VERIFY_IS_FALSE(profile1->ShouldBeLayered(profile3Json));
 
-        const auto profile3 = Profile::FromJson(profile3Json);
+        const auto profile3 = implementation::Profile::FromJson(profile3Json);
 
-        VERIFY_IS_FALSE(profile3.ShouldBeLayered(profile0Json));
+        VERIFY_IS_FALSE(profile3->ShouldBeLayered(profile0Json));
         // A profile _can_ be layered with itself, though what's the point?
-        VERIFY_IS_FALSE(profile3.ShouldBeLayered(profile1Json));
-        VERIFY_IS_FALSE(profile3.ShouldBeLayered(profile2Json));
-        VERIFY_IS_FALSE(profile3.ShouldBeLayered(profile3Json));
+        VERIFY_IS_FALSE(profile3->ShouldBeLayered(profile1Json));
+        VERIFY_IS_FALSE(profile3->ShouldBeLayered(profile2Json));
+        VERIFY_IS_FALSE(profile3->ShouldBeLayered(profile3Json));
     }
 
     void ProfileTests::LayerProfileProperties()
@@ -116,55 +117,55 @@ namespace TerminalAppLocalTests
         const auto profile1Json = VerifyParseSucceeded(profile1String);
         const auto profile2Json = VerifyParseSucceeded(profile2String);
 
-        auto profile0 = Profile::FromJson(profile0Json);
-        VERIFY_IS_TRUE(profile0._defaultForeground.has_value());
-        VERIFY_ARE_EQUAL(ARGB(0, 0, 0, 0), profile0._defaultForeground.value());
+        auto profile0 = implementation::Profile::FromJson(profile0Json);
+        VERIFY_IS_NOT_NULL(profile0->Foreground());
+        VERIFY_ARE_EQUAL(til::color(0, 0, 0), til::color{ profile0->Foreground().Value() });
 
-        VERIFY_IS_TRUE(profile0._defaultBackground.has_value());
-        VERIFY_ARE_EQUAL(ARGB(0, 1, 1, 1), profile0._defaultBackground.value());
+        VERIFY_IS_NOT_NULL(profile0->Background());
+        VERIFY_ARE_EQUAL(til::color(1, 1, 1), til::color{ profile0->Background().Value() });
 
-        VERIFY_IS_TRUE(profile0._selectionBackground.has_value());
-        VERIFY_ARE_EQUAL(ARGB(0, 1, 1, 1), profile0._selectionBackground.value());
+        VERIFY_IS_NOT_NULL(profile0->SelectionBackground());
+        VERIFY_ARE_EQUAL(til::color(1, 1, 1), til::color{ profile0->SelectionBackground().Value() });
 
-        VERIFY_ARE_EQUAL(L"profile0", profile0._name);
+        VERIFY_ARE_EQUAL(L"profile0", profile0->Name());
 
-        VERIFY_IS_FALSE(profile0._startingDirectory.has_value());
+        VERIFY_IS_TRUE(profile0->StartingDirectory().empty());
 
         Log::Comment(NoThrowString().Format(
             L"Layering profile1 on top of profile0"));
-        profile0.LayerJson(profile1Json);
+        profile0->LayerJson(profile1Json);
 
-        VERIFY_IS_TRUE(profile0._defaultForeground.has_value());
-        VERIFY_ARE_EQUAL(ARGB(0, 2, 2, 2), profile0._defaultForeground.value());
+        VERIFY_IS_NOT_NULL(profile0->Foreground());
+        VERIFY_ARE_EQUAL(til::color(2, 2, 2), til::color{ profile0->Foreground().Value() });
 
-        VERIFY_IS_TRUE(profile0._defaultBackground.has_value());
-        VERIFY_ARE_EQUAL(ARGB(0, 1, 1, 1), profile0._defaultBackground.value());
+        VERIFY_IS_NOT_NULL(profile0->Background());
+        VERIFY_ARE_EQUAL(til::color(1, 1, 1), til::color{ profile0->Background().Value() });
 
-        VERIFY_IS_TRUE(profile0._selectionBackground.has_value());
-        VERIFY_ARE_EQUAL(ARGB(0, 1, 1, 1), profile0._selectionBackground.value());
+        VERIFY_IS_NOT_NULL(profile0->Background());
+        VERIFY_ARE_EQUAL(til::color(1, 1, 1), til::color{ profile0->Background().Value() });
 
-        VERIFY_ARE_EQUAL(L"profile1", profile0._name);
+        VERIFY_ARE_EQUAL(L"profile1", profile0->Name());
 
-        VERIFY_IS_TRUE(profile0._startingDirectory.has_value());
-        VERIFY_ARE_EQUAL(L"C:/", profile0._startingDirectory.value());
+        VERIFY_IS_FALSE(profile0->StartingDirectory().empty());
+        VERIFY_ARE_EQUAL(L"C:/", profile0->StartingDirectory());
 
         Log::Comment(NoThrowString().Format(
             L"Layering profile2 on top of (profile0+profile1)"));
-        profile0.LayerJson(profile2Json);
+        profile0->LayerJson(profile2Json);
 
-        VERIFY_IS_TRUE(profile0._defaultForeground.has_value());
-        VERIFY_ARE_EQUAL(ARGB(0, 3, 3, 3), profile0._defaultForeground.value());
+        VERIFY_IS_NOT_NULL(profile0->Foreground());
+        VERIFY_ARE_EQUAL(til::color(3, 3, 3), til::color{ profile0->Foreground().Value() });
 
-        VERIFY_IS_TRUE(profile0._defaultBackground.has_value());
-        VERIFY_ARE_EQUAL(ARGB(0, 1, 1, 1), profile0._defaultBackground.value());
+        VERIFY_IS_NOT_NULL(profile0->Background());
+        VERIFY_ARE_EQUAL(til::color(1, 1, 1), til::color{ profile0->Background().Value() });
 
-        VERIFY_IS_TRUE(profile0._selectionBackground.has_value());
-        VERIFY_ARE_EQUAL(ARGB(0, 2, 2, 2), profile0._selectionBackground.value());
+        VERIFY_IS_NOT_NULL(profile0->SelectionBackground());
+        VERIFY_ARE_EQUAL(til::color(2, 2, 2), til::color{ profile0->SelectionBackground().Value() });
 
-        VERIFY_ARE_EQUAL(L"profile2", profile0._name);
+        VERIFY_ARE_EQUAL(L"profile2", profile0->Name());
 
-        VERIFY_IS_TRUE(profile0._startingDirectory.has_value());
-        VERIFY_ARE_EQUAL(L"C:/", profile0._startingDirectory.value());
+        VERIFY_IS_FALSE(profile0->StartingDirectory().empty());
+        VERIFY_ARE_EQUAL(L"C:/", profile0->StartingDirectory());
     }
 
     void ProfileTests::LayerProfileIcon()
@@ -194,33 +195,33 @@ namespace TerminalAppLocalTests
         const auto profile2Json = VerifyParseSucceeded(profile2String);
         const auto profile3Json = VerifyParseSucceeded(profile3String);
 
-        auto profile0 = Profile::FromJson(profile0Json);
-        VERIFY_IS_TRUE(profile0._icon.has_value());
-        VERIFY_ARE_EQUAL(L"not-null.png", profile0._icon.value());
+        auto profile0 = implementation::Profile::FromJson(profile0Json);
+        VERIFY_IS_FALSE(profile0->IconPath().empty());
+        VERIFY_ARE_EQUAL(L"not-null.png", profile0->IconPath());
 
         Log::Comment(NoThrowString().Format(
             L"Verify that layering an object the key set to null will clear the key"));
-        profile0.LayerJson(profile1Json);
-        VERIFY_IS_FALSE(profile0._icon.has_value());
+        profile0->LayerJson(profile1Json);
+        VERIFY_IS_TRUE(profile0->IconPath().empty());
 
-        profile0.LayerJson(profile2Json);
-        VERIFY_IS_FALSE(profile0._icon.has_value());
+        profile0->LayerJson(profile2Json);
+        VERIFY_IS_TRUE(profile0->IconPath().empty());
 
-        profile0.LayerJson(profile3Json);
-        VERIFY_IS_TRUE(profile0._icon.has_value());
-        VERIFY_ARE_EQUAL(L"another-real.png", profile0._icon.value());
+        profile0->LayerJson(profile3Json);
+        VERIFY_IS_FALSE(profile0->IconPath().empty());
+        VERIFY_ARE_EQUAL(L"another-real.png", profile0->IconPath());
 
         Log::Comment(NoThrowString().Format(
             L"Verify that layering an object _without_ the key will not clear the key"));
-        profile0.LayerJson(profile2Json);
-        VERIFY_IS_TRUE(profile0._icon.has_value());
-        VERIFY_ARE_EQUAL(L"another-real.png", profile0._icon.value());
+        profile0->LayerJson(profile2Json);
+        VERIFY_IS_FALSE(profile0->IconPath().empty());
+        VERIFY_ARE_EQUAL(L"another-real.png", profile0->IconPath());
 
-        auto profile1 = Profile::FromJson(profile1Json);
-        VERIFY_IS_FALSE(profile1._icon.has_value());
-        profile1.LayerJson(profile3Json);
-        VERIFY_IS_TRUE(profile1._icon.has_value());
-        VERIFY_ARE_EQUAL(L"another-real.png", profile1._icon.value());
+        auto profile1 = implementation::Profile::FromJson(profile1Json);
+        VERIFY_IS_TRUE(profile1->IconPath().empty());
+        profile1->LayerJson(profile3Json);
+        VERIFY_IS_FALSE(profile1->IconPath().empty());
+        VERIFY_ARE_EQUAL(L"another-real.png", profile1->IconPath());
     }
 
     void ProfileTests::LayerProfilesOnArray()
@@ -252,57 +253,57 @@ namespace TerminalAppLocalTests
         const auto profile3Json = VerifyParseSucceeded(profile3String);
         const auto profile4Json = VerifyParseSucceeded(profile4String);
 
-        CascadiaSettings settings;
+        auto settings = winrt::make_self<winrt::TerminalApp::implementation::CascadiaSettings>();
 
-        VERIFY_ARE_EQUAL(0u, settings._profiles.size());
-        VERIFY_IS_NULL(settings._FindMatchingProfile(profile0Json));
-        VERIFY_IS_NULL(settings._FindMatchingProfile(profile1Json));
-        VERIFY_IS_NULL(settings._FindMatchingProfile(profile2Json));
-        VERIFY_IS_NULL(settings._FindMatchingProfile(profile3Json));
-        VERIFY_IS_NULL(settings._FindMatchingProfile(profile4Json));
+        VERIFY_ARE_EQUAL(0u, settings->_profiles.Size());
+        VERIFY_IS_NULL(settings->_FindMatchingProfile(profile0Json));
+        VERIFY_IS_NULL(settings->_FindMatchingProfile(profile1Json));
+        VERIFY_IS_NULL(settings->_FindMatchingProfile(profile2Json));
+        VERIFY_IS_NULL(settings->_FindMatchingProfile(profile3Json));
+        VERIFY_IS_NULL(settings->_FindMatchingProfile(profile4Json));
 
-        settings._LayerOrCreateProfile(profile0Json);
-        VERIFY_ARE_EQUAL(1u, settings._profiles.size());
-        VERIFY_IS_NOT_NULL(settings._FindMatchingProfile(profile0Json));
-        VERIFY_IS_NULL(settings._FindMatchingProfile(profile1Json));
-        VERIFY_IS_NULL(settings._FindMatchingProfile(profile2Json));
-        VERIFY_IS_NOT_NULL(settings._FindMatchingProfile(profile3Json));
-        VERIFY_IS_NOT_NULL(settings._FindMatchingProfile(profile4Json));
+        settings->_LayerOrCreateProfile(profile0Json);
+        VERIFY_ARE_EQUAL(1u, settings->_profiles.Size());
+        VERIFY_IS_NOT_NULL(settings->_FindMatchingProfile(profile0Json));
+        VERIFY_IS_NULL(settings->_FindMatchingProfile(profile1Json));
+        VERIFY_IS_NULL(settings->_FindMatchingProfile(profile2Json));
+        VERIFY_IS_NOT_NULL(settings->_FindMatchingProfile(profile3Json));
+        VERIFY_IS_NOT_NULL(settings->_FindMatchingProfile(profile4Json));
 
-        settings._LayerOrCreateProfile(profile1Json);
-        VERIFY_ARE_EQUAL(2u, settings._profiles.size());
-        VERIFY_IS_NOT_NULL(settings._FindMatchingProfile(profile0Json));
-        VERIFY_IS_NOT_NULL(settings._FindMatchingProfile(profile1Json));
-        VERIFY_IS_NULL(settings._FindMatchingProfile(profile2Json));
-        VERIFY_IS_NOT_NULL(settings._FindMatchingProfile(profile3Json));
-        VERIFY_IS_NOT_NULL(settings._FindMatchingProfile(profile4Json));
+        settings->_LayerOrCreateProfile(profile1Json);
+        VERIFY_ARE_EQUAL(2u, settings->_profiles.Size());
+        VERIFY_IS_NOT_NULL(settings->_FindMatchingProfile(profile0Json));
+        VERIFY_IS_NOT_NULL(settings->_FindMatchingProfile(profile1Json));
+        VERIFY_IS_NULL(settings->_FindMatchingProfile(profile2Json));
+        VERIFY_IS_NOT_NULL(settings->_FindMatchingProfile(profile3Json));
+        VERIFY_IS_NOT_NULL(settings->_FindMatchingProfile(profile4Json));
 
-        settings._LayerOrCreateProfile(profile2Json);
-        VERIFY_ARE_EQUAL(3u, settings._profiles.size());
-        VERIFY_IS_NOT_NULL(settings._FindMatchingProfile(profile0Json));
-        VERIFY_IS_NOT_NULL(settings._FindMatchingProfile(profile1Json));
-        VERIFY_IS_NOT_NULL(settings._FindMatchingProfile(profile2Json));
-        VERIFY_IS_NOT_NULL(settings._FindMatchingProfile(profile3Json));
-        VERIFY_IS_NOT_NULL(settings._FindMatchingProfile(profile4Json));
-        VERIFY_ARE_EQUAL(L"profile0", settings._profiles.at(0)._name);
+        settings->_LayerOrCreateProfile(profile2Json);
+        VERIFY_ARE_EQUAL(3u, settings->_profiles.Size());
+        VERIFY_IS_NOT_NULL(settings->_FindMatchingProfile(profile0Json));
+        VERIFY_IS_NOT_NULL(settings->_FindMatchingProfile(profile1Json));
+        VERIFY_IS_NOT_NULL(settings->_FindMatchingProfile(profile2Json));
+        VERIFY_IS_NOT_NULL(settings->_FindMatchingProfile(profile3Json));
+        VERIFY_IS_NOT_NULL(settings->_FindMatchingProfile(profile4Json));
+        VERIFY_ARE_EQUAL(L"profile0", settings->_profiles.GetAt(0).Name());
 
-        settings._LayerOrCreateProfile(profile3Json);
-        VERIFY_ARE_EQUAL(3u, settings._profiles.size());
-        VERIFY_IS_NOT_NULL(settings._FindMatchingProfile(profile0Json));
-        VERIFY_IS_NOT_NULL(settings._FindMatchingProfile(profile1Json));
-        VERIFY_IS_NOT_NULL(settings._FindMatchingProfile(profile2Json));
-        VERIFY_IS_NOT_NULL(settings._FindMatchingProfile(profile3Json));
-        VERIFY_IS_NOT_NULL(settings._FindMatchingProfile(profile4Json));
-        VERIFY_ARE_EQUAL(L"profile3", settings._profiles.at(0)._name);
+        settings->_LayerOrCreateProfile(profile3Json);
+        VERIFY_ARE_EQUAL(3u, settings->_profiles.Size());
+        VERIFY_IS_NOT_NULL(settings->_FindMatchingProfile(profile0Json));
+        VERIFY_IS_NOT_NULL(settings->_FindMatchingProfile(profile1Json));
+        VERIFY_IS_NOT_NULL(settings->_FindMatchingProfile(profile2Json));
+        VERIFY_IS_NOT_NULL(settings->_FindMatchingProfile(profile3Json));
+        VERIFY_IS_NOT_NULL(settings->_FindMatchingProfile(profile4Json));
+        VERIFY_ARE_EQUAL(L"profile3", settings->_profiles.GetAt(0).Name());
 
-        settings._LayerOrCreateProfile(profile4Json);
-        VERIFY_ARE_EQUAL(3u, settings._profiles.size());
-        VERIFY_IS_NOT_NULL(settings._FindMatchingProfile(profile0Json));
-        VERIFY_IS_NOT_NULL(settings._FindMatchingProfile(profile1Json));
-        VERIFY_IS_NOT_NULL(settings._FindMatchingProfile(profile2Json));
-        VERIFY_IS_NOT_NULL(settings._FindMatchingProfile(profile3Json));
-        VERIFY_IS_NOT_NULL(settings._FindMatchingProfile(profile4Json));
-        VERIFY_ARE_EQUAL(L"profile4", settings._profiles.at(0)._name);
+        settings->_LayerOrCreateProfile(profile4Json);
+        VERIFY_ARE_EQUAL(3u, settings->_profiles.Size());
+        VERIFY_IS_NOT_NULL(settings->_FindMatchingProfile(profile0Json));
+        VERIFY_IS_NOT_NULL(settings->_FindMatchingProfile(profile1Json));
+        VERIFY_IS_NOT_NULL(settings->_FindMatchingProfile(profile2Json));
+        VERIFY_IS_NOT_NULL(settings->_FindMatchingProfile(profile3Json));
+        VERIFY_IS_NOT_NULL(settings->_FindMatchingProfile(profile4Json));
+        VERIFY_ARE_EQUAL(L"profile4", settings->_profiles.GetAt(0).Name());
     }
 
 }

src/cascadia/LocalTests_TerminalApp/TabTests.cpp

@@ -62,6 +62,10 @@ namespace TerminalAppLocalTests
         TEST_METHOD(TryDuplicateBadTab);
         TEST_METHOD(TryDuplicateBadPane);
 
+        TEST_METHOD(TryZoomPane);
+        TEST_METHOD(MoveFocusFromZoomedPane);
+        TEST_METHOD(CloseZoomedPane);
+
         TEST_CLASS_SETUP(ClassSetup)
         {
             InitializeJsonReader();
@@ -75,7 +79,8 @@ namespace TerminalAppLocalTests
 
     private:
         void _initializeTerminalPage(winrt::com_ptr<winrt::TerminalApp::implementation::TerminalPage>& page,
-                                     std::shared_ptr<CascadiaSettings> initialSettings);
+                                     winrt::com_ptr<winrt::TerminalApp::implementation::CascadiaSettings>& initialSettings);
+        winrt::com_ptr<winrt::TerminalApp::implementation::TerminalPage> _commonSetup();
     };
 
     void TabTests::EnsureTestsActivate()
@@ -190,7 +195,7 @@ namespace TerminalAppLocalTests
     // Return Value:
     // - <none>
     void TabTests::_initializeTerminalPage(winrt::com_ptr<winrt::TerminalApp::implementation::TerminalPage>& page,
-                                           std::shared_ptr<CascadiaSettings> initialSettings)
+                                           winrt::com_ptr<winrt::TerminalApp::implementation::CascadiaSettings>& initialSettings)
     {
         // This is super wacky, but we can't just initialize the
         // com_ptr<impl::TerminalPage> in the lambda and assign it back out of
@@ -206,7 +211,7 @@ namespace TerminalAppLocalTests
         auto result = RunOnUIThread([&projectedPage, &page, initialSettings]() {
             projectedPage = winrt::TerminalApp::TerminalPage();
             page.copy_from(winrt::get_self<winrt::TerminalApp::implementation::TerminalPage>(projectedPage));
-            page->_settings = initialSettings;
+            page->_settings = *initialSettings;
         });
         VERIFY_SUCCEEDED(result);
 
@@ -277,7 +282,7 @@ namespace TerminalAppLocalTests
         })" };
 
         VerifyParseSucceeded(settingsJson0);
-        auto settings0 = std::make_shared<CascadiaSettings>(false);
+        auto settings0 = winrt::make_self<implementation::CascadiaSettings>(false);
         VERIFY_IS_NOT_NULL(settings0);
         settings0->_ParseJsonString(settingsJson0, false);
         settings0->LayerJson(settings0->_userSettings);
@@ -339,14 +344,14 @@ namespace TerminalAppLocalTests
         })" };
 
         VerifyParseSucceeded(settingsJson0);
-        auto settings0 = std::make_shared<CascadiaSettings>(false);
+        auto settings0 = winrt::make_self<implementation::CascadiaSettings>(false);
         VERIFY_IS_NOT_NULL(settings0);
         settings0->_ParseJsonString(settingsJson0, false);
         settings0->LayerJson(settings0->_userSettings);
         settings0->_ValidateSettings();
 
         VerifyParseSucceeded(settingsJson1);
-        auto settings1 = std::make_shared<CascadiaSettings>(false);
+        auto settings1 = winrt::make_self<implementation::CascadiaSettings>(false);
         VERIFY_IS_NOT_NULL(settings1);
         settings1->_ParseJsonString(settingsJson1, false);
         settings1->LayerJson(settings1->_userSettings);
@@ -383,7 +388,7 @@ namespace TerminalAppLocalTests
             L"Change the settings of the TerminalPage so the first profile is "
             L"no longer in the list of profiles"));
         result = RunOnUIThread([&page, settings1]() {
-            page->_settings = settings1;
+            page->_settings = *settings1;
         });
         VERIFY_SUCCEEDED(result);
 
@@ -434,14 +439,14 @@ namespace TerminalAppLocalTests
         })" };
 
         VerifyParseSucceeded(settingsJson0);
-        auto settings0 = std::make_shared<CascadiaSettings>(false);
+        auto settings0 = winrt::make_self<implementation::CascadiaSettings>(false);
         VERIFY_IS_NOT_NULL(settings0);
         settings0->_ParseJsonString(settingsJson0, false);
         settings0->LayerJson(settings0->_userSettings);
         settings0->_ValidateSettings();
 
         VerifyParseSucceeded(settingsJson1);
-        auto settings1 = std::make_shared<CascadiaSettings>(false);
+        auto settings1 = winrt::make_self<implementation::CascadiaSettings>(false);
         VERIFY_IS_NOT_NULL(settings1);
         settings1->_ParseJsonString(settingsJson1, false);
         settings1->LayerJson(settings1->_userSettings);
@@ -488,7 +493,7 @@ namespace TerminalAppLocalTests
             L"Change the settings of the TerminalPage so the first profile is "
             L"no longer in the list of profiles"));
         result = RunOnUIThread([&page, settings1]() {
-            page->_settings = settings1;
+            page->_settings = *settings1;
         });
         VERIFY_SUCCEEDED(result);
 
@@ -517,4 +522,192 @@ namespace TerminalAppLocalTests
         });
     }
 
+    // Method Description:
+    // - This is a helper method for setting up a TerminalPage with some common
+    //   settings, and creating the first tab.
+    // Arguments:
+    // - <none>
+    // Return Value:
+    // - The initialized TerminalPage, ready to use.
+    winrt::com_ptr<winrt::TerminalApp::implementation::TerminalPage> TabTests::_commonSetup()
+    {
+        const std::string settingsJson0{ R"(
+        {
+            "defaultProfile": "{6239a42c-1111-49a3-80bd-e8fdd045185c}",
+            "profiles": [
+                {
+                    "name" : "profile0",
+                    "guid": "{6239a42c-1111-49a3-80bd-e8fdd045185c}",
+                    "historySize": 1
+                },
+                {
+                    "name" : "profile1",
+                    "guid": "{6239a42c-2222-49a3-80bd-e8fdd045185c}",
+                    "historySize": 2
+                }
+            ]
+        })" };
+
+        CascadiaSettings settings0{ til::u8u16(settingsJson0) };
+        VERIFY_IS_NOT_NULL(settings0);
+
+        const auto guid1 = Microsoft::Console::Utils::GuidFromString(L"{6239a42c-1111-49a3-80bd-e8fdd045185c}");
+        const auto guid2 = Microsoft::Console::Utils::GuidFromString(L"{6239a42c-2222-49a3-80bd-e8fdd045185c}");
+
+        // This is super wacky, but we can't just initialize the
+        // com_ptr<impl::TerminalPage> in the lambda and assign it back out of
+        // the lambda. We'll crash trying to get a weak_ref to the TerminalPage
+        // during TerminalPage::Create() below.
+        //
+        // Instead, create the winrt object, then get a com_ptr to the
+        // implementation _from_ the winrt object. This seems to work, even if
+        // it's weird.
+        winrt::com_ptr<winrt::TerminalApp::implementation::TerminalPage> page{ nullptr };
+        _initializeTerminalPage(page, settings0);
+
+        auto result = RunOnUIThread([&page]() {
+            VERIFY_ARE_EQUAL(1u, page->_tabs.Size());
+        });
+        VERIFY_SUCCEEDED(result);
+
+        return page;
+    }
+
+    void TabTests::TryZoomPane()
+    {
+        auto page = _commonSetup();
+
+        Log::Comment(L"Create a second pane");
+        auto result = RunOnUIThread([&page]() {
+            SplitPaneArgs args{ SplitType::Duplicate };
+            ActionEventArgs eventArgs{ args };
+            // eventArgs.Args(args);
+            page->_HandleSplitPane(nullptr, eventArgs);
+            auto firstTab = page->_GetStrongTabImpl(0);
+
+            VERIFY_ARE_EQUAL(2, firstTab->GetLeafPaneCount());
+            VERIFY_IS_FALSE(firstTab->IsZoomed());
+        });
+        VERIFY_SUCCEEDED(result);
+
+        Log::Comment(L"Zoom in on the pane");
+        result = RunOnUIThread([&page]() {
+            ActionEventArgs eventArgs{};
+            page->_HandleTogglePaneZoom(nullptr, eventArgs);
+            auto firstTab = page->_GetStrongTabImpl(0);
+            VERIFY_ARE_EQUAL(2, firstTab->GetLeafPaneCount());
+            VERIFY_IS_TRUE(firstTab->IsZoomed());
+        });
+        VERIFY_SUCCEEDED(result);
+
+        Log::Comment(L"Zoom out of the pane");
+        result = RunOnUIThread([&page]() {
+            ActionEventArgs eventArgs{};
+            page->_HandleTogglePaneZoom(nullptr, eventArgs);
+            auto firstTab = page->_GetStrongTabImpl(0);
+            VERIFY_ARE_EQUAL(2, firstTab->GetLeafPaneCount());
+            VERIFY_IS_FALSE(firstTab->IsZoomed());
+        });
+        VERIFY_SUCCEEDED(result);
+    }
+
+    void TabTests::MoveFocusFromZoomedPane()
+    {
+        auto page = _commonSetup();
+
+        Log::Comment(L"Create a second pane");
+        auto result = RunOnUIThread([&page]() {
+            // Set up action
+            SplitPaneArgs args{ SplitType::Duplicate };
+            ActionEventArgs eventArgs{ args };
+            page->_HandleSplitPane(nullptr, eventArgs);
+            auto firstTab = page->_GetStrongTabImpl(0);
+
+            VERIFY_ARE_EQUAL(2, firstTab->GetLeafPaneCount());
+            VERIFY_IS_FALSE(firstTab->IsZoomed());
+        });
+        VERIFY_SUCCEEDED(result);
+
+        Log::Comment(L"Zoom in on the pane");
+        result = RunOnUIThread([&page]() {
+            // Set up action
+            ActionEventArgs eventArgs{};
+
+            page->_HandleTogglePaneZoom(nullptr, eventArgs);
+
+            auto firstTab = page->_GetStrongTabImpl(0);
+            VERIFY_ARE_EQUAL(2, firstTab->GetLeafPaneCount());
+            VERIFY_IS_TRUE(firstTab->IsZoomed());
+        });
+        VERIFY_SUCCEEDED(result);
+
+        Log::Comment(L"Move focus. This will cause us to un-zoom.");
+        result = RunOnUIThread([&page]() {
+            // Set up action
+            MoveFocusArgs args{ Direction::Left };
+            ActionEventArgs eventArgs{ args };
+
+            page->_HandleMoveFocus(nullptr, eventArgs);
+
+            auto firstTab = page->_GetStrongTabImpl(0);
+            VERIFY_ARE_EQUAL(2, firstTab->GetLeafPaneCount());
+            VERIFY_IS_FALSE(firstTab->IsZoomed());
+        });
+        VERIFY_SUCCEEDED(result);
+    }
+
+    void TabTests::CloseZoomedPane()
+    {
+        auto page = _commonSetup();
+
+        Log::Comment(L"Create a second pane");
+        auto result = RunOnUIThread([&page]() {
+            // Set up action
+            SplitPaneArgs args{ SplitType::Duplicate };
+            ActionEventArgs eventArgs{ args };
+            page->_HandleSplitPane(nullptr, eventArgs);
+            auto firstTab = page->_GetStrongTabImpl(0);
+
+            VERIFY_ARE_EQUAL(2, firstTab->GetLeafPaneCount());
+            VERIFY_IS_FALSE(firstTab->IsZoomed());
+        });
+        VERIFY_SUCCEEDED(result);
+
+        Log::Comment(L"Zoom in on the pane");
+        result = RunOnUIThread([&page]() {
+            // Set up action
+            ActionEventArgs eventArgs{};
+
+            page->_HandleTogglePaneZoom(nullptr, eventArgs);
+
+            auto firstTab = page->_GetStrongTabImpl(0);
+            VERIFY_ARE_EQUAL(2, firstTab->GetLeafPaneCount());
+            VERIFY_IS_TRUE(firstTab->IsZoomed());
+        });
+        VERIFY_SUCCEEDED(result);
+
+        Log::Comment(L"Close Pane. This should cause us to un-zoom, and remove the second pane from the tree");
+        result = RunOnUIThread([&page]() {
+            // Set up action
+            ActionEventArgs eventArgs{};
+
+            page->_HandleClosePane(nullptr, eventArgs);
+
+            auto firstTab = page->_GetStrongTabImpl(0);
+            VERIFY_IS_FALSE(firstTab->IsZoomed());
+        });
+        VERIFY_SUCCEEDED(result);
+
+        // Introduce a slight delay to let the events finish propagating
+        Sleep(250);
+
+        Log::Comment(L"Check to ensure there's only one pane left.");
+
+        result = RunOnUIThread([&page]() {
+            auto firstTab = page->_GetStrongTabImpl(0);
+            VERIFY_ARE_EQUAL(1, firstTab->GetLeafPaneCount());
+            VERIFY_IS_FALSE(firstTab->IsZoomed());
+        });
+        VERIFY_SUCCEEDED(result);
+    }
 }

src/cascadia/LocalTests_TerminalApp/TestUtils.h

@@ -19,11 +19,11 @@ public:
     // - This is a helper to retrieve the ActionAndArgs from the keybindings
     //   for a given chord.
     // Arguments:
-    // - bindings: The AppKeyBindings to lookup the ActionAndArgs from.
+    // - keymap: The AppKeyBindings to lookup the ActionAndArgs from.
     // - kc: The key chord to look up the bound ActionAndArgs for.
     // Return Value:
     // - The ActionAndArgs bound to the given key, or nullptr if nothing is bound to it.
-    static const winrt::TerminalApp::ActionAndArgs GetActionAndArgs(const winrt::TerminalApp::implementation::AppKeyBindings& bindings,
+    static const winrt::TerminalApp::ActionAndArgs GetActionAndArgs(const winrt::TerminalApp::implementation::KeyMapping& keymap,
                                                                     const winrt::Microsoft::Terminal::TerminalControl::KeyChord& kc)
     {
         std::wstring buffer{ L"" };
@@ -42,12 +42,8 @@ public:
         buffer += static_cast<wchar_t>(MapVirtualKeyW(kc.Vkey(), MAPVK_VK_TO_CHAR));
         WEX::Logging::Log::Comment(WEX::Common::NoThrowString().Format(L"Looking for key:%s", buffer.c_str()));
 
-        const auto keyIter = bindings._keyShortcuts.find(kc);
-        VERIFY_IS_TRUE(keyIter != bindings._keyShortcuts.end(), L"Expected to find an action bound to the given KeyChord");
-        if (keyIter != bindings._keyShortcuts.end())
-        {
-            return keyIter->second;
-        }
-        return nullptr;
+        const auto action = keymap.TryLookup(kc);
+        VERIFY_IS_NOT_NULL(action, L"Expected to find an action bound to the given KeyChord");
+        return action;
     };
 };

src/cascadia/LocalTests_TerminalApp/pch.h

@@ -15,6 +15,8 @@ Author(s):
 
 #pragma once
 
+// Manually include til after we include Windows.Foundation to give it winrt superpowers
+#define BLOCK_TIL
 // This includes support libraries from the CRT, STL, WIL, and GSL
 #include "LibraryIncludes.h"
 // This is inexplicable, but for whatever reason, cppwinrt conflicts with the
@@ -33,12 +35,6 @@ Author(s):
 #include <json.h>
 #include "consoletaeftemplates.hpp"
 
-// Common includes for most tests:
-#include "../../inc/argb.h"
-#include "../../inc/conattrs.hpp"
-#include "../../types/inc/utils.hpp"
-#include "../../inc/DefaultSettings.h"
-
 #include <winrt/Windows.ApplicationModel.Resources.Core.h>
 #include "winrt/Windows.UI.Xaml.Markup.h"
 #include <winrt/Windows.system.h>
@@ -63,3 +59,12 @@ Author(s):
 
 #include <regex>
 #include <CLI11/CLI11.hpp>
+
+// Manually include til after we include Windows.Foundation to give it winrt superpowers
+#include "til.h"
+
+// Common includes for most tests:
+#include "../../inc/argb.h"
+#include "../../inc/conattrs.hpp"
+#include "../../types/inc/utils.hpp"
+#include "../../inc/DefaultSettings.h"

src/cascadia/PublicTerminalCore/HwndTerminal.cpp

@@ -242,7 +242,7 @@ HRESULT HwndTerminal::Initialize()
     _terminal->Create(COORD{ 80, 25 }, 1000, *_renderer);
     _terminal->SetDefaultBackground(RGB(12, 12, 12));
     _terminal->SetDefaultForeground(RGB(204, 204, 204));
-    _terminal->SetWriteInputCallback([=](std::wstring & input) noexcept { _WriteTextToConnection(input); });
+    _terminal->SetWriteInputCallback([=](std::wstring& input) noexcept { _WriteTextToConnection(input); });
     localPointerToThread->EnablePainting();
 
     _multiClickTime = std::chrono::milliseconds{ GetDoubleClickTime() };
@@ -433,7 +433,15 @@ void _stdcall TerminalSendOutput(void* terminal, LPCWSTR data)
     publicTerminal->SendOutput(data);
 }
 
-HRESULT _stdcall TerminalTriggerResize(void* terminal, double width, double height, _Out_ COORD* dimensions)
+/// <summary>
+/// Triggers a terminal resize using the new width and height in pixel.
+/// </summary>
+/// <param name="terminal">Terminal pointer.</param>
+/// <param name="width">New width of the terminal in pixels.</param>
+/// <param name="height">New height of the terminal in pixels</param>
+/// <param name="dimensions">Out parameter containing the columns and rows that fit the new size.</param>
+/// <returns>HRESULT of the attempted resize.</returns>
+HRESULT _stdcall TerminalTriggerResize(_In_ void* terminal, _In_ short width, _In_ short height, _Out_ COORD* dimensions)
 {
     const auto publicTerminal = static_cast<HwndTerminal*>(terminal);
 
@@ -446,10 +454,55 @@ HRESULT _stdcall TerminalTriggerResize(void* terminal, double width, double heig
         static_cast<int>(height),
         0));
 
-    const SIZE windowSize{ static_cast<short>(width), static_cast<short>(height) };
+    const SIZE windowSize{ width, height };
     return publicTerminal->Refresh(windowSize, dimensions);
 }
 
+/// <summary>
+/// Helper method for resizing the terminal using character column and row counts
+/// </summary>
+/// <param name="terminal">Pointer to the terminal object.</param>
+/// <param name="dimensionsInCharacters">New terminal size in row and column count.</param>
+/// <param name="dimensionsInPixels">Out parameter with the new size of the renderer.</param>
+/// <returns>HRESULT of the attempted resize.</returns>
+HRESULT _stdcall TerminalTriggerResizeWithDimension(_In_ void* terminal, _In_ COORD dimensionsInCharacters, _Out_ SIZE* dimensionsInPixels)
+{
+    RETURN_HR_IF_NULL(E_INVALIDARG, dimensionsInPixels);
+
+    const auto publicTerminal = static_cast<const HwndTerminal*>(terminal);
+
+    const auto viewInCharacters = Viewport::FromDimensions({ 0, 0 }, { (dimensionsInCharacters.X), (dimensionsInCharacters.Y) });
+    const auto viewInPixels = publicTerminal->_renderEngine->GetViewportInPixels(viewInCharacters);
+
+    dimensionsInPixels->cx = viewInPixels.Width();
+    dimensionsInPixels->cy = viewInPixels.Height();
+
+    COORD unused{ 0, 0 };
+
+    return TerminalTriggerResize(terminal, viewInPixels.Width(), viewInPixels.Height(), &unused);
+}
+
+/// <summary>
+/// Calculates the amount of rows and columns that fit in the provided width and height.
+/// </summary>
+/// <param name="terminal">Terminal pointer</param>
+/// <param name="width">Width of the terminal area to calculate.</param>
+/// <param name="height">Height of the terminal area to calculate.</param>
+/// <param name="dimensions">Out parameter containing the columns and rows that fit the new size.</param>
+/// <returns>HRESULT of the calculation.</returns>
+HRESULT _stdcall TerminalCalculateResize(_In_ void* terminal, _In_ short width, _In_ short height, _Out_ COORD* dimensions)
+{
+    const auto publicTerminal = static_cast<const HwndTerminal*>(terminal);
+
+    const auto viewInPixels = Viewport::FromDimensions({ 0, 0 }, { width, height });
+    const auto viewInCharacters = publicTerminal->_renderEngine->GetViewportInCharacters(viewInPixels);
+
+    dimensions->X = viewInCharacters.Width();
+    dimensions->Y = viewInCharacters.Height();
+
+    return S_OK;
+}
+
 void _stdcall TerminalDpiChanged(void* terminal, int newDpi)
 {
     const auto publicTerminal = static_cast<HwndTerminal*>(terminal);
@@ -760,18 +813,6 @@ void _stdcall TerminalSetTheme(void* terminal, TerminalTheme theme, LPCWSTR font
     publicTerminal->Refresh(windowSize, &dimensions);
 }
 
-// Resizes the terminal to the specified rows and columns.
-HRESULT _stdcall TerminalResize(void* terminal, COORD dimensions)
-{
-    const auto publicTerminal = static_cast<const HwndTerminal*>(terminal);
-
-    auto lock = publicTerminal->_terminal->LockForWriting();
-    publicTerminal->_terminal->ClearSelection();
-    publicTerminal->_renderer->TriggerRedrawAll();
-
-    return publicTerminal->_terminal->UserResize(dimensions);
-}
-
 void _stdcall TerminalBlinkCursor(void* terminal)
 {
     const auto publicTerminal = static_cast<const HwndTerminal*>(terminal);

src/cascadia/PublicTerminalCore/HwndTerminal.hpp

@@ -27,8 +27,9 @@ extern "C" {
 __declspec(dllexport) HRESULT _stdcall CreateTerminal(HWND parentHwnd, _Out_ void** hwnd, _Out_ void** terminal);
 __declspec(dllexport) void _stdcall TerminalSendOutput(void* terminal, LPCWSTR data);
 __declspec(dllexport) void _stdcall TerminalRegisterScrollCallback(void* terminal, void __stdcall callback(int, int, int));
-__declspec(dllexport) HRESULT _stdcall TerminalTriggerResize(void* terminal, double width, double height, _Out_ COORD* dimensions);
-__declspec(dllexport) HRESULT _stdcall TerminalResize(void* terminal, COORD dimensions);
+__declspec(dllexport) HRESULT _stdcall TerminalTriggerResize(_In_ void* terminal, _In_ short width, _In_ short height, _Out_ COORD* dimensions);
+__declspec(dllexport) HRESULT _stdcall TerminalTriggerResizeWithDimension(_In_ void* terminal, _In_ COORD dimensions, _Out_ SIZE* dimensionsInPixels);
+__declspec(dllexport) HRESULT _stdcall TerminalCalculateResize(_In_ void* terminal, _In_ short width, _In_ short height, _Out_ COORD* dimensions);
 __declspec(dllexport) void _stdcall TerminalDpiChanged(void* terminal, int newDpi);
 __declspec(dllexport) void _stdcall TerminalUserScroll(void* terminal, int viewTop);
 __declspec(dllexport) void _stdcall TerminalClearSelection(void* terminal);
@@ -90,7 +91,9 @@ private:
     std::optional<til::point> _singleClickTouchdownPos;
 
     friend HRESULT _stdcall CreateTerminal(HWND parentHwnd, _Out_ void** hwnd, _Out_ void** terminal);
-    friend HRESULT _stdcall TerminalResize(void* terminal, COORD dimensions);
+    friend HRESULT _stdcall TerminalTriggerResize(_In_ void* terminal, _In_ short width, _In_ short height, _Out_ COORD* dimensions);
+    friend HRESULT _stdcall TerminalTriggerResizeWithDimension(_In_ void* terminal, _In_ COORD dimensions, _Out_ SIZE* dimensionsInPixels);
+    friend HRESULT _stdcall TerminalCalculateResize(_In_ void* terminal, _In_ short width, _In_ short height, _Out_ COORD* dimensions);
     friend void _stdcall TerminalDpiChanged(void* terminal, int newDpi);
     friend void _stdcall TerminalUserScroll(void* terminal, int viewTop);
     friend void _stdcall TerminalClearSelection(void* terminal);

src/cascadia/ShellExtension/OpenTerminalHere.cpp

@@ -185,12 +185,17 @@ HRESULT OpenTerminalHere::GetState(IShellItemArray* /*psiItemArray*/,
 
 HRESULT OpenTerminalHere::GetIcon(IShellItemArray* /*psiItemArray*/,
                                   LPWSTR* ppszIcon)
+try
 {
-    // the icon ref ("dll,-<resid>") is provided here, in this case none is provided
-    *ppszIcon = nullptr;
-    // TODO GH#6111: Return the Terminal icon here
-    return E_NOTIMPL;
+    std::filesystem::path modulePath{ wil::GetModuleFileNameW<std::wstring>(wil::GetModuleInstanceHandle()) };
+    modulePath.replace_filename(WindowsTerminalExe);
+    // WindowsTerminal.exe,-101 will be the first icon group in WT
+    // We're using WindowsTerminal here explicitly, and not wt (from _getExePath), because
+    // WindowsTerminal is the only one built with the right icons.
+    const auto resource{ modulePath.wstring() + L",-101" };
+    return SHStrDupW(resource.c_str(), ppszIcon);
 }
+CATCH_RETURN();
 
 HRESULT OpenTerminalHere::GetFlags(EXPCMDFLAGS* pFlags)
 {

src/cascadia/TerminalApp/ActionAndArgs.cpp

@@ -105,7 +105,7 @@ namespace winrt::TerminalApp::implementation
         { UnboundKey, ShortcutAction::Invalid },
     };
 
-    using ParseResult = std::tuple<IActionArgs, std::vector<::TerminalApp::SettingsLoadWarnings>>;
+    using ParseResult = std::tuple<IActionArgs, std::vector<TerminalApp::SettingsLoadWarnings>>;
     using ParseActionFunction = std::function<ParseResult(const Json::Value&)>;
 
     // This is a map of ShortcutAction->function<IActionArgs(Json::Value)>. It holds
@@ -169,7 +169,7 @@ namespace winrt::TerminalApp::implementation
     // - a deserialized ActionAndArgs corresponding to the values in json, or
     //   null if we failed to deserialize an action.
     winrt::com_ptr<ActionAndArgs> ActionAndArgs::FromJson(const Json::Value& json,
-                                                          std::vector<::TerminalApp::SettingsLoadWarnings>& warnings)
+                                                          std::vector<TerminalApp::SettingsLoadWarnings>& warnings)
     {
         // Invalid is our placeholder that the action was not parsed.
         ShortcutAction action = ShortcutAction::Invalid;
@@ -208,7 +208,7 @@ namespace winrt::TerminalApp::implementation
         // does, we'll try to deserialize any "args" that were provided with
         // the binding.
         IActionArgs args{ nullptr };
-        std::vector<::TerminalApp::SettingsLoadWarnings> parseWarnings;
+        std::vector<TerminalApp::SettingsLoadWarnings> parseWarnings;
         const auto deserializersIter = argParsers.find(action);
         if (deserializersIter != argParsers.end())
         {

src/cascadia/TerminalApp/ActionAndArgs.h

@@ -9,7 +9,7 @@ namespace winrt::TerminalApp::implementation
     {
         static const std::map<std::string_view, ShortcutAction, std::less<>> ActionKeyNamesMap;
         static winrt::com_ptr<ActionAndArgs> FromJson(const Json::Value& json,
-                                                      std::vector<::TerminalApp::SettingsLoadWarnings>& warnings);
+                                                      std::vector<TerminalApp::SettingsLoadWarnings>& warnings);
 
         ActionAndArgs() = default;
         hstring GenerateName() const;

src/cascadia/TerminalApp/ActionArgs.cpp

@@ -339,19 +339,27 @@ namespace winrt::TerminalApp::implementation
 
     winrt::hstring CloseOtherTabsArgs::GenerateName() const
     {
-        // "Close tabs other than index {0}"
-        return winrt::hstring{
-            fmt::format(std::wstring_view(RS_(L"CloseOtherTabsCommandKey")),
-                        _Index)
-        };
+        if (_Index)
+        {
+            // "Close tabs other than index {0}"
+            return winrt::hstring{
+                fmt::format(std::wstring_view(RS_(L"CloseOtherTabsCommandKey")),
+                            _Index.Value())
+            };
+        }
+        return RS_(L"CloseOtherTabsDefaultCommandKey");
     }
 
     winrt::hstring CloseTabsAfterArgs::GenerateName() const
     {
-        // "Close tabs after index {0}"
-        return winrt::hstring{
-            fmt::format(std::wstring_view(RS_(L"CloseTabsAfterCommandKey")),
-                        _Index)
-        };
+        if (_Index)
+        {
+            // "Close tabs after index {0}"
+            return winrt::hstring{
+                fmt::format(std::wstring_view(RS_(L"CloseTabsAfterCommandKey")),
+                            _Index.Value())
+            };
+        }
+        return RS_(L"CloseTabsAfterDefaultCommandKey");
     }
 }

src/cascadia/TerminalApp/ActionArgs.h

@@ -39,7 +39,7 @@
 namespace winrt::TerminalApp::implementation
 {
     using namespace ::TerminalApp;
-    using FromJsonResult = std::tuple<winrt::TerminalApp::IActionArgs, std::vector<::TerminalApp::SettingsLoadWarnings>>;
+    using FromJsonResult = std::tuple<winrt::TerminalApp::IActionArgs, std::vector<TerminalApp::SettingsLoadWarnings>>;
 
     struct ActionEventArgs : public ActionEventArgsT<ActionEventArgs>
     {
@@ -202,7 +202,7 @@ namespace winrt::TerminalApp::implementation
             JsonUtils::GetValueForKey(json, DirectionKey, args->_Direction);
             if (args->_Direction == TerminalApp::Direction::None)
             {
-                return { nullptr, { ::TerminalApp::SettingsLoadWarnings::MissingRequiredParameter } };
+                return { nullptr, { TerminalApp::SettingsLoadWarnings::MissingRequiredParameter } };
             }
             else
             {
@@ -214,6 +214,9 @@ namespace winrt::TerminalApp::implementation
     struct MoveFocusArgs : public MoveFocusArgsT<MoveFocusArgs>
     {
         MoveFocusArgs() = default;
+        MoveFocusArgs(TerminalApp::Direction direction) :
+            _Direction{ direction } {};
+
         GETSET_PROPERTY(TerminalApp::Direction, Direction, TerminalApp::Direction::None);
 
         static constexpr std::string_view DirectionKey{ "direction" };
@@ -237,7 +240,7 @@ namespace winrt::TerminalApp::implementation
             JsonUtils::GetValueForKey(json, DirectionKey, args->_Direction);
             if (args->_Direction == TerminalApp::Direction::None)
             {
-                return { nullptr, { ::TerminalApp::SettingsLoadWarnings::MissingRequiredParameter } };
+                return { nullptr, { TerminalApp::SettingsLoadWarnings::MissingRequiredParameter } };
             }
             else
             {
@@ -299,7 +302,7 @@ namespace winrt::TerminalApp::implementation
             JsonUtils::GetValueForKey(json, InputKey, args->_Input);
             if (args->_Input.empty())
             {
-                return { nullptr, { ::TerminalApp::SettingsLoadWarnings::MissingRequiredParameter } };
+                return { nullptr, { TerminalApp::SettingsLoadWarnings::MissingRequiredParameter } };
             }
             return { *args, {} };
         }
@@ -308,6 +311,11 @@ namespace winrt::TerminalApp::implementation
     struct SplitPaneArgs : public SplitPaneArgsT<SplitPaneArgs>
     {
         SplitPaneArgs() = default;
+        SplitPaneArgs(winrt::TerminalApp::SplitState style, const winrt::TerminalApp::NewTerminalArgs& terminalArgs) :
+            _SplitStyle{ style },
+            _TerminalArgs{ terminalArgs } {};
+        SplitPaneArgs(SplitType splitMode) :
+            _SplitMode{ splitMode } {};
         GETSET_PROPERTY(winrt::TerminalApp::SplitState, SplitStyle, winrt::TerminalApp::SplitState::Automatic);
         GETSET_PROPERTY(winrt::TerminalApp::NewTerminalArgs, TerminalArgs, nullptr);
         GETSET_PROPERTY(winrt::TerminalApp::SplitType, SplitMode, winrt::TerminalApp::SplitType::Manual);
@@ -395,7 +403,7 @@ namespace winrt::TerminalApp::implementation
             JsonUtils::GetValueForKey(json, NameKey, args->_SchemeName);
             if (args->_SchemeName.empty())
             {
-                return { nullptr, { ::TerminalApp::SettingsLoadWarnings::MissingRequiredParameter } };
+                return { nullptr, { TerminalApp::SettingsLoadWarnings::MissingRequiredParameter } };
             }
             return { *args, {} };
         }
@@ -486,7 +494,7 @@ namespace winrt::TerminalApp::implementation
             JsonUtils::GetValueForKey(json, CommandlineKey, args->_Commandline);
             if (args->_Commandline.empty())
             {
-                return { nullptr, { ::TerminalApp::SettingsLoadWarnings::MissingRequiredParameter } };
+                return { nullptr, { TerminalApp::SettingsLoadWarnings::MissingRequiredParameter } };
             }
             return { *args, {} };
         }
@@ -495,7 +503,7 @@ namespace winrt::TerminalApp::implementation
     struct CloseOtherTabsArgs : public CloseOtherTabsArgsT<CloseOtherTabsArgs>
     {
         CloseOtherTabsArgs() = default;
-        GETSET_PROPERTY(uint32_t, Index, 0);
+        GETSET_PROPERTY(winrt::Windows::Foundation::IReference<uint32_t>, Index, nullptr);
 
         static constexpr std::string_view IndexKey{ "index" };
 
@@ -523,7 +531,7 @@ namespace winrt::TerminalApp::implementation
     struct CloseTabsAfterArgs : public CloseTabsAfterArgsT<CloseTabsAfterArgs>
     {
         CloseTabsAfterArgs() = default;
-        GETSET_PROPERTY(uint32_t, Index, 0);
+        GETSET_PROPERTY(winrt::Windows::Foundation::IReference<uint32_t>, Index, nullptr);
 
         static constexpr std::string_view IndexKey{ "index" };
 
@@ -553,4 +561,6 @@ namespace winrt::TerminalApp::factory_implementation
 {
     BASIC_FACTORY(ActionEventArgs);
     BASIC_FACTORY(NewTerminalArgs);
+    BASIC_FACTORY(MoveFocusArgs);
+    BASIC_FACTORY(SplitPaneArgs);
 }

src/cascadia/TerminalApp/ActionArgs.idl

@@ -87,6 +87,7 @@ namespace TerminalApp
 
     [default_interface] runtimeclass MoveFocusArgs : IActionArgs
     {
+        MoveFocusArgs(Direction direction);
         Direction Direction { get; };
     };
 
@@ -102,6 +103,9 @@ namespace TerminalApp
 
     [default_interface] runtimeclass SplitPaneArgs : IActionArgs
     {
+        SplitPaneArgs(SplitState split, NewTerminalArgs terminalArgs);
+        SplitPaneArgs(SplitType splitMode);
+
         SplitState SplitStyle { get; };
         NewTerminalArgs TerminalArgs { get; };
         SplitType SplitMode { get; };
@@ -134,11 +138,11 @@ namespace TerminalApp
 
     [default_interface] runtimeclass CloseOtherTabsArgs : IActionArgs
     {
-        UInt32 Index { get; };
+        Windows.Foundation.IReference<UInt32> Index { get; };
     };
 
     [default_interface] runtimeclass CloseTabsAfterArgs : IActionArgs
     {
-        UInt32 Index { get; };
+        Windows.Foundation.IReference<UInt32> Index { get; };
     };
 }

src/cascadia/TerminalApp/AppActionHandlers.cpp

@@ -132,10 +132,9 @@ namespace winrt::TerminalApp::implementation
             // be removed before it's re-added in Pane::Restore
             _tabContent.Children().Clear();
 
+            // Togging the zoom on the tab will cause the tab to inform us of
+            // the new root Content for this tab.
             activeTab->ToggleZoom();
-
-            // Update the selected tab, to trigger us to re-add the tab's GetRootElement to the UI tree
-            _UpdatedSelectedTab(_tabView.SelectedIndex());
         }
         args.Handled(true);
     }
@@ -319,10 +318,11 @@ namespace winrt::TerminalApp::implementation
             {
                 if (auto activeControl = activeTab->GetActiveTerminalControl())
                 {
-                    auto controlSettings = activeControl.Settings();
-                    if (_settings->ApplyColorScheme(controlSettings, realArgs.SchemeName()))
+                    if (const auto scheme = _settings.GlobalSettings().ColorSchemes().TryLookup(realArgs.SchemeName()))
                     {
-                        activeControl.UpdateSettings(controlSettings);
+                        auto controlSettings = activeControl.Settings().as<TerminalSettings>();
+                        controlSettings->ApplyColorScheme(scheme);
+                        activeControl.UpdateSettings(*controlSettings);
                         args.Handled(true);
                     }
                 }
@@ -415,7 +415,21 @@ namespace winrt::TerminalApp::implementation
     {
         if (const auto& realArgs = actionArgs.ActionArgs().try_as<TerminalApp::CloseOtherTabsArgs>())
         {
-            uint32_t index = realArgs.Index();
+            uint32_t index;
+            if (realArgs.Index())
+            {
+                index = realArgs.Index().Value();
+            }
+            else if (auto focusedTabIndex = _GetFocusedTabIndex())
+            {
+                index = *focusedTabIndex;
+            }
+            else
+            {
+                // Do nothing
+                actionArgs.Handled(false);
+                return;
+            }
 
             // Remove tabs after the current one
             while (_tabs.Size() > index + 1)
@@ -438,7 +452,21 @@ namespace winrt::TerminalApp::implementation
     {
         if (const auto& realArgs = actionArgs.ActionArgs().try_as<TerminalApp::CloseTabsAfterArgs>())
         {
-            uint32_t index = realArgs.Index();
+            uint32_t index;
+            if (realArgs.Index())
+            {
+                index = realArgs.Index().Value();
+            }
+            else if (auto focusedTabIndex = _GetFocusedTabIndex())
+            {
+                index = *focusedTabIndex;
+            }
+            else
+            {
+                // Do nothing
+                actionArgs.Handled(false);
+                return;
+            }
 
             // Remove tabs after the current one
             while (_tabs.Size() > index + 1)
@@ -459,6 +487,14 @@ namespace winrt::TerminalApp::implementation
     void TerminalPage::_HandleOpenTabSearch(const IInspectable& /*sender*/,
                                             const TerminalApp::ActionEventArgs& args)
     {
+        // Tab search is always in-order.
+        auto tabCommands = winrt::single_threaded_vector<TerminalApp::Command>();
+        for (const auto& tab : _tabs)
+        {
+            tabCommands.Append(tab.SwitchToTabCommand());
+        }
+        CommandPalette().SetTabActions(tabCommands);
+
         auto opt = _GetFocusedTabIndex();
         uint32_t startIdx = opt.value_or(0);
 

src/cascadia/TerminalApp/AppKeyBindings.cpp

@@ -3,7 +3,6 @@
 
 #include "pch.h"
 #include "AppKeyBindings.h"
-#include "KeyChordSerialization.h"
 
 #include "AppKeyBindings.g.cpp"
 
@@ -13,71 +12,11 @@ using namespace winrt::Microsoft::Terminal::TerminalControl;
 
 namespace winrt::TerminalApp::implementation
 {
-    void AppKeyBindings::SetKeyBinding(const TerminalApp::ActionAndArgs& actionAndArgs,
-                                       const KeyChord& chord)
-    {
-        _keyShortcuts[chord] = actionAndArgs;
-    }
-
-    // Method Description:
-    // - Remove the action that's bound to a particular KeyChord.
-    // Arguments:
-    // - chord: the keystroke to remove the action for.
-    // Return Value:
-    // - <none>
-    void AppKeyBindings::ClearKeyBinding(const KeyChord& chord)
-    {
-        _keyShortcuts.erase(chord);
-    }
-
-    KeyChord AppKeyBindings::GetKeyBindingForAction(TerminalApp::ShortcutAction const& action)
-    {
-        for (auto& kv : _keyShortcuts)
-        {
-            if (kv.second.Action() == action)
-            {
-                return kv.first;
-            }
-        }
-        return { nullptr };
-    }
-
-    // Method Description:
-    // - Lookup the keychord bound to a particular combination of ShortcutAction
-    //   and IActionArgs. This enables searching no only for the binding of a
-    //   particular ShortcutAction, but also a particular set of values for
-    //   arguments to that action.
-    // Arguments:
-    // - actionAndArgs: The ActionAndArgs to lookup the keybinding for.
-    // Return Value:
-    // - The bound keychord, if this ActionAndArgs is bound to a key, otherwise nullptr.
-    KeyChord AppKeyBindings::GetKeyBindingForActionWithArgs(TerminalApp::ActionAndArgs const& actionAndArgs)
-    {
-        if (actionAndArgs == nullptr)
-        {
-            return { nullptr };
-        }
-
-        for (auto& kv : _keyShortcuts)
-        {
-            const auto action = kv.second.Action();
-            const auto args = kv.second.Args();
-            const auto actionMatched = action == actionAndArgs.Action();
-            const auto argsMatched = args ? args.Equals(actionAndArgs.Args()) : args == actionAndArgs.Args();
-            if (actionMatched && argsMatched)
-            {
-                return kv.first;
-            }
-        }
-        return { nullptr };
-    }
-
     bool AppKeyBindings::TryKeyChord(const KeyChord& kc)
     {
-        const auto keyIter = _keyShortcuts.find(kc);
-        if (keyIter != _keyShortcuts.end())
+        const auto actionAndArgs = _keymap.TryLookup(kc);
+        if (actionAndArgs)
         {
-            const auto actionAndArgs = keyIter->second;
             return _dispatch.DoAction(actionAndArgs);
         }
         return false;
@@ -88,28 +27,8 @@ namespace winrt::TerminalApp::implementation
         _dispatch = dispatch;
     }
 
-    // Method Description:
-    // - Takes the KeyModifier flags from Terminal and maps them to the WinRT types which are used by XAML
-    // Return Value:
-    // - a Windows::System::VirtualKeyModifiers object with the flags of which modifiers used.
-    Windows::System::VirtualKeyModifiers AppKeyBindings::ConvertVKModifiers(KeyModifiers modifiers)
+    void AppKeyBindings::SetKeyMapping(const winrt::TerminalApp::KeyMapping& keymap)
     {
-        Windows::System::VirtualKeyModifiers keyModifiers = Windows::System::VirtualKeyModifiers::None;
-
-        if (WI_IsFlagSet(modifiers, KeyModifiers::Ctrl))
-        {
-            keyModifiers |= Windows::System::VirtualKeyModifiers::Control;
-        }
-        if (WI_IsFlagSet(modifiers, KeyModifiers::Shift))
-        {
-            keyModifiers |= Windows::System::VirtualKeyModifiers::Shift;
-        }
-        if (WI_IsFlagSet(modifiers, KeyModifiers::Alt))
-        {
-            // note: Menu is the Alt VK_MENU
-            keyModifiers |= Windows::System::VirtualKeyModifiers::Menu;
-        }
-
-        return keyModifiers;
+        _keymap = keymap;
     }
 }

src/cascadia/TerminalApp/AppKeyBindings.h

@@ -18,48 +18,17 @@ namespace TerminalAppLocalTests
 
 namespace winrt::TerminalApp::implementation
 {
-    struct KeyChordHash
-    {
-        std::size_t operator()(const winrt::Microsoft::Terminal::TerminalControl::KeyChord& key) const
-        {
-            std::hash<int32_t> keyHash;
-            std::hash<winrt::Microsoft::Terminal::TerminalControl::KeyModifiers> modifiersHash;
-            std::size_t hashedKey = keyHash(key.Vkey());
-            std::size_t hashedMods = modifiersHash(key.Modifiers());
-            return hashedKey ^ hashedMods;
-        }
-    };
-
-    struct KeyChordEquality
-    {
-        bool operator()(const winrt::Microsoft::Terminal::TerminalControl::KeyChord& lhs, const winrt::Microsoft::Terminal::TerminalControl::KeyChord& rhs) const
-        {
-            return lhs.Modifiers() == rhs.Modifiers() && lhs.Vkey() == rhs.Vkey();
-        }
-    };
-
     struct AppKeyBindings : AppKeyBindingsT<AppKeyBindings>
     {
         AppKeyBindings() = default;
 
         bool TryKeyChord(winrt::Microsoft::Terminal::TerminalControl::KeyChord const& kc);
 
-        void SetKeyBinding(TerminalApp::ActionAndArgs const& actionAndArgs,
-                           winrt::Microsoft::Terminal::TerminalControl::KeyChord const& chord);
-        void ClearKeyBinding(winrt::Microsoft::Terminal::TerminalControl::KeyChord const& chord);
-        Microsoft::Terminal::TerminalControl::KeyChord GetKeyBindingForAction(TerminalApp::ShortcutAction const& action);
-        Microsoft::Terminal::TerminalControl::KeyChord GetKeyBindingForActionWithArgs(TerminalApp::ActionAndArgs const& actionAndArgs);
-
-        static Windows::System::VirtualKeyModifiers ConvertVKModifiers(winrt::Microsoft::Terminal::TerminalControl::KeyModifiers modifiers);
-
-        // Defined in AppKeyBindingsSerialization.cpp
-        std::vector<::TerminalApp::SettingsLoadWarnings> LayerJson(const Json::Value& json);
-        Json::Value ToJson();
-
         void SetDispatch(const winrt::TerminalApp::ShortcutActionDispatch& dispatch);
+        void SetKeyMapping(const winrt::TerminalApp::KeyMapping& keymap);
 
     private:
-        std::unordered_map<winrt::Microsoft::Terminal::TerminalControl::KeyChord, TerminalApp::ActionAndArgs, KeyChordHash, KeyChordEquality> _keyShortcuts;
+        winrt::TerminalApp::KeyMapping _keymap{ nullptr };
 
         winrt::TerminalApp::ShortcutActionDispatch _dispatch{ nullptr };
 

src/cascadia/TerminalApp/AppKeyBindings.idl

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
-import "ActionArgs.idl";
 import "ShortcutActionDispatch.idl";
+import "KeyMapping.idl";
 
 namespace TerminalApp
 {
@@ -9,12 +9,7 @@ namespace TerminalApp
     {
         AppKeyBindings();
 
-        void SetKeyBinding(ActionAndArgs actionAndArgs, Microsoft.Terminal.TerminalControl.KeyChord chord);
-        void ClearKeyBinding(Microsoft.Terminal.TerminalControl.KeyChord chord);
-
-        Microsoft.Terminal.TerminalControl.KeyChord GetKeyBindingForAction(ShortcutAction action);
-        Microsoft.Terminal.TerminalControl.KeyChord GetKeyBindingForActionWithArgs(ActionAndArgs actionAndArgs);
-
         void SetDispatch(ShortcutActionDispatch dispatch);
+        void SetKeyMapping(KeyMapping keymap);
     }
 }

src/cascadia/TerminalApp/AppLogic.cpp

@@ -29,7 +29,7 @@ static const winrt::hstring StartupTaskName = L"StartTerminalOnLoginTask";
 // !!! IMPORTANT !!!
 // Make sure that these keys are in the same order as the
 // SettingsLoadWarnings/Errors enum is!
-static const std::array<std::wstring_view, static_cast<uint32_t>(SettingsLoadWarnings::WARNINGS_SIZE)> settingsLoadWarningsLabels {
+static const std::array<std::wstring_view, static_cast<uint32_t>(winrt::TerminalApp::SettingsLoadWarnings::WARNINGS_SIZE)> settingsLoadWarningsLabels {
     USES_RESOURCE(L"MissingDefaultProfileText"),
     USES_RESOURCE(L"DuplicateProfileText"),
     USES_RESOURCE(L"UnknownColorSchemeText"),
@@ -39,9 +39,10 @@ static const std::array<std::wstring_view, static_cast<uint32_t>(SettingsLoadWar
     USES_RESOURCE(L"TooManyKeysForChord"),
     USES_RESOURCE(L"MissingRequiredParameter"),
     USES_RESOURCE(L"LegacyGlobalsProperty"),
-    USES_RESOURCE(L"FailedToParseCommandJson")
+    USES_RESOURCE(L"FailedToParseCommandJson"),
+    USES_RESOURCE(L"FailedToWriteToSettings")
 };
-static const std::array<std::wstring_view, static_cast<uint32_t>(SettingsLoadErrors::ERRORS_SIZE)> settingsLoadErrorsLabels {
+static const std::array<std::wstring_view, static_cast<uint32_t>(winrt::TerminalApp::SettingsLoadErrors::ERRORS_SIZE)> settingsLoadErrorsLabels {
     USES_RESOURCE(L"NoProfilesText"),
     USES_RESOURCE(L"AllProfilesHiddenText")
 };
@@ -76,7 +77,7 @@ static winrt::hstring _GetMessageText(uint32_t index, std::array<std::wstring_vi
 // - warning: the SettingsLoadWarnings value to get the localized text for.
 // Return Value:
 // - localized text for the given warning
-static winrt::hstring _GetWarningText(::TerminalApp::SettingsLoadWarnings warning)
+static winrt::hstring _GetWarningText(winrt::TerminalApp::SettingsLoadWarnings warning)
 {
     return _GetMessageText(static_cast<uint32_t>(warning), settingsLoadWarningsLabels);
 }
@@ -89,7 +90,7 @@ static winrt::hstring _GetWarningText(::TerminalApp::SettingsLoadWarnings warnin
 // - error: the SettingsLoadErrors value to get the localized text for.
 // Return Value:
 // - localized text for the given error
-static winrt::hstring _GetErrorText(::TerminalApp::SettingsLoadErrors error)
+static winrt::hstring _GetErrorText(winrt::TerminalApp::SettingsLoadErrors error)
 {
     return _GetMessageText(static_cast<uint32_t>(error), settingsLoadErrorsLabels);
 }
@@ -165,6 +166,17 @@ namespace winrt::TerminalApp::implementation
         return nullptr;
     }
 
+    // Method Description:
+    // - Returns the settings currently in use by the entire Terminal application.
+    // Throws:
+    // - HR E_INVALIDARG if the app isn't up and running.
+    const TerminalApp::CascadiaSettings AppLogic::CurrentAppSettings()
+    {
+        auto appLogic{ ::winrt::TerminalApp::implementation::AppLogic::Current() };
+        THROW_HR_IF_NULL(E_INVALIDARG, appLogic);
+        return appLogic->GetSettings();
+    }
+
     AppLogic::AppLogic() :
         _dialogLock{},
         _loadedInitialSettings{ false },
@@ -238,7 +250,7 @@ namespace winrt::TerminalApp::implementation
         // so this setting is overridden to false no matter what the preference is.
         if (_isUwp)
         {
-            _settings->GlobalSettings().ShowTabsInTitlebar(false);
+            _settings.GlobalSettings().ShowTabsInTitlebar(false);
         }
 
         _root->SetSettings(_settings, false);
@@ -256,14 +268,14 @@ namespace winrt::TerminalApp::implementation
         });
         _root->Create();
 
-        _ApplyTheme(_settings->GlobalSettings().Theme());
+        _ApplyTheme(_settings.GlobalSettings().Theme());
         _ApplyStartupTaskStateChange();
 
         TraceLoggingWrite(
             g_hTerminalAppProvider,
             "AppCreated",
             TraceLoggingDescription("Event emitted when the application is started"),
-            TraceLoggingBool(_settings->GlobalSettings().ShowTabsInTitlebar(), "TabsInTitlebar"),
+            TraceLoggingBool(_settings.GlobalSettings().ShowTabsInTitlebar(), "TabsInTitlebar"),
             TraceLoggingKeyword(MICROSOFT_KEYWORD_MEASURES),
             TelemetryPrivacyDataTag(PDT_ProductAndServicePerformance));
     }
@@ -310,7 +322,7 @@ namespace winrt::TerminalApp::implementation
         // details here, but it does have the desired effect.
         // It's not enough to set the theme on the dialog alone.
         auto themingLambda{ [this](const Windows::Foundation::IInspectable& sender, const RoutedEventArgs&) {
-            auto theme{ _settings->GlobalSettings().Theme() };
+            auto theme{ _settings.GlobalSettings().Theme() };
             auto element{ sender.try_as<winrt::Windows::UI::Xaml::FrameworkElement>() };
             while (element)
             {
@@ -400,7 +412,7 @@ namespace winrt::TerminalApp::implementation
         // Make sure the lines of text wrap
         warningsTextBlock.TextWrapping(TextWrapping::Wrap);
 
-        const auto& warnings = _settings->GetWarnings();
+        const auto warnings = _settings.Warnings();
         for (const auto& warning : warnings)
         {
             // Try looking up the warning message key for each warning.
@@ -453,6 +465,11 @@ namespace winrt::TerminalApp::implementation
     void AppLogic::_OnLoaded(const IInspectable& /*sender*/,
                              const RoutedEventArgs& /*eventArgs*/)
     {
+        const auto keyboardServiceIsDisabled = !_IsKeyboardServiceEnabled();
+        if (keyboardServiceIsDisabled)
+        {
+            _root->ShowKeyboardServiceWarning();
+        }
         if (FAILED(_settingsLoadedResult))
         {
             const winrt::hstring titleKey = USES_RESOURCE(L"InitialJsonParseErrorTitle");
@@ -465,6 +482,51 @@ namespace winrt::TerminalApp::implementation
         }
     }
 
+    // Method Description:
+    // - Helper for determining if the "Touch Keyboard and Handwriting Panel
+    //   Service" is enabled. If it isn't, we want to be able to display a
+    //   warning to the user, because they won't be able to type in the
+    //   Terminal.
+    // Return Value:
+    // - true if the service is enabled, or if we fail to query the service. We
+    //   return true in that case, to be less noisy (though, that is unexpected)
+    bool AppLogic::_IsKeyboardServiceEnabled()
+    {
+        if (IsUwp())
+        {
+            return true;
+        }
+
+        // If at any point we fail to open the service manager, the service,
+        // etc, then just quick return true to disable the dialog. We'd rather
+        // not be noisy with this dialog if we failed for some reason.
+
+        // Open the service manager. This will return 0 if it failed.
+        wil::unique_schandle hManager{ OpenSCManager(nullptr, nullptr, 0) };
+
+        if (LOG_LAST_ERROR_IF(!hManager.is_valid()))
+        {
+            return true;
+        }
+
+        // Get a handle to the keyboard service
+        wil::unique_schandle hService{ OpenService(hManager.get(), TabletInputServiceKey.data(), SERVICE_QUERY_STATUS) };
+        if (LOG_LAST_ERROR_IF(!hService.is_valid()))
+        {
+            return true;
+        }
+
+        // Get the current state of the service
+        SERVICE_STATUS status{ 0 };
+        if (!LOG_IF_WIN32_BOOL_FALSE(QueryServiceStatus(hService.get(), &status)))
+        {
+            return true;
+        }
+
+        const auto state = status.dwCurrentState;
+        return (state == SERVICE_RUNNING || state == SERVICE_START_PENDING);
+    }
+
     // Method Description:
     // - Get the size in pixels of the client area we'll need to launch this
     //   terminal app. This method will use the default profile's settings to do
@@ -483,7 +545,7 @@ namespace winrt::TerminalApp::implementation
         }
 
         // Use the default profile to determine how big of a window we need.
-        const auto [_, settings] = _settings->BuildSettings(nullptr);
+        const auto [_, settings] = TerminalSettings::BuildSettings(_settings, nullptr, nullptr);
 
         auto proposedSize = TermControl::GetProposedDimensions(settings, dpi);
 
@@ -492,7 +554,7 @@ namespace winrt::TerminalApp::implementation
         // GH#2061 - If the global setting "Always show tab bar" is
         // set or if "Show tabs in title bar" is set, then we'll need to add
         // the height of the tab bar here.
-        if (_settings->GlobalSettings().ShowTabsInTitlebar())
+        if (_settings.GlobalSettings().ShowTabsInTitlebar())
         {
             // If we're showing the tabs in the titlebar, we need to use a
             // TitlebarControl here to calculate how much space to reserve.
@@ -506,7 +568,7 @@ namespace winrt::TerminalApp::implementation
             titlebar.Measure({ SHRT_MAX, SHRT_MAX });
             proposedSize.Height += (titlebar.DesiredSize().Height) * scale;
         }
-        else if (_settings->GlobalSettings().AlwaysShowTabs())
+        else if (_settings.GlobalSettings().AlwaysShowTabs())
         {
             // Otherwise, let's use a TabRowControl to calculate how much extra
             // space we'll need.
@@ -544,7 +606,7 @@ namespace winrt::TerminalApp::implementation
 
         // GH#4620/#5801 - If the user passed --maximized or --fullscreen on the
         // commandline, then use that to override the value from the settings.
-        const auto valueFromSettings = _settings->GlobalSettings().LaunchMode();
+        const auto valueFromSettings = _settings.GlobalSettings().LaunchMode();
         const auto valueFromCommandlineArgs = _appArgs.GetLaunchMode();
         return valueFromCommandlineArgs.has_value() ?
                    valueFromCommandlineArgs.value() :
@@ -561,7 +623,7 @@ namespace winrt::TerminalApp::implementation
     // - defaultInitialY: the system default y coordinate value
     // Return Value:
     // - a point containing the requested initial position in pixels.
-    winrt::Windows::Foundation::Point AppLogic::GetLaunchInitialPositions(int32_t defaultInitialX, int32_t defaultInitialY)
+    TerminalApp::InitialPosition AppLogic::GetInitialPosition(int64_t defaultInitialX, int64_t defaultInitialY)
     {
         if (!_loadedInitialSettings)
         {
@@ -569,13 +631,11 @@ namespace winrt::TerminalApp::implementation
             LoadSettings();
         }
 
-        const auto initialPosition{ _settings->GlobalSettings().InitialPosition() };
-        winrt::Windows::Foundation::Point point{
-            /* X */ gsl::narrow_cast<float>(initialPosition.x.value_or(defaultInitialX)),
-            /* Y */ gsl::narrow_cast<float>(initialPosition.y.value_or(defaultInitialY))
+        const auto initialPosition{ _settings.GlobalSettings().InitialPosition() };
+        return {
+            initialPosition.X ? initialPosition.X.Value() : defaultInitialX,
+            initialPosition.Y ? initialPosition.Y.Value() : defaultInitialY
         };
-
-        return point;
     }
 
     winrt::Windows::UI::Xaml::ElementTheme AppLogic::GetRequestedTheme()
@@ -586,7 +646,7 @@ namespace winrt::TerminalApp::implementation
             LoadSettings();
         }
 
-        return _settings->GlobalSettings().Theme();
+        return _settings.GlobalSettings().Theme();
     }
 
     bool AppLogic::GetShowTabsInTitlebar()
@@ -597,7 +657,18 @@ namespace winrt::TerminalApp::implementation
             LoadSettings();
         }
 
-        return _settings->GlobalSettings().ShowTabsInTitlebar();
+        return _settings.GlobalSettings().ShowTabsInTitlebar();
+    }
+
+    bool AppLogic::GetInitialAlwaysOnTop()
+    {
+        if (!_loadedInitialSettings)
+        {
+            // Load settings if we haven't already
+            LoadSettings();
+        }
+
+        return _settings.GlobalSettings().AlwaysOnTop();
     }
 
     // Method Description:
@@ -618,9 +689,20 @@ namespace winrt::TerminalApp::implementation
         try
         {
             auto newSettings = _isUwp ? CascadiaSettings::LoadUniversal() : CascadiaSettings::LoadAll();
-            _settings = std::move(newSettings);
-            const auto& warnings = _settings->GetWarnings();
-            hr = warnings.size() == 0 ? S_OK : S_FALSE;
+            _settings = newSettings;
+
+            if (_settings.GetLoadingError())
+            {
+                _settingsLoadExceptionText = _GetErrorText(_settings.GetLoadingError().Value());
+                return E_INVALIDARG;
+            }
+            else if (!_settings.GetSerializationErrorMessage().empty())
+            {
+                _settingsLoadExceptionText = _settings.GetSerializationErrorMessage();
+                return E_INVALIDARG;
+            }
+
+            hr = _settings.Warnings().Size() == 0 ? S_OK : S_FALSE;
         }
         catch (const winrt::hresult_error& e)
         {
@@ -628,17 +710,6 @@ namespace winrt::TerminalApp::implementation
             _settingsLoadExceptionText = e.message();
             LOG_HR(hr);
         }
-        catch (const ::TerminalApp::SettingsException& ex)
-        {
-            hr = E_INVALIDARG;
-            _settingsLoadExceptionText = _GetErrorText(ex.Error());
-        }
-        catch (const ::TerminalApp::SettingsTypedDeserializationException& e)
-        {
-            hr = E_INVALIDARG;
-            std::string_view what{ e.what() };
-            _settingsLoadExceptionText = til::u8u16(what);
-        }
         catch (...)
         {
             hr = wil::ResultFromCaughtException();
@@ -695,6 +766,8 @@ namespace winrt::TerminalApp::implementation
 
         // Register for directory change notification.
         _RegisterSettingsChange();
+
+        Jumplist::UpdateJumplist(_settings);
     }
 
     // Method Description:
@@ -773,7 +846,7 @@ namespace winrt::TerminalApp::implementation
         co_await winrt::resume_foreground(_root->Dispatcher());
 
         // Refresh the UI theme
-        _ApplyTheme(_settings->GlobalSettings().Theme());
+        _ApplyTheme(_settings.GlobalSettings().Theme());
     }
 
     fire_and_forget AppLogic::_ApplyStartupTaskStateChange()
@@ -792,7 +865,7 @@ namespace winrt::TerminalApp::implementation
         if (auto page{ weakThis.get() })
         {
             StartupTaskState state;
-            bool tryEnableStartupTask = _settings->GlobalSettings().StartOnUserLogin();
+            bool tryEnableStartupTask = _settings.GlobalSettings().StartOnUserLogin();
             StartupTask task = co_await StartupTask::GetAsync(StartupTaskName);
 
             state = task.State();
@@ -853,11 +926,13 @@ namespace winrt::TerminalApp::implementation
 
         _RefreshThemeRoutine();
         _ApplyStartupTaskStateChange();
+
+        Jumplist::UpdateJumplist(_settings);
     }
 
     // Method Description:
     // - Returns a pointer to the global shared settings.
-    [[nodiscard]] std::shared_ptr<::TerminalApp::CascadiaSettings> AppLogic::GetSettings() const noexcept
+    [[nodiscard]] TerminalApp::CascadiaSettings AppLogic::GetSettings() const noexcept
     {
         return _settings;
     }

src/cascadia/TerminalApp/AppLogic.h

@@ -8,6 +8,7 @@
 #include "Tab.h"
 #include "CascadiaSettings.h"
 #include "TerminalPage.h"
+#include "Jumplist.h"
 #include "../../cascadia/inc/cppwinrt_utils.h"
 
 namespace winrt::TerminalApp::implementation
@@ -16,6 +17,7 @@ namespace winrt::TerminalApp::implementation
     {
     public:
         static AppLogic* Current() noexcept;
+        static const TerminalApp::CascadiaSettings CurrentAppSettings();
 
         AppLogic();
         ~AppLogic() = default;
@@ -25,7 +27,7 @@ namespace winrt::TerminalApp::implementation
         void RunAsUwp();
         bool IsElevated() const noexcept;
         void LoadSettings();
-        [[nodiscard]] std::shared_ptr<::TerminalApp::CascadiaSettings> GetSettings() const noexcept;
+        [[nodiscard]] TerminalApp::CascadiaSettings GetSettings() const noexcept;
 
         int32_t SetStartupCommandline(array_view<const winrt::hstring> actions);
         winrt::hstring ParseCommandlineMessage();
@@ -38,10 +40,11 @@ namespace winrt::TerminalApp::implementation
         bool AlwaysOnTop() const;
 
         Windows::Foundation::Size GetLaunchDimensions(uint32_t dpi);
-        winrt::Windows::Foundation::Point GetLaunchInitialPositions(int32_t defaultInitialX, int32_t defaultInitialY);
+        TerminalApp::InitialPosition GetInitialPosition(int64_t defaultInitialX, int64_t defaultInitialY);
         winrt::Windows::UI::Xaml::ElementTheme GetRequestedTheme();
         LaunchMode GetLaunchMode();
         bool GetShowTabsInTitlebar();
+        bool GetInitialAlwaysOnTop();
         float CalcSnappedDimension(const bool widthOrHeight, const float dimension) const;
 
         Windows::UI::Xaml::UIElement GetRoot() noexcept;
@@ -68,7 +71,7 @@ namespace winrt::TerminalApp::implementation
         // updated in _ApplyTheme. The root currently is _root.
         winrt::com_ptr<TerminalPage> _root{ nullptr };
 
-        std::shared_ptr<::TerminalApp::CascadiaSettings> _settings{ nullptr };
+        TerminalApp::CascadiaSettings _settings{ nullptr };
 
         HRESULT _settingsLoadedResult;
         winrt::hstring _settingsLoadExceptionText{};
@@ -86,6 +89,8 @@ namespace winrt::TerminalApp::implementation
 
         void _ShowLoadErrorsDialog(const winrt::hstring& titleKey, const winrt::hstring& contentKey, HRESULT settingsLoadedResult);
         void _ShowLoadWarningsDialog();
+        bool _IsKeyboardServiceEnabled();
+        void _ShowKeyboardServiceDisabledDialog();
 
         fire_and_forget _LoadErrorsDialogRoutine();
         fire_and_forget _ShowLoadWarningsDialogRoutine();

src/cascadia/TerminalApp/AppLogic.idl

@@ -7,6 +7,12 @@ import "IDirectKeyListener.idl";
 
 namespace TerminalApp
 {
+    struct InitialPosition
+    {
+        Int64 X;
+        Int64 Y;
+    };
+
     enum LaunchMode
     {
         DefaultMode,
@@ -47,10 +53,11 @@ namespace TerminalApp
 
         Windows.Foundation.Size GetLaunchDimensions(UInt32 dpi);
 
-        Windows.Foundation.Point GetLaunchInitialPositions(Int32 defaultInitialX, Int32 defaultInitialY);
+        InitialPosition GetInitialPosition(Int64 defaultInitialX, Int64 defaultInitialY);
         Windows.UI.Xaml.ElementTheme GetRequestedTheme();
         LaunchMode GetLaunchMode();
         Boolean GetShowTabsInTitlebar();
+        Boolean GetInitialAlwaysOnTop();
         Single CalcSnappedDimension(Boolean widthOrHeight, Single dimension);
         void TitlebarClicked();
         void WindowCloseButtonClicked();

src/cascadia/TerminalApp/AzureCloudShellGenerator.cpp

@@ -14,6 +14,7 @@
 #include "DefaultProfileUtils.h"
 
 using namespace ::TerminalApp;
+using namespace winrt::TerminalApp;
 
 std::wstring_view AzureCloudShellGenerator::GetNamespace()
 {
@@ -27,19 +28,17 @@ std::wstring_view AzureCloudShellGenerator::GetNamespace()
 // - <none>
 // Return Value:
 // - a vector with the Azure Cloud Shell connection profile, if available.
-std::vector<TerminalApp::Profile> AzureCloudShellGenerator::GenerateProfiles()
+std::vector<Profile> AzureCloudShellGenerator::GenerateProfiles()
 {
-    std::vector<TerminalApp::Profile> profiles;
+    std::vector<Profile> profiles;
 
     if (winrt::Microsoft::Terminal::TerminalConnection::AzureConnection::IsAzureConnectionAvailable())
     {
         auto azureCloudShellProfile{ CreateDefaultProfile(L"Azure Cloud Shell") };
-        azureCloudShellProfile.SetCommandline(L"Azure");
-        azureCloudShellProfile.SetStartingDirectory(DEFAULT_STARTING_DIRECTORY);
-        azureCloudShellProfile.SetColorScheme({ L"Vintage" });
-        azureCloudShellProfile.SetAcrylicOpacity(0.6);
-        azureCloudShellProfile.SetUseAcrylic(true);
-        azureCloudShellProfile.SetConnectionType(AzureConnectionType);
+        azureCloudShellProfile.Commandline(L"Azure");
+        azureCloudShellProfile.StartingDirectory(DEFAULT_STARTING_DIRECTORY);
+        azureCloudShellProfile.ColorSchemeName(L"Vintage");
+        azureCloudShellProfile.ConnectionType(AzureConnectionType);
         profiles.emplace_back(azureCloudShellProfile);
     }
 

src/cascadia/TerminalApp/AzureCloudShellGenerator.h

@@ -18,7 +18,7 @@ Author(s):
 #pragma once
 #include "IDynamicProfileGenerator.h"
 
-static constexpr GUID AzureConnectionType = { 0xd9fcfdfa, 0xa479, 0x412c, { 0x83, 0xb7, 0xc5, 0x64, 0xe, 0x61, 0xcd, 0x62 } };
+static constexpr winrt::guid AzureConnectionType = { 0xd9fcfdfa, 0xa479, 0x412c, { 0x83, 0xb7, 0xc5, 0x64, 0xe, 0x61, 0xcd, 0x62 } };
 
 namespace TerminalApp
 {
@@ -29,6 +29,6 @@ namespace TerminalApp
         ~AzureCloudShellGenerator() = default;
         std::wstring_view GetNamespace() override;
 
-        std::vector<TerminalApp::Profile> GenerateProfiles() override;
+        std::vector<winrt::TerminalApp::Profile> GenerateProfiles() override;
     };
 };

src/cascadia/TerminalApp/CascadiaSettings.cpp

@@ -17,9 +17,12 @@
 #include "WslDistroGenerator.h"
 #include "AzureCloudShellGenerator.h"
 
+#include "CascadiaSettings.g.cpp"
+
 using namespace ::TerminalApp;
 using namespace winrt::Microsoft::Terminal::TerminalControl;
-using namespace winrt::TerminalApp;
+using namespace winrt::TerminalApp::implementation;
+using namespace winrt::Windows::Foundation::Collections;
 using namespace Microsoft::Console;
 
 static constexpr std::wstring_view PACKAGED_PROFILE_ICON_PATH{ L"ms-appx:///ProfileIcons/" };
@@ -30,17 +33,6 @@ static constexpr std::wstring_view DEFAULT_LINUX_ICON_GUID{ L"{9acb9455-ca41-5af
 // make sure this matches defaults.json.
 static constexpr std::wstring_view DEFAULT_WINDOWS_POWERSHELL_GUID{ L"{61c54bbd-c2c6-5271-96e7-009a87ff44bf}" };
 
-// Method Description:
-// - Returns the settings currently in use by the entire Terminal application.
-// Throws:
-// - HR E_INVALIDARG if the app isn't up and running.
-const CascadiaSettings& CascadiaSettings::GetCurrentAppSettings()
-{
-    auto appLogic{ ::winrt::TerminalApp::implementation::AppLogic::Current() };
-    THROW_HR_IF_NULL(E_INVALIDARG, appLogic);
-    return *(appLogic->GetSettings());
-}
-
 CascadiaSettings::CascadiaSettings() :
     CascadiaSettings(true)
 {
@@ -52,7 +44,11 @@ CascadiaSettings::CascadiaSettings() :
 //   generators. Set this to `false` for unit testing.
 // Arguments:
 // - addDynamicProfiles: if true, we'll add the built-in DPGs.
-CascadiaSettings::CascadiaSettings(const bool addDynamicProfiles)
+CascadiaSettings::CascadiaSettings(const bool addDynamicProfiles) :
+    _globals{ winrt::make_self<implementation::GlobalAppSettings>() },
+    _profiles{ winrt::single_threaded_observable_vector<TerminalApp::Profile>() },
+    _warnings{ winrt::single_threaded_vector<SettingsLoadWarnings>() },
+    _deserializationErrorMessage{ L"" }
 {
     if (addDynamicProfiles)
     {
@@ -70,15 +66,16 @@ CascadiaSettings::CascadiaSettings(const bool addDynamicProfiles)
 // Return Value:
 // - a non-ownership pointer to the profile matching the given guid, or nullptr
 //      if there is no match.
-const Profile* CascadiaSettings::FindProfile(GUID profileGuid) const noexcept
+winrt::TerminalApp::Profile CascadiaSettings::FindProfile(winrt::guid profileGuid) const noexcept
 {
-    for (auto& profile : _profiles)
+    const winrt::guid guid{ profileGuid };
+    for (auto profile : _profiles)
     {
         try
         {
-            if (profile.GetGuid() == profileGuid)
+            if (profile.Guid() == guid)
             {
-                return &profile;
+                return profile;
             }
         }
         CATCH_LOG();
@@ -92,9 +89,9 @@ const Profile* CascadiaSettings::FindProfile(GUID profileGuid) const noexcept
 // - <none>
 // Return Value:
 // - an iterable collection of all of our Profiles.
-gsl::span<const Profile> CascadiaSettings::GetProfiles() const noexcept
+IObservableVector<winrt::TerminalApp::Profile> CascadiaSettings::Profiles() const noexcept
 {
-    return { &_profiles[0], _profiles.size() };
+    return _profiles;
 }
 
 // Method Description:
@@ -103,9 +100,9 @@ gsl::span<const Profile> CascadiaSettings::GetProfiles() const noexcept
 // - <none>
 // Return Value:
 // - the globally configured keybindings
-AppKeyBindings CascadiaSettings::GetKeybindings() const noexcept
+winrt::TerminalApp::KeyMapping CascadiaSettings::KeyMap() const noexcept
 {
-    return _globals.GetKeybindings();
+    return _globals->KeyMap();
 }
 
 // Method Description:
@@ -114,9 +111,9 @@ AppKeyBindings CascadiaSettings::GetKeybindings() const noexcept
 // - <none>
 // Return Value:
 // - a reference to our global settings
-GlobalAppSettings& CascadiaSettings::GlobalSettings()
+winrt::TerminalApp::GlobalAppSettings CascadiaSettings::GlobalSettings() const
 {
-    return _globals;
+    return *_globals;
 }
 
 // Method Description:
@@ -124,9 +121,29 @@ GlobalAppSettings& CascadiaSettings::GlobalSettings()
 //   knew were bad when we called `_ValidateSettings` last.
 // Return Value:
 // - a reference to our list of warnings.
-std::vector<TerminalApp::SettingsLoadWarnings>& CascadiaSettings::GetWarnings()
+IVectorView<winrt::TerminalApp::SettingsLoadWarnings> CascadiaSettings::Warnings()
 {
-    return _warnings;
+    return _warnings.GetView();
+}
+
+void CascadiaSettings::ClearWarnings()
+{
+    _warnings.Clear();
+}
+
+void CascadiaSettings::AppendWarning(SettingsLoadWarnings warning)
+{
+    _warnings.Append(warning);
+}
+
+winrt::Windows::Foundation::IReference<winrt::TerminalApp::SettingsLoadErrors> CascadiaSettings::GetLoadingError()
+{
+    return _loadError;
+}
+
+winrt::hstring CascadiaSettings::GetSerializationErrorMessage()
+{
+    return _deserializationErrorMessage;
 }
 
 // Method Description:
@@ -141,8 +158,6 @@ std::vector<TerminalApp::SettingsLoadWarnings>& CascadiaSettings::GetWarnings()
 // - <none>
 void CascadiaSettings::_ValidateSettings()
 {
-    _warnings.clear();
-
     // Make sure to check that profiles exists at all first and foremost:
     _ValidateProfilesExist();
 
@@ -194,7 +209,7 @@ void CascadiaSettings::_ValidateSettings()
 //   profiles at all, we'll throw an error if there aren't any profiles.
 void CascadiaSettings::_ValidateProfilesExist()
 {
-    const bool hasProfiles = !_profiles.empty();
+    const bool hasProfiles = _profiles.Size() > 0;
     if (!hasProfiles)
     {
         // Throw an exception. This is an invalid state, and we want the app to
@@ -203,7 +218,7 @@ void CascadiaSettings::_ValidateProfilesExist()
         // We can't add the warning to the list of warnings here, because this
         // object is not going to be returned at any point.
 
-        throw ::TerminalApp::SettingsException(::TerminalApp::SettingsLoadErrors::NoProfiles);
+        throw SettingsException(TerminalApp::SettingsLoadErrors::NoProfiles);
     }
 }
 
@@ -213,9 +228,10 @@ void CascadiaSettings::_ValidateProfilesExist()
 //   temporary runtime GUID for it. This validation does not add any warnings.
 void CascadiaSettings::_ValidateProfilesHaveGuid()
 {
-    for (auto& profile : _profiles)
+    for (auto profile : _profiles)
     {
-        profile.GenerateGuidIfNecessary();
+        auto profileImpl = winrt::get_self<implementation::Profile>(profile);
+        profileImpl->GenerateGuidIfNecessary();
     }
 }
 
@@ -225,10 +241,10 @@ void CascadiaSettings::_ValidateProfilesHaveGuid()
 void CascadiaSettings::_ResolveDefaultProfile()
 {
     const auto unparsedDefaultProfile{ GlobalSettings().UnparsedDefaultProfile() };
-    if (unparsedDefaultProfile)
+    if (!unparsedDefaultProfile.empty())
     {
-        auto maybeParsedDefaultProfile{ _GetProfileGuidByName(*unparsedDefaultProfile) };
-        auto defaultProfileGuid{ til::coalesce_value(maybeParsedDefaultProfile, GUID{}) };
+        auto maybeParsedDefaultProfile{ _GetProfileGuidByName(unparsedDefaultProfile) };
+        auto defaultProfileGuid{ til::coalesce_value(maybeParsedDefaultProfile, winrt::guid{}) };
         GlobalSettings().DefaultProfile(defaultProfileGuid);
     }
 }
@@ -242,12 +258,12 @@ void CascadiaSettings::_ResolveDefaultProfile()
 //   warnings if we failed to find the default.
 void CascadiaSettings::_ValidateDefaultProfileExists()
 {
-    const auto defaultProfileGuid = GlobalSettings().DefaultProfile();
-    const bool nullDefaultProfile = defaultProfileGuid == GUID{};
+    const winrt::guid defaultProfileGuid{ GlobalSettings().DefaultProfile() };
+    const bool nullDefaultProfile = defaultProfileGuid == winrt::guid{};
     bool defaultProfileNotInProfiles = true;
     for (const auto& profile : _profiles)
     {
-        if (profile.GetGuid() == defaultProfileGuid)
+        if (profile.Guid() == defaultProfileGuid)
         {
             defaultProfileNotInProfiles = false;
             break;
@@ -256,12 +272,12 @@ void CascadiaSettings::_ValidateDefaultProfileExists()
 
     if (nullDefaultProfile || defaultProfileNotInProfiles)
     {
-        _warnings.push_back(::TerminalApp::SettingsLoadWarnings::MissingDefaultProfile);
+        _warnings.Append(TerminalApp::SettingsLoadWarnings::MissingDefaultProfile);
         // Use the first profile as the new default
 
         // _temporarily_ set the default profile to the first profile. Because
         // we're adding a warning, this settings change won't be re-serialized.
-        GlobalSettings().DefaultProfile(_profiles[0].GetGuid());
+        GlobalSettings().DefaultProfile(_profiles.GetAt(0).Guid());
     }
 }
 
@@ -275,15 +291,15 @@ void CascadiaSettings::_ValidateNoDuplicateProfiles()
 {
     bool foundDupe = false;
 
-    std::vector<size_t> indicesToDelete;
+    std::vector<uint32_t> indicesToDelete;
 
-    std::set<GUID> uniqueGuids;
+    std::set<winrt::guid> uniqueGuids;
 
     // Try collecting all the unique guids. If we ever encounter a guid that's
     // already in the set, then we need to delete that profile.
-    for (size_t i = 0; i < _profiles.size(); i++)
+    for (uint32_t i = 0; i < _profiles.Size(); i++)
     {
-        if (!uniqueGuids.insert(_profiles.at(i).GetGuid()).second)
+        if (!uniqueGuids.insert(_profiles.GetAt(i).Guid()).second)
         {
             foundDupe = true;
             indicesToDelete.push_back(i);
@@ -294,12 +310,12 @@ void CascadiaSettings::_ValidateNoDuplicateProfiles()
     // Walk backwards, so we don't accidentally shift any of the elements
     for (auto iter = indicesToDelete.rbegin(); iter != indicesToDelete.rend(); iter++)
     {
-        _profiles.erase(_profiles.begin() + *iter);
+        _profiles.RemoveAt(*iter);
     }
 
     if (foundDupe)
     {
-        _warnings.push_back(::TerminalApp::SettingsLoadWarnings::DuplicateProfile);
+        _warnings.Append(TerminalApp::SettingsLoadWarnings::DuplicateProfile);
     }
 }
 
@@ -314,15 +330,15 @@ void CascadiaSettings::_ValidateNoDuplicateProfiles()
 // - <none>
 void CascadiaSettings::_ReorderProfilesToMatchUserSettingsOrder()
 {
-    std::set<GUID> uniqueGuids;
-    std::deque<GUID> guidOrder;
+    std::set<winrt::guid> uniqueGuids;
+    std::deque<winrt::guid> guidOrder;
 
     auto collectGuids = [&](const auto& json) {
         for (auto profileJson : _GetProfilesJsonObject(json))
         {
             if (profileJson.isObject())
             {
-                auto guid = Profile::GetGuidOrGenerateForJson(profileJson);
+                auto guid = implementation::Profile::GetGuidOrGenerateForJson(profileJson);
                 if (uniqueGuids.insert(guid).second)
                 {
                     guidOrder.push_back(guid);
@@ -336,21 +352,23 @@ void CascadiaSettings::_ReorderProfilesToMatchUserSettingsOrder()
 
     // Push all the defaultSettings profiles' GUIDS into the set
     collectGuids(_defaultSettings);
-    std::equal_to<GUID> equals;
+    std::equal_to<winrt::guid> equals;
     // Re-order the list of _profiles to match that ordering
     // for (gIndex=0 -> uniqueGuids.size)
     //   pIndex = the pIndex of the profile with guid==guids[gIndex]
     //   profiles.swap(pIndex <-> gIndex)
     // This is O(N^2), which is kinda rough. I'm sure there's a better way
-    for (size_t gIndex = 0; gIndex < guidOrder.size(); gIndex++)
+    for (uint32_t gIndex = 0; gIndex < guidOrder.size(); gIndex++)
     {
         const auto guid = guidOrder.at(gIndex);
-        for (size_t pIndex = gIndex; pIndex < _profiles.size(); pIndex++)
+        for (uint32_t pIndex = gIndex; pIndex < _profiles.Size(); pIndex++)
         {
-            auto profileGuid = _profiles.at(pIndex).GetGuid();
+            auto profileGuid = _profiles.GetAt(pIndex).Guid();
             if (equals(profileGuid, guid))
             {
-                std::iter_swap(_profiles.begin() + pIndex, _profiles.begin() + gIndex);
+                auto prof1 = _profiles.GetAt(pIndex);
+                _profiles.SetAt(pIndex, _profiles.GetAt(gIndex));
+                _profiles.SetAt(gIndex, prof1);
                 break;
             }
         }
@@ -366,24 +384,27 @@ void CascadiaSettings::_ReorderProfilesToMatchUserSettingsOrder()
 // - <none>
 void CascadiaSettings::_RemoveHiddenProfiles()
 {
-    // remove_if will move all the profiles where the lambda is true to the end
-    // of the list, then return a iterator to the point in the list where those
-    // profiles start. The erase call will then remove all of those profiles
-    // from the list. This is the [erase-remove
-    // idiom](https://en.wikipedia.org/wiki/Erase%E2%80%93remove_idiom)
-    _profiles.erase(std::remove_if(_profiles.begin(),
-                                   _profiles.end(),
-                                   [](auto&& profile) { return profile.IsHidden(); }),
-                    _profiles.end());
+    for (uint32_t i = 0; i < _profiles.Size();)
+    {
+        if (_profiles.GetAt(i).Hidden())
+        {
+            // remove hidden profile, don't increment 'i'
+            _profiles.RemoveAt(i);
+        }
+        else
+        {
+            ++i;
+        }
+    }
 
     // Ensure that we still have some profiles here. If we don't, then throw an
     // exception, so the app can use the defaults.
-    const bool hasProfiles = !_profiles.empty();
+    const bool hasProfiles = _profiles.Size() > 0;
     if (!hasProfiles)
     {
         // Throw an exception. This is an invalid state, and we want the app to
         // be able to gracefully use the default settings.
-        throw ::TerminalApp::SettingsException(::TerminalApp::SettingsLoadErrors::AllProfilesHidden);
+        throw SettingsException(TerminalApp::SettingsLoadErrors::AllProfilesHidden);
     }
 }
 
@@ -400,23 +421,19 @@ void CascadiaSettings::_RemoveHiddenProfiles()
 void CascadiaSettings::_ValidateAllSchemesExist()
 {
     bool foundInvalidScheme = false;
-    for (auto& profile : _profiles)
+    for (auto profile : _profiles)
     {
-        auto schemeName = profile.GetSchemeName();
-        if (schemeName.has_value())
+        const auto schemeName = profile.ColorSchemeName();
+        if (!_globals->ColorSchemes().HasKey(schemeName))
         {
-            const auto found = _globals.GetColorSchemes().find(schemeName.value());
-            if (found == _globals.GetColorSchemes().end())
-            {
-                profile.SetColorScheme({ L"Campbell" });
-                foundInvalidScheme = true;
-            }
+            profile.ColorSchemeName({ L"Campbell" });
+            foundInvalidScheme = true;
         }
     }
 
     if (foundInvalidScheme)
     {
-        _warnings.push_back(::TerminalApp::SettingsLoadWarnings::UnknownColorScheme);
+        _warnings.Append(SettingsLoadWarnings::UnknownColorScheme);
     }
 }
 
@@ -436,32 +453,34 @@ void CascadiaSettings::_ValidateMediaResources()
     bool invalidBackground{ false };
     bool invalidIcon{ false };
 
-    for (auto& profile : _profiles)
+    for (auto profile : _profiles)
     {
-        if (profile.HasBackgroundImage())
+        if (!profile.BackgroundImagePath().empty())
         {
             // Attempt to convert the path to a URI, the ctor will throw if it's invalid/unparseable.
             // This covers file paths on the machine, app data, URLs, and other resource paths.
             try
             {
-                winrt::Windows::Foundation::Uri imagePath{ profile.GetExpandedBackgroundImagePath() };
+                winrt::Windows::Foundation::Uri imagePath{ profile.ExpandedBackgroundImagePath() };
             }
             catch (...)
             {
-                profile.ResetBackgroundImagePath();
+                // reset background image path
+                profile.BackgroundImagePath(L"");
                 invalidBackground = true;
             }
         }
 
-        if (profile.HasIcon())
+        if (!profile.IconPath().empty())
         {
             try
             {
-                winrt::Windows::Foundation::Uri imagePath{ profile.GetExpandedIconPath() };
+                winrt::Windows::Foundation::Uri imagePath{ profile.ExpandedIconPath() };
             }
             catch (...)
             {
-                profile.ResetIconPath();
+                // reset icon path
+                profile.IconPath(L"");
                 invalidIcon = true;
             }
         }
@@ -469,76 +488,15 @@ void CascadiaSettings::_ValidateMediaResources()
 
     if (invalidBackground)
     {
-        _warnings.push_back(::TerminalApp::SettingsLoadWarnings::InvalidBackgroundImage);
+        _warnings.Append(TerminalApp::SettingsLoadWarnings::InvalidBackgroundImage);
     }
 
     if (invalidIcon)
     {
-        _warnings.push_back(::TerminalApp::SettingsLoadWarnings::InvalidIcon);
+        _warnings.Append(TerminalApp::SettingsLoadWarnings::InvalidIcon);
     }
 }
 
-// Method Description:
-// - Create a TerminalSettings object for the provided newTerminalArgs. We'll
-//   use the newTerminalArgs to look up the profile that should be used to
-//   create these TerminalSettings. Then, we'll apply settings contained in the
-//   newTerminalArgs to the profile's settings, to enable customization on top
-//   of the profile's default values.
-// Arguments:
-// - newTerminalArgs: An object that may contain a profile name or GUID to
-//   actually use. If the Profile value is not a guid, we'll treat it as a name,
-//   and attempt to look the profile up by name instead.
-//   * Additionally, we'll use other values (such as Commandline,
-//     StartingDirectory) in this object to override the settings directly from
-//     the profile.
-// Return Value:
-// - the GUID of the created profile, and a fully initialized TerminalSettings object
-std::tuple<GUID, TerminalSettings> CascadiaSettings::BuildSettings(const NewTerminalArgs& newTerminalArgs) const
-{
-    const GUID profileGuid = _GetProfileForArgs(newTerminalArgs);
-    auto settings = BuildSettings(profileGuid);
-
-    if (newTerminalArgs)
-    {
-        // Override commandline, starting directory if they exist in newTerminalArgs
-        if (!newTerminalArgs.Commandline().empty())
-        {
-            settings.Commandline(newTerminalArgs.Commandline());
-        }
-        if (!newTerminalArgs.StartingDirectory().empty())
-        {
-            settings.StartingDirectory(newTerminalArgs.StartingDirectory());
-        }
-        if (!newTerminalArgs.TabTitle().empty())
-        {
-            settings.StartingTitle(newTerminalArgs.TabTitle());
-        }
-    }
-
-    return { profileGuid, settings };
-}
-
-// Method Description:
-// - Create a TerminalSettings object for the profile with a GUID matching the
-//   provided GUID. If no profile matches this GUID, then this method will
-//   throw.
-// Arguments:
-// - profileGuid: The GUID of a profile to use to create a settings object for.
-// Return Value:
-// - the GUID of the created profile, and a fully initialized TerminalSettings object
-TerminalSettings CascadiaSettings::BuildSettings(GUID profileGuid) const
-{
-    const Profile* const profile = FindProfile(profileGuid);
-    THROW_HR_IF_NULL(E_INVALIDARG, profile);
-
-    TerminalSettings result = profile->CreateTerminalSettings(_globals.GetColorSchemes());
-
-    // Place our appropriate global settings into the Terminal Settings
-    _globals.ApplyToSettings(result);
-
-    return result;
-}
-
 // Method Description:
 // - Helper to get the GUID of a profile, given an optional index and a possible
 //   "profile" value to override that.
@@ -555,9 +513,9 @@ TerminalSettings CascadiaSettings::BuildSettings(GUID profileGuid) const
 //   and attempt to look the profile up by name instead.
 // Return Value:
 // - the GUID of the profile corresponding to this combination of index and NewTerminalArgs
-GUID CascadiaSettings::_GetProfileForArgs(const NewTerminalArgs& newTerminalArgs) const
+winrt::guid CascadiaSettings::GetProfileForArgs(const winrt::TerminalApp::NewTerminalArgs& newTerminalArgs) const
 {
-    std::optional<GUID> profileByIndex, profileByName;
+    std::optional<winrt::guid> profileByIndex, profileByName;
     if (newTerminalArgs)
     {
         if (newTerminalArgs.ProfileIndex() != nullptr)
@@ -568,7 +526,7 @@ GUID CascadiaSettings::_GetProfileForArgs(const NewTerminalArgs& newTerminalArgs
         profileByName = _GetProfileGuidByName(newTerminalArgs.Profile());
     }
 
-    return til::coalesce_value(profileByName, profileByIndex, _globals.DefaultProfile());
+    return til::coalesce_value(profileByName, profileByIndex, _globals->DefaultProfile());
 }
 
 // Method Description:
@@ -577,7 +535,7 @@ GUID CascadiaSettings::_GetProfileForArgs(const NewTerminalArgs& newTerminalArgs
 // - name: a guid string _or_ the name of a profile
 // Return Value:
 // - the GUID of the profile corresponding to this name
-std::optional<GUID> CascadiaSettings::_GetProfileGuidByName(const std::wstring_view name) const
+std::optional<winrt::guid> CascadiaSettings::_GetProfileGuidByName(const winrt::hstring name) const
 try
 {
     // First, try and parse the "name" as a GUID. If it's a
@@ -601,13 +559,12 @@ try
         // Here, we were unable to use the profile string as a GUID to
         // lookup a profile. Instead, try using the string to look the
         // Profile up by name.
-        const auto profileIterator{ std::find_if(_profiles.cbegin(), _profiles.cend(), [&](auto&& profile) {
-            return profile.GetName().compare(name) == 0;
-        }) };
-
-        if (profileIterator != _profiles.cend())
+        for (auto profile : _profiles)
         {
-            return profileIterator->GetGuid();
+            if (profile.Name() == name)
+            {
+                return profile.Guid();
+            }
         }
     }
 
@@ -629,17 +586,17 @@ catch (...)
 //   If omitted, instead return the default profile's GUID
 // Return Value:
 // - the Nth profile's GUID, or the default profile's GUID
-std::optional<GUID> CascadiaSettings::_GetProfileGuidByIndex(std::optional<int> index) const
+std::optional<winrt::guid> CascadiaSettings::_GetProfileGuidByIndex(std::optional<int> index) const
 {
     if (index)
     {
         const auto realIndex{ index.value() };
         // If we don't have that many profiles, then do nothing.
         if (realIndex >= 0 &&
-            realIndex < gsl::narrow_cast<decltype(realIndex)>(_profiles.size()))
+            realIndex < gsl::narrow_cast<decltype(realIndex)>(_profiles.Size()))
         {
-            const auto& selectedProfile = _profiles.at(realIndex);
-            return selectedProfile.GetGuid();
+            const auto& selectedProfile = _profiles.GetAt(realIndex);
+            return selectedProfile.Guid();
         }
     }
     return std::nullopt;
@@ -656,12 +613,15 @@ std::optional<GUID> CascadiaSettings::_GetProfileGuidByIndex(std::optional<int>
 // - <none>
 void CascadiaSettings::_ValidateKeybindings()
 {
-    auto keybindingWarnings = _globals.GetKeybindingsWarnings();
+    auto keybindingWarnings = _globals->KeybindingsWarnings();
 
     if (!keybindingWarnings.empty())
     {
-        _warnings.push_back(::TerminalApp::SettingsLoadWarnings::AtLeastOneKeybindingWarning);
-        _warnings.insert(_warnings.end(), keybindingWarnings.begin(), keybindingWarnings.end());
+        _warnings.Append(TerminalApp::SettingsLoadWarnings::AtLeastOneKeybindingWarning);
+        for (auto warning : keybindingWarnings)
+        {
+            _warnings.Append(warning);
+        }
     }
 }
 
@@ -680,7 +640,7 @@ void CascadiaSettings::_ValidateNoGlobalsKey()
 {
     if (auto oldGlobalsProperty{ _userSettings["globals"] })
     {
-        _warnings.push_back(::TerminalApp::SettingsLoadWarnings::LegacyGlobalsProperty);
+        _warnings.Append(TerminalApp::SettingsLoadWarnings::LegacyGlobalsProperty);
     }
 }
 
@@ -701,7 +661,7 @@ std::string CascadiaSettings::_ApplyFirstRunChangesToSettingsTemplate(std::strin
     std::string finalSettings{ settingsTemplate };
 
     std::wstring defaultProfileGuid{ DEFAULT_WINDOWS_POWERSHELL_GUID };
-    if (const auto psCoreProfileGuid{ _GetProfileGuidByName(PowershellCoreProfileGenerator::GetPreferredPowershellProfileName()) })
+    if (const auto psCoreProfileGuid{ _GetProfileGuidByName(hstring{ PowershellCoreProfileGenerator::GetPreferredPowershellProfileName() }) })
     {
         defaultProfileGuid = Utils::GuidToString(*psCoreProfileGuid);
     }
@@ -734,44 +694,13 @@ std::string CascadiaSettings::_ApplyFirstRunChangesToSettingsTemplate(std::strin
 // - profileGuid: the GUID of the profile to find the scheme for.
 // Return Value:
 // - a non-owning pointer to the scheme.
-const ColorScheme CascadiaSettings::GetColorSchemeForProfile(const GUID profileGuid) const
+winrt::TerminalApp::ColorScheme CascadiaSettings::GetColorSchemeForProfile(const winrt::guid profileGuid) const
 {
-    auto* profile = FindProfile(profileGuid);
+    auto profile = FindProfile(profileGuid);
     if (!profile)
     {
         return nullptr;
     }
-    auto schemeName = profile->GetSchemeName().has_value() ? profile->GetSchemeName().value() : L"\0";
-    auto scheme = _globals.GetColorSchemes().find(schemeName);
-    if (scheme != _globals.GetColorSchemes().end())
-    {
-        return scheme->second;
-    }
-    else
-    {
-        return nullptr;
-    }
-}
-
-// Method Description:
-// - Apply the color scheme (provided by name) to the given IControlSettings.
-//   The settings are modified in-place.
-// - If the name doesn't correspond to any of our schemes, this does nothing.
-// Arguments:
-// - settings: the IControlSettings object to modify
-// - name: the name of the scheme to apply
-// Return Value:
-// - true iff we found a matching scheme for the name schemeName
-bool CascadiaSettings::ApplyColorScheme(winrt::Microsoft::Terminal::TerminalControl::IControlSettings& settings,
-                                        std::wstring_view schemeName)
-{
-    std::wstring name{ schemeName };
-    auto schemeAndName = _globals.GetColorSchemes().find(name);
-    if (schemeAndName != _globals.GetColorSchemes().end())
-    {
-        const auto& scheme = schemeAndName->second;
-        scheme.ApplyScheme(settings);
-        return true;
-    }
-    return false;
+    const auto schemeName = profile.ColorSchemeName();
+    return _globals->ColorSchemes().TryLookup(schemeName);
 }

src/cascadia/TerminalApp/CascadiaSettings.h

@@ -16,12 +16,15 @@ Author(s):
 
 --*/
 #pragma once
+
+#include "CascadiaSettings.g.h"
+
 #include <winrt/Microsoft.Terminal.TerminalConnection.h>
 #include "GlobalAppSettings.h"
 #include "TerminalWarnings.h"
-#include "Profile.h"
 #include "IDynamicProfileGenerator.h"
 
+#include "Profile.h"
 #include "ColorScheme.h"
 
 // fwdecl unittest classes
@@ -42,7 +45,6 @@ namespace TerminalAppUnitTests
 namespace TerminalApp
 {
     class SettingsTypedDeserializationException;
-    class CascadiaSettings;
 };
 
 class TerminalApp::SettingsTypedDeserializationException final : public std::runtime_error
@@ -52,94 +54,102 @@ public:
         runtime_error(description.data()) {}
 };
 
-class TerminalApp::CascadiaSettings final
+namespace winrt::TerminalApp::implementation
 {
-public:
-    CascadiaSettings();
-    explicit CascadiaSettings(const bool addDynamicProfiles);
+    struct CascadiaSettings : CascadiaSettingsT<CascadiaSettings>
+    {
+    public:
+        CascadiaSettings();
+        explicit CascadiaSettings(const bool addDynamicProfiles);
 
-    static std::unique_ptr<CascadiaSettings> LoadDefaults();
-    static std::unique_ptr<CascadiaSettings> LoadAll();
-    static std::unique_ptr<CascadiaSettings> LoadUniversal();
+        static TerminalApp::CascadiaSettings LoadDefaults();
+        static TerminalApp::CascadiaSettings LoadAll();
+        static TerminalApp::CascadiaSettings LoadUniversal();
 
-    static const CascadiaSettings& GetCurrentAppSettings();
+        TerminalApp::GlobalAppSettings GlobalSettings() const;
 
-    std::tuple<GUID, winrt::TerminalApp::TerminalSettings> BuildSettings(const winrt::TerminalApp::NewTerminalArgs& newTerminalArgs) const;
-    winrt::TerminalApp::TerminalSettings BuildSettings(GUID profileGuid) const;
+        Windows::Foundation::Collections::IObservableVector<winrt::TerminalApp::Profile> Profiles() const noexcept;
 
-    GlobalAppSettings& GlobalSettings();
+        TerminalApp::KeyMapping KeyMap() const noexcept;
 
-    gsl::span<const Profile> GetProfiles() const noexcept;
+        static std::unique_ptr<CascadiaSettings> FromJson(const Json::Value& json);
+        void LayerJson(const Json::Value& json);
 
-    winrt::TerminalApp::AppKeyBindings GetKeybindings() const noexcept;
+        static std::filesystem::path GetSettingsPath();
+        static std::filesystem::path GetDefaultSettingsPath();
 
-    static std::unique_ptr<CascadiaSettings> FromJson(const Json::Value& json);
-    void LayerJson(const Json::Value& json);
+        TerminalApp::Profile FindProfile(guid profileGuid) const noexcept;
+        TerminalApp::ColorScheme GetColorSchemeForProfile(const guid profileGuid) const;
 
-    static std::filesystem::path GetSettingsPath();
-    static std::filesystem::path GetDefaultSettingsPath();
+        Windows::Foundation::Collections::IVectorView<SettingsLoadWarnings> Warnings();
+        void ClearWarnings();
+        void AppendWarning(SettingsLoadWarnings warning);
+        Windows::Foundation::IReference<SettingsLoadErrors> GetLoadingError();
+        hstring GetSerializationErrorMessage();
 
-    const Profile* FindProfile(GUID profileGuid) const noexcept;
-    const winrt::TerminalApp::ColorScheme GetColorSchemeForProfile(const GUID profileGuid) const;
+        winrt::guid GetProfileForArgs(const winrt::TerminalApp::NewTerminalArgs& newTerminalArgs) const;
 
-    std::vector<TerminalApp::SettingsLoadWarnings>& GetWarnings();
+    private:
+        com_ptr<GlobalAppSettings> _globals;
+        Windows::Foundation::Collections::IObservableVector<TerminalApp::Profile> _profiles;
+        Windows::Foundation::Collections::IVector<TerminalApp::SettingsLoadWarnings> _warnings;
+        Windows::Foundation::IReference<SettingsLoadErrors> _loadError;
+        hstring _deserializationErrorMessage;
 
-    bool ApplyColorScheme(winrt::Microsoft::Terminal::TerminalControl::IControlSettings& settings, std::wstring_view schemeName);
+        std::vector<std::unique_ptr<::TerminalApp::IDynamicProfileGenerator>> _profileGenerators;
 
-private:
-    GlobalAppSettings _globals;
-    std::vector<Profile> _profiles;
-    std::vector<TerminalApp::SettingsLoadWarnings> _warnings;
+        std::string _userSettingsString;
+        Json::Value _userSettings;
+        Json::Value _defaultSettings;
+        Json::Value _userDefaultProfileSettings{ Json::Value::null };
 
-    std::vector<std::unique_ptr<TerminalApp::IDynamicProfileGenerator>> _profileGenerators;
+        void _LayerOrCreateProfile(const Json::Value& profileJson);
+        winrt::com_ptr<winrt::TerminalApp::implementation::Profile> _FindMatchingProfile(const Json::Value& profileJson);
+        void _LayerOrCreateColorScheme(const Json::Value& schemeJson);
+        winrt::com_ptr<winrt::TerminalApp::implementation::ColorScheme> _FindMatchingColorScheme(const Json::Value& schemeJson);
+        void _ParseJsonString(std::string_view fileData, const bool isDefaultSettings);
+        static const Json::Value& _GetProfilesJsonObject(const Json::Value& json);
+        static const Json::Value& _GetDisabledProfileSourcesJsonObject(const Json::Value& json);
+        bool _PrependSchemaDirective();
+        bool _AppendDynamicProfilesToUserSettings();
+        std::string _ApplyFirstRunChangesToSettingsTemplate(std::string_view settingsTemplate) const;
 
-    std::string _userSettingsString;
-    Json::Value _userSettings;
-    Json::Value _defaultSettings;
-    Json::Value _userDefaultProfileSettings{ Json::Value::null };
+        void _ApplyDefaultsFromUserSettings();
 
-    void _LayerOrCreateProfile(const Json::Value& profileJson);
-    Profile* _FindMatchingProfile(const Json::Value& profileJson);
-    void _LayerOrCreateColorScheme(const Json::Value& schemeJson);
-    winrt::com_ptr<winrt::TerminalApp::implementation::ColorScheme> _FindMatchingColorScheme(const Json::Value& schemeJson);
-    void _ParseJsonString(std::string_view fileData, const bool isDefaultSettings);
-    static const Json::Value& _GetProfilesJsonObject(const Json::Value& json);
-    static const Json::Value& _GetDisabledProfileSourcesJsonObject(const Json::Value& json);
-    bool _PrependSchemaDirective();
-    bool _AppendDynamicProfilesToUserSettings();
-    std::string _ApplyFirstRunChangesToSettingsTemplate(std::string_view settingsTemplate) const;
+        void _LoadDynamicProfiles();
 
-    void _ApplyDefaultsFromUserSettings();
+        static bool _IsPackaged();
+        static void _WriteSettings(const std::string_view content);
+        static std::optional<std::string> _ReadUserSettings();
+        static std::optional<std::string> _ReadFile(HANDLE hFile);
 
-    void _LoadDynamicProfiles();
+        std::optional<guid> _GetProfileGuidByName(const hstring) const;
+        std::optional<guid> _GetProfileGuidByIndex(std::optional<int> index) const;
 
-    static bool _IsPackaged();
-    static void _WriteSettings(const std::string_view content);
-    static std::optional<std::string> _ReadUserSettings();
-    static std::optional<std::string> _ReadFile(HANDLE hFile);
+        void _ValidateSettings();
+        void _ValidateProfilesExist();
+        void _ValidateProfilesHaveGuid();
+        void _ValidateDefaultProfileExists();
+        void _ValidateNoDuplicateProfiles();
+        void _ResolveDefaultProfile();
+        void _ReorderProfilesToMatchUserSettingsOrder();
+        void _RemoveHiddenProfiles();
+        void _ValidateAllSchemesExist();
+        void _ValidateMediaResources();
+        void _ValidateKeybindings();
+        void _ValidateNoGlobalsKey();
 
-    std::optional<GUID> _GetProfileGuidByName(const std::wstring_view) const;
-    std::optional<GUID> _GetProfileGuidByIndex(std::optional<int> index) const;
-    GUID _GetProfileForArgs(const winrt::TerminalApp::NewTerminalArgs& newTerminalArgs) const;
+        friend class TerminalAppLocalTests::SettingsTests;
+        friend class TerminalAppLocalTests::ProfileTests;
+        friend class TerminalAppLocalTests::ColorSchemeTests;
+        friend class TerminalAppLocalTests::KeyBindingsTests;
+        friend class TerminalAppLocalTests::TabTests;
+        friend class TerminalAppUnitTests::DynamicProfileTests;
+        friend class TerminalAppUnitTests::JsonTests;
+    };
+}
 
-    void _ValidateSettings();
-    void _ValidateProfilesExist();
-    void _ValidateProfilesHaveGuid();
-    void _ValidateDefaultProfileExists();
-    void _ValidateNoDuplicateProfiles();
-    void _ResolveDefaultProfile();
-    void _ReorderProfilesToMatchUserSettingsOrder();
-    void _RemoveHiddenProfiles();
-    void _ValidateAllSchemesExist();
-    void _ValidateMediaResources();
-    void _ValidateKeybindings();
-    void _ValidateNoGlobalsKey();
-
-    friend class TerminalAppLocalTests::SettingsTests;
-    friend class TerminalAppLocalTests::ProfileTests;
-    friend class TerminalAppLocalTests::ColorSchemeTests;
-    friend class TerminalAppLocalTests::KeyBindingsTests;
-    friend class TerminalAppLocalTests::TabTests;
-    friend class TerminalAppUnitTests::DynamicProfileTests;
-    friend class TerminalAppUnitTests::JsonTests;
-};
+namespace winrt::TerminalApp::factory_implementation
+{
+    BASIC_FACTORY(CascadiaSettings);
+}

src/cascadia/TerminalApp/CascadiaSettings.idl

@@ -0,0 +1,30 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+import "GlobalAppSettings.idl";
+import "Profile.idl";
+import "TerminalWarnings.idl";
+
+namespace TerminalApp
+{
+    [default_interface] runtimeclass CascadiaSettings {
+        static CascadiaSettings LoadDefaults();
+        static CascadiaSettings LoadAll();
+        static CascadiaSettings LoadUniversal();
+
+        GlobalAppSettings GlobalSettings { get; };
+
+        Windows.Foundation.Collections.IObservableVector<Profile> Profiles { get; };
+
+        KeyMapping KeyMap { get; };
+
+        Windows.Foundation.Collections.IVectorView<SettingsLoadWarnings> Warnings { get; };
+        Windows.Foundation.IReference<SettingsLoadErrors> GetLoadingError { get; };
+        String GetSerializationErrorMessage { get; };
+
+        Profile FindProfile(Guid profileGuid);
+        ColorScheme GetColorSchemeForProfile(Guid profileGuid);
+
+        Guid GetProfileForArgs(NewTerminalArgs newTerminalArgs);
+    }
+}

src/cascadia/TerminalApp/CascadiaSettingsSerialization.cpp

@@ -18,8 +18,7 @@
 // Both defaults.h and userDefaults.h are generated at build time into the
 // "Generated Files" directory.
 
-using namespace ::TerminalApp;
-using namespace winrt::TerminalApp;
+using namespace winrt::TerminalApp::implementation;
 using namespace ::Microsoft::Console;
 
 static constexpr std::wstring_view SettingsFilename{ L"settings.json" };
@@ -101,146 +100,171 @@ static void _CatchRethrowSerializationExceptionWithLocationInfo(std::string_view
 //   profiles inserted into their list of profiles.
 // Return Value:
 // - a unique_ptr containing a new CascadiaSettings object.
-std::unique_ptr<CascadiaSettings> CascadiaSettings::LoadAll()
+winrt::TerminalApp::CascadiaSettings CascadiaSettings::LoadAll()
 {
-    auto resultPtr = LoadDefaults();
-
-    // GH 3588, we need this below to know if the user chose something that wasn't our default.
-    // Collect it up here in case it gets modified by any of the other layers between now and when
-    // the user's preferences are loaded and layered.
-    const auto hardcodedDefaultGuid = resultPtr->GlobalSettings().DefaultProfile();
-
-    std::optional<std::string> fileData = _ReadUserSettings();
-    const bool foundFile = fileData.has_value();
-
-    // Make sure the file isn't totally empty. If it is, we'll treat the file
-    // like it doesn't exist at all.
-    const bool fileHasData = foundFile && !fileData.value().empty();
-    bool needToWriteFile = false;
-    if (fileHasData)
-    {
-        resultPtr->_ParseJsonString(fileData.value(), false);
-    }
-
-    // Load profiles from dynamic profile generators. _userSettings should be
-    // created by now, because we're going to check in there for any generators
-    // that should be disabled (if the user had any settings.)
-    resultPtr->_LoadDynamicProfiles();
-
-    if (!fileHasData)
-    {
-        // We didn't find the user settings. We'll need to create a file
-        // to use as the user defaults.
-        // For now, just parse our user settings template as their user settings.
-        auto userSettings{ resultPtr->_ApplyFirstRunChangesToSettingsTemplate(UserSettingsJson) };
-        resultPtr->_ParseJsonString(userSettings, false);
-        needToWriteFile = true;
-    }
-
     try
     {
-        // See microsoft/terminal#2325: find the defaultSettings from the user's
-        // settings. Layer those settings upon all the existing profiles we have
-        // (defaults and dynamic profiles). We'll also set
-        // _userDefaultProfileSettings here. When we LayerJson below to apply the
-        // user settings, we'll make sure to use these defaultSettings _before_ any
-        // profiles the user might have.
-        resultPtr->_ApplyDefaultsFromUserSettings();
+        auto settings = LoadDefaults();
+        auto resultPtr = winrt::get_self<CascadiaSettings>(settings);
+        resultPtr->ClearWarnings();
 
-        // Apply the user's settings
-        resultPtr->LayerJson(resultPtr->_userSettings);
-    }
-    catch (...)
-    {
-        _CatchRethrowSerializationExceptionWithLocationInfo(resultPtr->_userSettingsString);
-    }
+        // GH 3588, we need this below to know if the user chose something that wasn't our default.
+        // Collect it up here in case it gets modified by any of the other layers between now and when
+        // the user's preferences are loaded and layered.
+        const auto hardcodedDefaultGuid = resultPtr->GlobalSettings().DefaultProfile();
 
-    // After layering the user settings, check if there are any new profiles
-    // that need to be inserted into their user settings file.
-    needToWriteFile = resultPtr->_AppendDynamicProfilesToUserSettings() || needToWriteFile;
+        std::optional<std::string> fileData = _ReadUserSettings();
+        const bool foundFile = fileData.has_value();
 
-    if (needToWriteFile)
-    {
-        // For safety's sake, we need to re-parse the JSON document to ensure that
-        // all future patches are applied with updated object offsets.
-        resultPtr->_ParseJsonString(resultPtr->_userSettingsString, false);
-    }
-
-    // Make sure there's a $schema at the top of the file.
-    needToWriteFile = resultPtr->_PrependSchemaDirective() || needToWriteFile;
-
-    // TODO:GH#2721 If powershell core is installed, we need to set that to the
-    // default profile, but only when the settings file was newly created. We'll
-    // re-write the segment of the user settings for "default profile" to have
-    // the powershell core GUID instead.
-
-    // If we created the file, or found new dynamic profiles, write the user
-    // settings string back to the file.
-    if (needToWriteFile)
-    {
-        // If AppendDynamicProfilesToUserSettings (or the pwsh check above)
-        // changed the file, then our local settings JSON is no longer accurate.
-        // We should re-parse, but not re-layer
-        resultPtr->_ParseJsonString(resultPtr->_userSettingsString, false);
-
-        _WriteSettings(resultPtr->_userSettingsString);
-    }
-
-    // If this throws, the app will catch it and use the default settings
-    resultPtr->_ValidateSettings();
-
-    // GH 3855 - Gathering Data on custom profiles to inform better defaults
-    // Do it after everything else so it won't happen unless validation passed.
-    // Also, avoid processing unless someone's listening for measures. The keybindings work, at least,
-    // is a lot of computation we can skip if no one cares.
-    if (TraceLoggingProviderEnabled(g_hTerminalAppProvider, 0, MICROSOFT_KEYWORD_MEASURES))
-    {
-        const auto guid = resultPtr->GlobalSettings().DefaultProfile();
-
-        // Compare to the defaults.json one that we set on install.
-        // If it's different, log what the user chose.
-        if (hardcodedDefaultGuid != guid)
+        // Make sure the file isn't totally empty. If it is, we'll treat the file
+        // like it doesn't exist at all.
+        const bool fileHasData = foundFile && !fileData.value().empty();
+        bool needToWriteFile = false;
+        if (fileHasData)
         {
-            TraceLoggingWrite(
-                g_hTerminalAppProvider, // handle to TerminalApp tracelogging provider
-                "CustomDefaultProfile",
-                TraceLoggingDescription("Event emitted when user has chosen a different default profile than hardcoded one on load/reload"),
-                TraceLoggingGuid(guid, "DefaultProfile", "ID of user-chosen default profile"),
-                TraceLoggingKeyword(MICROSOFT_KEYWORD_MEASURES),
-                TelemetryPrivacyDataTag(PDT_ProductAndServiceUsage));
+            resultPtr->_ParseJsonString(fileData.value(), false);
         }
 
-        // If the user had keybinding settings preferences, we want to learn from them to make better defaults
-        auto userKeybindings = resultPtr->_userSettings[JsonKey(KeybindingsKey)];
-        if (!userKeybindings.empty())
+        // Load profiles from dynamic profile generators. _userSettings should be
+        // created by now, because we're going to check in there for any generators
+        // that should be disabled (if the user had any settings.)
+        resultPtr->_LoadDynamicProfiles();
+
+        if (!fileHasData)
         {
-            // If there are custom key bindings, let's understand what they are because maybe the defaults aren't good enough
-
-            // Run it through the object so we can parse it apart and then only serialize the fields we're interested in
-            // and avoid extraneous data.
-            auto akb = winrt::make_self<implementation::AppKeyBindings>();
-            akb->LayerJson(userKeybindings);
-            auto value = akb->ToJson();
-
-            // Reserialize the keybindings
-            Json::StreamWriterBuilder wbuilder;
-            // Use 4 spaces to indent instead of \t
-            wbuilder.settings_["indentation"] = "    ";
-            wbuilder.settings_["enableYAMLCompatibility"] = true; // suppress spaces around colons
-
-            const auto keybindingsString = Json::writeString(wbuilder, value);
-
-            TraceLoggingWrite(
-                g_hTerminalAppProvider, // handle to TerminalApp tracelogging provider
-                "CustomKeybindings",
-                TraceLoggingDescription("Event emitted when custom keybindings are identified on load/reload"),
-                TraceLoggingUtf8String(keybindingsString.c_str(), "Keybindings", "Keybindings as JSON"),
-                TraceLoggingKeyword(MICROSOFT_KEYWORD_MEASURES),
-                TelemetryPrivacyDataTag(PDT_ProductAndServiceUsage));
+            // We didn't find the user settings. We'll need to create a file
+            // to use as the user defaults.
+            // For now, just parse our user settings template as their user settings.
+            auto userSettings{ resultPtr->_ApplyFirstRunChangesToSettingsTemplate(UserSettingsJson) };
+            resultPtr->_ParseJsonString(userSettings, false);
+            needToWriteFile = true;
         }
-    }
 
-    return resultPtr;
+        try
+        {
+            // See microsoft/terminal#2325: find the defaultSettings from the user's
+            // settings. Layer those settings upon all the existing profiles we have
+            // (defaults and dynamic profiles). We'll also set
+            // _userDefaultProfileSettings here. When we LayerJson below to apply the
+            // user settings, we'll make sure to use these defaultSettings _before_ any
+            // profiles the user might have.
+            resultPtr->_ApplyDefaultsFromUserSettings();
+
+            // Apply the user's settings
+            resultPtr->LayerJson(resultPtr->_userSettings);
+        }
+        catch (...)
+        {
+            _CatchRethrowSerializationExceptionWithLocationInfo(resultPtr->_userSettingsString);
+        }
+
+        // After layering the user settings, check if there are any new profiles
+        // that need to be inserted into their user settings file.
+        needToWriteFile = resultPtr->_AppendDynamicProfilesToUserSettings() || needToWriteFile;
+
+        if (needToWriteFile)
+        {
+            // For safety's sake, we need to re-parse the JSON document to ensure that
+            // all future patches are applied with updated object offsets.
+            resultPtr->_ParseJsonString(resultPtr->_userSettingsString, false);
+        }
+
+        // Make sure there's a $schema at the top of the file.
+        needToWriteFile = resultPtr->_PrependSchemaDirective() || needToWriteFile;
+
+        // TODO:GH#2721 If powershell core is installed, we need to set that to the
+        // default profile, but only when the settings file was newly created. We'll
+        // re-write the segment of the user settings for "default profile" to have
+        // the powershell core GUID instead.
+
+        // If we created the file, or found new dynamic profiles, write the user
+        // settings string back to the file.
+        if (needToWriteFile)
+        {
+            // If AppendDynamicProfilesToUserSettings (or the pwsh check above)
+            // changed the file, then our local settings JSON is no longer accurate.
+            // We should re-parse, but not re-layer
+            resultPtr->_ParseJsonString(resultPtr->_userSettingsString, false);
+
+            try
+            {
+                _WriteSettings(resultPtr->_userSettingsString);
+            }
+            catch (...)
+            {
+                resultPtr->AppendWarning(SettingsLoadWarnings::FailedToWriteToSettings);
+            }
+        }
+
+        // If this throws, the app will catch it and use the default settings
+        resultPtr->_ValidateSettings();
+
+        // GH 3855 - Gathering Data on custom profiles to inform better defaults
+        // Do it after everything else so it won't happen unless validation passed.
+        // Also, avoid processing unless someone's listening for measures. The keybindings work, at least,
+        // is a lot of computation we can skip if no one cares.
+        if (TraceLoggingProviderEnabled(g_hTerminalAppProvider, 0, MICROSOFT_KEYWORD_MEASURES))
+        {
+            const auto guid = resultPtr->GlobalSettings().DefaultProfile();
+
+            // Compare to the defaults.json one that we set on install.
+            // If it's different, log what the user chose.
+            if (hardcodedDefaultGuid != guid)
+            {
+                TraceLoggingWrite(
+                    g_hTerminalAppProvider, // handle to TerminalApp tracelogging provider
+                    "CustomDefaultProfile",
+                    TraceLoggingDescription("Event emitted when user has chosen a different default profile than hardcoded one on load/reload"),
+                    TraceLoggingGuid(guid, "DefaultProfile", "ID of user-chosen default profile"),
+                    TraceLoggingKeyword(MICROSOFT_KEYWORD_MEASURES),
+                    TelemetryPrivacyDataTag(PDT_ProductAndServiceUsage));
+            }
+
+            // If the user had keybinding settings preferences, we want to learn from them to make better defaults
+            auto userKeybindings = resultPtr->_userSettings[JsonKey(KeybindingsKey)];
+            if (!userKeybindings.empty())
+            {
+                // If there are custom key bindings, let's understand what they are because maybe the defaults aren't good enough
+
+                // Run it through the object so we can parse it apart and then only serialize the fields we're interested in
+                // and avoid extraneous data.
+                auto km = winrt::make_self<implementation::KeyMapping>();
+                km->LayerJson(userKeybindings);
+                auto value = km->ToJson();
+
+                // Reserialize the keybindings
+                Json::StreamWriterBuilder wbuilder;
+                // Use 4 spaces to indent instead of \t
+                wbuilder.settings_["indentation"] = "    ";
+                wbuilder.settings_["enableYAMLCompatibility"] = true; // suppress spaces around colons
+
+                const auto keybindingsString = Json::writeString(wbuilder, value);
+
+                TraceLoggingWrite(
+                    g_hTerminalAppProvider, // handle to TerminalApp tracelogging provider
+                    "CustomKeybindings",
+                    TraceLoggingDescription("Event emitted when custom keybindings are identified on load/reload"),
+                    TraceLoggingUtf8String(keybindingsString.c_str(), "Keybindings", "Keybindings as JSON"),
+                    TraceLoggingKeyword(MICROSOFT_KEYWORD_MEASURES),
+                    TelemetryPrivacyDataTag(PDT_ProductAndServiceUsage));
+            }
+        }
+
+        return *resultPtr;
+    }
+    catch (const SettingsException& ex)
+    {
+        auto settings{ winrt::make_self<implementation::CascadiaSettings>() };
+        settings->_loadError = ex.Error();
+        return *settings;
+    }
+    catch (const SettingsTypedDeserializationException& e)
+    {
+        auto settings{ winrt::make_self<implementation::CascadiaSettings>() };
+        std::string_view what{ e.what() };
+        settings->_deserializationErrorMessage = til::u8u16(what);
+        return *settings;
+    }
 }
 
 // Function Description:
@@ -249,21 +273,37 @@ std::unique_ptr<CascadiaSettings> CascadiaSettings::LoadAll()
 // - <none>
 // Return Value:
 // - a unique_ptr to a CascadiaSettings with the connection types and settings for Universal terminal
-std::unique_ptr<CascadiaSettings> CascadiaSettings::LoadUniversal()
+winrt::TerminalApp::CascadiaSettings CascadiaSettings::LoadUniversal()
 {
     // We're going to do this ourselves because we want to exclude almost everything
     // from the special Universal-for-developers configuration
 
-    // Create settings and get the universal defaults loaded up.
-    auto resultPtr = std::make_unique<CascadiaSettings>();
-    resultPtr->_ParseJsonString(DefaultUniversalJson, true);
-    resultPtr->LayerJson(resultPtr->_defaultSettings);
+    try
+    {
+        // Create settings and get the universal defaults loaded up.
+        auto resultPtr = winrt::make_self<CascadiaSettings>();
+        resultPtr->_ParseJsonString(DefaultUniversalJson, true);
+        resultPtr->LayerJson(resultPtr->_defaultSettings);
 
-    // Now validate.
-    // If this throws, the app will catch it and use the default settings
-    resultPtr->_ValidateSettings();
+        // Now validate.
+        // If this throws, the app will catch it and use the default settings
+        resultPtr->_ValidateSettings();
 
-    return resultPtr;
+        return *resultPtr;
+    }
+    catch (const SettingsException& ex)
+    {
+        auto settings{ winrt::make_self<implementation::CascadiaSettings>() };
+        settings->_loadError = ex.Error();
+        return *settings;
+    }
+    catch (const SettingsTypedDeserializationException& e)
+    {
+        auto settings{ winrt::make_self<implementation::CascadiaSettings>() };
+        std::string_view what{ e.what() };
+        settings->_deserializationErrorMessage = til::u8u16(what);
+        return *settings;
+    }
 }
 
 // Function Description:
@@ -273,9 +313,9 @@ std::unique_ptr<CascadiaSettings> CascadiaSettings::LoadUniversal()
 // - <none>
 // Return Value:
 // - a unique_ptr to a CascadiaSettings with the settings from defaults.json
-std::unique_ptr<CascadiaSettings> CascadiaSettings::LoadDefaults()
+winrt::TerminalApp::CascadiaSettings CascadiaSettings::LoadDefaults()
 {
-    auto resultPtr = std::make_unique<CascadiaSettings>();
+    auto resultPtr{ winrt::make_self<CascadiaSettings>() };
 
     // We already have the defaults in memory, because we stamp them into a
     // header as part of the build process. We don't need to bother with reading
@@ -284,7 +324,7 @@ std::unique_ptr<CascadiaSettings> CascadiaSettings::LoadDefaults()
     resultPtr->LayerJson(resultPtr->_defaultSettings);
     resultPtr->_ResolveDefaultProfile();
 
-    return resultPtr;
+    return *resultPtr;
 }
 
 // Method Description:
@@ -327,9 +367,9 @@ void CascadiaSettings::_LoadDynamicProfiles()
                 {
                     // If the profile did not have a GUID when it was generated,
                     // we'll synthesize a GUID for it in _ValidateProfilesHaveGuid
-                    profile.SetSource(generatorNamespace);
+                    profile.Source(generatorNamespace);
 
-                    _profiles.emplace_back(profile);
+                    _profiles.Append(profile);
                 }
             }
             CATCH_LOG_MSG("Dynamic Profile Namespace: \"%ls\"", generatorNamespace.data());
@@ -452,7 +492,8 @@ bool CascadiaSettings::_AppendDynamicProfilesToUserSettings()
         {
             if (profileJson.isObject())
             {
-                if (profile.ShouldBeLayered(profileJson))
+                const auto profileImpl = winrt::get_self<winrt::TerminalApp::implementation::Profile>(profile);
+                if (profileImpl->ShouldBeLayered(profileJson))
                 {
                     return true;
                 }
@@ -502,7 +543,8 @@ bool CascadiaSettings::_AppendDynamicProfilesToUserSettings()
 
         // Generate a diff for the profile, that contains the minimal set of
         // changes to re-create this profile.
-        const auto diff = profile.GenerateStub();
+        const auto profileImpl = winrt::get_self<winrt::TerminalApp::implementation::Profile>(profile);
+        const auto diff = profileImpl->GenerateStub();
         auto profileSerialization = Json::writeString(wbuilder, diff);
 
         // Add the user's indent to the start of each line
@@ -558,7 +600,7 @@ std::unique_ptr<CascadiaSettings> CascadiaSettings::FromJson(const Json::Value&
 // <none>
 void CascadiaSettings::LayerJson(const Json::Value& json)
 {
-    _globals.LayerJson(json);
+    _globals->LayerJson(json);
 
     if (auto schemes{ json[SchemesKey.data()] })
     {
@@ -607,17 +649,17 @@ void CascadiaSettings::_LayerOrCreateProfile(const Json::Value& profileJson)
         // `source`. Dynamic profiles _must_ be layered on an existing profile.
         if (!Profile::IsDynamicProfileObject(profileJson))
         {
-            Profile profile{};
+            auto profile = winrt::make_self<Profile>();
 
             // GH#2325: If we have a set of default profile settings, apply them here.
             // We _won't_ have these settings yet for defaults, dynamic profiles.
             if (_userDefaultProfileSettings)
             {
-                profile.LayerJson(_userDefaultProfileSettings);
+                profile->LayerJson(_userDefaultProfileSettings);
             }
 
-            profile.LayerJson(profileJson);
-            _profiles.emplace_back(profile);
+            profile->LayerJson(profileJson);
+            _profiles.Append(*profile);
         }
     }
 }
@@ -633,17 +675,14 @@ void CascadiaSettings::_LayerOrCreateProfile(const Json::Value& profileJson)
 // Return Value:
 // - a Profile that can be layered with the given json object, iff such a
 //   profile exists.
-Profile* CascadiaSettings::_FindMatchingProfile(const Json::Value& profileJson)
+winrt::com_ptr<Profile> CascadiaSettings::_FindMatchingProfile(const Json::Value& profileJson)
 {
-    for (auto& profile : _profiles)
+    for (auto profile : _profiles)
     {
-        if (profile.ShouldBeLayered(profileJson))
+        auto profileImpl = winrt::get_self<Profile>(profile);
+        if (profileImpl->ShouldBeLayered(profileJson))
         {
-            // HERE BE DRAGONS: Returning a pointer to a type in the vector is
-            // maybe not the _safest_ thing, but we have a mind to make Profile
-            // and ColorScheme winrt types in the future, so this will be safer
-            // then.
-            return &profile;
+            return profileImpl->get_strong();
         }
     }
     return nullptr;
@@ -683,9 +722,10 @@ void CascadiaSettings::_ApplyDefaultsFromUserSettings()
         // hyper-explode, so just don't let them do that.
         _userDefaultProfileSettings.removeMember({ "guid" });
 
-        for (auto& profile : _profiles)
+        for (auto profile : _profiles)
         {
-            profile.LayerJson(_userDefaultProfileSettings);
+            auto profileImpl = winrt::get_self<Profile>(profile);
+            profileImpl->LayerJson(_userDefaultProfileSettings);
         }
     }
 }
@@ -708,8 +748,8 @@ void CascadiaSettings::_LayerOrCreateColorScheme(const Json::Value& schemeJson)
     }
     else
     {
-        const auto scheme = implementation::ColorScheme::FromJson(schemeJson);
-        _globals.AddColorScheme(*scheme);
+        const auto scheme = ColorScheme::FromJson(schemeJson);
+        _globals->AddColorScheme(*scheme);
     }
 }
 
@@ -724,15 +764,13 @@ void CascadiaSettings::_LayerOrCreateColorScheme(const Json::Value& schemeJson)
 // Return Value:
 // - a ColorScheme that can be layered with the given json object, iff such a
 //   color scheme exists.
-winrt::com_ptr<implementation::ColorScheme> CascadiaSettings::_FindMatchingColorScheme(const Json::Value& schemeJson)
+winrt::com_ptr<ColorScheme> CascadiaSettings::_FindMatchingColorScheme(const Json::Value& schemeJson)
 {
-    if (auto schemeName = implementation::ColorScheme::GetNameFromJson(schemeJson))
+    if (auto schemeName = ColorScheme::GetNameFromJson(schemeJson))
     {
-        auto& schemes = _globals.GetColorSchemes();
-        auto iterator = schemes.find(*schemeName);
-        if (iterator != schemes.end())
+        if (auto scheme{ _globals->ColorSchemes().TryLookup(*schemeName) })
         {
-            return winrt::get_self<implementation::ColorScheme>(iterator->second)->get_strong();
+            return winrt::get_self<ColorScheme>(scheme)->get_strong();
         }
     }
     return nullptr;

src/cascadia/TerminalApp/ColorPickupFlyout.xaml

@@ -129,7 +129,7 @@
             </Grid.RowDefinitions>
             <ColorPicker x:Name="customColorPicker"
                      IsMoreButtonVisible="True"
-                     IsColorSliderVisible="False"
+                     IsColorSliderVisible="True"
                      IsColorChannelTextInputVisible="True"
                      IsHexInputVisible="True"
                      IsAlphaEnabled="False"

src/cascadia/TerminalApp/ColorScheme.cpp

@@ -63,27 +63,6 @@ ColorScheme::~ColorScheme()
 {
 }
 
-// Method Description:
-// - Apply our values to the given TerminalSettings object. Sets the foreground,
-//      background, and color table of the settings object.
-// Arguments:
-// - terminalSettings: the object to apply our settings to.
-// Return Value:
-// - <none>
-void ColorScheme::ApplyScheme(const winrt::Microsoft::Terminal::TerminalControl::IControlSettings& terminalSettings) const
-{
-    terminalSettings.DefaultForeground(static_cast<COLORREF>(_defaultForeground));
-    terminalSettings.DefaultBackground(static_cast<COLORREF>(_defaultBackground));
-    terminalSettings.SelectionBackground(static_cast<COLORREF>(_selectionBackground));
-    terminalSettings.CursorColor(static_cast<COLORREF>(_cursorColor));
-
-    auto const tableCount = gsl::narrow_cast<int>(_table.size());
-    for (int i = 0; i < tableCount; i++)
-    {
-        terminalSettings.SetColorTableEntry(i, static_cast<COLORREF>(_table[i]));
-    }
-}
-
 // Method Description:
 // - Create a new instance of this class from a serialized JsonObject.
 // Arguments:

src/cascadia/TerminalApp/ColorScheme.h

@@ -15,8 +15,8 @@ Author(s):
 
 --*/
 #pragma once
-#include "TerminalSettings.h"
 #include "../../inc/conattrs.hpp"
+#include "inc/cppwinrt_utils.h"
 
 #include "ColorScheme.g.h"
 
@@ -36,8 +36,6 @@ namespace winrt::TerminalApp::implementation
         ColorScheme(hstring name, Windows::UI::Color defaultFg, Windows::UI::Color defaultBg, Windows::UI::Color cursorColor);
         ~ColorScheme();
 
-        void ApplyScheme(const winrt::Microsoft::Terminal::TerminalControl::IControlSettings& terminalSettings) const;
-
         static com_ptr<ColorScheme> FromJson(const Json::Value& json);
         bool ShouldBeLayered(const Json::Value& json) const;
         void LayerJson(const Json::Value& json);