Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into dev/migrie/b/5780-o…
Browse files Browse the repository at this point in the history 
…n-2.4

# Conflicts:
#	doc/building.md
#	src/cascadia/CascadiaPackage/CascadiaPackage.wapproj
#	src/cascadia/LocalTests_TerminalApp/TerminalApp.LocalTests.vcxproj
#	src/cascadia/LocalTests_TerminalApp/TestHostApp/TestHostApp.vcxproj
#	src/cascadia/TerminalApp/TerminalApp.vcxproj
#	src/cascadia/TerminalApp/lib/TerminalAppLib.vcxproj
#	src/cascadia/TerminalApp/packages.config
#	src/cascadia/WindowsTerminal/WindowsTerminal.vcxproj
#	src/cascadia/WindowsTerminal/packages.config
#	src/cascadia/WindowsTerminalUniversal/WindowsTerminalUniversal.vcxproj
#	src/cascadia/ut_app/TerminalApp.UnitTests.vcxproj
  • Loading branch information
@zadjii-msft
zadjii-msft committed Jun 5, 2020
2 parents a1e61f3 + c3ea731 commit 084d163
Show file tree
Hide file tree
Showing 252 changed files with 14,760 additions and 8,207 deletions.
18 changes: 13 additions & 5 deletions .github/actions/spell-check/advice.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,21 @@
:pencil2: Contributor please read this
</summary>

* If the items listed above are names, please add them to `.github/actions/spell-check/dictionary/names.txt`.
* If they're APIs, you can add them to a file in `.github/actions/spell-check/dictionary/`.
* If they're just things you're using, please add them to an appropriate file in `.github/actions/spell-check/whitelist/`.
* If you need to use a specific token in one place and it shouldn't generally be used, you can
add an item in an appropriate file in `.github/actions/spell-check/patterns/`.
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
Expand Down
Empty file added .github/actions/spell-check/dictionary/api.txt
View file
Empty file.
19 changes: 19 additions & 0 deletions .github/actions/spell-check/dictionary/apis.txt
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,30 @@
ACCEPTFILES
ACCESSDENIED
bitfield
bitfields
CLASSNOTAVAILABLE
EXPCMDFLAGS
EXPCMDSTATE
fullkbd
href
IBox
IBind
IClass
IComparable
ICustom
IExplorer
IMap
IObject
IStorage
LCID
NCHITTEST
NCLBUTTONDBLCLK
NCRBUTTONDBLCLK
NOAGGREGATION
NOREDIRECTIONBITMAP
oaidl
ocidl
rfind
roundf
SIZENS
tmp
18 changes: 18 additions & 0 deletions .github/actions/spell-check/dictionary/dictionary.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97786,6 +97786,7 @@ dalesman
dalesmen
dalespeople
daleswoman
dalet
daleth
daleths
Daleville
Expand Down Expand Up @@ -107561,6 +107562,7 @@ dialystelic
dialystely
dialytic
dialytically
dialytika
dialyzability
dialyzable
dialyzate
Expand Down Expand Up @@ -114004,6 +114006,7 @@ djalmaite
Djambi
djasakid
djave
dje
djebel
djebels
djehad
Expand Down Expand Up @@ -120418,11 +120421,13 @@ DZ
dz
dz.
Dzaudzhikau
dze
dzeren
dzerin
dzeron
Dzerzhinsk
Dzhambul
dzhe
Dzhugashvili
dziggetai
dzo
Expand Down Expand Up @@ -158966,6 +158971,7 @@ Ghaznevid
Ghazzah
Ghazzali
ghbor
ghe
Gheber
gheber
ghebeta
Expand Down Expand Up @@ -160166,6 +160172,7 @@ gizzards
gizzen
gizzened
gizzern
gje
gjedost
Gjellerup
gjetost
Expand Down Expand Up @@ -212347,6 +212354,7 @@ Kizilbash
Kizzee
Kizzie
kJ
kje
Kjeldahl
kjeldahlization
kjeldahlize
Expand Down Expand Up @@ -224856,6 +224864,7 @@ lizzie
Lizzy
LJ
LJBF
lje
Ljod
Ljoka
Ljubljana
Expand Down Expand Up @@ -261607,6 +261616,7 @@ N.J.
NJ
nj
njave
nje
Njord
Njorth
NKGB
Expand Down Expand Up @@ -274785,6 +274795,7 @@ Ogma
ogmic
Ogmios
OGO
ogonek
ogonium
Ogor
O'Gowan
Expand Down Expand Up @@ -329834,6 +329845,7 @@ QN
qn
QNP
QNS
qof
Qoheleth
Qom
qoph
Expand Down Expand Up @@ -371408,6 +371420,7 @@ Shaysite
shazam
Shazar
SHCD
shcha
Shcheglovsk
Shcherbakov
she
Expand Down Expand Up @@ -420973,6 +420986,7 @@ tonometry
Tonopah
tonophant
tonoplast
tonos
tonoscope
tonotactic
tonotaxis
Expand Down Expand Up @@ -428676,6 +428690,7 @@ tsetses
TSF
TSgt
TSH
tshe
Tshi
tshi
Tshiluba
Expand Down Expand Up @@ -477068,6 +477083,7 @@ Yermo
yern
yertchuk
yerth
yeru
yerva
Yerwa-Maiduguri
Yerxa
Expand Down Expand Up @@ -478235,6 +478251,7 @@ Z-bar
ZBB
ZBR
ZD
ze
Zea
zea
zeal
Expand Down Expand Up @@ -478604,6 +478621,7 @@ ZG
ZGS
Zhang
Zhdanov
zhe
Zhitomir
Zhivkov
Zhmud
Expand Down
1 change: 1 addition & 0 deletions .github/actions/spell-check/dictionary/microsoft.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ mfcribbon
microsoft
microsoftonline
osgvsowi
powerrename
powershell
tdbuildteamid
vcruntime
Expand Down
3 changes: 3 additions & 0 deletions .github/actions/spell-check/dictionary/names.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ austdi
Ballmer
bhoj
Bhojwani
carlos
dhowett
Diviness
dsafa
Expand Down Expand Up @@ -53,6 +54,8 @@ Wirt
Wojciech
zadjii
Zamor
Zamora
zamora
Zoey
zorio
Zverovich
1 change: 1 addition & 0 deletions .github/actions/spell-check/excludes.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ SUMS$
\.xpm$
\.yml$
\.zip$
^consolegit2gitfilters\.json$
^dep/
^oss/
^doc/reference/UTF8-torture-test\.txt$
Expand Down
13 changes: 13 additions & 0 deletions .github/actions/spell-check/expect/README.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
The contents of each `.txt` file in this directory are merged together.

