Skip to content

Commit cb609a1

Browse files
committed
Fixed bad line entry for #1422
1 parent b202ccc commit cb609a1

File tree

2 files changed

+14
-11
lines changed

2 files changed

+14
-11
lines changed

pkg/yqlib/lib.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,10 @@ func parseSnippet(value string) (*yaml.Node, error) {
268268
if len(parsedNode.Node.Content) == 0 {
269269
return nil, fmt.Errorf("bad data")
270270
}
271-
return unwrapDoc(parsedNode.Node), err
271+
result := unwrapDoc(parsedNode.Node)
272+
result.Line = 0
273+
result.Column = 0
274+
return result, err
272275
}
273276

274277
func recursiveNodeEqual(lhs *yaml.Node, rhs *yaml.Node) bool {

pkg/yqlib/lib_test.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ var parseSnippetScenarios = []parseSnippetScenario{
3838
Kind: yaml.ScalarNode,
3939
Tag: "!!null",
4040
Value: "null",
41-
Line: 1,
42-
Column: 1,
41+
Line: 0,
42+
Column: 0,
4343
},
4444
},
4545
{
@@ -48,8 +48,8 @@ var parseSnippetScenarios = []parseSnippetScenario{
4848
Kind: yaml.ScalarNode,
4949
Tag: "!!int",
5050
Value: "3",
51-
Line: 1,
52-
Column: 1,
51+
Line: 0,
52+
Column: 0,
5353
},
5454
},
5555
{
@@ -58,8 +58,8 @@ var parseSnippetScenarios = []parseSnippetScenario{
5858
Kind: yaml.ScalarNode,
5959
Tag: "!!str",
6060
Value: "cat",
61-
Line: 1,
62-
Column: 1,
61+
Line: 0,
62+
Column: 0,
6363
},
6464
},
6565
{
@@ -68,8 +68,8 @@ var parseSnippetScenarios = []parseSnippetScenario{
6868
Kind: yaml.ScalarNode,
6969
Tag: "!!float",
7070
Value: "3.1",
71-
Line: 1,
72-
Column: 1,
71+
Line: 0,
72+
Column: 0,
7373
},
7474
},
7575
{
@@ -78,8 +78,8 @@ var parseSnippetScenarios = []parseSnippetScenario{
7878
Kind: yaml.ScalarNode,
7979
Tag: "!!bool",
8080
Value: "true",
81-
Line: 1,
82-
Column: 1,
81+
Line: 0,
82+
Column: 0,
8383
},
8484
},
8585
}

0 commit comments

Comments
 (0)