diff options
| author | Steven <61625851+justusbunsi@users.noreply.github.com> | 2021-05-09 20:25:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-09 19:25:23 +0100 |
| commit | 2e0f3156170dac30325a5fadd5ad3525b4a60e50 (patch) | |
| tree | 38367c47d897a49fa1eb3fdfe95024174dce05d3 | |
| parent | a2df2654765c85cb7e7efc5eec9a97befa47bf15 (diff) | |
| download | gitea-2e0f3156170dac30325a5fadd5ad3525b4a60e50.tar.gz gitea-2e0f3156170dac30325a5fadd5ad3525b4a60e50.zip | |
Respect default merge message syntax when parsing item references (#15772)
* Respect merge message structure for parsing item references
Signed-off-by: JustusBunsi <61625851+justusbunsi@users.noreply.github.com>
Co-authored-by: zeripath <art27@cantab.net>
| -rw-r--r-- | modules/references/references.go | 2 | ||||
| -rw-r--r-- | modules/references/references_test.go | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/modules/references/references.go b/modules/references/references.go index 6c0db0cf47..106e66b47b 100644 --- a/modules/references/references.go +++ b/modules/references/references.go @@ -29,7 +29,7 @@ var ( // mentionPattern matches all mentions in the form of "@user" or "@org/team" mentionPattern = regexp.MustCompile(`(?:\s|^|\(|\[)(@[0-9a-zA-Z-_]+|@[0-9a-zA-Z-_]+\/?[0-9a-zA-Z-_]+|@[0-9a-zA-Z-_][0-9a-zA-Z-_.]+\/?[0-9a-zA-Z-_.]+[0-9a-zA-Z-_])(?:\s|[:,;.?!]\s|[:,;.?!]?$|\)|\])`) // issueNumericPattern matches string that references to a numeric issue, e.g. #1287 - issueNumericPattern = regexp.MustCompile(`(?:\s|^|\(|\[)([#!][0-9]+)(?:\s|$|\)|\]|[:;,.?!]\s|[:;,.?!]$)`) + issueNumericPattern = regexp.MustCompile(`(?:\s|^|\(|\[|\')([#!][0-9]+)(?:\s|$|\)|\]|[:;,.?!]\s|[:;,.?!]$)`) // issueAlphanumericPattern matches string that references to an alphanumeric issue, e.g. ABC-1234 issueAlphanumericPattern = regexp.MustCompile(`(?:\s|^|\(|\[)([A-Z]{1,10}-[1-9][0-9]*)(?:\s|$|\)|\]|:|\.(\s|$))`) // crossReferenceIssueNumericPattern matches string that references a numeric issue in a different repository diff --git a/modules/references/references_test.go b/modules/references/references_test.go index d4f080490d..293322a714 100644 --- a/modules/references/references_test.go +++ b/modules/references/references_test.go @@ -198,6 +198,13 @@ func TestFindAllIssueReferences(t *testing.T) { }, }, { + "Merge pull request '#12345 My fix for a bug' (!1337) from feature-branch into main", + []testResult{ + {12345, "", "", "12345", false, XRefActionNone, &RefSpan{Start: 20, End: 26}, nil, ""}, + {1337, "", "", "1337", true, XRefActionNone, &RefSpan{Start: 46, End: 51}, nil, ""}, + }, + }, + { "Which abc. #9434 same as above", []testResult{ {9434, "", "", "9434", false, XRefActionNone, &RefSpan{Start: 11, End: 16}, nil, ""}, |