diff --git a/cmd/web.go b/cmd/web.go
index 3fc64f7748..787411939c 100644
--- a/cmd/web.go
+++ b/cmd/web.go
@@ -195,7 +195,7 @@ func serveInstalled(ctx *cli.Context) error {
publicFilesSet.Remove(".well-known")
publicFilesSet.Remove("assets")
publicFilesSet.Remove("robots.txt")
- for _, fn := range publicFilesSet.Values() {
+ for fn := range publicFilesSet.Seq() {
log.Error("Found legacy public asset %q in CustomPath. Please move it to %s/public/assets/%s", fn, setting.CustomPath, fn)
}
if _, err := os.Stat(filepath.Join(setting.CustomPath, "robots.txt")); err == nil {
diff --git a/models/user/user_test.go b/models/user/user_test.go
index df0c3856e9..2c8c1609fd 100644
--- a/models/user/user_test.go
+++ b/models/user/user_test.go
@@ -715,7 +715,7 @@ func TestDisabledUserFeatures(t *testing.T) {
// no features should be disabled with a plain login type
assert.LessOrEqual(t, user.LoginType, auth.Plain)
assert.Empty(t, user_model.DisabledFeaturesWithLoginType(user).Values())
- for _, f := range testValues.Values() {
+ for f := range testValues.Seq() {
assert.False(t, user_model.IsFeatureDisabledWithLoginType(user, f))
}
@@ -724,7 +724,7 @@ func TestDisabledUserFeatures(t *testing.T) {
// all features should be disabled
assert.NotEmpty(t, user_model.DisabledFeaturesWithLoginType(user).Values())
- for _, f := range testValues.Values() {
+ for f := range testValues.Seq() {
assert.True(t, user_model.IsFeatureDisabledWithLoginType(user, f))
}
}
diff --git a/modules/assetfs/layered.go b/modules/assetfs/layered.go
index 9678d23ad6..9feabc3f8c 100644
--- a/modules/assetfs/layered.go
+++ b/modules/assetfs/layered.go
@@ -11,7 +11,7 @@ import (
"net/http"
"os"
"path/filepath"
- "sort"
+ "slices"
"time"
"code.gitea.io/gitea/modules/container"
@@ -143,8 +143,7 @@ func (l *LayeredFS) ListFiles(name string, fileMode ...bool) ([]string, error) {
}
}
}
- files := fileSet.Values()
- sort.Strings(files)
+ files := slices.Sorted(fileSet.Seq())
return files, nil
}
@@ -184,8 +183,7 @@ func listAllFiles(layers []*Layer, name string, fileMode ...bool) ([]string, err
if err := list(name); err != nil {
return nil, err
}
- files := fileSet.Values()
- sort.Strings(files)
+ files := slices.Sorted(fileSet.Seq())
return files, nil
}
diff --git a/modules/container/set.go b/modules/container/set.go
index 2d654d0aee..70f837bc66 100644
--- a/modules/container/set.go
+++ b/modules/container/set.go
@@ -3,6 +3,11 @@
package container
+import (
+ "iter"
+ "maps"
+)
+
type Set[T comparable] map[T]struct{}
// SetOf creates a set and adds the specified elements to it.
@@ -63,3 +68,9 @@ func (s Set[T]) Values() []T {
}
return keys
}
+
+// Seq returns a iterator over the elements in the set.
+// It returns a single-use iterator.
+func (s Set[T]) Seq() iter.Seq[T] {
+ return maps.Keys(s)
+}
diff --git a/modules/container/set_test.go b/modules/container/set_test.go
index 3cfbf7cc2c..e54e31a052 100644
--- a/modules/container/set_test.go
+++ b/modules/container/set_test.go
@@ -4,6 +4,7 @@
package container
import (
+ "slices"
"testing"
"github.com/stretchr/testify/assert"
@@ -29,6 +30,14 @@ func TestSet(t *testing.T) {
assert.True(t, s.Contains("key4"))
assert.True(t, s.Contains("key5"))
+ values := s.Values()
+ called := 0
+ for value := range s.Seq() {
+ called++
+ assert.True(t, slices.Contains(values, value))
+ }
+ assert.EqualValues(t, len(values), called)
+
s = SetOf("key6", "key7")
assert.False(t, s.Contains("key1"))
assert.True(t, s.Contains("key6"))
diff --git a/modules/markup/file_preview.go b/modules/markup/file_preview.go
index 49a5f1e8ba..3caf08f7bb 100644
--- a/modules/markup/file_preview.go
+++ b/modules/markup/file_preview.go
@@ -77,6 +77,12 @@ func newFilePreview(ctx *RenderContext, node *html.Node, locale translation.Loca
commitSha := node.Data[m[4]:m[5]]
filePath := node.Data[m[6]:m[7]]
+ urlFullSource := urlFull
+ if strings.HasSuffix(filePath, "?display=source") {
+ filePath = strings.TrimSuffix(filePath, "?display=source")
+ } else if Type(filePath) != "" {
+ urlFullSource = node.Data[m[0]:m[6]] + filePath + "?display=source#" + node.Data[m[8]:m[1]]
+ }
hash := node.Data[m[8]:m[9]]
preview.start = m[0]
@@ -113,7 +119,7 @@ func newFilePreview(ctx *RenderContext, node *html.Node, locale translation.Loca
titleBuffer.WriteString(" – ")
}
- err = html.Render(titleBuffer, createLink(urlFull, filePath, "muted"))
+ err = html.Render(titleBuffer, createLink(urlFullSource, filePath, "muted"))
if err != nil {
log.Error("failed to render filepathLink: %v", err)
}
diff --git a/modules/markup/html_test.go b/modules/markup/html_test.go
index 50ea70905c..702c5a716d 100644
--- a/modules/markup/html_test.go
+++ b/modules/markup/html_test.go
@@ -1026,4 +1026,107 @@ func TestRender_FilePreview(t *testing.T) {
localMetas,
)
})
+
+ commitFileURL := util.URLJoin(markup.TestRepoURL, "src", "commit", "c9913120ed2c1e27c1d7752ecdb7a504dc7cf6be", "path", "to", "file.md")
+
+ t.Run("rendered file with ?display=source", func(t *testing.T) {
+ testRender(
+ commitFileURL+"?display=source"+"#L1-L2",
+ ``+
+ ``+
+ ``+
+ `
`+
+ `
`+
+ ``+
+ ``+
+ ` | `+
+ `# A`+"\n"+` | `+
+ `
`+
+ ``+
+ ` | `+
+ `B`+"\n"+` | `+
+ `
`+
+ ``+
+ `
`+
+ `
`+
+ `
`+
+ ``+
+ `
`+
+ `
`+
+ ``+
+ ``+
+ ` | `+
+ `# A`+"\n"+` | `+
+ `
`+
+ ``+
+ ` | `+
+ `B`+"\n"+` | `+
+ `
`+
+ ``+
+ `
`+
+ `
`+
+ `
`+
+ ``+
+ `
`+
+ `
`+
+ ``+
+ ``+
+ ` | `+
+ `B`+"\n"+` | `+
+ `
`+
+ ``+
+ ` | `+
+ `C`+"\n"+` | `+
+ `
`+
+ ``+
+ `
`+
+ `
`+
+ `