Skip to content

Commit cc8c811

Browse files
author
Gleb Brozhe
committed
attempt to fix merge conflict
1 parent 8a1e868 commit cc8c811

File tree

2 files changed

+8
-23
lines changed

2 files changed

+8
-23
lines changed

internal/stack/record.go

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,14 @@ func parseFunctionName(name string) functionDetails {
124124
details.pkgPath, name = name[:i], name[i+1:]
125125
}
126126
split := strings.Split(name, ".")
127-
details.lambdas = extractLambdas(split)
127+
details.lambdas = make([]string, 0, len(split))
128+
for i := range split {
129+
elem := split[len(split)-i-1]
130+
if !strings.HasPrefix(elem, "func") {
131+
break
132+
}
133+
details.lambdas = append(details.lambdas, elem)
134+
}
128135
split = split[:len(split)-len(details.lambdas)]
129136
if len(split) > 0 {
130137
details.pkgName = split[0]
@@ -139,19 +146,6 @@ func parseFunctionName(name string) functionDetails {
139146
return details
140147
}
141148

142-
func extractLambdas(split []string) (lambdas []string) {
143-
lambdas = make([]string, 0, len(split))
144-
for i := range split {
145-
elem := split[len(split)-i-1]
146-
if !strings.HasPrefix(elem, "func") {
147-
break
148-
}
149-
lambdas = append(lambdas, elem)
150-
}
151-
152-
return lambdas
153-
}
154-
155149
func buildRecordString(
156150
optionsHolder recordOptions,
157151
fnDetails *functionDetails,

internal/stack/record_test.go

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -289,15 +289,6 @@ func TestParseFunctionName(t *testing.T) {
289289
require.Contains(t, fnDetails.lambdas, "func1", "Lambdas should include 'func1'")
290290
}
291291

292-
func TestExtractLambdas(t *testing.T) {
293-
split := []string{"github.com/ydb-platform/ydb-go-sdk/v3/internal/stack", "TestExtractLambdas", "func1", "func2"}
294-
lambdas := extractLambdas(split)
295-
296-
require.Len(t, lambdas, 2, "There should be two lambda functions extracted")
297-
require.Contains(t, lambdas, "func1")
298-
require.Contains(t, lambdas, "func2")
299-
}
300-
301292
func TestBuildRecordString(t *testing.T) {
302293
optionsHolder := recordOptions{
303294
packagePath: true,

0 commit comments

Comments
 (0)