Skip to content

Commit de7f5bd

Browse files
lopi-pychrisbra
authored andcommitted
patch 9.1.0076: luau config file not detected
Problem: luau config file not detected (lopy) Solution: Detect it as jsonc (lopy) fixes: #13960 closes: #13970 Signed-off-by: lopy <[email protected]> Signed-off-by: Christian Brabandt <[email protected]>
1 parent 7c5aeaf commit de7f5bd

3 files changed

Lines changed: 6 additions & 1 deletion

File tree

runtime/filetype.vim

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1244,6 +1244,9 @@ au BufNewFile,BufRead *.lua setf lua
12441244
" Luau
12451245
au BufNewFile,BufRead *.luau setf luau
12461246

1247+
" Luau config
1248+
au BufNewFile,BufRead .luaurc setf jsonc
1249+
12471250
" Luacheck
12481251
au BufNewFile,BufRead .luacheckrc setf lua
12491252

src/testdir/test_filetype.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ def s:GetFilenameChecks(): dict<list<string>>
351351
jproperties: ['file.properties', 'file.properties_xx', 'file.properties_xx_xx', 'some.properties_xx_xx_file', 'org.eclipse.xyz.prefs'],
352352
json: ['file.json', 'file.jsonp', 'file.json-patch', 'file.geojson', 'file.webmanifest', 'Pipfile.lock', 'file.ipynb', '.prettierrc', '.firebaserc', '.stylelintrc', 'file.slnf'],
353353
json5: ['file.json5'],
354-
jsonc: ['file.jsonc', '.babelrc', '.eslintrc', '.jsfmtrc', '.jshintrc', '.hintrc', '.swrc', 'jsconfig.json', 'tsconfig.json', 'tsconfig.test.json', 'tsconfig-test.json'],
354+
jsonc: ['file.jsonc', '.babelrc', '.eslintrc', '.jsfmtrc', '.jshintrc', '.hintrc', '.swrc', 'jsconfig.json', 'tsconfig.json', 'tsconfig.test.json', 'tsconfig-test.json', '.luaurc'],
355355
jsonl: ['file.jsonl'],
356356
jsonnet: ['file.jsonnet', 'file.libsonnet'],
357357
jsp: ['file.jsp'],

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -704,6 +704,8 @@ static char *(features[]) =
704704

705705
static int included_patches[] =
706706
{ /* Add new patch number below this line */
707+
/**/
708+
76,
707709
/**/
708710
75,
709711
/**/

0 commit comments

Comments
 (0)