-
Notifications
You must be signed in to change notification settings - Fork 444
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
When the elaborator doesn't provide us with any `CompletionInfo`, we currently provide no completions whatsoever. But in many cases, we can still provide some helpful identifier completions without elaborator information. This PR adds a fallback mode for this situation. There is more potential here, but this should be a good start. In principle, this issue alleviates #5172 (since we now provide completions in these contexts). I'll leave it up to an elaboration maintainer whether we also want to ensure that the completion infos are provided correctly in these cases.
- Loading branch information
Showing
6 changed files
with
187 additions
and
18 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
-- When the elaborator doesn't provide `CompletionInfo`, try to provide identifier completions. | ||
-- As of when this test case was written, the elaborator did not provide `CompletionInfo` in these cases. | ||
|
||
-- https://github.com/leanprover/lean4/issues/5172 | ||
|
||
inductive Direction where | ||
| up | ||
| right | ||
| down | ||
| left | ||
deriving Repr | ||
|
||
def angle (d: Direction) := | ||
match d with | ||
| Direction. => 90 | ||
--^ textDocument/completion | ||
| Direction.right => 0 | ||
| Direction.down => 270 | ||
| Direction.left => 180 | ||
|
||
-- Ensure that test is stable when changes to the `And` namespace are made. | ||
structure CustomAnd (a b : Prop) : Prop where | ||
ha : a | ||
hb : b | ||
|
||
example : p ∨ (q ∧ r) → CustomAnd (p ∨ q) (p ∨ r) := by | ||
intro h | ||
cases h with | ||
| inl hp => apply CustomAnd. (Or.intro_left q hp) (Or.intro_left r hp) | ||
--^ textDocument/completion | ||
| inr hqr => apply CustomAnd.mk (Or.intro_right p hqr.left) (Or.intro_right p hqr.right) |
80 changes: 80 additions & 0 deletions
80
tests/lean/interactive/completionFallback.lean.expected.out
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,80 @@ | ||
{"textDocument": {"uri": "file:///completionFallback.lean"}, | ||
"position": {"line": 14, "character": 14}} | ||
{"items": | ||
[{"sortText": "0", | ||
"label": "down", | ||
"kind": 4, | ||
"data": | ||
{"params": | ||
{"textDocument": {"uri": "file:///completionFallback.lean"}, | ||
"position": {"line": 14, "character": 14}}, | ||
"id": {"const": {"declName": "Direction.down"}}}}, | ||
{"sortText": "1", | ||
"label": "left", | ||
"kind": 4, | ||
"data": | ||
{"params": | ||
{"textDocument": {"uri": "file:///completionFallback.lean"}, | ||
"position": {"line": 14, "character": 14}}, | ||
"id": {"const": {"declName": "Direction.left"}}}}, | ||
{"sortText": "2", | ||
"label": "noConfusionType", | ||
"kind": 3, | ||
"data": | ||
{"params": | ||
{"textDocument": {"uri": "file:///completionFallback.lean"}, | ||
"position": {"line": 14, "character": 14}}, | ||
"id": {"const": {"declName": "Direction.noConfusionType"}}}}, | ||
{"sortText": "3", | ||
"label": "right", | ||
"kind": 4, | ||
"data": | ||
{"params": | ||
{"textDocument": {"uri": "file:///completionFallback.lean"}, | ||
"position": {"line": 14, "character": 14}}, | ||
"id": {"const": {"declName": "Direction.right"}}}}, | ||
{"sortText": "4", | ||
"label": "toCtorIdx", | ||
"kind": 3, | ||
"data": | ||
{"params": | ||
{"textDocument": {"uri": "file:///completionFallback.lean"}, | ||
"position": {"line": 14, "character": 14}}, | ||
"id": {"const": {"declName": "Direction.toCtorIdx"}}}}, | ||
{"sortText": "5", | ||
"label": "up", | ||
"kind": 4, | ||
"data": | ||
{"params": | ||
{"textDocument": {"uri": "file:///completionFallback.lean"}, | ||
"position": {"line": 14, "character": 14}}, | ||
"id": {"const": {"declName": "Direction.up"}}}}], | ||
"isIncomplete": true} | ||
{"textDocument": {"uri": "file:///completionFallback.lean"}, | ||
"position": {"line": 28, "character": 30}} | ||
{"items": | ||
[{"sortText": "0", | ||
"label": "ha", | ||
"kind": 5, | ||
"data": | ||
{"params": | ||
{"textDocument": {"uri": "file:///completionFallback.lean"}, | ||
"position": {"line": 28, "character": 30}}, | ||
"id": {"const": {"declName": "CustomAnd.ha"}}}}, | ||
{"sortText": "1", | ||
"label": "hb", | ||
"kind": 5, | ||
"data": | ||
{"params": | ||
{"textDocument": {"uri": "file:///completionFallback.lean"}, | ||
"position": {"line": 28, "character": 30}}, | ||
"id": {"const": {"declName": "CustomAnd.hb"}}}}, | ||
{"sortText": "2", | ||
"label": "mk", | ||
"kind": 4, | ||
"data": | ||
{"params": | ||
{"textDocument": {"uri": "file:///completionFallback.lean"}, | ||
"position": {"line": 28, "character": 30}}, | ||
"id": {"const": {"declName": "CustomAnd.mk"}}}}], | ||
"isIncomplete": true} |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.