Tom Zaspel and Danilo Leal created
Before you mark this PR as ready for review, make sure that you have:
- [ ] Added a solid test coverage and/or screenshots from doing manual
testing
- [x] Done a self-review taking into account security and performance
aspects
- [x] Aligned any UI changes with the [UI
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
I used the icons from here:
- GitLab: https://about.gitlab.com/press/press-kit/
- Helm: https://www.svgrepo.com/svg/330624/helm
- Yaml: https://icons.getbootstrap.com/icons/filetype-yml/
FYI: I'm not familiar with Rust please review the rust code.
Release Notes:
- Added file icons for YAML, Helm and GitLab files, and used the Docker
icon for `Containerfile`.
---------
Co-authored-by: Danilo Leal <daniloleal09@gmail.com>assets/icons/file_icons/gitlab.svg | 1
assets/icons/file_icons/helm.svg | 0
assets/icons/file_icons/yaml.svg | 1
crates/theme/src/icon_theme.rs | 35 ++++++++++++++++++++++++++++---
4 files changed, 33 insertions(+), 4 deletions(-)
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path fill="#c6cad0" fill-rule="evenodd" d="m13.823 6.818-.017-.044-1.64-4.28a.43.43 0 0 0-.424-.267.45.45 0 0 0-.246.092.45.45 0 0 0-.146.221l-1.107 3.387H5.76L4.653 2.54a.43.43 0 0 0-.816-.044L2.195 6.773l-.017.043a3.045 3.045 0 0 0 1.105 3.465l.026.018L8 13.78l4.69-3.48.027-.019a3.04 3.04 0 0 0 1.106-3.462" clip-rule="evenodd"/></svg>
@@ -0,0 +1 @@
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path fill="#c6cad0" d="M2.067 2.422h1.364l1.3 2.14 1.427-2.14h1.364L5.26 5.604v1.818H4.15V5.604zM4.15 8.288h1.379l1.456 3.554h.062l1.457-3.554h1.38v5.29H8.798v-3.443h-.044l-1.37 3.417h-.738l-1.369-3.43h-.044v3.456H4.15zM10.547 13.578v-5.29h1.118v4.368h2.268v.922z"/><path fill="#c6cad0" d="M11.704 7.422h-1.31l-.365-1.055H7.865l-.412 1.055H6.145l2-5h1.573zm-3.5-1.928h1.52l-.694-2h-.045z" opacity=".5"/></svg>
@@ -66,7 +66,7 @@ pub struct IconDefinition {
}
const FILE_STEMS_BY_ICON_KEY: &[(&str, &[&str])] = &[
- ("docker", &["Dockerfile"]),
+ ("docker", &["Containerfile", "Dockerfile"]),
("ruby", &["Podfile"]),
("heroku", &["Procfile"]),
];
@@ -99,6 +99,15 @@ const FILE_SUFFIXES_BY_ICON_KEY: &[(&str, &[&str])] = &[
("cue", &["cue"]),
("dart", &["dart"]),
("diff", &["diff"]),
+ (
+ "docker",
+ &[
+ "docker-compose.yml",
+ "docker-compose.yaml",
+ "compose.yml",
+ "compose.yaml",
+ ],
+ ),
(
"document",
&[
@@ -138,12 +147,27 @@ const FILE_SUFFIXES_BY_ICON_KEY: &[(&str, &[&str])] = &[
("font", &["otf", "ttf", "woff", "woff2"]),
("fsharp", &["fs"]),
("fsproj", &["fsproj"]),
- ("gitlab", &["gitlab-ci.yml"]),
+ ("gitlab", &["gitlab-ci.yml", "gitlab-ci.yaml"]),
("gleam", &["gleam"]),
("go", &["go", "mod", "work"]),
("graphql", &["gql", "graphql", "graphqls"]),
("haskell", &["hs"]),
("hcl", &["hcl"]),
+ (
+ "helm",
+ &[
+ "helmfile.yaml",
+ "helmfile.yml",
+ "Chart.yaml",
+ "Chart.yml",
+ "Chart.lock",
+ "values.yaml",
+ "values.yml",
+ "requirements.yaml",
+ "requirements.yml",
+ "tpl",
+ ],
+ ),
("html", &["htm", "html"]),
(
"image",
@@ -198,7 +222,7 @@ const FILE_SUFFIXES_BY_ICON_KEY: &[(&str, &[&str])] = &[
("rust", &["rs"]),
("sass", &["sass", "scss"]),
("scala", &["scala", "sc"]),
- ("settings", &["conf", "ini", "yaml", "yml"]),
+ ("settings", &["conf", "ini"]),
("solidity", &["sol"]),
(
"storage",
@@ -279,6 +303,7 @@ const FILE_SUFFIXES_BY_ICON_KEY: &[(&str, &[&str])] = &[
("vue", &["vue"]),
("vyper", &["vy", "vyi"]),
("wgsl", &["wgsl"]),
+ ("yaml", &["yaml", "yml"]),
("zig", &["zig"]),
];
@@ -310,12 +335,13 @@ const FILE_ICONS: &[(&str, &str)] = &[
("font", "icons/file_icons/font.svg"),
("fsharp", "icons/file_icons/fsharp.svg"),
("fsproj", "icons/file_icons/file.svg"),
- ("gitlab", "icons/file_icons/settings.svg"),
+ ("gitlab", "icons/file_icons/gitlab.svg"),
("gleam", "icons/file_icons/gleam.svg"),
("go", "icons/file_icons/go.svg"),
("graphql", "icons/file_icons/graphql.svg"),
("haskell", "icons/file_icons/haskell.svg"),
("hcl", "icons/file_icons/hcl.svg"),
+ ("helm", "icons/file_icons/helm.svg"),
("heroku", "icons/file_icons/heroku.svg"),
("html", "icons/file_icons/html.svg"),
("image", "icons/file_icons/image.svg"),
@@ -371,6 +397,7 @@ const FILE_ICONS: &[(&str, &str)] = &[
("vue", "icons/file_icons/vue.svg"),
("vyper", "icons/file_icons/vyper.svg"),
("wgsl", "icons/file_icons/wgsl.svg"),
+ ("yaml", "icons/file_icons/yaml.svg"),
("zig", "icons/file_icons/zig.svg"),
];