Skip to content

Extend quoting functionality to include polyvariant keywords #877

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

Merged
merged 2 commits into from
Dec 19, 2023
Merged

Extend quoting functionality to include polyvariant keywords #877

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9aa86e8
extend quoting functionality to include polyvariant keywords
WhyThat Dec 19, 2023
22ea4fe
update CHANGELOG.md
WhyThat Dec 19, 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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#### :bug: Bug Fix

- Fix so that you don't need a leading `#` to complete for polyvariant constructors. https://github.com/rescript-lang/rescript-vscode/pull/874
- Print keyword polyvariant constructors with quotes when doing completions. https://github.com/rescript-lang/rescript-vscode/pull/877

## 1.30.0

Expand Down
2 changes: 1 addition & 1 deletion analysis/src/Utils.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,4 +259,4 @@ let printMaybeExoticIdent ?(allowUident = false) txt =
| 'A' .. 'Z' | 'a' .. 'z' | '0' .. '9' | '\'' | '_' -> loop (i + 1)
| _ -> "\"" ^ txt ^ "\""
in
loop 0
if Res_token.isKeywordTxt txt then "\"" ^ txt ^ "\"" else loop 0
2 changes: 1 addition & 1 deletion analysis/tests/src/ExhaustiveSwitch.res
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
type someVariant = One | Two | Three(option<bool>)
type somePolyVariant = [#one | #two | #three(option<bool>) | #"exotic ident"]
type somePolyVariant = [#one | #two | #three(option<bool>) | #"exotic ident" | #"switch"]

let withSomeVariant = One
let withSomePoly: somePolyVariant = #one
Expand Down
2 changes: 1 addition & 1 deletion analysis/tests/src/expected/ExhaustiveSwitch.res.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Path withSomePol
"detail": "insert exhaustive switch for value",
"documentation": null,
"filterText": "withSomePoly",
"insertText": "withSomePoly {\n | #one => ${1:failwith(\"todo\")}\n | #three(_) => ${2:failwith(\"todo\")}\n | #two => ${3:failwith(\"todo\")}\n | #\"exotic ident\" => ${4:failwith(\"todo\")}\n }",
"insertText": "withSomePoly {\n | #\"switch\" => ${1:failwith(\"todo\")}\n | #one => ${2:failwith(\"todo\")}\n | #three(_) => ${3:failwith(\"todo\")}\n | #two => ${4:failwith(\"todo\")}\n | #\"exotic ident\" => ${5:failwith(\"todo\")}\n }",
"insertTextFormat": 2
}]

Expand Down