add OpenSCAD language support #1502

kenchou · 2024-12-28T16:21:24Z

OpenSCAD is a software for creating solid 3D CAD objects.
SCAD stands for "Scripted CAD", where CAD is an acronym for "Computer-Aided Design".

OpenSCAD has been added to the upstream repository Tokei (v13.0.0-alpha.2) ( PR #1097)

Due to Perl 6 being renamed to Raku in Tokei v13.x, this PR has also been updated accordingly to avoid build errors.

o2sh · 2024-12-28T18:25:07Z

languages.yaml

+      - "#803788"
+      - "#FFFFFF"
+    chip: "#178600" # required, this is used for the language breakdown bar, its value can be found in linguist (link 2).
+    icon: '\u{F34E}'


The icon property's indentation needs to be decreased by one level.

This is why the Nerd Font icon isn't appearing in the web preview. https://vercel-cxhqbujdb-o2shs-projects.vercel.app/#OpenScad

o2sh · 2024-12-28T18:26:59Z

languages.yaml

+      - blue
+      - magenta
+      - magenta
+      - white
+    hex: # optional, alternative to basic colors for terminals that support true colour.
+      - "#9B4F97"
+      - "#67217A"
+      - "#803788"
+      - "#FFFFFF"


You're declaring 4 colors but only using one.

More info on how to color an ascii logo: https://github.com/o2sh/onefetch/wiki/ascii-art

fixed. Removed unnecessary color definitions.

94b5656 I added a second color with hex values to get it closer to the original logo https://vercel-f4f8n13fs-o2shs-projects.vercel.app/#OpenScad

o2sh · 2024-12-28T18:27:25Z

languages.yaml

+    {0}     ·...·   .-=++*****++=-.
+    {0}                ---------
+  colors:
+    ansi: # required, a list of the ANSI colors used to colorize the logo


you can remove the comments

spenserblack · 2024-12-28T19:54:32Z

languages.yaml

@@ -1887,7 +1920,7 @@ Perl:
      - cyan
    chip: "#0298C3"
  icon: '\u{E67E}'
-Perl6:
+Raku:


The languages are alphabetized, so this would need to be moved.

fixed. Moved to after Racket

spenserblack · 2024-12-28T19:57:45Z

Cargo.toml

@@ -66,7 +66,7 @@ serde_yaml = "0.9.34"
 strum.workspace = true
 time = { version = "0.3.37", features = ["formatting"] }
 time-humanize = { version = "0.1.3", features = ["time"] }
-tokei = "12.1.2"
+tokei = "13.0.0-alpha.7"


@o2sh So we're good with moving to a pre-release? I don't have a problem with it, but what are your thoughts?

It's definitely not ideal, but we can always roll back if we find any issues

Sadly, the upstream release is too slow. It took 3 months from merging this PR to the release. I almost forgot about it.

spenserblack

Because I'm picky about git histories, ideally this PR would be 1 commit to bump tokei and 1 to add OpenSCAD support, but I'm not going to block based on that. LGTM!

o2sh · 2024-12-29T16:56:18Z

Good point @spenserblack, I bumped tokei in its own commit da23635 and reverted the corresponding changes from this PR

o2sh

Thanks a lot for your contribution @kenchou, the ASCII logo looks great 🎉

This MR contains the following updates: | Package | Update | Change | |---|---|---| | [o2sh/onefetch](https://github.com/o2sh/onefetch) | minor | `2.22.0` -> `2.23.1` | MR created with the help of [el-capitano/tools/renovate-bot](https://gitlab.com/el-capitano/tools/renovate-bot). **Proposed changes to behavior should be submitted there as MRs.** --- ### Release Notes <details> <summary>o2sh/onefetch (o2sh/onefetch)</summary> ### [`v2.23.1`](https://github.com/o2sh/onefetch/releases/tag/2.23.1) [Compare Source](o2sh/onefetch@2.23.0...2.23.1)  ##### Bug Fixes 🐛 - Fix version in man page **Full Changelog**: o2sh/onefetch@2.23.0...2.23.1 ### [`v2.23.0`](https://github.com/o2sh/onefetch/releases/tag/2.23.0) [Compare Source](o2sh/onefetch@2.22.0...2.23.0)  #### What's Changed ##### New Features 🎉 - add language support for OpenSCAD by [@kenchou](https://github.com/kenchou) in o2sh/onefetch#1502 - add language support for Modelica by [@dietmarw](https://github.com/dietmarw) in o2sh/onefetch#1262 - add language support for ATS by [@pykenny](https://github.com/pykenny) in o2sh/onefetch#523 - add language support for CUDA by [@jtmr05](https://github.com/jtmr05) in o2sh/onefetch#940 - add missing nerd fonts icons for some languages by [@ankddev](https://github.com/ankddev) in o2sh/onefetch#1491 ##### Chores 🧹 - add Italian translation of README by [@tlazzarin](https://github.com/tlazzarin) in o2sh/onefetch#1435 - add Polish translation of README by [@adamperkowski](https://github.com/adamperkowski) in o2sh/onefetch#1444 - add Czech translation of READEME by [@Amereyeu](https://github.com/Amereyeu) in o2sh/onefetch#1439 - update russian README by [@ankddev](https://github.com/ankddev) in o2sh/onefetch#1478 - \[onefetch.dev] migrate to Svelte v5 by [@o2sh](https://github.com/o2sh) in o2sh/onefetch#1455 - add script to preview/validate Nerd Fonts by [@spenserblack](https://github.com/spenserblack) in o2sh/onefetch#1492 - add Powershell snippet to run onefetch automatically by [@kiapanahi](https://github.com/kiapanahi) in o2sh/onefetch#1453 #### New Contributors - [@tlazzarin](https://github.com/tlazzarin) made their first contribution in o2sh/onefetch#1435 - [@kiapanahi](https://github.com/kiapanahi) made their first contribution in o2sh/onefetch#1453 - [@adamperkowski](https://github.com/adamperkowski) made their first contribution in o2sh/onefetch#1444 - [@Amereyeu](https://github.com/Amereyeu) made their first contribution in o2sh/onefetch#1439 - [@ankddev](https://github.com/ankddev) made their first contribution in o2sh/onefetch#1478 - [@kenchou](https://github.com/kenchou) made their first contribution in o2sh/onefetch#1502 - [@dietmarw](https://github.com/dietmarw) made their first contribution in o2sh/onefetch#1262 - [@pykenny](https://github.com/pykenny) made their first contribution in o2sh/onefetch#523 - [@jtmr05](https://github.com/jtmr05) made their first contribution in o2sh/onefetch#940 **Full Changelog**: o2sh/onefetch@2.22.0...2.23.0 </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever MR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this MR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this MR, check this box --- This MR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).

add OpenSCAD language support

b2906d0

kenchou requested review from spenserblack and o2sh as code owners December 28, 2024 16:21

vercel bot deployed to Preview December 28, 2024 16:21 View deployment

o2sh reviewed Dec 28, 2024

View reviewed changes

spenserblack requested changes Dec 28, 2024

View reviewed changes

fix

dcf7aeb

vercel bot deployed to Preview December 29, 2024 05:37 View deployment

update color

653a6c8

vercel bot deployed to Preview December 29, 2024 05:45 View deployment

add second color + hex values

94b5656

vercel bot deployed to Preview December 29, 2024 12:47 View deployment

o2sh approved these changes Dec 29, 2024

View reviewed changes

spenserblack approved these changes Dec 29, 2024

View reviewed changes

revole conflict on cargo.lock

f492a20

vercel bot deployed to Preview December 29, 2024 16:52 View deployment

Merge branch 'main' into main

df39581

vercel bot deployed to Preview December 29, 2024 16:53 View deployment

o2sh approved these changes Dec 29, 2024

View reviewed changes

o2sh merged commit 4bec002 into o2sh:main Dec 29, 2024
4 checks passed

o2sh added the feat label Jan 1, 2025

add OpenSCAD language support #1502

add OpenSCAD language support #1502

Uh oh!

Conversation

kenchou commented Dec 28, 2024

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

spenserblack left a comment

Choose a reason for hiding this comment

Uh oh!

o2sh commented Dec 29, 2024

Uh oh!

o2sh left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!