Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into dev/migrie/f/6580-m…
Browse files Browse the repository at this point in the history
…aybe-move-focus

# Conflicts:
#	src/cascadia/TerminalApp/AppCommandlineArgs.cpp
#	src/cascadia/TerminalApp/AppCommandlineArgs.h
  • Loading branch information
zadjii-msft committed Oct 1, 2020
2 parents 6f748f7 + 4a11497 commit f7b7509
Show file tree
Hide file tree
Showing 944 changed files with 32,188 additions and 14,451 deletions.
14 changes: 9 additions & 5 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -20,6 +22,7 @@ AlwaysBreakTemplateDeclarations: Yes
BinPackArguments: false
BinPackParameters: false
BraceWrapping:
AfterCaseLabel: true
AfterClass: true
AfterControlStatement: true
AfterEnum: true
Expand Down Expand Up @@ -47,6 +50,7 @@ ConstructorInitializerAllOnOneLineOrOnePerLine: true
ConstructorInitializerIndentWidth: 4
ContinuationIndentWidth: 4
Cpp11BracedListStyle: false
DeriveLineEnding: true
DerivePointerAlignment: false
FixNamespaceComments: false
IncludeBlocks: Regroup
Expand All @@ -73,7 +77,7 @@ ReflowComments: false
SortIncludes: false
SortUsingDeclarations: true
SpaceAfterCStyleCast: false
#SpaceAfterLogicalNot: false
SpaceAfterLogicalNot: false
SpaceAfterTemplateKeyword: false
SpaceBeforeAssignmentOperators: true
SpaceBeforeCpp11BracedList: false
Expand All @@ -88,6 +92,6 @@ SpacesInCStyleCastParentheses: false
SpacesInContainerLiterals: false
SpacesInParentheses: false
SpacesInSquareBrackets: false
Standard: Cpp11
Standard: Latest
TabWidth: 4
UseTab: Never
3 changes: 2 additions & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
* [ ] Closes #xxx
* [ ] CLA signed. If not, go over [here](https://cla.opensource.microsoft.com/microsoft/Terminal) and sign the CLA
* [ ] Tests added/passed
* [ ] Requires documentation to be updated
* [ ] Documentation updated. If checked, please file a pull request on [our docs repo](https://github.com/MicrosoftDocs/terminal) and link it here: #xxx
* [ ] Schema updated.
* [ ] I've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx

<!-- Provide a more detailed description of the PR, other things fixed or any additional comments/features here -->
Expand Down
23 changes: 22 additions & 1 deletion .github/actions/spell-check/dictionary/apis.txt
Original file line number Diff line number Diff line change
@@ -1,24 +1,32 @@
ACCEPTFILES
ACCESSDENIED
alignof
bitfield
bitfields
COLORPROPERTY
CLASSNOTAVAILABLE
environstrings
EXPCMDFLAGS
EXPCMDSTATE
fullkbd
futex
Hashtable
href
IAsync
IBox
IBind
IBox
IClass
IComparable
ICustom
IDialog
IDirect
IExplorer
IMap
IObject
IStorage
llabs
LCID
lround
LSHIFT
NCHITTEST
NCLBUTTONDBLCLK
Expand All @@ -27,9 +35,22 @@ NOAGGREGATION
NOREDIRECTIONBITMAP
oaidl
ocidl
otms
OUTLINETEXTMETRICW
PAGESCROLL
RETURNCMD
rfind
roundf
RSHIFT
rx
serializer
SIZENS
spsc
STDCPP
syscall
tmp
tx
userenv
wcstoui
XDocument
XElement
7 changes: 7 additions & 0 deletions .github/actions/spell-check/dictionary/dictionary.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20937,6 +20937,8 @@ apay
Apayao
APB
APC
Apc
apc
APDA
APDU
APE
Expand Down Expand Up @@ -99401,6 +99403,8 @@ DCP
DCPR
DCPSK
DCS
Dcs
dcs
DCT
DCTN
DCTS
Expand Down Expand Up @@ -186986,6 +186990,7 @@ hyperleucocytotic
hyperleukocytosis
hyperlexis
hyperlink
hyperlinks
hyperlinking
hyperlipaemia
hyperlipaemic
Expand Down Expand Up @@ -284908,6 +284913,7 @@ overliing
overliking
overlimit
overline
overlined
overling
overlinger
overlinked
Expand Down Expand Up @@ -383885,6 +383891,7 @@ sorus
sorva
sory
SOS
Sos
sos
Sosanna
so-seeming
Expand Down
25 changes: 25 additions & 0 deletions .github/actions/spell-check/dictionary/microsoft.txt
Original file line number Diff line number Diff line change
@@ -1,14 +1,39 @@
ACLs
altform
appendwttlogging
backplating
CPRs
DACL
DACLs
dotnetfeed
DWINRT
enablewttlogging
LKG
mfcribbon
microsoft
microsoftonline
netcore
osgvsowi
pgc
pgo
pgosweep
powerrename
powershell
propkey
pscustomobject
robocopy
SACLs
Shobjidl
Skype
sysnative
systemroot
taskkill
tasklist
tdbuildteamid
vcruntime
visualstudio
wlk
wslpath
wtl
wtt
wttlog
1 change: 1 addition & 0 deletions .github/actions/spell-check/dictionary/names.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ Kourosh
kowalczyk
leonmsft
Lepilleur
lukesampson
Manandhar
mbadolato
Mehrain
Expand Down
4 changes: 4 additions & 0 deletions .github/actions/spell-check/expect/alphabet.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
abcd
abcde
abcdef
ABCDEFG
Expand All @@ -8,7 +9,10 @@ abcdefghijklmnop
ABCDEFGHIJKLMNOPQRST
abcdefghijklmnopqrstuvwxyz
ABE
BBGGRR
BBBBBBBBBBBBBBDDDD
EFG
EFGh
QQQQQQQQQQABCDEFGHIJ
QQQQQQQQQQABCDEFGHIJKLMNOPQRSTQQQQQQQQQ
QQQQQQQQQQABCDEFGHIJKLMNOPQRSTQQQQQQQQQQ
Expand Down
Loading

1 comment on commit f7b7509

@github-actions

This comment was marked as outdated.

Please sign in to comment.