Skip to content

Fix call_parentheses = Input don't work in editorconfig #1057

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.

Sign up for GitHub

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

Open
phanen wants to merge 2 commits into
base: main
Choose a base branch
from
+49 −68
Open

Fix call_parentheses = Input don't work in editorconfig #1057

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
62488a6
Fix `call_parentheses = Input` don't work in editorconfig
phanen Dec 24, 2025
2f21a7e
fixup! Fix `call_parentheses = Input` don't work in editorconfig
phanen Dec 24, 2025
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
117 changes: 49 additions & 68 deletions src/editorconfig.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@ property_choice! {
(Always, "always"),
(NoSingleString, "nosinglestring"),
(NoSingleTable, "nosingletable"),
(None, "none")
(None, "none"),
(Input, "input")
}

property_choice! {
Expand Down Expand Up @@ -90,91 +91,71 @@ property_choice! {
// Override StyLua config with EditorConfig properties
fn load(mut config: Config, properties: &Properties) -> Config {
if let Ok(end_of_line) = properties.get::<EndOfLine>() {
match end_of_line {
EndOfLine::Cr | EndOfLine::Lf => config.line_endings = LineEndings::Unix,
EndOfLine::CrLf => config.line_endings = LineEndings::Windows,
}
config.line_endings = match end_of_line {
EndOfLine::Cr | EndOfLine::Lf => LineEndings::Unix,
EndOfLine::CrLf => LineEndings::Windows,
};
}
if let Ok(indent_size) = properties.get::<IndentSize>() {
match indent_size {
IndentSize::Value(indent_width) => config.indent_width = indent_width,
IndentSize::UseTabWidth => {
if let Ok(TabWidth::Value(indent_width)) = properties.get::<TabWidth>() {
config.indent_width = indent_width
}
}
}
config.indent_width = match indent_size {
IndentSize::Value(indent_width) => indent_width,
IndentSize::UseTabWidth => match properties.get::<TabWidth>() {
Ok(TabWidth::Value(tab_width)) => tab_width,
_ => config.indent_width,
},
};
}
if let Ok(indent_style) = properties.get::<IndentStyle>() {
match indent_style {
IndentStyle::Tabs => config.indent_type = IndentType::Tabs,
IndentStyle::Spaces => config.indent_type = IndentType::Spaces,
}
config.indent_type = match indent_style {
IndentStyle::Tabs => IndentType::Tabs,
IndentStyle::Spaces => IndentType::Spaces,
};
}
if let Ok(max_line_length) = properties.get::<MaxLineLen>() {
match max_line_length {
MaxLineLen::Value(column_width) => config.column_width = column_width,
MaxLineLen::Off => config.column_width = usize::MAX,
}
config.column_width = match max_line_length {
MaxLineLen::Value(column_width) => column_width,
MaxLineLen::Off => usize::MAX,
};
}
if let Ok(quote_type) = properties.get::<QuoteTypeChoice>() {
match quote_type {
QuoteTypeChoice::Double => config.quote_style = QuoteStyle::AutoPreferDouble,
QuoteTypeChoice::Single => config.quote_style = QuoteStyle::AutoPreferSingle,
QuoteTypeChoice::Auto => (),
}
config.quote_style = match quote_type {
QuoteTypeChoice::Double => QuoteStyle::AutoPreferDouble,
QuoteTypeChoice::Single => QuoteStyle::AutoPreferSingle,
QuoteTypeChoice::Auto => config.quote_style,
};
}
if let Ok(call_parentheses) = properties.get::<CallParenthesesChoice>() {
match call_parentheses {
CallParenthesesChoice::Always => config.call_parentheses = CallParenType::Always,
CallParenthesesChoice::NoSingleString => {
config.call_parentheses = CallParenType::NoSingleString
}
CallParenthesesChoice::NoSingleTable => {
config.call_parentheses = CallParenType::NoSingleTable
}
CallParenthesesChoice::None => config.call_parentheses = CallParenType::None,
}
config.call_parentheses = match call_parentheses {
CallParenthesesChoice::Always => CallParenType::Always,
CallParenthesesChoice::NoSingleString => CallParenType::NoSingleString,
CallParenthesesChoice::NoSingleTable => CallParenType::NoSingleTable,
CallParenthesesChoice::None => CallParenType::None,
CallParenthesesChoice::Input => CallParenType::Input,
};
}
if let Ok(space_after_function_names) = properties.get::<SpaceAfterFunctionNamesChoice>() {
match space_after_function_names {
SpaceAfterFunctionNamesChoice::Always => {
config.space_after_function_names = SpaceAfterFunctionNames::Always
}
SpaceAfterFunctionNamesChoice::Definitions => {
config.space_after_function_names = SpaceAfterFunctionNames::Definitions
}
SpaceAfterFunctionNamesChoice::Calls => {
config.space_after_function_names = SpaceAfterFunctionNames::Calls
}
SpaceAfterFunctionNamesChoice::Never => {
config.space_after_function_names = SpaceAfterFunctionNames::Never
}
}
config.space_after_function_names = match space_after_function_names {
SpaceAfterFunctionNamesChoice::Always => SpaceAfterFunctionNames::Always,
SpaceAfterFunctionNamesChoice::Definitions => SpaceAfterFunctionNames::Definitions,
SpaceAfterFunctionNamesChoice::Calls => SpaceAfterFunctionNames::Calls,
SpaceAfterFunctionNamesChoice::Never => SpaceAfterFunctionNames::Never,
};
}
if let Ok(collapse_simple_statement) = properties.get::<CollapseSimpleStatementChoice>() {
match collapse_simple_statement {
CollapseSimpleStatementChoice::Never => {
config.collapse_simple_statement = CollapseSimpleStatement::Never
}
CollapseSimpleStatementChoice::FunctionOnly => {
config.collapse_simple_statement = CollapseSimpleStatement::FunctionOnly
}
config.collapse_simple_statement = match collapse_simple_statement {
CollapseSimpleStatementChoice::Never => CollapseSimpleStatement::Never,
CollapseSimpleStatementChoice::FunctionOnly => CollapseSimpleStatement::FunctionOnly,
CollapseSimpleStatementChoice::ConditionalOnly => {
config.collapse_simple_statement = CollapseSimpleStatement::ConditionalOnly
}
CollapseSimpleStatementChoice::Always => {
config.collapse_simple_statement = CollapseSimpleStatement::Always
CollapseSimpleStatement::ConditionalOnly
}
}
CollapseSimpleStatementChoice::Always => CollapseSimpleStatement::Always,
};
}
if let Ok(sort_requires) = properties.get::<SortRequiresChoice>() {
match sort_requires {
SortRequiresChoice::True => config.sort_requires = SortRequiresConfig { enabled: true },
SortRequiresChoice::False => {
config.sort_requires = SortRequiresConfig { enabled: false }
}
}
config.sort_requires = match sort_requires {
SortRequiresChoice::True => SortRequiresConfig { enabled: true },
SortRequiresChoice::False => SortRequiresConfig { enabled: false },
};
}

config
Expand Down
Loading