diff options
| author | lopy <70210066+lopi-py@users.noreply.github.com> | 2024-02-04 10:27:33 +0100 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2024-02-04 10:27:33 +0100 |
| commit | de7f5bde6c598d4da4ce5b30328eb458962ba60a (patch) | |
| tree | d1a481e7a05cd676adf1364c0cb530782554fdbe | |
| parent | 7c5aeaffa2bec8f16f36bd33a749a6e965d8ab30 (diff) | |
patch 9.1.0076: luau config file not detectedv9.1.0076
Problem: luau config file not detected
(lopy)
Solution: Detect it as jsonc
(lopy)
fixes: #13960
closes: #13970
Signed-off-by: lopy <70210066+lopi-py@users.noreply.github.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
| -rw-r--r-- | runtime/filetype.vim | 3 | ||||
| -rw-r--r-- | src/testdir/test_filetype.vim | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim index f1e1a76f21..17fe86d7b4 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -1244,6 +1244,9 @@ au BufNewFile,BufRead *.lua setf lua " Luau au BufNewFile,BufRead *.luau setf luau +" Luau config +au BufNewFile,BufRead .luaurc setf jsonc + " Luacheck au BufNewFile,BufRead .luacheckrc setf lua diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim index 045675bbcd..544557afb0 100644 --- a/src/testdir/test_filetype.vim +++ b/src/testdir/test_filetype.vim @@ -351,7 +351,7 @@ def s:GetFilenameChecks(): dict<list<string>> jproperties: ['file.properties', 'file.properties_xx', 'file.properties_xx_xx', 'some.properties_xx_xx_file', 'org.eclipse.xyz.prefs'], json: ['file.json', 'file.jsonp', 'file.json-patch', 'file.geojson', 'file.webmanifest', 'Pipfile.lock', 'file.ipynb', '.prettierrc', '.firebaserc', '.stylelintrc', 'file.slnf'], json5: ['file.json5'], - jsonc: ['file.jsonc', '.babelrc', '.eslintrc', '.jsfmtrc', '.jshintrc', '.hintrc', '.swrc', 'jsconfig.json', 'tsconfig.json', 'tsconfig.test.json', 'tsconfig-test.json'], + jsonc: ['file.jsonc', '.babelrc', '.eslintrc', '.jsfmtrc', '.jshintrc', '.hintrc', '.swrc', 'jsconfig.json', 'tsconfig.json', 'tsconfig.test.json', 'tsconfig-test.json', '.luaurc'], jsonl: ['file.jsonl'], jsonnet: ['file.jsonnet', 'file.libsonnet'], jsp: ['file.jsp'], diff --git a/src/version.c b/src/version.c index 78d8cf50d0..efde1b57f8 100644 --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 76, +/**/ 75, /**/ 74, |