Skip to content

Commit 954e990

Browse files
ychinychin
committed
Merge remote-tracking branch 'vim/master'
2 parents dabc773 + ebea31e commit 954e990

File tree

414 files changed

+28818
-16668
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

414 files changed

+28818
-16668
lines changed

‎.cirrus.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ env:
55
freebsd_task:
66
name: FreeBSD
77
matrix:
8-
- name: FreeBSD 14.1
8+
- name: FreeBSD 14.2
99
freebsd_instance:
10-
image_family: freebsd-14-1
10+
image_family: freebsd-14-2
1111
timeout_in: 20m
1212
install_script:
1313
- pkg install -y gettext

‎.clang-format

+254
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,254 @@
1+
---
2+
Language: Cpp
3+
AccessModifierOffset: -4
4+
AlignAfterOpenBracket: Align
5+
AlignArrayOfStructures: None
6+
AlignConsecutiveAssignments:
7+
Enabled: false
8+
AcrossEmptyLines: false
9+
AcrossComments: false
10+
AlignCompound: false
11+
AlignFunctionPointers: false
12+
PadOperators: false
13+
AlignConsecutiveBitFields:
14+
Enabled: false
15+
AcrossEmptyLines: false
16+
AcrossComments: false
17+
AlignCompound: false
18+
AlignFunctionPointers: false
19+
PadOperators: false
20+
AlignConsecutiveDeclarations:
21+
Enabled: false
22+
AcrossEmptyLines: false
23+
AcrossComments: false
24+
AlignCompound: false
25+
AlignFunctionPointers: false
26+
PadOperators: false
27+
AlignConsecutiveMacros:
28+
Enabled: false
29+
AcrossEmptyLines: false
30+
AcrossComments: false
31+
AlignCompound: false
32+
AlignFunctionPointers: false
33+
PadOperators: false
34+
AlignConsecutiveShortCaseStatements:
35+
Enabled: false
36+
AcrossEmptyLines: false
37+
AcrossComments: false
38+
AlignCaseColons: false
39+
AlignEscapedNewlines: DontAlign
40+
AlignOperands: Align
41+
AlignTrailingComments:
42+
Kind: Leave
43+
OverEmptyLines: 0
44+
AllowAllArgumentsOnNextLine: false
45+
AllowAllParametersOfDeclarationOnNextLine: false
46+
AllowBreakBeforeNoexceptSpecifier: Never
47+
AllowShortBlocksOnASingleLine: Never
48+
AllowShortCaseLabelsOnASingleLine: false
49+
AllowShortCompoundRequirementOnASingleLine: true
50+
AllowShortEnumsOnASingleLine: false
51+
AllowShortFunctionsOnASingleLine: None
52+
AllowShortIfStatementsOnASingleLine: Never
53+
AllowShortLambdasOnASingleLine: None
54+
AllowShortLoopsOnASingleLine: false
55+
AlwaysBreakAfterDefinitionReturnType: All
56+
AlwaysBreakAfterReturnType: AllDefinitions
57+
AlwaysBreakBeforeMultilineStrings: false
58+
AlwaysBreakTemplateDeclarations: MultiLine
59+
BinPackArguments: true
60+
BinPackParameters: false
61+
BitFieldColonSpacing: Both
62+
BraceWrapping:
63+
AfterCaseLabel: true
64+
AfterClass: true
65+
AfterControlStatement: Always
66+
AfterEnum: true
67+
AfterExternBlock: true
68+
AfterFunction: true
69+
AfterNamespace: true
70+
AfterObjCDeclaration: true
71+
AfterStruct: true
72+
AfterUnion: true
73+
BeforeCatch: true
74+
BeforeElse: true
75+
BeforeLambdaBody: false
76+
BeforeWhile: true
77+
IndentBraces: false
78+
SplitEmptyFunction: true
79+
SplitEmptyRecord: true
80+
SplitEmptyNamespace: true
81+
BreakAdjacentStringLiterals: true
82+
BreakAfterAttributes: Leave
83+
BreakAfterJavaFieldAnnotations: false
84+
BreakArrays: true
85+
BreakBeforeBinaryOperators: None
86+
BreakBeforeConceptDeclarations: Always
87+
BreakBeforeBraces: Custom
88+
BreakBeforeInlineASMColon: OnlyMultiline
89+
BreakBeforeTernaryOperators: true
90+
BreakConstructorInitializers: BeforeColon
91+
BreakInheritanceList: BeforeColon
92+
BreakStringLiterals: true
93+
ColumnLimit: 80
94+
CommentPragmas: '^ IWYU pragma:'
95+
CompactNamespaces: false
96+
ConstructorInitializerIndentWidth: 4
97+
ContinuationIndentWidth: 4
98+
Cpp11BracedListStyle: false
99+
DerivePointerAlignment: false
100+
DisableFormat: false
101+
EmptyLineAfterAccessModifier: Never
102+
EmptyLineBeforeAccessModifier: LogicalBlock
103+
ExperimentalAutoDetectBinPacking: false
104+
FixNamespaceComments: false
105+
IfMacros:
106+
- KJ_IF_MAYBE
107+
IncludeBlocks: Preserve
108+
IncludeCategories:
109+
- Regex: '^"(llvm|llvm-c|clang|clang-c)/'
110+
Priority: 2
111+
SortPriority: 0
112+
CaseSensitive: false
113+
- Regex: '^(<|"(gtest|gmock|isl|json)/)'
114+
Priority: 3
115+
SortPriority: 0
116+
CaseSensitive: false
117+
- Regex: '.*'
118+
Priority: 1
119+
SortPriority: 0
120+
CaseSensitive: false
121+
IncludeIsMainRegex: '(Test)?$'
122+
IncludeIsMainSourceRegex: ''
123+
IndentAccessModifiers: false
124+
IndentCaseBlocks: false
125+
IndentCaseLabels: true
126+
IndentExternBlock: AfterExternBlock
127+
IndentGotoLabels: true
128+
IndentPPDirectives: AfterHash
129+
IndentRequiresClause: true
130+
IndentWidth: 4
131+
IndentWrappedFunctionNames: false
132+
InsertBraces: false
133+
InsertNewlineAtEOF: false
134+
InsertTrailingCommas: None
135+
IntegerLiteralSeparator:
136+
Binary: 0
137+
BinaryMinDigits: 0
138+
Decimal: 0
139+
DecimalMinDigits: 0
140+
Hex: 0
141+
HexMinDigits: 0
142+
JavaScriptQuotes: Leave
143+
JavaScriptWrapImports: true
144+
KeepEmptyLinesAtTheStartOfBlocks: true
145+
KeepEmptyLinesAtEOF: false
146+
LambdaBodyIndentation: Signature
147+
LineEnding: DeriveLF
148+
MacroBlockBegin: ''
149+
MacroBlockEnd: ''
150+
MaxEmptyLinesToKeep: 1
151+
NamespaceIndentation: None
152+
ObjCBinPackProtocolList: Auto
153+
ObjCBlockIndentWidth: 4
154+
ObjCBreakBeforeNestedBlockParam: true
155+
ObjCSpaceAfterProperty: false
156+
ObjCSpaceBeforeProtocolList: true
157+
PackConstructorInitializers: BinPack
158+
PenaltyBreakAssignment: 4
159+
PenaltyBreakBeforeFirstCallParameter: 19
160+
PenaltyBreakComment: 1000000000
161+
PenaltyBreakFirstLessLess: 120
162+
PenaltyBreakOpenParenthesis: 0
163+
PenaltyBreakScopeResolution: 500
164+
PenaltyBreakString: 1000
165+
PenaltyBreakTemplateDeclaration: 10
166+
PenaltyExcessCharacter: 1000000
167+
PenaltyIndentedWhitespace: 0
168+
PenaltyReturnTypeOnItsOwnLine: 60
169+
PointerAlignment: Right
170+
PPIndentWidth: 1
171+
QualifierAlignment: Leave
172+
ReferenceAlignment: Pointer
173+
ReflowComments: false
174+
RemoveBracesLLVM: false
175+
RemoveParentheses: Leave
176+
RemoveSemicolon: false
177+
RequiresClausePosition: OwnLine
178+
RequiresExpressionIndentation: OuterScope
179+
SeparateDefinitionBlocks: Leave
180+
ShortNamespaceLines: 1
181+
SkipMacroDefinitionBody: false
182+
SortIncludes: CaseSensitive
183+
SortJavaStaticImport: Before
184+
SortUsingDeclarations: LexicographicNumeric
185+
SpaceAfterCStyleCast: false
186+
SpaceAfterLogicalNot: false
187+
SpaceAfterTemplateKeyword: true
188+
SpaceAroundPointerQualifiers: Default
189+
SpaceBeforeAssignmentOperators: true
190+
SpaceBeforeCaseColon: false
191+
SpaceBeforeCpp11BracedList: false
192+
SpaceBeforeCtorInitializerColon: true
193+
SpaceBeforeInheritanceColon: true
194+
SpaceBeforeJsonColon: false
195+
SpaceBeforeParens: ControlStatementsExceptControlMacros
196+
SpaceBeforeRangeBasedForLoopColon: true
197+
SpaceBeforeSquareBrackets: false
198+
SpaceInEmptyBlock: false
199+
SpacesBeforeTrailingComments: 1
200+
SpacesInAngles: Never
201+
SpacesInContainerLiterals: true
202+
SpacesInLineCommentPrefix:
203+
Minimum: 1
204+
Maximum: -1
205+
SpacesInParens: Never
206+
SpacesInParensOptions:
207+
InCStyleCasts: false
208+
InConditionalStatements: false
209+
InEmptyParentheses: false
210+
Other: false
211+
SpacesInSquareBrackets: false
212+
Standard: c++03
213+
TabWidth: 8
214+
UseTab: Never
215+
VerilogBreakBetweenInstancePorts: true
216+
WhitespaceSensitiveMacros:
217+
- BOOST_PP_STRINGIZE
218+
- CF_SWIFT_NAME
219+
- NS_SWIFT_NAME
220+
- PP_STRINGIZE
221+
- STRINGIZE
222+
223+
# Taken from:
224+
# git grep '^#define *FOR_*' src | cut -d':' -f2 | grep -o '[A-Z]*_.*(' \
225+
# | tr -d '(' | LC_ALL=C sort -u
226+
ForEachMacros:
227+
- 'FOR_ALL_AUTOCMD_PATTERNS'
228+
- 'FOR_ALL_BUFFERS'
229+
- 'FOR_ALL_BUFS_FROM_LAST'
230+
- 'FOR_ALL_BUF_WININFO'
231+
- 'FOR_ALL_CHANNELS'
232+
- 'FOR_ALL_CHILD_MENUS'
233+
- 'FOR_ALL_DIFFBLOCKS_IN_TAB'
234+
- 'FOR_ALL_FRAMES'
235+
- 'FOR_ALL_HASHTAB_ITEMS'
236+
- 'FOR_ALL_JOBS'
237+
- 'FOR_ALL_LIST_ITEMS'
238+
- 'FOR_ALL_MENUS'
239+
- 'FOR_ALL_NODE_SIBLINGS'
240+
- 'FOR_ALL_POPUPWINS'
241+
- 'FOR_ALL_POPUPWINS_IN_TAB'
242+
- 'FOR_ALL_QFL_ITEMS'
243+
- 'FOR_ALL_SIGNS'
244+
- 'FOR_ALL_SIGNS_IN_BUF'
245+
- 'FOR_ALL_SPELL_LANGS'
246+
- 'FOR_ALL_SYNSTATES'
247+
- 'FOR_ALL_TABPAGES'
248+
- 'FOR_ALL_TAB_WINDOWS'
249+
- 'FOR_ALL_TERMS'
250+
- 'FOR_ALL_TIMERS'
251+
- 'FOR_ALL_WATCHERS'
252+
- 'FOR_ALL_WINDOWS'
253+
- 'FOR_ALL_WINDOWS_IN_TAB'
254+
...

