Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix incorrect gutter bail message #7534

Merged
merged 1 commit into from
Jul 7, 2023

Conversation

t-taylor
Copy link
Contributor

@t-taylor t-taylor commented Jul 4, 2023

"spacer" was listed twice in the editors.gutter example and the error message for the gutter config parsing was missing newer options.

@t-taylor t-taylor changed the title Remove duplicated configuration option in docs Remove duplicated configuration option in docs & fix invalid gutter message Jul 4, 2023
pascalkuthe
pascalkuthe previously approved these changes Jul 4, 2023
@pascalkuthe
Copy link
Member

Please run rustfmt to make CI pass

pascalkuthe
pascalkuthe previously approved these changes Jul 5, 2023
Copy link
Member

@the-mikedavis the-mikedavis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The change in the bail! message looks good but I believe the configuration docs are correct:

impl Default for GutterConfig {
fn default() -> Self {
Self {
layout: vec![
GutterType::Diagnostics,
GutterType::Spacer,
GutterType::LineNumbers,
GutterType::Spacer,
GutterType::Diff,
],
line_numbers: GutterLineNumbersConfig::default(),
}
}
}

Gutter elements are repeatable and spacer is used to add some space between other elements.

@pascalkuthe
Copy link
Member

ah right I misserad the change. The docs show the default configureitaton (which contains two spacers) not the list of available options

@t-taylor t-taylor changed the title Remove duplicated configuration option in docs & fix invalid gutter message Fix invalid gutter bail message Jul 6, 2023
@the-mikedavis the-mikedavis changed the title Fix invalid gutter bail message Fix incorrect gutter bail message Jul 7, 2023
@the-mikedavis the-mikedavis merged commit dc50263 into helix-editor:master Jul 7, 2023
6 checks passed
mtoohey31 pushed a commit to mtoohey31/helix that referenced this pull request Jun 2, 2024
smortime pushed a commit to smortime/helix that referenced this pull request Jul 10, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants