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

Improve handling of un-indented arrays #989

Open
wants to merge 2 commits into
base: main
Choose a base branch
from

Conversation

winstliu
Copy link

@winstliu winstliu commented Sep 21, 2024

What does this PR do?

This PR improves handling of un-indented arrays by fixing two similar scenarios.

Scenario 1

Given

steps:
- task: PowerShell@2
  |

We should be completing properties for the object that task is a part of, not the list under steps.

Previously, the parent algorithm would see that the current indentation == the configured indentation and incorrectly choose the parent list as the "real" closest node, despite the cursor clearly being more indented than the list.

Now, we also verify that the indentation of the current node equals the cursor indentation before deciding to look at the parent.

Scenario 2

Given

steps:
- task: PowerShell@2
|

It is less clear if we want to continue adding onto the array, or if we want to complete schemas that are siblings of steps.

What we do know, however, is that we cannot suggest array items without the leading array indicator. #804 added that incorrect behavior while trying to fix a subset of Scenario 1. Now with Scenario 1 fixed, #804 can be reverted which also fixes Scenario 2.

What issues does this PR fix or reference?

N/A, I caught both of these issues when trying to catch azure-pipelines-language-server back up with yaml-language-server.

Is it tested? How?

Added unit tests and confirmed that all tests pass.

Given

steps:
- task: PowerShell@2
  |

We should be completing properties for the object that `task` is a part of, not the list under `steps`.

Previously, the parent algorithm would see that the current indentation == the configured indentation and incorrectly choose the parent list as the "real" closest node,
despite the cursor clearly being more indented than the list.

Now, we also verify that the indentation of the current node equals the cursor indentation before deciding to look at the parent.
Given

steps:
- task: PowerShell@2
|

We can either complete schemas that are siblings of `steps` or continue adding onto the array,
but what we _cannot_ do is suggest array items without the leading array indicator.

In essence, this reverts redhat-developer#804 as my previous commit addresses that in a different way.
@winstliu winstliu changed the title Only look at parent when line and cursor indents match Improve handling of un-indented arrays Nov 1, 2024
winstliu added a commit to microsoft/azure-pipelines-language-server that referenced this pull request Nov 1, 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.

1 participant