‎.editorconfig

+7-3
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ insert_final_newline = true
1010
[*.{c,h,proto}]
1111
indent_size = 4
1212

13+
[src/MacVim/**]
14+
indent_style = space
15+
indent_size = 4
16+
1317
[*.{md,yml,sh,bat}]
1418
# This will become the default after we migrate the codebase
1519
indent_style = space
@@ -24,6 +28,6 @@ trim_trailing_whitespace = false
2428
# It can mess up some documentation by trying to strip trailing whitespaces
2529
trim_trailing_whitespace = false
2630

27-
[src/MacVim/**]
28-
indent_style = space
29-
indent_size = 4
31+
[src/testdir/test*.vim]
32+
# Some tests need trailing whitespaces, for example `set showbreak=>>\ `
33+
trim_trailing_whitespace = false

‎.git-blame-ignore-revs

+5
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,8 @@
88

99
# Patch v9.1.0829 expanded tabs to spaces in sound.c
1010
8ce738de3fd7192fa6274730594305cde780074c
11+
# Patch v9.1.0879 reformated sound.c and sign.c
12+
3cf094edaff815141d9941b8dba52b9e77d8dfc1
13+
# change indentation style of netrw plugin
14+
c363ca1ecd1f8db03663ef98dcf41eeacc3c22c7
15+
c673b805ad80d0aef07e745d412a2bf298ba1c07

0 commit comments

Comments
 (0)