zencoder
diff --git a/‎gopls/internal/lsp/cmd/call_hierarchy.go
Lines changed: 3 additions & 4 deletions b/‎gopls/internal/lsp/cmd/call_hierarchy.go
Lines changed: 3 additions & 4 deletions
diff --git a/‎gopls/internal/lsp/cmd/folding_range.go
Lines changed: 1 addition & 1 deletion b/‎gopls/internal/lsp/cmd/folding_range.go
Lines changed: 1 addition & 1 deletion
@@ -129,13 +129,12 @@ func callItemPrintString(ctx context.Context, conn *connection, item protocol.Ca
 	}
 	var callRanges []string
 	for _, rng := range calls {
-		callSpan, err := callsFile.mapper.LocationSpan(protocol.Location{URI: item.URI, Range: rng})
+		call, err := callsFile.mapper.RangeSpan(rng)
 		if err != nil {
 			return "", err
 		}
-
-		spn := fmt.Sprint(callSpan)
-		callRanges = append(callRanges, fmt.Sprint(spn[strings.Index(spn, ":")+1:]))
+		callRange := fmt.Sprintf("%d:%d-%d", call.Start().Line(), call.Start().Column(), call.End().Column())
+		callRanges = append(callRanges, callRange)
 	}
 
 	printString := fmt.Sprintf("function %s in %v", item.Name, itemSpan)
 
@@ -65,7 +65,7 @@ func (r *foldingRanges) Run(ctx context.Context, args ...string) error {
 			r.StartLine+1,
 			r.StartCharacter+1,
 			r.EndLine+1,
-			r.EndCharacter,
+			r.EndCharacter+1,
 		)
 	}
Original file line number	Diff line number	Diff line change
`@@ -129,13 +129,12 @@ func callItemPrintString(ctx context.Context, conn *connection, item protocol.Ca`
`129`	`129`	`}`
`130`	`130`	`var callRanges []string`
`131`	`131`	`for _, rng := range calls {`
`132`		`- callSpan, err := callsFile.mapper.LocationSpan(protocol.Location{URI: item.URI, Range: rng})`
	`132`	`+ call, err := callsFile.mapper.RangeSpan(rng)`
`133`	`133`	`if err != nil {`
`134`	`134`	`return "", err`
`135`	`135`	`}`
`136`		`-`
`137`		`- spn := fmt.Sprint(callSpan)`
`138`		`- callRanges = append(callRanges, fmt.Sprint(spn[strings.Index(spn, ":")+1:]))`
	`136`	`+ callRange := fmt.Sprintf("%d:%d-%d", call.Start().Line(), call.Start().Column(), call.End().Column())`
	`137`	`+ callRanges = append(callRanges, callRange)`
`139`	`138`	`}`
`140`	`139`
`141`	`140`	`printString := fmt.Sprintf("function %s in %v", item.Name, itemSpan)`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ func (r *foldingRanges) Run(ctx context.Context, args ...string) error {`
`65`	`65`	`r.StartLine+1,`
`66`	`66`	`r.StartCharacter+1,`
`67`	`67`	`r.EndLine+1,`
`68`		`- r.EndCharacter,`
	`68`	`+ r.EndCharacter+1,`
`69`	`69`	`)`
`70`	`70`	`}`
`71`	`71`