From 295d17e6f30452127d1032e9c57ca6d55700eef7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20R=C3=BCger?= Date: Mon, 4 Sep 2023 21:41:50 +0200 Subject: [PATCH] Sync confluencetag parser with upstream Adds changes from https://github.com/yuin/goldmark/commit/254b9f8f77b8ec6c0c4effd6dffc1ff1f9861062 --- pkg/mark/parser/confluencetags.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkg/mark/parser/confluencetags.go b/pkg/mark/parser/confluencetags.go index 54e7ff0..01e6456 100644 --- a/pkg/mark/parser/confluencetags.go +++ b/pkg/mark/parser/confluencetags.go @@ -47,11 +47,12 @@ func (s *confluenceTagParser) Parse(_ ast.Node, block text.Reader, pc parser.Con var tagnamePattern = `([A-Za-z][A-Za-z0-9-]*)` +var spaceOrOneNewline = `(?:[ \t]|(?:\r\n|\n){0,1})` var attributePattern = `(?:[\r\n \t]+[a-zA-Z_:][a-zA-Z0-9:._-]*(?:[\r\n \t]*=[\r\n \t]*(?:[^\"'=<>` + "`" + `\x00-\x20]+|'[^']*'|"[^"]*"))?)` // Only match and tags -var openTagRegexp = regexp.MustCompile("^<(ac|ri):" + tagnamePattern + attributePattern + `*[ \t]*/?>`) -var closeTagRegexp = regexp.MustCompile("^`) +var openTagRegexp = regexp.MustCompile("^<(ac|ri):" + tagnamePattern + attributePattern + `*` + spaceOrOneNewline + `*/?>`) +var closeTagRegexp = regexp.MustCompile("^`) var openCDATA = []byte("")