Skip to content

[Rust] more support + fix for #41 #42

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

Draft
alexpw wants to merge 5 commits into
base: master
Choose a base branch
from
+594 −20
Draft

[Rust] more support + fix for #41 #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
db23cd9
feat: support for rust
alexpw May 8, 2023
ba0277b
feat: spec/support for parameters, tuple_pattern, enum_variant_list
alexpw May 8, 2023
b10dff4
feat: add spec for #41 case
alexpw May 8, 2023
4bd056e
fix: remove dupe Rust entry -- oops, must be tired
alexpw May 8, 2023
e080bbf
fix: 3 cases mentioned in #41
alexpw May 8, 2023
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 .github/workflows/spec.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:

- name: Compile parsers
run: |
nvim --headless -c "TSInstallSync ruby python lua javascript julia yaml sql r" -c "q"
nvim --headless -c "TSInstallSync ruby python lua javascript julia yaml sql r rust" -c "q"
- name: Tests
env:
ci: "1"
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ Builtin actions are all higher-order functions so they can easily have options o
| `cycle_case()` | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | | | ✅ | ✅ |
| `cycle_quotes()` | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | | | | ✅ |
| `toggle_multiline()` | | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | | |
| `toggle_operator()` | | ✅ | ✅ | ✅ | ✅ | ✅ | | | | | ✅ |
| `toggle_operator()` | | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | | | ✅ |
| `toggle_int_readability()` | | ✅ | ✅ | | ✅ | ✅ | ✅ | ✅ | | | |
| `toggle_block()` | | ✅ | | | | | | | | | |
| if/else <-> ternery | | ✅ | | | ✅ | | | | | | |
Expand Down
100 changes: 82 additions & 18 deletions lua/ts-node-action/filetypes/rust.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,90 @@
local actions = require("ts-node-action.actions")

local operators = {
-- assignment
["+="] = "-=",
["-="] = "+=",
["%="] = "/=",
["/="] = "%=",
-- bitwise assignment
["&="] = "|=",
["|="] = "^=",
["^="] = "&=",
-- comparison
["!="] = "==",
["=="] = "!=",
[">"] = "<",
["<"] = ">",
[">="] = "<=",
["<="] = ">=",
-- shift
["<<"] = ">>",
[">>"] = "<<",
-- shift assignment
[">>="] = "<<=",
["<<="] = ">>=",
-- arithmetic
["+"] = "-",
["-"] = "+",
["*"] = "/",
["/"] = "*",
-- bitwise
["|"] = "&",
["&"] = "|",
-- logical
["||"] = "&&",
["&&"] = "||",
}

local padding = {
["{"] = "%s ",
["}"] = {
" %s",
["{"] = "%s",
[","] = "%s",
[";"] = "%s",
["prev_nil"] = "%s",
},
["let"] = "%s ",
["as"] = " %s ",
["in"] = { " %s ", ["prev_nil"] = "%s ", },
["="] = " %s ",
[":"] = "%s ",
[";"] = "%s ",
[","] = "%s ",
}
local padding_use_list = {
["{"] = "%s",
["}"] = "%s",
[","] = "%s ",
[":"] = "%s ",
["{"] = "%s ",
["=>"] = " %s ",
["="] = " %s ",
["}"] = " %s",
["+"] = " %s ",
["-"] = " %s ",
["*"] = " %s ",
["/"] = " %s ",
}

local uncollapsible = {
["string_literal"] = true,
["let_declaration"] = true,
["reference_type"] = true,
["reference_expression"] = true,
["type_case_expression"] = true,
["macro_invocation"] = true,
["macro"] = true,
["for_expression"] = true,
["range_expression"] = true,
["line_comment"] = true,
}

return {
["field_declaration_list"] = actions.toggle_multiline(padding),
["parameters"] = actions.toggle_multiline(padding),
["enum_variant_list"] = actions.toggle_multiline(padding),
["block"] = actions.toggle_multiline(padding),
["array_expression"] = actions.toggle_multiline(padding),
["tuple_expression"] = actions.toggle_multiline(padding),
["tuple_pattern"] = actions.toggle_multiline(padding),
["boolean_literal"] = actions.toggle_boolean(),
["integer_literal"] = actions.toggle_int_readability(),
["boolean_literal"] = actions.toggle_boolean(),
["integer_literal"] = actions.toggle_int_readability(),
["binary_expression"] = actions.toggle_operator(operators),
["compound_assignment_expr"] = actions.toggle_operator(operators),
["use_list"] = actions.toggle_multiline(padding_use_list, uncollapsible),
["block"] = actions.toggle_multiline(padding, uncollapsible),
["parameters"] = actions.toggle_multiline(padding, uncollapsible),
["arguments"] = actions.toggle_multiline(padding, uncollapsible),
["array_expression"] = actions.toggle_multiline(padding, uncollapsible),
["tuple_expression"] = actions.toggle_multiline(padding, uncollapsible),
["tuple_pattern"] = actions.toggle_multiline(padding, uncollapsible),
["enum_variant_list"] = actions.toggle_multiline(padding, uncollapsible),
["field_initializer_list"] = actions.toggle_multiline(padding, uncollapsible),
["field_declaration_list"] = actions.toggle_multiline(padding, uncollapsible),
}
Loading