remove redundant code

Author: kerwin612

modules/fileicon/basic.go

@@ -17,14 +17,6 @@ func BasicThemeFolderIconName(isOpen bool) string {
 	return "octicon-file-directory-fill"
 }
 
-func BasicThemeIcon(entry *git.TreeEntry) template.HTML {
-	return BasicThemeIconWithOpenStatus(entry, false)
-}
-
-func BasicThemeIconOpen(entry *git.TreeEntry) template.HTML {
-	return BasicThemeIconWithOpenStatus(entry, true)
-}
-
 func BasicThemeIconWithOpenStatus(entry *git.TreeEntry, isOpen bool) template.HTML {
 	// TODO: add "open icon" support
 	svgName := "octicon-file"

modules/fileicon/material.go

@@ -75,14 +75,6 @@ func (m *MaterialIconProvider) renderFileIconSVG(p *RenderedIconPool, name, svg,
 	return template.HTML(`<svg ` + svgCommonAttrs + `><use xlink:href="#` + svgID + `"></use></svg>`)
 }
 
-func (m *MaterialIconProvider) FileIcon(p *RenderedIconPool, entry *git.TreeEntry) template.HTML {
-	return m.FileIconWithOpenStatus(p, entry, false)
-}
-
-func (m *MaterialIconProvider) FileIconOpen(p *RenderedIconPool, entry *git.TreeEntry) template.HTML {
-	return m.FileIconWithOpenStatus(p, entry, true)
-}
-
 func (m *MaterialIconProvider) FileIconWithOpenStatus(p *RenderedIconPool, entry *git.TreeEntry, isOpen bool) template.HTML {
 	if m.rules == nil {
 		return BasicThemeIconWithOpenStatus(entry, isOpen)

modules/fileicon/render.go

@@ -36,16 +36,9 @@ func (p *RenderedIconPool) RenderToHTML() template.HTML {
 
 // TODO: use an interface or struct to replace "*git.TreeEntry", to decouple the fileicon module from git module
 
-func RenderEntryIcon(renderedIconPool *RenderedIconPool, entry *git.TreeEntry) template.HTML {
+func RenderEntryIconWithOpenStatus(renderedIconPool *RenderedIconPool, entry *git.TreeEntry, isOpen bool) template.HTML {
 	if setting.UI.FileIconTheme == "material" {
-		return DefaultMaterialIconProvider().FileIcon(renderedIconPool, entry)
+		return DefaultMaterialIconProvider().FileIconWithOpenStatus(renderedIconPool, entry, isOpen)
 	}
-	return BasicThemeIcon(entry)
-}
-
-func RenderEntryIconOpen(renderedIconPool *RenderedIconPool, entry *git.TreeEntry) template.HTML {
-	if setting.UI.FileIconTheme == "material" {
-		return DefaultMaterialIconProvider().FileIconOpen(renderedIconPool, entry)
-	}
-	return BasicThemeIconOpen(entry)
+	return BasicThemeIconWithOpenStatus(entry, isOpen)
 }

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.RenderEntryIcon(renderedIconPool, f.Entry)
+		fileIcons[f.Entry.Name()] = fileicon.RenderEntryIconWithOpenStatus(renderedIconPool, f.Entry, false)
 	}
 	ctx.Data["FileIcons"] = fileIcons
 	ctx.Data["FileIconPoolHTML"] = renderedIconPool.RenderToHTML()

services/repository/files/tree.go

@@ -175,8 +175,8 @@ func newTreeViewNodeFromEntry(ctx context.Context, renderedIconPool *fileicon.Re
 	}
 
 	if node.EntryIcon == "" {
-		node.EntryIcon = fileicon.RenderEntryIcon(renderedIconPool, entry)
-		node.EntryIconOpen = fileicon.RenderEntryIconOpen(renderedIconPool, entry)
+		node.EntryIcon = fileicon.RenderEntryIconWithOpenStatus(renderedIconPool, entry, false)
+		node.EntryIconOpen = fileicon.RenderEntryIconWithOpenStatus(renderedIconPool, entry, true)
 	}
 
 	if node.EntryMode == "commit" {