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

Fixed stack overflow when requesting completion in an object literal #15579

Merged
merged 2 commits into from
Nov 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
28 changes: 28 additions & 0 deletions src/Bicep.LangServer.IntegrationTests/CompletionTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5134,5 +5134,33 @@ param firstItem object
output foo string[] = [for item in items: item.bar|]
""");
}

[TestMethod]
// https://github.com/azure/bicep/issues/15569
public async Task String_literal_union_with_object_value_should_not_cause_stack_overflow()
{
var serverHelper = new ServerRequestHelper(TestContext, DefaultServer);

// single parameter of string literal union type
var moduleText = "param foo 'foo' | 'bar'";
var moduleFile = await serverHelper.OpenFile("/mod.bicep", moduleText);

var (text, cursor) = ParserHelper.GetFileWithSingleCursor("""
targetScope = 'resourceGroup'

module mod 'mod.bicep' = {
name: ''
params: {
foo: {
|
}
}
}
""");
var mainFile = await serverHelper.OpenFile("/main.bicep", text);

var completions = await mainFile.RequestCompletion(cursor);
completions.Should().BeEmpty();
}
}
}
15 changes: 14 additions & 1 deletion src/Bicep.LangServer/Completions/BicepCompletionProvider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1279,11 +1279,24 @@ private static IEnumerable<TypeProperty> GetProperties(TypeSymbol? type)
TestType testType => GetProperties(testType.Body.Type),
ObjectType objectType => objectType.Properties.Values,
DiscriminatedObjectType discriminated => discriminated.DiscriminatorProperty.AsEnumerable(),
UnionType unionType => GetProperties(TypeHelper.TryCollapseTypes(unionType.Members)),
UnionType unionType => GetPropertiesFromUnionType(unionType),
_ => [],
}).Where(p => !p.Flags.HasFlag(TypePropertyFlags.FallbackProperty));
}

private static IEnumerable<TypeProperty> GetPropertiesFromUnionType(UnionType unionType)
{
var potentiallyCollapsedType = TypeHelper.TryCollapseTypes(unionType.Members);
if(potentiallyCollapsedType is UnionType)
{
// type collapsed into a new or same union type (may have collapsed into itself)
// get properties from each union members
return unionType.Members.SelectMany(member => GetProperties(member.Type));
}

return GetProperties(potentiallyCollapsedType);
}

private static TypeSymbol? GetAdditionalPropertiesType(TypeSymbol? type) => type switch
{
ResourceType resourceType => GetAdditionalPropertiesType(resourceType.Body.Type),
Expand Down
Loading