Skip to content

Commit 53f8249

Browse files
stefanhallerstefanhaller
authored
Fix file icons (jesseduffield#3975)
- **PR Description** Some file icons weren't drawn correctly, e.g. the ones for `tailwind.config.ts` or `nuxt.config.ts`, but also many others. Fixes jesseduffield#3747. - **Please check if the PR fulfills these requirements** * [x] Cheatsheets are up-to-date (run `go generate ./...`) * [x] Code has been formatted (see [here](https://github.com/jesseduffield/lazygit/blob/master/CONTRIBUTING.md#code-formatting)) * [x] Tests have been added/updated (see [here](https://github.com/jesseduffield/lazygit/blob/master/pkg/integration/README.md) for the integration test guide) * [ ] Text is internationalised (see [here](https://github.com/jesseduffield/lazygit/blob/master/CONTRIBUTING.md#internationalisation)) * [ ] If a new UserConfig entry was added, make sure it can be hot-reloaded (see [here](https://github.com/jesseduffield/lazygit/blob/master/docs/dev/Codebase_Guide.md#using-userconfig)) * [ ] Docs have been updated if necessary * [x] You've read through your own file changes for silly mistakes etc
2 parents 4e361e1 + f71274b commit 53f8249

File tree

2 files changed

+60
-39
lines changed

2 files changed

+60
-39
lines changed

‎pkg/gui/presentation/icons/file_icons.go‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ var nameIconMap = map[string]IconProperties{
2121
".bash_profile": {Icon: "\ue615", Color: 113}, // 
2222
".bashprofile": {Icon: "\ue615", Color: 113}, // 
2323
".bashrc": {Icon: "\ue795", Color: 113}, // 
24-
".dockerignore": {Icon: "\uf0868", Color: 68}, // 󰡨
24+
".dockerignore": {Icon: "\U000f0868", Color: 68}, // 󰡨
2525
".ds_store": {Icon: "\ue615", Color: 239}, // 
2626
".editorconfig": {Icon: "\ue652", Color: 255}, // 
2727
".env": {Icon: "\uf462", Color: 227}, // 
@@ -44,7 +44,7 @@ var nameIconMap = map[string]IconProperties{
4444
".mailmap": {Icon: "\U000f02a2", Color: 202}, // 󰊢
4545
".npmignore": {Icon: "\ue71e", Color: 197}, // 
4646
".npmrc": {Icon: "\ue71e", Color: 197}, // 
47-
".nuxtrc": {Icon: "\uf1106", Color: 42}, // 󱄆
47+
".nuxtrc": {Icon: "\U000f1106", Color: 42}, // 󱄆
4848
".nvmrc": {Icon: "\ue718", Color: 71}, // 
4949
".prettierignore": {Icon: "\ue6b4", Color: 33}, // 
5050
".prettierrc": {Icon: "\ue6b4", Color: 33}, // 
@@ -76,21 +76,21 @@ var nameIconMap = map[string]IconProperties{
7676
"cantorrc": {Icon: "\uf373", Color: 32}, // 
7777
"Cargo.lock": {Icon: "\ue7a8", Color: 216}, // 
7878
"Cargo.toml": {Icon: "\ue7a8", Color: 216}, // 
79-
"checkhealth": {Icon: "\uf04d9", Color: 75}, // 󰓙
79+
"checkhealth": {Icon: "\U000f04d9", Color: 75}, // 󰓙
8080
"cmakelists.txt": {Icon: "\ue615", Color: 66}, // 
8181
"commit_editmsg": {Icon: "\ue702", Color: 196}, // 
8282
"COMMIT_EDITMSG": {Icon: "\ue702", Color: 239}, // 
83-
"commitlint.config.js": {Icon: "\uf0718", Color: 30}, // 󰜘
84-
"commitlint.config.ts": {Icon: "\uf0718", Color: 30}, // 󰜘
83+
"commitlint.config.js": {Icon: "\U000f0718", Color: 30}, // 󰜘
84+
"commitlint.config.ts": {Icon: "\U000f0718", Color: 30}, // 󰜘
8585
"compose.yaml": {Icon: "\uf308", Color: 68}, // 
8686
"compose.yml": {Icon: "\uf308", Color: 68}, // 
8787
"config": {Icon: "\ue5fc", Color: 241}, // 
88-
"containerfile": {Icon: "\uf0868", Color: 68}, // 󰡨
88+
"containerfile": {Icon: "\U000f0868", Color: 68}, // 󰡨
8989
"copying": {Icon: "\ue60a", Color: 185}, // 
9090
"copying.lesser": {Icon: "\ue60a", Color: 185}, // 
9191
"docker-compose.yaml": {Icon: "\uf308", Color: 68}, // 
9292
"docker-compose.yml": {Icon: "\uf308", Color: 68}, // 
93-
"dockerfile": {Icon: "\uf0868", Color: 68}, // 󰡨
93+
"dockerfile": {Icon: "\U000f0868", Color: 68}, // 󰡨
9494
"Dockerfile": {Icon: "\uf308", Color: 68}, // 
9595
"ds_store": {Icon: "\uf179", Color: 15}, // 
9696
"eslint.config.cjs": {Icon: "\ue655", Color: 56}, // 
@@ -148,10 +148,10 @@ var nameIconMap = map[string]IconProperties{
148148
"mpv.conf": {Icon: "\uf36e", Color: 53}, // 
149149
"node_modules": {Icon: "\ue718", Color: 197}, // 
150150
"npmignore": {Icon: "\ue71e", Color: 197}, // 
151-
"nuxt.config.cjs": {Icon: "\uf1106", Color: 42}, // 󱄆
152-
"nuxt.config.js": {Icon: "\uf1106", Color: 42}, // 󱄆
153-
"nuxt.config.mjs": {Icon: "\uf1106", Color: 42}, // 󱄆
154-
"nuxt.config.ts": {Icon: "\uf1106", Color: 42}, // 󱄆
151+
"nuxt.config.cjs": {Icon: "\U000f1106", Color: 42}, // 󱄆
152+
"nuxt.config.js": {Icon: "\U000f1106", Color: 42}, // 󱄆
153+
"nuxt.config.mjs": {Icon: "\U000f1106", Color: 42}, // 󱄆
154+
"nuxt.config.ts": {Icon: "\U000f1106", Color: 42}, // 󱄆
155155
"package.json": {Icon: "\ue71e", Color: 197}, // 
156156
"package-lock.json": {Icon: "\ue71e", Color: 52}, // 
157157
"PKGBUILD": {Icon: "\uf303", Color: 38}, // 
@@ -165,23 +165,23 @@ var nameIconMap = map[string]IconProperties{
165165
"PrusaSlicer.ini": {Icon: "\uf351", Color: 202}, // 
166166
"py.typed": {Icon: "\ue606", Color: 214}, // 
167167
"QtProject.conf": {Icon: "\uf375", Color: 77}, // 
168-
"R": {Icon: "\uf07d4", Color: 25}, // 󰟔
169-
"robots.txt": {Icon: "\uf06a9", Color: 60}, // 󰚩
168+
"R": {Icon: "\U000f07d4", Color: 25}, // 󰟔
169+
"robots.txt": {Icon: "\U000f06a9", Color: 60}, // 󰚩
170170
"rubydoc": {Icon: "\ue73b", Color: 160}, // 
171171
"settings.gradle": {Icon: "\ue660", Color: 24}, // 
172172
"svelte.config.js": {Icon: "\ue697", Color: 196}, // 
173173
"sxhkdrc": {Icon: "\uf355", Color: 236}, // 
174174
"sym-lib-table": {Icon: "\uf34c", Color: 231}, // 
175-
"tailwind.config.js": {Icon: "\uf13ff", Color: 45}, // 󱏿
176-
"tailwind.config.mjs": {Icon: "\uf13ff", Color: 45}, // 󱏿
177-
"tailwind.config.ts": {Icon: "\uf13ff", Color: 45}, // 󱏿
175+
"tailwind.config.js": {Icon: "\U000f13ff", Color: 45}, // 󱏿
176+
"tailwind.config.mjs": {Icon: "\U000f13ff", Color: 45}, // 󱏿
177+
"tailwind.config.ts": {Icon: "\U000f13ff", Color: 45}, // 󱏿
178178
"tmux.conf": {Icon: "\uebc8", Color: 34}, // 
179179
"tmux.conf.local": {Icon: "\uebc8", Color: 34}, // 
180180
"tsconfig.json": {Icon: "\ue69d", Color: 74}, // 
181181
"unlicense": {Icon: "\ue60a", Color: 185}, // 
182182
"vagrantfile$": {Icon: "\uf2b8", Color: 27}, // 
183-
"vlcrc": {Icon: "\uf057c", Color: 208}, // 󰕼
184-
"webpack": {Icon: "\uf072b", Color: 74}, // 󰜫
183+
"vlcrc": {Icon: "\U000f057c", Color: 208}, // 󰕼
184+
"webpack": {Icon: "\U000f072b", Color: 74}, // 󰜫
185185
"weston.ini": {Icon: "\uf367", Color: 214}, // 
186186
"workspace": {Icon: "\ue63a", Color: 113}, // 
187187
"xmobarrc.hs": {Icon: "\uf35e", Color: 203}, // 
@@ -207,7 +207,7 @@ var extIconMap = map[string]IconProperties{
207207
".app": {Icon: "\ueae8", Color: 124}, // 
208208
".apple": {Icon: "\uf179", Color: 15}, // 
209209
".applescript": {Icon: "\uf179", Color: 66}, // 
210-
".asc": {Icon: "\uf099d", Color: 242}, // 󰦝
210+
".asc": {Icon: "\U000f099d", Color: 242}, // 󰦝
211211
".ass": {Icon: "\U000f0a16", Color: 214}, // 󰨖
212212
".astro": {Icon: "\ue6b3", Color: 197}, // 
213213
".avif": {Icon: "\uf1c5", Color: 140}, // 
@@ -320,7 +320,7 @@ var extIconMap = map[string]IconProperties{
320320
".exe": {Icon: "\uf17a", Color: 81}, // 
321321
".ex": {Icon: "\ue62d", Color: 140}, // 
322322
".exs": {Icon: "\ue62d", Color: 140}, // 
323-
".f3d": {Icon: "\uf0eeb", Color: 101}, // 󰻫
323+
".f3d": {Icon: "\U000f0eeb", Color: 101}, // 󰻫
324324
".f90": {Icon: "\U000f121a", Color: 97}, // 󱈚
325325
".fbx": {Icon: "\U000f01a7", Color: 102}, // 󰆧
326326
".fcbak": {Icon: "\uf336", Color: 160}, // 
@@ -380,7 +380,7 @@ var extIconMap = map[string]IconProperties{
380380
".hs": {Icon: "\ue777", Color: 140}, // 
381381
".htm": {Icon: "\uf13b", Color: 196}, // 
382382
".html": {Icon: "\uf13b", Color: 196}, // 
383-
".huff": {Icon: "\uf0858", Color: 56}, // 󰡘
383+
".huff": {Icon: "\U000f0858", Color: 56}, // 󰡘
384384
".hurl": {Icon: "\uf0ec", Color: 198}, // 
385385
".hx": {Icon: "\ue666", Color: 208}, // 
386386
".hxx": {Icon: "\uf0fd", Color: 140}, // 
@@ -425,7 +425,7 @@ var extIconMap = map[string]IconProperties{
425425
".jsx": {Icon: "\ue7ba", Color: 45}, // 
426426
".jwmrc": {Icon: "\uf35b", Color: 32}, // 
427427
".jxl": {Icon: "\uf1c5", Color: 241}, // 
428-
".kbx": {Icon: "\uf0bc4", Color: 243}, // 󰯄
428+
".kbx": {Icon: "\U000f0bc4", Color: 243}, // 󰯄
429429
".kdb": {Icon: "\uf23e", Color: 71}, // 
430430
".kdbx": {Icon: "\uf23e", Color: 71}, // 
431431
".kdenlive": {Icon: "\uf33c", Color: 110}, // 
@@ -472,12 +472,12 @@ var extIconMap = map[string]IconProperties{
472472
".magnet": {Icon: "\uf076", Color: 124}, // 
473473
".makefile": {Icon: "\ue779", Color: 66}, // 
474474
".markdown": {Icon: "\uf48a", Color: 74}, // 
475-
".material": {Icon: "\uf0509", Color: 163}, // 󰔉
476-
".md5": {Icon: "\uf0565", Color: 103}, // 󰕥
475+
".material": {Icon: "\U000f0509", Color: 163}, // 󰔉
476+
".md5": {Icon: "\U000f0565", Color: 103}, // 󰕥
477477
".md": {Icon: "\uf48a", Color: 74}, // 
478478
".mdx": {Icon: "\uf48a", Color: 74}, // 
479479
".m": {Icon: "\ue61e", Color: 111}, // 
480-
".mint": {Icon: "\uf032a", Color: 108}, // 󰌪
480+
".mint": {Icon: "\U000f032a", Color: 108}, // 󰌪
481481
".mjs": {Icon: "\ue74e", Color: 185}, // 
482482
".mkd": {Icon: "\uf48a", Color: 74}, // 
483483
".mk": {Icon: "\ue795", Color: 241}, // 
@@ -535,10 +535,10 @@ var extIconMap = map[string]IconProperties{
535535
".properties": {Icon: "\ue60b", Color: 185}, // 
536536
".ps1": {Icon: "\ue795", Color: 241}, // 
537537
".psb": {Icon: "\ue7b8", Color: 74}, // 
538-
".psd1": {Icon: "\uf0a0a", Color: 68}, // 󰨊
538+
".psd1": {Icon: "\U000f0a0a", Color: 68}, // 󰨊
539539
".psd": {Icon: "\ue7b8", Color: 241}, // 
540-
".psm1": {Icon: "\uf0a0a", Color: 68}, // 󰨊
541-
".pub": {Icon: "\uf0dd6", Color: 222}, // 󰷖
540+
".psm1": {Icon: "\U000f0a0a", Color: 68}, // 󰨊
541+
".pub": {Icon: "\U000f0dd6", Color: 222}, // 󰷖
542542
".pxd": {Icon: "\ue606", Color: 39}, // 
543543
".pxi": {Icon: "\ue606", Color: 39}, // 
544544
".pxm": {Icon: "\uf1c5", Color: 241}, // 
@@ -570,7 +570,7 @@ var extIconMap = map[string]IconProperties{
570570
".rlib": {Icon: "\ue7a8", Color: 216}, // 
571571
".rmd": {Icon: "\uf48a", Color: 74}, // 
572572
".rpm": {Icon: "\ue7bb", Color: 52}, // 
573-
".rproj": {Icon: "\uf05c6", Color: 29}, // 󰗆
573+
".rproj": {Icon: "\U000f05c6", Color: 29}, // 󰗆
574574
".rs": {Icon: "\ue7a8", Color: 216}, // 
575575
".rspec": {Icon: "\ue21e", Color: 160}, // 
576576
".rspec_parallel": {Icon: "\ue21e", Color: 160}, // 
@@ -584,13 +584,13 @@ var extIconMap = map[string]IconProperties{
584584
".scad": {Icon: "\uf34e", Color: 220}, // 
585585
".scala": {Icon: "\ue737", Color: 74}, // 
586586
".sc": {Icon: "\ue737", Color: 167}, // 
587-
".scm": {Icon: "\uf0627", Color: 255}, // 󰘧
587+
".scm": {Icon: "\U000f0627", Color: 255}, // 󰘧
588588
".scss": {Icon: "\ue749", Color: 204}, // 
589-
".sha1": {Icon: "\uf0565", Color: 103}, // 󰕥
590-
".sha224": {Icon: "\uf0565", Color: 103}, // 󰕥
591-
".sha256": {Icon: "\uf0565", Color: 103}, // 󰕥
592-
".sha384": {Icon: "\uf0565", Color: 103}, // 󰕥
593-
".sha512": {Icon: "\uf0565", Color: 103}, // 󰕥
589+
".sha1": {Icon: "\U000f0565", Color: 103}, // 󰕥
590+
".sha224": {Icon: "\U000f0565", Color: 103}, // 󰕥
591+
".sha256": {Icon: "\U000f0565", Color: 103}, // 󰕥
592+
".sha384": {Icon: "\U000f0565", Color: 103}, // 󰕥
593+
".sha512": {Icon: "\U000f0565", Color: 103}, // 󰕥
594594
".shell": {Icon: "\ue795", Color: 239}, // 
595595
".sh": {Icon: "\ue795", Color: 239}, // 
596596
".sig": {Icon: "\u03bb", Color: 166}, // λ
@@ -631,10 +631,10 @@ var extIconMap = map[string]IconProperties{
631631
".swift": {Icon: "\ue755", Color: 208}, // 
632632
".tar": {Icon: "\uf410", Color: 241}, // 
633633
".taz": {Icon: "\uf410", Color: 241}, // 
634-
".tbc": {Icon: "\uf06d3", Color: 25}, // 󰛓
634+
".tbc": {Icon: "\U000f06d3", Color: 25}, // 󰛓
635635
".tbz2": {Icon: "\uf410", Color: 241}, // 
636636
".tbz": {Icon: "\uf410", Color: 241}, // 
637-
".tcl": {Icon: "\uf06d3", Color: 25}, // 󰛓
637+
".tcl": {Icon: "\U000f06d3", Color: 25}, // 󰛓
638638
".templ": {Icon: "\ueac4", Color: 178}, // 
639639
".terminal": {Icon: "\uf489", Color: 34}, // 
640640
".test.js": {Icon: "\uf499", Color: 185}, // 
@@ -680,7 +680,7 @@ var extIconMap = map[string]IconProperties{
680680
".wav": {Icon: "\uf001", Color: 241}, // 
681681
".webmanifest": {Icon: "\ue60b", Color: 185}, // 
682682
".webm": {Icon: "\uf03d", Color: 241}, // 
683-
".webpack": {Icon: "\uf072b", Color: 74}, // 󰜫
683+
".webpack": {Icon: "\U000f072b", Color: 74}, // 󰜫
684684
".webp": {Icon: "\uf1c5", Color: 241}, // 
685685
".windows": {Icon: "\uf17a", Color: 81}, // 
686686
".wma": {Icon: "\uf001", Color: 39}, // 
@@ -690,7 +690,7 @@ var extIconMap = map[string]IconProperties{
690690
".wrz": {Icon: "\U000f01a7", Color: 102}, // 󰆧
691691
".wvc": {Icon: "\uf001", Color: 39}, // 
692692
".wv": {Icon: "\uf001", Color: 39}, // 
693-
".xaml": {Icon: "\uf0673", Color: 56}, // 󰙳
693+
".xaml": {Icon: "\U000f0673", Color: 56}, // 󰙳
694694
".xcf": {Icon: "\uf338", Color: 240}, // 
695695
".xcplayground": {Icon: "\ue755", Color: 166}, // 
696696
".xcstrings": {Icon: "\U000f05ca", Color: 31}, // 󰗊

‎pkg/gui/presentation/icons/file_icons_test.go‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
package icons
2+
3+
import (
4+
"testing"
5+
)
6+
7+
func TestFileIcons(t *testing.T) {
8+
t.Run("TestFileIcons", func(t *testing.T) {
9+
for name, icon := range nameIconMap {
10+
if len([]rune(icon.Icon)) != 1 {
11+
t.Errorf("nameIconMap[\"%s\"] is not a single rune", name)
12+
}
13+
}
14+
15+
for ext, icon := range extIconMap {
16+
if len([]rune(icon.Icon)) != 1 {
17+
t.Errorf("extIconMap[\"%s\"] is not a single rune", ext)
18+
}
19+
}
20+
})
21+
}

0 commit comments

Comments
 (0)