mirror of
https://github.com/golang/go
synced 2024-11-19 03:14:42 -07:00
115af5e89b
The control flow highlighting is taking precedence when you are highlighting a key:value expression within the return statement. Expected behavior is to just highlight all instances of the key or value and ignore the control flow statement when inside the scope. Fixes golang/go#36057 Change-Id: If4b254151c38d152f337833c55a456f8dce18be7 Reviewed-on: https://go-review.googlesource.com/c/tools/+/210558 Reviewed-by: Rebecca Stambler <rstambler@golang.org> Run-TryBot: Rohan Challa <rohan@golang.org> TryBot-Result: Gobot Gobot <gobot@golang.org>
104 lines
4.5 KiB
Go
104 lines
4.5 KiB
Go
package highlights
|
|
|
|
import (
|
|
"fmt"
|
|
"sort"
|
|
|
|
"golang.org/x/tools/internal/lsp/protocol"
|
|
)
|
|
|
|
type F struct{ bar int } //@mark(barDeclaration, "bar"),highlight(barDeclaration, barDeclaration, bar1, bar2, bar3)
|
|
|
|
func _() F {
|
|
return F{
|
|
bar: 123, //@mark(bar1, "bar"),highlight(bar1, barDeclaration, bar1, bar2, bar3)
|
|
}
|
|
}
|
|
|
|
var foo = F{bar: 52} //@mark(fooDeclaration, "foo"),mark(bar2, "bar"),highlight(fooDeclaration, fooDeclaration, fooUse),highlight(bar2, barDeclaration, bar1, bar2, bar3)
|
|
|
|
func Print() { //@mark(printFunc, "Print"),highlight(printFunc, printFunc, printTest)
|
|
fmt.Println(foo) //@mark(fooUse, "foo"),highlight(fooUse, fooDeclaration, fooUse)
|
|
fmt.Print("yo") //@mark(printSep, "Print"),highlight(printSep, printSep, print1, print2)
|
|
}
|
|
|
|
func (x *F) Inc() { //@mark(xDeclaration, "x"),highlight(xDeclaration, xDeclaration, xUse)
|
|
x.bar++ //@mark(xUse, "x"),mark(bar3, "bar"),highlight(xUse, xDeclaration, xUse),highlight(bar3, barDeclaration, bar1, bar2, bar3)
|
|
}
|
|
|
|
func testFunctions() {
|
|
fmt.Print("main start") //@mark(print1, "Print"),highlight(print1, printSep, print1, print2)
|
|
fmt.Print("ok") //@mark(print2, "Print"),highlight(print2, printSep, print1, print2)
|
|
Print() //@mark(printTest, "Print"),highlight(printTest, printFunc, printTest)
|
|
}
|
|
|
|
func toProtocolHighlight(rngs []protocol.Range) []protocol.DocumentHighlight { //@mark(doc1, "DocumentHighlight"),mark(docRet1, "[]protocol.DocumentHighlight"),highlight(doc1, docRet1, doc1, doc2, doc3, result)
|
|
result := make([]protocol.DocumentHighlight, 0, len(rngs)) //@mark(doc2, "DocumentHighlight"),highlight(doc2, doc1, doc2, doc3)
|
|
kind := protocol.Text
|
|
for _, rng := range rngs {
|
|
result = append(result, protocol.DocumentHighlight{ //@mark(doc3, "DocumentHighlight"),highlight(doc3, doc1, doc2, doc3)
|
|
Kind: kind,
|
|
Range: rng,
|
|
})
|
|
}
|
|
return result //@mark(result, "result")
|
|
}
|
|
|
|
func testForLoops() {
|
|
for i := 0; i < 10; i++ { //@mark(forDecl1, "for"),highlight(forDecl1, forDecl1, brk1, cont1)
|
|
if i > 8 {
|
|
break //@mark(brk1, "break"),highlight(brk1, forDecl1, brk1, cont1)
|
|
}
|
|
if i < 2 {
|
|
for j := 1; j < 10; j++ { //@mark(forDecl2, "for"),highlight(forDecl2, forDecl2, cont2)
|
|
if j < 3 {
|
|
for k := 1; k < 10; k++ { //@mark(forDecl3, "for"),highlight(forDecl3, forDecl3, cont3)
|
|
if k < 3 {
|
|
continue //@mark(cont3, "continue"),highlight(cont3, forDecl3, cont3)
|
|
}
|
|
}
|
|
continue //@mark(cont2, "continue"),highlight(cont2, forDecl2, cont2)
|
|
}
|
|
}
|
|
continue //@mark(cont1, "continue"),highlight(cont1, forDecl1, brk1, cont1)
|
|
}
|
|
}
|
|
|
|
arr := []int{}
|
|
for i := range arr { //@mark(forDecl4, "for"),highlight(forDecl4, forDecl4, brk4, cont4)
|
|
if i > 8 {
|
|
break //@mark(brk4, "break"),highlight(brk4, forDecl4, brk4, cont4)
|
|
}
|
|
if i < 4 {
|
|
continue //@mark(cont4, "continue"),highlight(cont4, forDecl4, brk4, cont4)
|
|
}
|
|
}
|
|
}
|
|
|
|
func testReturn() bool { //@mark(func1, "func"),mark(bool1, "bool"),highlight(func1, func1, fullRet11, fullRet12),highlight(bool1, bool1, false1, bool2, true1)
|
|
if 1 < 2 {
|
|
return false //@mark(ret11, "return"),mark(fullRet11, "return false"),mark(false1, "false"),highlight(ret11, func1, fullRet11, fullRet12)
|
|
}
|
|
candidates := []int{}
|
|
sort.SliceStable(candidates, func(i, j int) bool { //@mark(func2, "func"),mark(bool2, "bool"),highlight(func2, func2, fullRet2)
|
|
return candidates[i] > candidates[j] //@mark(ret2, "return"),mark(fullRet2, "return candidates[i] > candidates[j]"),highlight(ret2, func2, fullRet2)
|
|
})
|
|
return true //@mark(ret12, "return"),mark(fullRet12, "return true"),mark(true1, "true"),highlight(ret12, func1, fullRet11, fullRet12)
|
|
}
|
|
|
|
func testReturnFields() float64 { //@mark(retVal1, "float64"),highlight(retVal1, retVal1, retVal11, retVal21)
|
|
if 1 < 2 {
|
|
return 20.1 //@mark(retVal11, "20.1"),highlight(retVal11, retVal1, retVal11, retVal21)
|
|
}
|
|
z := 4.3 //@mark(zDecl, "z")
|
|
return z //@mark(retVal21, "z"),highlight(retVal21, retVal1, retVal11, zDecl, retVal21)
|
|
}
|
|
|
|
func testReturnMultipleFields() (float32, string) { //@mark(retVal31, "float32"),mark(retVal32, "string"),highlight(retVal31, retVal31, retVal41, retVal51),highlight(retVal32, retVal32, retVal42, retVal52)
|
|
y := "im a var" //@mark(yDecl, "y"),
|
|
if 1 < 2 {
|
|
return 20.1, y //@mark(retVal41, "20.1"),mark(retVal42, "y"),highlight(retVal41, retVal31, retVal41, retVal51),highlight(retVal42, retVal32, yDecl, retVal42, retVal52)
|
|
}
|
|
return 4.9, "test" //@mark(retVal51, "4.9"),mark(retVal52, "\"test\""),highlight(retVal51, retVal31, retVal41, retVal51),highlight(retVal52, retVal32, retVal42, retVal52)
|
|
}
|