Skip to content
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

Jump to bottom

Prefix links to wiki pages from comments in ticket #8

Merged
merged 2 commits into from
Jun 13, 2024
Merged

Prefix links to wiki pages from comments in ticket #8

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ae27e4
Prefix links to wiki pages from comments in ticket
btlogy Jun 3, 2024
7fbcffb
Better condition to prefix with path to wiki
btlogy Jun 13, 2024
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
27 changes: 19 additions & 8 deletions markdown/link.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,25 +256,31 @@ func (converter *DefaultConverter) resolveTicketLink(link string) string {
return markLink(issueURL)
}

func (converter *DefaultConverter) resolveWikiLink(link string) string {
func (converter *DefaultConverter) resolveWikiLink(path string, link string) string {
wikiPageName := wikiLinkRegexp.ReplaceAllString(link, `$1`)
wikiPageAnchor := wikiLinkRegexp.ReplaceAllString(link, `$2`)
translatedPageName := converter.giteaAccessor.TranslateWikiPageName(wikiPageName)
var suffix string
if wikiPageAnchor == "" {
return markLink(translatedPageName)
suffix = ""
} else {
suffix = "#" + wikiPageAnchor
}
return markLink(translatedPageName + "#" + wikiPageAnchor)
return markLink(path + translatedPageName + suffix)
}

func (converter *DefaultConverter) resolveWikiCamelCaseLink(link string) string {
func (converter *DefaultConverter) resolveWikiCamelCaseLink(path string, link string) string {
leadingChar := wikiCamelCaseLinkRegexp.ReplaceAllString(link, `$1`)
wikiPageName := wikiCamelCaseLinkRegexp.ReplaceAllString(link, `$2`)
wikiPageAnchor := wikiCamelCaseLinkRegexp.ReplaceAllString(link, `$3`)
translatedPageName := converter.giteaAccessor.TranslateWikiPageName(wikiPageName)
var suffix string
if wikiPageAnchor == "" {
return leadingChar + markLink(translatedPageName)
suffix = ""
} else {
suffix = "#" + wikiPageAnchor
}
return leadingChar + markLink(translatedPageName+"#"+wikiPageAnchor)
return leadingChar + markLink(path + translatedPageName + suffix)
}

// convertBrackettedTracLinks converts the various forms of (square) bracketted Trac links into an unbracketted form.
Expand Down Expand Up @@ -374,12 +380,17 @@ func (converter *DefaultConverter) convertUnbrackettedTracLinks(ticketID int64,
return converter.resolveTicketLink(match)
})

// add a 'wiki/' path for link from ticket
var path = ""
if ticketID != trac.NullID {
path = "wiki/"
}
out = wikiLinkRegexp.ReplaceAllStringFunc(out, func(match string) string {
return converter.resolveWikiLink(match)
return converter.resolveWikiLink(path, match)
})

out = wikiCamelCaseLinkRegexp.ReplaceAllStringFunc(out, func(match string) string {
return converter.resolveWikiCamelCaseLink(match)
return converter.resolveWikiCamelCaseLink(path, match)
})

return out
Expand Down
Loading