Extract the parameter of RenderEntryIconWithOpenStatus from git.TreeEntry to FileEntry to decouple it from git.TreeEntry.

kerwin612 · kerwin612 · commit ec3dcafdddff · 2025-04-10T12:21:50.000Z
This change will allow integrating the file icons of the file tree on the diff page into the unified rendering logic without relying on `git.TreeEntry`.
diff --git a/modules/fileicon/basic.go b/modules/fileicon/basic.go
@@ -10,6 +10,28 @@ import (
 	"code.gitea.io/gitea/modules/svg"
 )
 
+type FileEntry struct {
+	Name            string
+	EntryMode       git.EntryMode
+	FollowEntryMode git.EntryMode
+}
+
+func GetFileEntryByTreeEntry(entry *git.TreeEntry) *FileEntry {
+	if entry.IsLink() {
+		if te, err := entry.FollowLink(); err == nil && te.IsDir() {
+			return &FileEntry{
+				Name:            entry.Name(),
+				EntryMode:       entry.Mode(),
+				FollowEntryMode: te.Mode(),
+			}
+		}
+	}
+	return &FileEntry{
+		Name:      entry.Name(),
+		EntryMode: entry.Mode(),
+	}
+}
+
 func BasicThemeFolderIconName(isOpen bool) string {
 	if isOpen {
 		return "octicon-file-directory-open-fill"
@@ -21,18 +43,18 @@ func BasicThemeFolderIconWithOpenStatus(isOpen bool) template.HTML {
 	return svg.RenderHTML(BasicThemeFolderIconName(isOpen))
 }
 
-func BasicThemeIconWithOpenStatus(entry *git.TreeEntry, isOpen bool) template.HTML {
+func BasicThemeIconWithOpenStatus(entry *FileEntry, isOpen bool) template.HTML {
 	// TODO: add "open icon" support
 	svgName := "octicon-file"
 	switch {
-	case entry.IsLink():
+	case entry.EntryMode.IsLink():
 		svgName = "octicon-file-symlink-file"
-		if te, err := entry.FollowLink(); err == nil && te.IsDir() {
+		if entry.FollowEntryMode.IsDir() {
 			svgName = "octicon-file-directory-symlink"
 		}
-	case entry.IsDir():
+	case entry.EntryMode.IsDir():
 		svgName = BasicThemeFolderIconName(isOpen)
-	case entry.IsSubModule():
+	case entry.EntryMode.IsSubModule():
 		svgName = "octicon-file-submodule"
 	}
 	return svg.RenderHTML(svgName)
diff --git a/modules/fileicon/material.go b/modules/fileicon/material.go
@@ -9,7 +9,6 @@ import (
 	"strings"
 	"sync"
 
-	"code.gitea.io/gitea/modules/git"
 	"code.gitea.io/gitea/modules/json"
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/options"
@@ -84,13 +83,13 @@ func (m *MaterialIconProvider) FolderIconWithOpenStatus(p *RenderedIconPool, isO
 	return m.renderFileIconSVG(p, name, m.svgs[name], BasicThemeFolderIconName(isOpen))
 }
 
-func (m *MaterialIconProvider) FileIconWithOpenStatus(p *RenderedIconPool, entry *git.TreeEntry, isOpen bool) template.HTML {
+func (m *MaterialIconProvider) FileIconWithOpenStatus(p *RenderedIconPool, entry *FileEntry, isOpen bool) template.HTML {
 	if m.rules == nil {
 		return BasicThemeIconWithOpenStatus(entry, isOpen)
 	}
 
-	if entry.IsLink() {
-		if te, err := entry.FollowLink(); err == nil && te.IsDir() {
+	if entry.EntryMode.IsLink() {
+		if entry.FollowEntryMode.IsDir() {
 			// keep the old "octicon-xxx" class name to make some "theme plugin selector" could still work
 			return svg.RenderHTML("material-folder-symlink", 16, "octicon-file-directory-symlink")
 		}
@@ -105,9 +104,9 @@ func (m *MaterialIconProvider) FileIconWithOpenStatus(p *RenderedIconPool, entry
 		// keep the old "octicon-xxx" class name to make some "theme plugin selector" could still work
 		extraClass := "octicon-file"
 		switch {
-		case entry.IsDir():
+		case entry.EntryMode.IsDir():
 			extraClass = BasicThemeFolderIconName(isOpen)
-		case entry.IsSubModule():
+		case entry.EntryMode.IsSubModule():
 			extraClass = "octicon-file-submodule"
 		}
 		return m.renderFileIconSVG(p, name, iconSVG, extraClass)
@@ -160,9 +159,9 @@ func (m *MaterialIconProvider) FindIconName(name string, isDir, isOpen bool) str
 	return "file"
 }
 
-func (m *MaterialIconProvider) findIconNameByGit(entry *git.TreeEntry, isOpen bool) string {
-	if entry.IsSubModule() {
+func (m *MaterialIconProvider) findIconNameByGit(entry *FileEntry, isOpen bool) string {
+	if entry.EntryMode.IsSubModule() {
 		return "folder-git"
 	}
-	return m.FindIconName(entry.Name(), entry.IsDir(), isOpen)
+	return m.FindIconName(entry.Name, entry.EntryMode.IsDir(), isOpen)
 }
diff --git a/modules/fileicon/render.go b/modules/fileicon/render.go
@@ -7,7 +7,6 @@ import (
 	"html/template"
 	"strings"
 
-	"code.gitea.io/gitea/modules/git"
 	"code.gitea.io/gitea/modules/setting"
 )
 
@@ -34,9 +33,7 @@ func (p *RenderedIconPool) RenderToHTML() template.HTML {
 	return template.HTML(sb.String())
 }
 
-// TODO: use an interface or struct to replace "*git.TreeEntry", to decouple the fileicon module from git module
-
-func RenderEntryIconWithOpenStatus(renderedIconPool *RenderedIconPool, entry *git.TreeEntry, isOpen bool) template.HTML {
+func RenderEntryIconWithOpenStatus(renderedIconPool *RenderedIconPool, entry *FileEntry, isOpen bool) template.HTML {
 	if setting.UI.FileIconTheme == "material" {
 		return DefaultMaterialIconProvider().FileIconWithOpenStatus(renderedIconPool, entry, isOpen)
 	}
diff --git a/modules/git/tree_entry_mode.go b/modules/git/tree_entry_mode.go
@@ -30,6 +30,31 @@ func (e EntryMode) String() string {
 	return strconv.FormatInt(int64(e), 8)
 }
 
+// IsSubModule if the entry is a sub module
+func (e EntryMode) IsSubModule() bool {
+	return e == EntryModeCommit
+}
+
+// IsDir if the entry is a sub dir
+func (e EntryMode) IsDir() bool {
+	return e == EntryModeTree
+}
+
+// IsLink if the entry is a symlink
+func (e EntryMode) IsLink() bool {
+	return e == EntryModeSymlink
+}
+
+// IsRegular if the entry is a regular file
+func (e EntryMode) IsRegular() bool {
+	return e == EntryModeBlob
+}
+
+// IsExecutable if the entry is an executable file (not necessarily binary)
+func (e EntryMode) IsExecutable() bool {
+	return e == EntryModeExec
+}
+
 func ParseEntryMode(mode string) (EntryMode, error) {
 	switch mode {
 	case "000000":
diff --git a/modules/git/tree_entry_nogogit.go b/modules/git/tree_entry_nogogit.go
@@ -59,27 +59,27 @@ func (te *TreeEntry) Size() int64 {
 
 // IsSubModule if the entry is a sub module
 func (te *TreeEntry) IsSubModule() bool {
-	return te.entryMode == EntryModeCommit
+	return te.entryMode.IsSubModule()
 }
 
 // IsDir if the entry is a sub dir
 func (te *TreeEntry) IsDir() bool {
-	return te.entryMode == EntryModeTree
+	return te.entryMode.IsDir()
 }
 
 // IsLink if the entry is a symlink
 func (te *TreeEntry) IsLink() bool {
-	return te.entryMode == EntryModeSymlink
+	return te.entryMode.IsLink()
 }
 
 // IsRegular if the entry is a regular file
 func (te *TreeEntry) IsRegular() bool {
-	return te.entryMode == EntryModeBlob
+	return te.entryMode.IsRegular()
 }
 
 // IsExecutable if the entry is an executable file (not necessarily binary)
 func (te *TreeEntry) IsExecutable() bool {
-	return te.entryMode == EntryModeExec
+	return te.entryMode.IsExecutable()
 }
 
 // Blob returns the blob object the entry
diff --git a/modules/templates/helper.go b/modules/templates/helper.go
@@ -60,7 +60,7 @@ func NewFuncMap() template.FuncMap {
 		// -----------------------------------------------------------------
 		// svg / avatar / icon / color
 		"svg":                        svg.RenderHTML,
-		"folderIconHTMLByOpenStatus": folderIconHTMLByOpenStatus,
+		"folderIconHTMLByOpenStatus": FolderIconHTMLByOpenStatus,
 		"MigrationIcon":              migrationIcon,
 		"ActionIcon":                 actionIcon,
 		"SortArrow":                  sortArrow,
diff --git a/modules/templates/util_misc.go b/modules/templates/util_misc.go
@@ -195,7 +195,7 @@ func tabSizeClass(ec *editorconfig.Editorconfig, filename string) string {
 	return "tab-size-4"
 }
 
-func folderIconHTMLByOpenStatus(isOpen bool) template.HTML {
+func FolderIconHTMLByOpenStatus(isOpen bool) template.HTML {
 	if setting.UI.FileIconTheme == "material" {
 		return fileicon.DefaultMaterialIconProvider().FolderIconWithOpenStatus(nil, isOpen)
 	}
diff --git a/routers/web/repo/commit.go b/routers/web/repo/commit.go
@@ -21,6 +21,7 @@ import (
 	user_model "code.gitea.io/gitea/models/user"
 	"code.gitea.io/gitea/modules/base"
 	"code.gitea.io/gitea/modules/charset"
+	"code.gitea.io/gitea/modules/fileicon"
 	"code.gitea.io/gitea/modules/git"
 	"code.gitea.io/gitea/modules/gitrepo"
 	"code.gitea.io/gitea/modules/log"
@@ -370,7 +371,11 @@ func Diff(ctx *context.Context) {
 			return
 		}
 
-		ctx.PageData["DiffFiles"] = transformDiffTreeForUI(diffTree, nil)
+		renderedIconPool := fileicon.NewRenderedIconPool()
+		ctx.PageData["DiffFiles"] = transformDiffTreeForUI(renderedIconPool, diffTree, nil)
+		ctx.PageData["FolderIcon"] = templates.FolderIconHTMLByOpenStatus(false)
+		ctx.PageData["FolderOpenIcon"] = templates.FolderIconHTMLByOpenStatus(true)
+		ctx.Data["FileIconPoolHTML"] = renderedIconPool.RenderToHTML()
 	}
 
 	statuses, _, err := git_model.GetLatestCommitStatus(ctx, ctx.Repo.Repository.ID, commitID, db.ListOptionsAll)
diff --git a/routers/web/repo/compare.go b/routers/web/repo/compare.go
@@ -26,6 +26,7 @@ import (
 	"code.gitea.io/gitea/modules/base"
 	"code.gitea.io/gitea/modules/charset"
 	csv_module "code.gitea.io/gitea/modules/csv"
+	"code.gitea.io/gitea/modules/fileicon"
 	"code.gitea.io/gitea/modules/git"
 	"code.gitea.io/gitea/modules/gitrepo"
 	"code.gitea.io/gitea/modules/log"
@@ -639,7 +640,11 @@ func PrepareCompareDiff(
 			return false
 		}
 
-		ctx.PageData["DiffFiles"] = transformDiffTreeForUI(diffTree, nil)
+		renderedIconPool := fileicon.NewRenderedIconPool()
+		ctx.PageData["DiffFiles"] = transformDiffTreeForUI(renderedIconPool, diffTree, nil)
+		ctx.PageData["FolderIcon"] = templates.FolderIconHTMLByOpenStatus(false)
+		ctx.PageData["FolderOpenIcon"] = templates.FolderIconHTMLByOpenStatus(true)
+		ctx.Data["FileIconPoolHTML"] = renderedIconPool.RenderToHTML()
 	}
 
 	headCommit, err := ci.HeadGitRepo.GetCommit(headCommitID)
diff --git a/routers/web/repo/pull.go b/routers/web/repo/pull.go
@@ -24,6 +24,7 @@ import (
 	"code.gitea.io/gitea/models/unit"
 	user_model "code.gitea.io/gitea/models/user"
 	"code.gitea.io/gitea/modules/emoji"
+	"code.gitea.io/gitea/modules/fileicon"
 	"code.gitea.io/gitea/modules/git"
 	"code.gitea.io/gitea/modules/gitrepo"
 	issue_template "code.gitea.io/gitea/modules/issue/template"
@@ -834,7 +835,11 @@ func viewPullFiles(ctx *context.Context, specifiedStartCommit, specifiedEndCommi
 			}
 		}
 
-		ctx.PageData["DiffFiles"] = transformDiffTreeForUI(diffTree, filesViewedState)
+		renderedIconPool := fileicon.NewRenderedIconPool()
+		ctx.PageData["DiffFiles"] = transformDiffTreeForUI(renderedIconPool, diffTree, filesViewedState)
+		ctx.PageData["FolderIcon"] = templates.FolderIconHTMLByOpenStatus(false)
+		ctx.PageData["FolderOpenIcon"] = templates.FolderIconHTMLByOpenStatus(true)
+		ctx.Data["FileIconPoolHTML"] = renderedIconPool.RenderToHTML()
 	}
 
 	ctx.Data["Diff"] = diff
diff --git a/routers/web/repo/treelist.go b/routers/web/repo/treelist.go
@@ -4,6 +4,7 @@
 package repo
 
 import (
+	"html/template"
 	"net/http"
 
 	pull_model "code.gitea.io/gitea/models/pull"
@@ -63,11 +64,12 @@ type FileDiffFile struct {
 	IsSubmodule bool
 	IsViewed    bool
 	Status      string
+	FileIcon    template.HTML
 }
 
 // transformDiffTreeForUI transforms a DiffTree into a slice of FileDiffFile for UI rendering
 // it also takes a map of file names to their viewed state, which is used to mark files as viewed
-func transformDiffTreeForUI(diffTree *gitdiff.DiffTree, filesViewedState map[string]pull_model.ViewedState) []FileDiffFile {
+func transformDiffTreeForUI(renderedIconPool *fileicon.RenderedIconPool, diffTree *gitdiff.DiffTree, filesViewedState map[string]pull_model.ViewedState) []FileDiffFile {
 	files := make([]FileDiffFile, 0, len(diffTree.Files))
 
 	for _, file := range diffTree.Files {
@@ -81,6 +83,10 @@ func transformDiffTreeForUI(diffTree *gitdiff.DiffTree, filesViewedState map[str
 			IsSubmodule: isSubmodule,
 			IsViewed:    isViewed,
 			Status:      file.Status,
+			FileIcon: fileicon.RenderEntryIconWithOpenStatus(renderedIconPool, &fileicon.FileEntry{
+				Name:      file.HeadPath,
+				EntryMode: file.HeadMode,
+			}, false),
 		})
 	}
 
diff --git a/routers/web/repo/view.go b/routers/web/repo/view.go
@@ -257,7 +257,7 @@ func prepareDirectoryFileIcons(ctx *context.Context, files []git.CommitInfo) {
 	renderedIconPool := fileicon.NewRenderedIconPool()
 	fileIcons := map[string]template.HTML{}
 	for _, f := range files {
-		fileIcons[f.Entry.Name()] = fileicon.RenderEntryIconWithOpenStatus(renderedIconPool, f.Entry, false)
+		fileIcons[f.Entry.Name()] = fileicon.RenderEntryIconWithOpenStatus(renderedIconPool, fileicon.GetFileEntryByTreeEntry(f.Entry), false)
 	}
 	ctx.Data["FileIcons"] = fileIcons
 	ctx.Data["FileIconPoolHTML"] = renderedIconPool.RenderToHTML()
diff --git a/services/repository/files/tree.go b/services/repository/files/tree.go
@@ -175,8 +175,8 @@ func newTreeViewNodeFromEntry(ctx context.Context, renderedIconPool *fileicon.Re
 	}
 
 	if node.EntryIcon == "" {
-		node.EntryIcon = fileicon.RenderEntryIconWithOpenStatus(renderedIconPool, entry, false)
-		node.EntryIconOpen = fileicon.RenderEntryIconWithOpenStatus(renderedIconPool, entry, true)
+		node.EntryIcon = fileicon.RenderEntryIconWithOpenStatus(renderedIconPool, fileicon.GetFileEntryByTreeEntry(entry), false)
+		node.EntryIconOpen = fileicon.RenderEntryIconWithOpenStatus(renderedIconPool, fileicon.GetFileEntryByTreeEntry(entry), true)
 	}
 
 	if node.EntryMode == "commit" {
diff --git a/templates/repo/diff/box.tmpl b/templates/repo/diff/box.tmpl
@@ -60,6 +60,7 @@
 	{{end}}
 	<div id="diff-container">
 		{{if $showFileTree}}
+			{{$.FileIconPoolHTML}}
 			<div id="diff-file-tree" class="tw-hidden not-mobile"></div>
 			<script>
 				if (diffTreeVisible) document.getElementById('diff-file-tree').classList.remove('tw-hidden');
diff --git a/web_src/js/components/DiffFileTreeItem.vue b/web_src/js/components/DiffFileTreeItem.vue
@@ -2,7 +2,7 @@
 import {SvgIcon, type SvgName} from '../svg.ts';
 import {diffTreeStore} from '../modules/stores.ts';
 import {ref} from 'vue';
-import type {Item, File, FileStatus} from '../utils/filetree.ts';
+import type {Item, FileStatus} from '../utils/filetree.ts';
 
 defineProps<{
   item: Item,
@@ -22,13 +22,6 @@ function getIconForDiffStatus(pType: FileStatus) {
   };
   return diffTypes[pType];
 }
-
-function fileIcon(file: File) {
-  if (file.IsSubmodule) {
-    return 'octicon-file-submodule';
-  }
-  return 'octicon-file';
-}
 </script>
 
 <template>
@@ -39,7 +32,8 @@ function fileIcon(file: File) {
     :title="item.name" :href="'#diff-' + item.file.NameHash"
   >
     <!-- file -->
-    <SvgIcon :name="fileIcon(item.file)"/>
+    <!-- eslint-disable-next-line vue/no-v-html -->
+    <span class="tw-contents" v-html="item.file.FileIcon"/>
     <span class="gt-ellipsis tw-flex-1">{{ item.name }}</span>
     <SvgIcon
       :name="getIconForDiffStatus(item.file.Status).name"
@@ -51,10 +45,8 @@ function fileIcon(file: File) {
     <div class="item-directory" :title="item.name" @click.stop="collapsed = !collapsed">
       <!-- directory -->
       <SvgIcon :name="collapsed ? 'octicon-chevron-right' : 'octicon-chevron-down'"/>
-      <SvgIcon
-        class="text primary"
-        :name="collapsed ? 'octicon-file-directory-fill' : 'octicon-file-directory-open-fill'"
-      />
+      <!-- eslint-disable-next-line vue/no-v-html -->
+      <span class="tw-contents" v-html="collapsed ? store.folderIcon : store.folderOpenIcon"/>
       <span class="gt-ellipsis">{{ item.name }}</span>
     </div>
 
diff --git a/web_src/js/modules/stores.ts b/web_src/js/modules/stores.ts
@@ -8,6 +8,8 @@ export function diffTreeStore() {
   if (!diffTreeStoreReactive) {
     diffTreeStoreReactive = reactive({
       files: pageData.DiffFiles,
+      folderIcon: pageData.FolderIcon,
+      folderOpenIcon: pageData.FolderOpenIcon,
       fileTreeIsVisible: false,
       selectedItem: '',
     });
diff --git a/web_src/js/utils/filetree.ts b/web_src/js/utils/filetree.ts
@@ -8,6 +8,7 @@ export type File = {
   Status: FileStatus;
   IsViewed: boolean;
   IsSubmodule: boolean;
+  FileIcon: string;
 }
 
 type DirItem = {

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@ import (`
`7`	`7`	`"html/template"`
`8`	`8`	`"strings"`
`9`	`9`
`10`		`- "code.gitea.io/gitea/modules/git"`
`11`	`10`	`"code.gitea.io/gitea/modules/setting"`
`12`	`11`	`)`
`13`	`12`
`@@ -34,9 +33,7 @@ func (p *RenderedIconPool) RenderToHTML() template.HTML {`
`34`	`33`	`return template.HTML(sb.String())`
`35`	`34`	`}`
`36`	`35`
`37`		`-// TODO: use an interface or struct to replace "*git.TreeEntry", to decouple the fileicon module from git module`
`38`		`-`
`39`		`-func RenderEntryIconWithOpenStatus(renderedIconPool RenderedIconPool, entry git.TreeEntry, isOpen bool) template.HTML {`
	`36`	`+func RenderEntryIconWithOpenStatus(renderedIconPool RenderedIconPool, entry FileEntry, isOpen bool) template.HTML {`
`40`	`37`	`if setting.UI.FileIconTheme == "material" {`
`41`	`38`	`return DefaultMaterialIconProvider().FileIconWithOpenStatus(renderedIconPool, entry, isOpen)`
`42`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,27 +59,27 @@ func (te *TreeEntry) Size() int64 {`
`59`	`59`
`60`	`60`	`// IsSubModule if the entry is a sub module`
`61`	`61`	`func (te *TreeEntry) IsSubModule() bool {`
`62`		`- return te.entryMode == EntryModeCommit`
	`62`	`+ return te.entryMode.IsSubModule()`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`// IsDir if the entry is a sub dir`
`66`	`66`	`func (te *TreeEntry) IsDir() bool {`
`67`		`- return te.entryMode == EntryModeTree`
	`67`	`+ return te.entryMode.IsDir()`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`// IsLink if the entry is a symlink`
`71`	`71`	`func (te *TreeEntry) IsLink() bool {`
`72`		`- return te.entryMode == EntryModeSymlink`
	`72`	`+ return te.entryMode.IsLink()`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`// IsRegular if the entry is a regular file`
`76`	`76`	`func (te *TreeEntry) IsRegular() bool {`
`77`		`- return te.entryMode == EntryModeBlob`
	`77`	`+ return te.entryMode.IsRegular()`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`// IsExecutable if the entry is an executable file (not necessarily binary)`
`81`	`81`	`func (te *TreeEntry) IsExecutable() bool {`
`82`		`- return te.entryMode == EntryModeExec`
	`82`	`+ return te.entryMode.IsExecutable()`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`// Blob returns the blob object the entry`
Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,7 @@ func tabSizeClass(ec *editorconfig.Editorconfig, filename string) string {`
`195`	`195`	`return "tab-size-4"`
`196`	`196`	`}`
`197`	`197`
`198`		`-func folderIconHTMLByOpenStatus(isOpen bool) template.HTML {`
	`198`	`+func FolderIconHTMLByOpenStatus(isOpen bool) template.HTML {`
`199`	`199`	`if setting.UI.FileIconTheme == "material" {`
`200`	`200`	`return fileicon.DefaultMaterialIconProvider().FolderIconWithOpenStatus(nil, isOpen)`
`201`	`201`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ import (`
`24`	`24`	`"code.gitea.io/gitea/models/unit"`
`25`	`25`	`user_model "code.gitea.io/gitea/models/user"`
`26`	`26`	`"code.gitea.io/gitea/modules/emoji"`
	`27`	`+ "code.gitea.io/gitea/modules/fileicon"`
`27`	`28`	`"code.gitea.io/gitea/modules/git"`
`28`	`29`	`"code.gitea.io/gitea/modules/gitrepo"`
`29`	`30`	`issue_template "code.gitea.io/gitea/modules/issue/template"`
`@@ -834,7 +835,11 @@ func viewPullFiles(ctx *context.Context, specifiedStartCommit, specifiedEndCommi`
`834`	`835`	`}`
`835`	`836`	`}`
`836`	`837`
`837`		`- ctx.PageData["DiffFiles"] = transformDiffTreeForUI(diffTree, filesViewedState)`
	`838`	`+ renderedIconPool := fileicon.NewRenderedIconPool()`
	`839`	`+ ctx.PageData["DiffFiles"] = transformDiffTreeForUI(renderedIconPool, diffTree, filesViewedState)`
	`840`	`+ ctx.PageData["FolderIcon"] = templates.FolderIconHTMLByOpenStatus(false)`
	`841`	`+ ctx.PageData["FolderOpenIcon"] = templates.FolderIconHTMLByOpenStatus(true)`
	`842`	`+ ctx.Data["FileIconPoolHTML"] = renderedIconPool.RenderToHTML()`
`838`	`843`	`}`
`839`	`844`
`840`	`845`	`ctx.Data["Diff"] = diff`