core: Fix matching with nested braces (#160)

cxw42 · cxw42 · commit 4c15bbf5d950 · 2022-10-31T13:00:40.000-04:00
Port the change from <editorconfig/editorconfig-core-py#33> to this core.
diff --git a/autoload/editorconfig_core/fnmatch.vim b/autoload/editorconfig_core/fnmatch.vim
@@ -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 "\"
 "
 "    \}                  # "}"
 "

Original file line number	Diff line number	Diff line change
`@@ -45,22 +45,24 @@ if !exists('g:editorconfig_core_vimscript_debug')`
`45`	`45`	`endif`
`46`	`46`	`" }}}1`
`47`	`47`	`" === Regexes =========================================================== {{{1`
`48`		`-let s:LEFT_BRACE = '\v%(^\|[^\\])\{'`
	`48`	`+let s:LEFT_BRACE = '\v[\\]@8<!\{'`
	`49`	`+" 8 is an arbitrary byte-count limit to the lookbehind (micro-optimization)`
`49`	`50`	`"LEFT_BRACE = re.compile(`
`50`	`51`	`" r"""`
`51`	`52`	`"`
`52`		`-" (?: ^ \| [^\\] ) # Beginning of string or a character besides "\"`
	`53`	`+" (?<! \\ ) # Not preceded by "\"`
`53`	`54`	`"`
`54`	`55`	`" \{ # "{"`
`55`	`56`	`"`
`56`	`57`	`" """, re.VERBOSE`
`57`	`58`	`")`
`58`	`59`
`59`		`-let s:RIGHT_BRACE = '\v%(^\|[^\\])\}'`
	`60`	`+let s:RIGHT_BRACE = '\v[\\]@8<!\}'`
	`61`	`+" 8 is an arbitrary byte-count limit to the lookbehind (micro-optimization)`
`60`	`62`	`"RIGHT_BRACE = re.compile(`
`61`	`63`	`" r"""`
`62`	`64`	`"`
`63`		`-" (?: ^ \| [^\\] ) # Beginning of string or a character besides "\"`
	`65`	`+" (?<! \\ ) # Not preceded by "\"`
`64`	`66`	`"`
`65`	`67`	`" \} # "}"`
`66`	`68`	`"`