h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-10 04:41:15 -03:00
Code Issues Packages Projects Releases Wiki Activity

ast: More migration from type to kind

Browse Source
This commit is contained in:
Peter Ammon
2025-05-03 17:42:56 -07:00
parent 82eacb6d50
commit d23b8af60d
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/builtins/fish_indent.rs
View File

@@ -15,7 +15,7 @@
use libc::LC_ALL;
use super::prelude::*;
use crate::ast::{self, Ast, Kind, Leaf, Node, NodeVisitor, SourceRangeList, Traversal, Type};
use crate::ast::{self, Ast, Kind, Leaf, Node, NodeVisitor, SourceRangeList, Traversal};
use crate::common::{
str2wcstring, unescape_string, wcs2string, UnescapeFlags, UnescapeStringStyle, PROGRAM_NAME,
};
@@ -381,14 +381,14 @@ fn indent(&self, index: usize) -> usize {
// Return gap text flags for the gap text that comes *before* a given node type.
fn gap_text_flags_before_node(&self, node: &dyn Node) -> GapFlags {
let mut result = GapFlags::default();
match node.typ() {
match node.kind() {
// Allow escaped newlines before leaf nodes that can be part of a long command.
Type::argument | Type::redirection | Type::variable_assignment => {
Kind::Argument(_) | Kind::Redirection(_) | Kind::VariableAssignment(_) => {
result.allow_escaped_newlines = true
}
Type::token_base => {
Kind::Token(token) => {
// Allow escaped newlines before && and ||, and also pipes.
match node.as_token().unwrap().token_type() {
match token.token_type() {
ParseTokenType::andand | ParseTokenType::oror | ParseTokenType::pipe => {
result.allow_escaped_newlines = true;
}
@@ -396,11 +396,11 @@ fn gap_text_flags_before_node(&self, node: &dyn Node) -> GapFlags {
// Allow escaped newlines before commands that follow a variable assignment
// since both can be long (#7955).
let p = self.traversal.parent(node);
if p.typ() != Type::decorated_statement {
if !matches!(p.kind(), Kind::DecoratedStatement(_)) {
return result;
}
let p = self.traversal.parent(p);
assert_eq!(p.typ(), Type::statement);
assert!(matches!(p.kind(), Kind::Statement(_)));
let p = self.traversal.parent(p);
if let Kind::JobPipeline(job) = p.kind() {
if !job.variables.is_empty() {

2
src/tests/parser.rs
View File

@@ -956,7 +956,7 @@ fn test_traversal_skip_children_panics() {
let ast = ast::parse(L!("true;"), ParseTreeFlags::empty(), None);
let mut traversal = ast.walk();
while let Some(node) = traversal.next() {
if node.typ() == ast::Type::decorated_statement {
if matches!(node.kind(), ast::Kind::DecoratedStatement(_)) {
// Should panic as we can only skip the current node.
traversal.skip_children(ast.top());
}