Skip to content

Refactor nested YAML value extraction#52212

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.

Sign up for GitHub

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

Merged
pelikhan merged 4 commits into from
Aug 13, 2026
Merged

Refactor nested YAML value extraction #52212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cd38d72
Initial plan
Copilot Aug 12, 2026
0a39cac
Refactor nested YAML value extraction
Copilot Aug 12, 2026
791a9c0
Merge branch 'main' into copilot/lint-monster-function-length-refacto…
github-actions[bot] Aug 13, 2026
9f60a7a
Compile nested YAML scalar matchers once per scan
Copilot Aug 13, 2026
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
55 changes: 34 additions & 21 deletions pkg/parser/schema_suggestions.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -545,7 +545,10 @@ func extractNestedYAMLValue(yamlContent, parentKey, childKey string) string {
if err != nil {
return ""
}
escapedChild := regexp.QuoteMeta(childKey)
scalarMatchers, err := buildNestedYAMLScalarMatchers(regexp.QuoteMeta(childKey))
if err != nil {
return ""
}

parentIndent := -1
childIndent := -1 // indent of direct children (set on first non-blank line inside the block)
Expand DownExpand Up@@ -581,30 +584,40 @@ func extractNestedYAMLValue(yamlContent, parentKey, childKey string) string {
continue
}

// Try to match child key with its value (single-quoted, double-quoted, unquoted).
childPrefix := `^\s+` + escapedChild + `[ \t]*:[ \t]*`
//nolint:regexpdynamicpattern // The child key is quoted before compilation.
reSingle, err := regexp.Compile(childPrefix + `'([^'\n]+)'`)
if err != nil {
return ""
}
if match := reSingle.FindStringSubmatch(line); len(match) >= 2 {
return strings.TrimSpace(match[1])
}
//nolint:regexpdynamicpattern // The child key is quoted before compilation.
reDouble, err := regexp.Compile(childPrefix + `"([^"\n]+)"`)
if err != nil {
return ""
}
if match := reDouble.FindStringSubmatch(line); len(match) >= 2 {
return strings.TrimSpace(match[1])
if value := extractNestedYAMLScalar(line, scalarMatchers); value != "" {
return value
}
}

return ""
}

// buildNestedYAMLScalarMatchers compiles the scalar value patterns for a child key once,
// so they can be reused across every candidate line inside the parent block.
func buildNestedYAMLScalarMatchers(escapedChild string) ([]*regexp.Regexp, error) {
childPrefix := `^\s+` + escapedChild + `[ \t]*:[ \t]*`
valuePatterns := []string{
childPrefix + `'([^'\n]+)'`,
childPrefix + `"([^"\n]+)"`,
childPrefix + `([^'"\n#][^\n#]*?)(?:[ \t]*#.*)?$`,
}

matchers := make([]*regexp.Regexp, 0, len(valuePatterns))
for _, valuePattern := range valuePatterns {

@github-actionsgithub-actionsBotAug 13, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[/codebase-design]extractNestedYAMLScalar compiles up to 3 regexps on every invocation — once per candidate line inside the parent block. Since the patterns depend only on escapedChild, which is fixed for the whole scan, they can be compiled once and reused. This refactor is the ideal seam to make the helper deeper.

💡 Suggested refactor: compile once, match many

Build the matchers once in the caller, then pass them in:

// in extractNestedYAMLValue, after escapedChild is computed:scalarMatchers, err:=buildScalarMatchers(escapedChild)
iferr!=nil {
return""
}
// inside the loop:ifvalue:=extractNestedYAMLScalar(line, scalarMatchers); value!="" {
returnvalue
}
funcbuildScalarMatchers(escapedChildstring) ([]*regexp.Regexp, error) {
prefix:=`^\s+`+escapedChild+`[ \t]*:[ \t]*`patterns:= []string{
prefix+`'([^'\n]+'`,
prefix+`"([^"\n]+)"`,
prefix+`([^'"\n#][^\n#]*?)(?:[ \t]*#.*)?$`,
}
out:=make([]*regexp.Regexp, 0, len(patterns))
for_, p:=rangepatterns {
re, err:=regexp.Compile(p)
iferr!=nil {
returnnil, err
}
out=append(out, re)
}
returnout, nil
}
funcextractNestedYAMLScalar(linestring, matchers []*regexp.Regexp) string {
for_, re:=rangematchers {
ifm:=re.FindStringSubmatch(line); len(m) >=2 {
returnstrings.TrimSpace(m[1])
}
}
return""
}

@copilot please address this.

CopilotAIAug 13, 2026

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done. The three scalar patterns are now compiled once per scan in buildNestedYAMLScalarMatchers(escapedChild) and extractNestedYAMLScalar just iterates the prepared matchers, so no regexp compilation happens per candidate line.

//nolint:regexpdynamicpattern // The child key is quoted before compilation.
reUnquoted, err := regexp.Compile(childPrefix + `([^'"\n#][^\n#]*?)(?:[ \t]*#.*)?$`)
valueRegexp, err := regexp.Compile(valuePattern)
if err != nil {
return ""
return nil, err
}
if match := reUnquoted.FindStringSubmatch(line); len(match) >= 2 {
matchers = append(matchers, valueRegexp)
}

return matchers, nil
}

func extractNestedYAMLScalar(line string, matchers []*regexp.Regexp) string {
for _, valueRegexp := range matchers {
if match := valueRegexp.FindStringSubmatch(line); len(match) >= 2 {
return strings.TrimSpace(match[1])
}
}
Expand Down
6 changes: 6 additions & 0 deletions pkg/parser/schema_suggestions_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -405,6 +405,12 @@ func TestExtractYAMLValueAtPath(t *testing.T) {
path: "/permissions/contents",
wantValue: "raed",
},
{
name: "nested path - unquoted value with inline comment",
yaml: "permissions:\n contents: raed # typo\n",
path: "/permissions/contents",
wantValue: "raed",
},
{
name: "three-level path returns empty",
yaml: "a:\n b:\n c: value\n",
Expand Down
Loading