pogmommy/zellij
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(style): make match arms consistent (#96)

Browse source
This commit is contained in:
Henil 2020-12-11 23:06:15 +05:30 • committed by GitHub
parent 1defd39491
commit 8589addde0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 202 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

279
src/boundaries.rs
View file

@ -18,145 +18,270 @@ pub type BoundaryType = &'static str; // easy way to refer to boundary_type abov
fn combine_symbols(current_symbol: &str, next_symbol: &str) -> Option<&'static str> { fn combine_symbols(current_symbol: &str, next_symbol: &str) -> Option<&'static str> {
match (current_symbol, next_symbol) { match (current_symbol, next_symbol) {
(boundary_type::TOP_RIGHT, boundary_type::TOP_RIGHT) => Some(boundary_type::TOP_RIGHT), // (┐, ┐) => Some(┐) (boundary_type::TOP_RIGHT, boundary_type::TOP_RIGHT) => {
(boundary_type::TOP_RIGHT, boundary_type::VERTICAL) => Some(boundary_type::VERTICAL_LEFT), // (┐, │) => Some(┤) // (┐, ┐) => Some(┐)
Some(boundary_type::TOP_RIGHT)
}
(boundary_type::TOP_RIGHT, boundary_type::VERTICAL) => {
// (┐, │) => Some(┤)
Some(boundary_type::VERTICAL_LEFT)
}
(boundary_type::TOP_RIGHT, boundary_type::HORIZONTAL) => { (boundary_type::TOP_RIGHT, boundary_type::HORIZONTAL) => {
// (┐, ─) => Some(┬)
Some(boundary_type::HORIZONTAL_DOWN) Some(boundary_type::HORIZONTAL_DOWN)
} // (┐, ─) => Some(┬) }
(boundary_type::TOP_RIGHT, boundary_type::TOP_LEFT) => Some(boundary_type::HORIZONTAL_DOWN), // (┐, ┌) => Some(┬) (boundary_type::TOP_RIGHT, boundary_type::TOP_LEFT) => {
// (┐, ┌) => Some(┬)
Some(boundary_type::HORIZONTAL_DOWN)
}
(boundary_type::TOP_RIGHT, boundary_type::BOTTOM_RIGHT) => { (boundary_type::TOP_RIGHT, boundary_type::BOTTOM_RIGHT) => {
// (┐, ┘) => Some(┤)
Some(boundary_type::VERTICAL_LEFT) Some(boundary_type::VERTICAL_LEFT)
} // (┐, ┘) => Some(┤) }
(boundary_type::TOP_RIGHT, boundary_type::BOTTOM_LEFT) => Some(boundary_type::CROSS), // (┐, └) => Some(┼) (boundary_type::TOP_RIGHT, boundary_type::BOTTOM_LEFT) => {
// (┐, └) => Some(┼)
Some(boundary_type::CROSS)
}
(boundary_type::TOP_RIGHT, boundary_type::VERTICAL_LEFT) => { (boundary_type::TOP_RIGHT, boundary_type::VERTICAL_LEFT) => {
// (┐, ┤) => Some(┤)
Some(boundary_type::VERTICAL_LEFT) Some(boundary_type::VERTICAL_LEFT)
} // (┐, ┤) => Some(┤) }
(boundary_type::TOP_RIGHT, boundary_type::VERTICAL_RIGHT) => Some(boundary_type::CROSS), // (┐, ├) => Some(┼) (boundary_type::TOP_RIGHT, boundary_type::VERTICAL_RIGHT) => {
// (┐, ├) => Some(┼)
Some(boundary_type::CROSS)
}
(boundary_type::TOP_RIGHT, boundary_type::HORIZONTAL_DOWN) => { (boundary_type::TOP_RIGHT, boundary_type::HORIZONTAL_DOWN) => {
// (┐, ┬) => Some(┬)
Some(boundary_type::HORIZONTAL_DOWN) Some(boundary_type::HORIZONTAL_DOWN)
} // (┐, ┬) => Some(┬) }
(boundary_type::TOP_RIGHT, boundary_type::HORIZONTAL_UP) => Some(boundary_type::CROSS), // (┐, ┴) => Some(┼) (boundary_type::TOP_RIGHT, boundary_type::HORIZONTAL_UP) => {
(boundary_type::TOP_RIGHT, boundary_type::CROSS) => Some(boundary_type::CROSS), // (┐, ┼) => Some(┼) // (┐, ┴) => Some(┼)
Some(boundary_type::CROSS)
(boundary_type::HORIZONTAL, boundary_type::HORIZONTAL) => Some(boundary_type::HORIZONTAL), // (─, ─) => Some(─) }
(boundary_type::HORIZONTAL, boundary_type::VERTICAL) => Some(boundary_type::CROSS), // (─, │) => Some(┼) (boundary_type::TOP_RIGHT, boundary_type::CROSS) => {
// (┐, ┼) => Some(┼)
Some(boundary_type::CROSS)
}
(boundary_type::HORIZONTAL, boundary_type::HORIZONTAL) => {
// (─, ─) => Some(─)
Some(boundary_type::HORIZONTAL)
}
(boundary_type::HORIZONTAL, boundary_type::VERTICAL) => {
// (─, │) => Some(┼)
Some(boundary_type::CROSS)
}
(boundary_type::HORIZONTAL, boundary_type::TOP_LEFT) => { (boundary_type::HORIZONTAL, boundary_type::TOP_LEFT) => {
// (─, ┌) => Some(┬)
Some(boundary_type::HORIZONTAL_DOWN) Some(boundary_type::HORIZONTAL_DOWN)
} // (─, ┌) => Some(┬) }
(boundary_type::HORIZONTAL, boundary_type::BOTTOM_RIGHT) => { (boundary_type::HORIZONTAL, boundary_type::BOTTOM_RIGHT) => {
// (─, ┘) => Some(┴)
Some(boundary_type::HORIZONTAL_UP) Some(boundary_type::HORIZONTAL_UP)
} // (─, ┘) => Some(┴) }
(boundary_type::HORIZONTAL, boundary_type::BOTTOM_LEFT) => { (boundary_type::HORIZONTAL, boundary_type::BOTTOM_LEFT) => {
// (─, └) => Some(┴)
Some(boundary_type::HORIZONTAL_UP) Some(boundary_type::HORIZONTAL_UP)
} // (─, └) => Some(┴) }
(boundary_type::HORIZONTAL, boundary_type::VERTICAL_LEFT) => Some(boundary_type::CROSS), // (─, ┤) => Some(┼) (boundary_type::HORIZONTAL, boundary_type::VERTICAL_LEFT) => {
(boundary_type::HORIZONTAL, boundary_type::VERTICAL_RIGHT) => Some(boundary_type::CROSS), // (─, ├) => Some(┼) // (─, ┤) => Some(┼)
Some(boundary_type::CROSS)
}
(boundary_type::HORIZONTAL, boundary_type::VERTICAL_RIGHT) => {
// (─, ├) => Some(┼)
Some(boundary_type::CROSS)
}
(boundary_type::HORIZONTAL, boundary_type::HORIZONTAL_DOWN) => { (boundary_type::HORIZONTAL, boundary_type::HORIZONTAL_DOWN) => {
// (─, ┬) => Some(┬)
Some(boundary_type::HORIZONTAL_DOWN) Some(boundary_type::HORIZONTAL_DOWN)
} // (─, ┬) => Some(┬) }
(boundary_type::HORIZONTAL, boundary_type::HORIZONTAL_UP) => { (boundary_type::HORIZONTAL, boundary_type::HORIZONTAL_UP) => {
// (─, ┴) => Some(┴)
Some(boundary_type::HORIZONTAL_UP) Some(boundary_type::HORIZONTAL_UP)
} // (─, ┴) => Some(┴) }
(boundary_type::HORIZONTAL, boundary_type::CROSS) => Some(boundary_type::CROSS), // (─, ┼) => Some(┼) (boundary_type::HORIZONTAL, boundary_type::CROSS) => {
// (─, ┼) => Some(┼)
(boundary_type::VERTICAL, boundary_type::VERTICAL) => Some(boundary_type::VERTICAL), // (│, │) => Some(│) Some(boundary_type::CROSS)
(boundary_type::VERTICAL, boundary_type::TOP_LEFT) => Some(boundary_type::VERTICAL_RIGHT), // (│, ┌) => Some(├) }
(boundary_type::VERTICAL, boundary_type::VERTICAL) => {
// (│, │) => Some(│)
Some(boundary_type::VERTICAL)
}
(boundary_type::VERTICAL, boundary_type::TOP_LEFT) => {
// (│, ┌) => Some(├)
Some(boundary_type::VERTICAL_RIGHT)
}
(boundary_type::VERTICAL, boundary_type::BOTTOM_RIGHT) => { (boundary_type::VERTICAL, boundary_type::BOTTOM_RIGHT) => {
// (│, ┘) => Some(┤)
Some(boundary_type::VERTICAL_LEFT) Some(boundary_type::VERTICAL_LEFT)
} // (│, ┘) => Some(┤) }
(boundary_type::VERTICAL, boundary_type::BOTTOM_LEFT) => { (boundary_type::VERTICAL, boundary_type::BOTTOM_LEFT) => {
// (│, └) => Some(├)
Some(boundary_type::VERTICAL_RIGHT) Some(boundary_type::VERTICAL_RIGHT)
} // (│, └) => Some(├) }
(boundary_type::VERTICAL, boundary_type::VERTICAL_LEFT) => { (boundary_type::VERTICAL, boundary_type::VERTICAL_LEFT) => {
// (│, ┤) => Some(┤)
Some(boundary_type::VERTICAL_LEFT) Some(boundary_type::VERTICAL_LEFT)
} // (│, ┤) => Some(┤) }
(boundary_type::VERTICAL, boundary_type::VERTICAL_RIGHT) => { (boundary_type::VERTICAL, boundary_type::VERTICAL_RIGHT) => {
// (│, ├) => Some(├)
Some(boundary_type::VERTICAL_RIGHT) Some(boundary_type::VERTICAL_RIGHT)
} // (│, ├) => Some(├) }
(boundary_type::VERTICAL, boundary_type::HORIZONTAL_DOWN) => Some(boundary_type::CROSS), // (│, ┬) => Some(┼) (boundary_type::VERTICAL, boundary_type::HORIZONTAL_DOWN) => {
(boundary_type::VERTICAL, boundary_type::HORIZONTAL_UP) => Some(boundary_type::CROSS), // (│, ┴) => Some(┼) // (│, ┬) => Some(┼)
(boundary_type::VERTICAL, boundary_type::CROSS) => Some(boundary_type::CROSS), // (│, ┼) => Some(┼) Some(boundary_type::CROSS)
}
(boundary_type::TOP_LEFT, boundary_type::TOP_LEFT) => Some(boundary_type::TOP_LEFT), // (┌, ┌) => Some(┌) (boundary_type::VERTICAL, boundary_type::HORIZONTAL_UP) => {
(boundary_type::TOP_LEFT, boundary_type::BOTTOM_RIGHT) => Some(boundary_type::CROSS), // (┌, ┘) => Some(┼) // (│, ┴) => Some(┼)
Some(boundary_type::CROSS)
}
(boundary_type::VERTICAL, boundary_type::CROSS) => {
// (│, ┼) => Some(┼)
Some(boundary_type::CROSS)
}
(boundary_type::TOP_LEFT, boundary_type::TOP_LEFT) => {
// (┌, ┌) => Some(┌)
Some(boundary_type::TOP_LEFT)
}
(boundary_type::TOP_LEFT, boundary_type::BOTTOM_RIGHT) => {
// (┌, ┘) => Some(┼)
Some(boundary_type::CROSS)
}
(boundary_type::TOP_LEFT, boundary_type::BOTTOM_LEFT) => { (boundary_type::TOP_LEFT, boundary_type::BOTTOM_LEFT) => {
// (┌, └) => Some(├)
Some(boundary_type::VERTICAL_RIGHT) Some(boundary_type::VERTICAL_RIGHT)
} // (┌, └) => Some(├) }
(boundary_type::TOP_LEFT, boundary_type::VERTICAL_LEFT) => Some(boundary_type::CROSS), // (┌, ┤) => Some(┼) (boundary_type::TOP_LEFT, boundary_type::VERTICAL_LEFT) => {
// (┌, ┤) => Some(┼)
Some(boundary_type::CROSS)
}
(boundary_type::TOP_LEFT, boundary_type::VERTICAL_RIGHT) => { (boundary_type::TOP_LEFT, boundary_type::VERTICAL_RIGHT) => {
// (┌, ├) => Some(├)
Some(boundary_type::VERTICAL_RIGHT) Some(boundary_type::VERTICAL_RIGHT)
} // (┌, ├) => Some(├) }
(boundary_type::TOP_LEFT, boundary_type::HORIZONTAL_DOWN) => { (boundary_type::TOP_LEFT, boundary_type::HORIZONTAL_DOWN) => {
// (┌, ┬) => Some(┬)
Some(boundary_type::HORIZONTAL_DOWN) Some(boundary_type::HORIZONTAL_DOWN)
} // (┌, ┬) => Some(┬) }
(boundary_type::TOP_LEFT, boundary_type::HORIZONTAL_UP) => Some(boundary_type::CROSS), // (┌, ┴) => Some(┼) (boundary_type::TOP_LEFT, boundary_type::HORIZONTAL_UP) => {
(boundary_type::TOP_LEFT, boundary_type::CROSS) => Some(boundary_type::CROSS), // (┌, ┼) => Some(┼) // (┌, ┴) => Some(┼)
Some(boundary_type::CROSS)
}
(boundary_type::TOP_LEFT, boundary_type::CROSS) => {
// (┌, ┼) => Some(┼)
Some(boundary_type::CROSS)
}
(boundary_type::BOTTOM_RIGHT, boundary_type::BOTTOM_RIGHT) => { (boundary_type::BOTTOM_RIGHT, boundary_type::BOTTOM_RIGHT) => {
// (┘, ┘) => Some(┘)
Some(boundary_type::BOTTOM_RIGHT) Some(boundary_type::BOTTOM_RIGHT)
} // (┘, ┘) => Some(┘) }
(boundary_type::BOTTOM_RIGHT, boundary_type::BOTTOM_LEFT) => { (boundary_type::BOTTOM_RIGHT, boundary_type::BOTTOM_LEFT) => {
// (┘, └) => Some(┴)
Some(boundary_type::HORIZONTAL_UP) Some(boundary_type::HORIZONTAL_UP)
} // (┘, └) => Some(┴) }
(boundary_type::BOTTOM_RIGHT, boundary_type::VERTICAL_LEFT) => { (boundary_type::BOTTOM_RIGHT, boundary_type::VERTICAL_LEFT) => {
// (┘, ┤) => Some(┤)
Some(boundary_type::VERTICAL_LEFT) Some(boundary_type::VERTICAL_LEFT)
} // (┘, ┤) => Some(┤) }
(boundary_type::BOTTOM_RIGHT, boundary_type::VERTICAL_RIGHT) => Some(boundary_type::CROSS), // (┘, ├) => Some(┼) (boundary_type::BOTTOM_RIGHT, boundary_type::VERTICAL_RIGHT) => {
(boundary_type::BOTTOM_RIGHT, boundary_type::HORIZONTAL_DOWN) => Some(boundary_type::CROSS), // (┘, ┬) => Some(┼) // (┘, ├) => Some(┼)
Some(boundary_type::CROSS)
}
(boundary_type::BOTTOM_RIGHT, boundary_type::HORIZONTAL_DOWN) => {
// (┘, ┬) => Some(┼)
Some(boundary_type::CROSS)
}
(boundary_type::BOTTOM_RIGHT, boundary_type::HORIZONTAL_UP) => { (boundary_type::BOTTOM_RIGHT, boundary_type::HORIZONTAL_UP) => {
// (┘, ┴) => Some(┴)
Some(boundary_type::HORIZONTAL_UP) Some(boundary_type::HORIZONTAL_UP)
} // (┘, ┴) => Some(┴) }
(boundary_type::BOTTOM_RIGHT, boundary_type::CROSS) => Some(boundary_type::CROSS), // (┘, ┼) => Some(┼) (boundary_type::BOTTOM_RIGHT, boundary_type::CROSS) => {
// (┘, ┼) => Some(┼)
Some(boundary_type::CROSS)
}
(boundary_type::BOTTOM_LEFT, boundary_type::BOTTOM_LEFT) => { (boundary_type::BOTTOM_LEFT, boundary_type::BOTTOM_LEFT) => {
// (└, └) => Some(└)
Some(boundary_type::BOTTOM_LEFT) Some(boundary_type::BOTTOM_LEFT)
} // (└, └) => Some(└) }
(boundary_type::BOTTOM_LEFT, boundary_type::VERTICAL_LEFT) => Some(boundary_type::CROSS), // (└, ┤) => Some(┼) (boundary_type::BOTTOM_LEFT, boundary_type::VERTICAL_LEFT) => {
// (└, ┤) => Some(┼)
Some(boundary_type::CROSS)
}
(boundary_type::BOTTOM_LEFT, boundary_type::VERTICAL_RIGHT) => { (boundary_type::BOTTOM_LEFT, boundary_type::VERTICAL_RIGHT) => {
// (└, ├) => Some(├)
Some(boundary_type::VERTICAL_RIGHT) Some(boundary_type::VERTICAL_RIGHT)
} // (└, ├) => Some(├) }
(boundary_type::BOTTOM_LEFT, boundary_type::HORIZONTAL_DOWN) => Some(boundary_type::CROSS), // (└, ┬) => Some(┼) (boundary_type::BOTTOM_LEFT, boundary_type::HORIZONTAL_DOWN) => {
// (└, ┬) => Some(┼)
Some(boundary_type::CROSS)
}
(boundary_type::BOTTOM_LEFT, boundary_type::HORIZONTAL_UP) => { (boundary_type::BOTTOM_LEFT, boundary_type::HORIZONTAL_UP) => {
// (└, ┴) => Some(┴)
Some(boundary_type::HORIZONTAL_UP) Some(boundary_type::HORIZONTAL_UP)
} // (└, ┴) => Some(┴) }
(boundary_type::BOTTOM_LEFT, boundary_type::CROSS) => Some(boundary_type::CROSS), // (└, ┼) => Some(┼) (boundary_type::BOTTOM_LEFT, boundary_type::CROSS) => {
// (└, ┼) => Some(┼)
Some(boundary_type::CROSS)
}
(boundary_type::VERTICAL_LEFT, boundary_type::VERTICAL_LEFT) => { (boundary_type::VERTICAL_LEFT, boundary_type::VERTICAL_LEFT) => {
// (┤, ┤) => Some(┤)
Some(boundary_type::VERTICAL_LEFT) Some(boundary_type::VERTICAL_LEFT)
} // (┤, ┤) => Some(┤) }
(boundary_type::VERTICAL_LEFT, boundary_type::VERTICAL_RIGHT) => Some(boundary_type::CROSS), // (┤, ├) => Some(┼) (boundary_type::VERTICAL_LEFT, boundary_type::VERTICAL_RIGHT) => {
// (┤, ├) => Some(┼)
Some(boundary_type::CROSS)
}
(boundary_type::VERTICAL_LEFT, boundary_type::HORIZONTAL_DOWN) => { (boundary_type::VERTICAL_LEFT, boundary_type::HORIZONTAL_DOWN) => {
// (┤, ┬) => Some(┼)
Some(boundary_type::CROSS) Some(boundary_type::CROSS)
} // (┤, ┬) => Some(┼) }
(boundary_type::VERTICAL_LEFT, boundary_type::HORIZONTAL_UP) => { (boundary_type::VERTICAL_LEFT, boundary_type::HORIZONTAL_UP) => {
// (┤, ┴) => Some(┼)
Some(boundary_type::HORIZONTAL_UP) Some(boundary_type::HORIZONTAL_UP)
} // (┤, ┴) => Some(┼) }
(boundary_type::VERTICAL_LEFT, boundary_type::CROSS) => Some(boundary_type::CROSS), // (┤, ┼) => Some(┼) (boundary_type::VERTICAL_LEFT, boundary_type::CROSS) => {
// (┤, ┼) => Some(┼)
Some(boundary_type::CROSS)
}
(boundary_type::VERTICAL_RIGHT, boundary_type::VERTICAL_RIGHT) => { (boundary_type::VERTICAL_RIGHT, boundary_type::VERTICAL_RIGHT) => {
// (├, ├) => Some(├)
Some(boundary_type::VERTICAL_RIGHT) Some(boundary_type::VERTICAL_RIGHT)
} // (├, ├) => Some(├) }
(boundary_type::VERTICAL_RIGHT, boundary_type::HORIZONTAL_DOWN) => { (boundary_type::VERTICAL_RIGHT, boundary_type::HORIZONTAL_DOWN) => {
// (├, ┬) => Some(┼)
Some(boundary_type::CROSS) Some(boundary_type::CROSS)
} // (├, ┬) => Some(┼) }
(boundary_type::VERTICAL_RIGHT, boundary_type::HORIZONTAL_UP) => Some(boundary_type::CROSS), // (├, ┴) => Some(┼) (boundary_type::VERTICAL_RIGHT, boundary_type::HORIZONTAL_UP) => {
(boundary_type::VERTICAL_RIGHT, boundary_type::CROSS) => Some(boundary_type::CROSS), // (├, ┼) => Some(┼) // (├, ┴) => Some(┼)
Some(boundary_type::CROSS)
}
(boundary_type::VERTICAL_RIGHT, boundary_type::CROSS) => {
// (├, ┼) => Some(┼)
Some(boundary_type::CROSS)
}
(boundary_type::HORIZONTAL_DOWN, boundary_type::HORIZONTAL_DOWN) => { (boundary_type::HORIZONTAL_DOWN, boundary_type::HORIZONTAL_DOWN) => {
// (┬, ┬) => Some(┬)
Some(boundary_type::HORIZONTAL_DOWN) Some(boundary_type::HORIZONTAL_DOWN)
} // (┬, ┬) => Some(┬) }
(boundary_type::HORIZONTAL_DOWN, boundary_type::HORIZONTAL_UP) => { (boundary_type::HORIZONTAL_DOWN, boundary_type::HORIZONTAL_UP) => {
// (┬, ┴) => Some(┼)
Some(boundary_type::CROSS) Some(boundary_type::CROSS)
} // (┬, ┴) => Some(┼) }
(boundary_type::HORIZONTAL_DOWN, boundary_type::CROSS) => Some(boundary_type::CROSS), // (┬, ┼) => Some(┼) (boundary_type::HORIZONTAL_DOWN, boundary_type::CROSS) => {
// (┬, ┼) => Some(┼)
Some(boundary_type::CROSS)
}
(boundary_type::HORIZONTAL_UP, boundary_type::HORIZONTAL_UP) => { (boundary_type::HORIZONTAL_UP, boundary_type::HORIZONTAL_UP) => {
// (┴, ┴) => Some(┴)
Some(boundary_type::HORIZONTAL_UP) Some(boundary_type::HORIZONTAL_UP)
} // (┴, ┴) => Some(┴) }
(boundary_type::HORIZONTAL_UP, boundary_type::CROSS) => Some(boundary_type::CROSS), // (┴, ┼) => Some(┼) (boundary_type::HORIZONTAL_UP, boundary_type::CROSS) => {
// (┴, ┼) => Some(┼)
(boundary_type::CROSS, boundary_type::CROSS) => Some(boundary_type::CROSS), // (┼, ┼) => Some(┼) Some(boundary_type::CROSS)
}
(boundary_type::CROSS, boundary_type::CROSS) => {
// (┼, ┼) => Some(┼)
Some(boundary_type::CROSS)
}
(_, _) => None, (_, _) => None,
} }
} }