* [alphabet](alphabet.txt) is a sample for alphabet related items
* [web](web.txt) is a sample for web/html related items
* [expect](expect.txt) is the main list of expected items -- there is nothing
particularly special about the file name (beyond the extension which is
important).

These terms are things which temporarily exist in the project, but which
aren't necessarily words.

If something is a word that could come and go, it probably belongs in a
[dictionary](../dictionary/README.md).
3 changes: 2 additions & 1 deletion ...ctions/spell-check/whitelist/alphabet.txt → ...b/actions/spell-check/expect/alphabet.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
abcd
abcde
abcdef
ABCDEFG
Expand All @@ -8,6 +7,7 @@ abcdefghijk
abcdefghijklmnop
ABCDEFGHIJKLMNOPQRST
abcdefghijklmnopqrstuvwxyz
ABE
BBBBBBBBBBBBBBDDDD
QQQQQQQQQQABCDEFGHIJ
QQQQQQQQQQABCDEFGHIJKLMNOPQRSTQQQQQQQQQ
Expand All @@ -17,6 +17,7 @@ qrstuvwxyz
qwerty
QWERTYUIOP
qwertyuiopasdfg
YYYYYYYDDDDDDDDDDD
ZAAZZ
ZABBZ
ZBAZZ
Expand Down
Loading

1 comment on commit 084d163

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

New misspellings found, please review:

  • ACLs
  • DACL
  • existance
  • mutexes
  • programatically
  • protcool
  • reparent
  • runbox
  • SACLs
  • tearoff
  • unhosted
To accept these changes, run the following commands 
perl -e '
my @expect_files=qw('".github/actions/spell-check/expect/alphabet.txt
.github/actions/spell-check/expect/expect.txt
.github/actions/spell-check/expect/web.txt"');
@ARGV=@expect_files;
my @stale=qw('"atg BKMK consoleaccessibility FFF NRCS remoting SCS shobjidl xab xb xbc xca xce xdd xffff "');
my $re=join "|", @stale;
my $suffix=".".time();
my $previous="";
sub maybe_unlink { unlink($_[0]) if $_[0]; }
while (<>) {
  if ($ARGV ne $old_argv) { maybe_unlink($previous); $previous="$ARGV$suffix"; rename($ARGV, $previous); open(ARGV_OUT, ">$ARGV"); select(ARGV_OUT); $old_argv = $ARGV; }
  next if /^($re)(?:$| .*)/; print;
}; maybe_unlink($previous);'
perl -e '
my $new_expect_file=".github/actions/spell-check/expect/084d163c341db7d31352811ffe16e339b28c856e.txt";
open FILE, q{<}, $new_expect_file; chomp(my @words = <FILE>); close FILE;
my @add=qw('"ACLs DACL existance mutexes nrcs programatically protcool Remoting reparent runbox SACLs Scs Shobjidl tearoff unhosted "');
my %items; @items{@words} = @words x (1); @items{@add} = @add x (1);
@words = sort {lc($a) cmp lc($b)} keys %items;
open FILE, q{>}, $new_expect_file; for my $word (@words) { print FILE "$word\n" if $word =~ /\w/; };
close FILE;'
git add .github/actions/spell-check/expect || echo '... you want to ensure .github/actions/spell-check/expect/084d163c341db7d31352811ffe16e339b28c856e.txt is added to your repository...'
✏️ Contributor please read this

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.

⚠️ 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.

🔬 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 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. 😉

⚠️ Reviewers

At present, the action that triggered this message will not show its ❌ 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.

Please sign in to comment.