mirror of
https://github.com/elicpeter/nyx.git
synced 2026-06-09 19:45:13 +02:00
[pitboss/grind] deferred session-0009 (20260520T233019Z-6958)
This commit is contained in:
parent
a6f34554db
commit
38cc0ce05f
60 changed files with 509 additions and 541 deletions
|
|
@ -40,8 +40,8 @@ pub fn detect_rails_routes(
|
|||
|
||||
fn detect_routes_dsl(root: Node, bytes: &[u8], file_rel: &str, out: &mut Vec<SurfaceNode>) {
|
||||
fn recurse(node: Node, bytes: &[u8], file_rel: &str, out: &mut Vec<SurfaceNode>) {
|
||||
if matches!(node.kind(), "call" | "method_call") {
|
||||
if let Some(method_node) = node.child_by_field_name("method")
|
||||
if matches!(node.kind(), "call" | "method_call")
|
||||
&& let Some(method_node) = node.child_by_field_name("method")
|
||||
&& let Ok(method_text) = method_node.utf8_text(bytes)
|
||||
&& let Some((_, method)) = VERBS.iter().find(|(v, _)| *v == method_text)
|
||||
{
|
||||
|
|
@ -73,7 +73,6 @@ fn detect_routes_dsl(root: Node, bytes: &[u8], file_rel: &str, out: &mut Vec<Sur
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
let mut cursor = node.walk();
|
||||
for child in node.children(&mut cursor) {
|
||||
recurse(child, bytes, file_rel, out);
|
||||
|
|
|
|||
|
|
@ -53,9 +53,9 @@ fn is_app_router_route(path: &Path) -> bool {
|
|||
}
|
||||
|
||||
fn is_pages_api_route(path: &Path) -> bool {
|
||||
let mut comps = path.components().peekable();
|
||||
let comps = path.components().peekable();
|
||||
let mut saw_pages = false;
|
||||
while let Some(c) = comps.next() {
|
||||
for c in comps {
|
||||
if c.as_os_str().to_string_lossy() == "pages" {
|
||||
saw_pages = true;
|
||||
} else if saw_pages && c.as_os_str().to_string_lossy() == "api" {
|
||||
|
|
|
|||
|
|
@ -341,11 +341,10 @@ impl SurfaceMap {
|
|||
/// Returns the absolute path verbatim when the file is outside the
|
||||
/// scan root or when path stripping fails.
|
||||
pub fn relative_path_string(path: &Path, scan_root: Option<&Path>) -> String {
|
||||
if let Some(root) = scan_root {
|
||||
if let Ok(rel) = path.strip_prefix(root) {
|
||||
if let Some(root) = scan_root
|
||||
&& let Ok(rel) = path.strip_prefix(root) {
|
||||
return rel.to_string_lossy().replace('\\', "/");
|
||||
}
|
||||
}
|
||||
path.to_string_lossy().replace('\\', "/")
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue