Skip to content

Commit

Permalink
remove duplicate from merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
austinvalle committed Mar 20, 2024
1 parent 5c1f575 commit 9b2199b
Showing 1 changed file with 0 additions and 23 deletions.
23 changes: 0 additions & 23 deletions function/definition.go
Original file line number Diff line number Diff line change
Expand Up @@ -142,18 +142,6 @@ func (d Definition) ValidateImplementation(ctx context.Context, req DefinitionVa
diags.Append(resp.Diagnostics...)
}

if paramWithValidateImplementation, ok := param.(fwfunction.ParameterWithValidateImplementation); ok {
req := fwfunction.ValidateParameterImplementationRequest{
Name: name,
ParameterPosition: &parameterPosition,
}
resp := &fwfunction.ValidateParameterImplementationResponse{}

paramWithValidateImplementation.ValidateImplementation(ctx, req, resp)

diags.Append(resp.Diagnostics...)
}

conflictPos, exists := paramNames[name]
if exists && name != "" {
diags.AddError(
Expand Down Expand Up @@ -192,17 +180,6 @@ func (d Definition) ValidateImplementation(ctx context.Context, req DefinitionVa
diags.Append(resp.Diagnostics...)
}

if paramWithValidateImplementation, ok := d.VariadicParameter.(fwfunction.ParameterWithValidateImplementation); ok {
req := fwfunction.ValidateParameterImplementationRequest{
Name: name,
}
resp := &fwfunction.ValidateParameterImplementationResponse{}

paramWithValidateImplementation.ValidateImplementation(ctx, req, resp)

diags.Append(resp.Diagnostics...)
}

conflictPos, exists := paramNames[name]
if exists && name != "" {
diags.AddError(
Expand Down

0 comments on commit 9b2199b

Please sign in to comment.