Skip to content

core: Update tests; fix bugs #199

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cxw42 merged 4 commits into from
Jan 15, 2023
Merged

core: Update tests; fix bugs #199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
77fa19f
Update core-tests submodule
cxw42 Oct 31, 2022
8cdbbaf
Do not remove comments from property values
cxw42 Oct 31, 2022
89ca35f
Update property key, value length limits per spec change
cxw42 Oct 31, 2022
4c15bbf
core: Fix matching with nested braces (#160)
cxw42 Oct 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions autoload/editorconfig_core/fnmatch.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,22 +45,24 @@ if !exists('g:editorconfig_core_vimscript_debug')
endif
" }}}1
" === Regexes =========================================================== {{{1
let s:LEFT_BRACE = '\v%(^|[^\\])\{'
let s:LEFT_BRACE = '\v[\\]@8<!\{'
" 8 is an arbitrary byte-count limit to the lookbehind (micro-optimization)
"LEFT_BRACE = re.compile(
" r"""
"
" (?: ^ | [^\\] ) # Beginning of string or a character besides "\"
" (?<! \\ ) # Not preceded by "\"
"
" \{ # "{"
"
" """, re.VERBOSE
")

let s:RIGHT_BRACE = '\v%(^|[^\\])\}'
let s:RIGHT_BRACE = '\v[\\]@8<!\}'
" 8 is an arbitrary byte-count limit to the lookbehind (micro-optimization)
"RIGHT_BRACE = re.compile(
" r"""
"
" (?: ^ | [^\\] ) # Beginning of string or a character besides "\"
" (?<! \\ ) # Not preceded by "\"
"
" \} # "}"
"
Expand Down
16 changes: 2 additions & 14 deletions autoload/editorconfig_core/ini.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ let s:SECTCRE = '\v^\s*\[(%([^\\#;]|\\.)+)\]'
let s:OPTCRE = '\v\s*([^:=[:space:]][^:=]*)\s*([:=])\s*(.*)$'

let s:MAX_SECTION_NAME = 4096
let s:MAX_PROPERTY_NAME = 50
let s:MAX_PROPERTY_VALUE = 255
let s:MAX_PROPERTY_NAME = 1024
let s:MAX_PROPERTY_VALUE = 4096

lockvar s:SECTCRE s:OPTCRE s:MAX_SECTION_NAME s:MAX_PROPERTY_NAME s:MAX_PROPERTY_VALUE

Expand Down Expand Up @@ -155,18 +155,6 @@ function! s:parse(config_filename, target_filename, lines)
echom printf('Saw raw opt <%s>=<%s>', l:optname, l:optval)
endif

if l:optval =~# '\v[;#]'
" ';' and '#' are comment delimiters only if
" preceded by a spacing character
let l:m = matchlist(l:optval, '\v(.{-})\s[;#]')
if len(l:m)
let l:optval = l:m[1]
endif

" ; and # can be escaped with backslash.
let l:optval = substitute(l:optval, '\v\\([;#])', '\1', 'g')

endif
let l:optval = editorconfig_core#util#strip(l:optval)
" allow empty values
if l:optval ==? '""'
Expand Down
2 changes: 1 addition & 1 deletion tests/core/tests
Open in desktop
Submodule tests updated 9 files
+14 −0 glob/CMakeLists.txt
+8 −0 glob/braces.in
+22 −13 parser/CMakeLists.txt
+6 −4 parser/comments.in
+4 −0 parser/comments_and_newlines.in
+1 −0 parser/comments_only.in
+0 −0 parser/empty.in
+7 −9 parser/limits.in
+2 −0 parser/newlines_only.in