rei-forks/fred
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

extension: Use heck instead of convert_case for snake_case check (#28608)

Browse Source 
This PR updates the snake_case check for grammar names to use `heck`
instead of `convert_case`.

`heck` correctly handles values like `d2`.

Fixes https://github.com/zed-industries/zed/issues/28583.

Release Notes:

- Updated snake_case check for grammar names in extensions.
This commit is contained in:
Marshall Bowers 2025-04-11 16:01:25 -06:00 committed by GitHub
parent a5fe6d1e61
commit 141ad72d97
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -4979,10 +4979,10 @@ dependencies = [
"async-tar", "async-tar",
"async-trait", "async-trait",
"collections", "collections",
"convert_case 0.8.0",
"fs", "fs",
"futures 0.3.31", "futures 0.3.31",
"gpui", "gpui",
"heck 0.5.0",
"http_client", "http_client",
"language", "language",
"log", "log",

1
Cargo.toml
View File

@ -443,6 +443,7 @@ futures-lite = "1.13"
git2 = { version = "0.20.1", default-features = false } git2 = { version = "0.20.1", default-features = false }
globset = "0.4" globset = "0.4"
handlebars = "4.3" handlebars = "4.3"
heck = "0.5"
heed = { version = "0.21.0", features = ["read-txn-no-tls"] } heed = { version = "0.21.0", features = ["read-txn-no-tls"] }
hex = "0.4.3" hex = "0.4.3"
html5ever = "0.27.0" html5ever = "0.27.0"

2
crates/extension/Cargo.toml
View File

@ -17,10 +17,10 @@ async-compression.workspace = true
async-tar.workspace = true async-tar.workspace = true
async-trait.workspace = true async-trait.workspace = true
collections.workspace = true collections.workspace = true
convert_case.workspace = true
fs.workspace = true fs.workspace = true
futures.workspace = true futures.workspace = true
gpui.workspace = true gpui.workspace = true
heck.workspace = true
http_client.workspace = true http_client.workspace = true
language.workspace = true language.workspace = true
log.workspace = true log.workspace = true

4
crates/extension/src/extension_builder.rs
View File

@ -4,9 +4,9 @@ use crate::{
use anyhow::{Context as _, Result, anyhow, bail}; use anyhow::{Context as _, Result, anyhow, bail};
use async_compression::futures::bufread::GzipDecoder; use async_compression::futures::bufread::GzipDecoder;
use async_tar::Archive; use async_tar::Archive;
use convert_case::{Case, Casing as _};
use futures::AsyncReadExt; use futures::AsyncReadExt;
use futures::io::BufReader; use futures::io::BufReader;
use heck::ToSnakeCase;
use http_client::{self, AsyncBody, HttpClient}; use http_client::{self, AsyncBody, HttpClient};
use serde::Deserialize; use serde::Deserialize;
use std::{ use std::{
@ -106,7 +106,7 @@ impl ExtensionBuilder {
} }
for (grammar_name, grammar_metadata) in &extension_manifest.grammars { for (grammar_name, grammar_metadata) in &extension_manifest.grammars {
let snake_cased_grammar_name = grammar_name.to_case(Case::Snake); let snake_cased_grammar_name = grammar_name.to_snake_case();
if grammar_name.as_ref() != snake_cased_grammar_name.as_str() { if grammar_name.as_ref() != snake_cased_grammar_name.as_str() {
bail!( bail!(
"grammar name '{grammar_name}' must be written in snake_case: {snake_cased_grammar_name}" "grammar name '{grammar_name}' must be written in snake_case: {snake_cased_grammar_name}"