Commit 61ef8a3

aerkkilachrisbra

authored and

committed

patch 9.1.1877: cindent: wrong indentation after an array declaration

Problem: cindent: wrong indentation after an array declaration Solution: check if the filetype if javascript before matching the syntax (Anttoni Erkkilä) cindent matches a javascript syntax for C files causing wrong indentation in the following case: ``` void foo() { float a[5], b; } ``` closes: #18631 Signed-off-by: Anttoni Erkkilä <anttoni.erkkila@protonmail.com> Signed-off-by: Christian Brabandt <cb@256bit.org>

1 parent c8eeda9 commit 61ef8a3Copy full SHA for 61ef8a3

File tree

3 files changed

+13

-1

lines changed

src
- cindent.c
- testdir
  - test_cindent.vim
- version.c

3 files changed

+13

-1

lines changed

`‎src/cindent.c‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3476,7 +3476,7 @@ get_c_indent(void)`
`3476`	`3476`	`amount = cur_amount;`
`3477`	`3477`
`3478`	`3478`	`n = (int)STRLEN(l);`
`3479`		`- if (terminated == ',' && (*skipwhite(l) == ']'`
	`3479`	`+ if (curbuf->b_ind_js&&terminated == ',' && (*skipwhite(l) == ']'`
`3480`	`3480`	`\|\| (n >=2 && l[n - 2] == ']')))`
`3481`	`3481`	`break;`
`3482`	`3482`

`‎src/testdir/test_cindent.vim‎`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1106,6 +1106,11 @@ def Test_cindent_1()`
`1106`	`1106`	`}`
`1107`	`1107`	`}`
`1108`	`1108`
	`1109`	`+ void foo() {`
	`1110`	`+ float a[5],`
	`1111`	`+ b;`
	`1112`	`+ }`
	`1113`	`+`
`1109`	`1114`	`/* end of AUTO */`
`1110`	`1115`	`[CODE]`
`1111`	`1116`
`@@ -2083,6 +2088,11 @@ def Test_cindent_1()`
`2083`	`2088`	`}`
`2084`	`2089`	`}`
`2085`	`2090`
	`2091`	`+ void foo() {`
	`2092`	`+ float a[5],`
	`2093`	`+ b;`
	`2094`	`+ }`
	`2095`	`+`
`2086`	`2096`	`/* end of AUTO */`
`2087`	`2097`
`2088`	`2098`	`[CODE]`

`‎src/version.c‎`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -729,6 +729,8 @@ static char *(features[]) =`
`729`	`729`
`730`	`730`	`static int included_patches[] =`
`731`	`731`	`{ /* Add new patch number below this line */`
	`732`	`+/**/`
	`733`	`+ 1877,`
`732`	`734`	`/**/`
`733`	`735`	`1876,`
`734`	`736`	`/**/`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit 61ef8a3

File tree

3 files changed

3 files changed

`‎src/cindent.c‎`

`‎src/testdir/test_cindent.vim‎`

`‎src/version.c‎`

0 commit comments