Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/editor/view/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8270,7 +8270,7 @@ fn move_single_word(text: &str) -> CharOffset {
/// The anchor for showing command x-ray information
#[derive(Debug)]
pub enum CommandXRayAnchor {
/// Show x-ray info based on the cursor positon
/// Show x-ray info based on the cursor position
Cursor,

/// Show x-ray info based on a hover at the given display point
Expand Down
2 changes: 1 addition & 1 deletion app/src/menu.rs
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ pub struct SubMenu<A: Action + Clone = ()> {
/// Menu contains the menu items and defines the logic for managing the actions and rendering of the
/// items. It has two variants (scrollable and fixed) which slightly change the way it's laid out.
/// TODO: In the future, if we keep bumping into more rendering changes here, it may make sense to
/// abstract the Menu functionality into a trait and have separte implementations for dropdown and
/// abstract the Menu functionality into a trait and have separate implementations for dropdown and
/// context menu.
pub struct Menu<A: Action + Clone = ()> {
/// Whether or not the element should make the rest of the window unresponsive. All mouse events
Expand Down
8 changes: 4 additions & 4 deletions app/src/terminal/event.rs
Original file line number Diff line number Diff line change
Expand Up @@ -193,8 +193,8 @@ pub struct InitShellEvent {
pub struct BootstrappedEvent {
/// The command which spawned the shell.
pub spawning_command: String,
// This is wrapped in an `Box` to surpress clippy's large-enum-variant warning, not because it
// functionally needs to be wrapped in an `Box`.
// This is wrapped in a `Box` to suppress clippy's large-enum-variant warning, not because it
// functionally needs to be wrapped in a `Box`.
pub session_info: Box<SessionInfo>,
pub restored_block_commands: Vec<HistoryEntry>,
/// The time we spent sourcing the user's rcfiles, in seconds. This may be
Expand Down Expand Up @@ -296,11 +296,11 @@ pub struct UserBlockCompleted {
pub command_with_obfuscated_secrets: String,

/// The output lines for a block without any escape sequences.
/// They are truncated to the number of lines specificed by the caller.
/// They are truncated to the number of lines specified by the caller.
pub output_truncated: String,

/// The output lines for a block without any escape sequences.
/// They are truncated to the number of lines specificed by the caller.
/// They are truncated to the number of lines specified by the caller.
/// Forced secrets to be obfuscated as well.
pub output_truncated_with_obfuscated_secrets: String,

Expand Down
6 changes: 3 additions & 3 deletions app/src/terminal/input/inline_menu/positioning.rs
Original file line number Diff line number Diff line change
Expand Up @@ -154,16 +154,16 @@ impl InlineMenuPositioner {
/// This inset application is done in one of two ways in waterfall mode:
/// * If there is no gap, we subtract the 'inset', equivalent to the inline menu
/// height from the max height constraint of the blocklist element
/// * If there _is_ a gap, we subtract the inset from painted visible blocklist element originj
/// * If there _is_ a gap, we subtract the inset from painted visible blocklist element origin
/// at paint time.
///
/// When there is no gap, that's pretty much all we need to do.
///
/// When there is a gap, there is further accounting to be done: this blocklist translation is
/// applied at paint-time to reduce the surface area of logic that needs to be aware of the
/// inline menu visiblity/height (for example, the sumtree doesn't need to be aware of this at
/// inline menu visibility/height (for example, the sumtree doesn't need to be aware of this at
/// all). This means, however, we do need to account for inset value in logic that translates
/// artifacts of rendering (layout/paint) back to the data model -- main in places where the
/// artifacts of rendering (layout/paint) back to the data model -- mainly in places where the
/// sumtree heights are dependent on the laid out input size (the inline menu is part of the
/// input element subtree). The main areas considered are:
///
Expand Down
6 changes: 3 additions & 3 deletions app/src/terminal/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ pub enum SizeUpdateReason {
/// Updated because of some general refresh (e.g. a font-size change)
Refresh,

/// Updated after the temrinal has been laid out, so some of the element
/// Updated after the terminal has been laid out, so some of the element
/// sizes that drive terminal size may have changed.
AfterLayout,

Expand Down Expand Up @@ -306,8 +306,8 @@ pub struct SizeInfo {
///
/// Note that *rows* is always determined as a function of pane size, not
/// the content element size, which is somewhat counterintuitive. The reason
/// is that the content element size changes frequenetly as the input size
/// changes or the input dissapears for long running commands, but many
/// is that the content element size changes frequently as the input size
/// changes or the input disappears for long running commands, but many
/// programs do not handle size changes while they are running very well. To
/// get around this we make them think that rows always comes from the pane size.
rows: usize,
Expand Down