From 1762287ae9dd21445958f73600bc993491802f67 Mon Sep 17 00:00:00 2001 From: Paul Jolly Date: Wed, 15 Apr 2020 21:37:46 +0100 Subject: [PATCH] internal/lsp: rename workspace symbol test symbols to avoid clash In a later CL we include the fully qualified path to a symbol in the Name field of SymbolInformation. This means that we end up with matches like: golang.org/x/tools/internal/lsp/workspacesymbol/b.WorkspaceSymbolVariableB A fuzzy match against this name using the query "wsym" would match the "workspacesymbol" of the import path as well as the "WorkspaceSymbolVariableB" that is the symbol name itself. Therefore we rename the symbols in the: internal/lsp/testdata/lsp/primarymod/workspacesymbol/... from WorkspaceSymbol* to RandomGopher*, which allows our fuzzy matches to be more precise. Change-Id: Idbeb663f5750cae4835b0fdaa77531e30353fb89 Reviewed-on: https://go-review.googlesource.com/c/tools/+/228759 Run-TryBot: Paul Jolly TryBot-Result: Gobot Gobot Reviewed-by: Robert Findley --- .../lsp/primarymod/workspacesymbol/a/a.go | 6 ++-- .../primarymod/workspacesymbol/a/a.go.golden | 6 ++-- .../lsp/primarymod/workspacesymbol/b/b.go | 6 ++-- .../primarymod/workspacesymbol/b/b.go.golden | 4 +-- .../primarymod/workspacesymbol/fuzzy/fuzzy.go | 32 +++++++++---------- .../workspacesymbol/fuzzy/randoma.golden | 5 +++ .../workspacesymbol/fuzzy/randomb.golden | 5 +++ .../workspacesymbol/fuzzy/rgop.golden | 6 ++++ .../workspacesymbol/fuzzy/symbola.golden | 5 --- .../workspacesymbol/fuzzy/symbolb.golden | 5 --- .../workspacesymbol/fuzzy/wsym.golden | 6 ---- .../workspacesymbol/randomgophervar.golden | 3 ++ .../workspacesymbol/workspacesymbol.go | 6 ++-- .../workspacesymbol/workspacesymbolvar.golden | 3 -- 14 files changed, 49 insertions(+), 49 deletions(-) create mode 100644 internal/lsp/testdata/lsp/primarymod/workspacesymbol/fuzzy/randoma.golden create mode 100644 internal/lsp/testdata/lsp/primarymod/workspacesymbol/fuzzy/randomb.golden create mode 100644 internal/lsp/testdata/lsp/primarymod/workspacesymbol/fuzzy/rgop.golden delete mode 100644 internal/lsp/testdata/lsp/primarymod/workspacesymbol/fuzzy/symbola.golden delete mode 100644 internal/lsp/testdata/lsp/primarymod/workspacesymbol/fuzzy/symbolb.golden delete mode 100644 internal/lsp/testdata/lsp/primarymod/workspacesymbol/fuzzy/wsym.golden create mode 100644 internal/lsp/testdata/lsp/primarymod/workspacesymbol/randomgophervar.golden delete mode 100644 internal/lsp/testdata/lsp/primarymod/workspacesymbol/workspacesymbolvar.golden diff --git a/internal/lsp/testdata/lsp/primarymod/workspacesymbol/a/a.go b/internal/lsp/testdata/lsp/primarymod/workspacesymbol/a/a.go index 7ff01b2c87..072f4cb051 100644 --- a/internal/lsp/testdata/lsp/primarymod/workspacesymbol/a/a.go +++ b/internal/lsp/testdata/lsp/primarymod/workspacesymbol/a/a.go @@ -1,9 +1,9 @@ package a -var WorkspaceSymbolVariableA = "a" //@symbol("WorkspaceSymbolVariableA", "WorkspaceSymbolVariableA", "Variable", "", "WorkspaceSymbolVariableA") +var RandomGopherVariableA = "a" //@symbol("RandomGopherVariableA", "RandomGopherVariableA", "Variable", "", "RandomGopherVariableA") -const WorkspaceSymbolConstantA = "a" //@symbol("WorkspaceSymbolConstantA", "WorkspaceSymbolConstantA", "Constant", "", "WorkspaceSymbolConstantA") +const RandomGopherConstantA = "a" //@symbol("RandomGopherConstantA", "RandomGopherConstantA", "Constant", "", "RandomGopherConstantA") const ( - workspacesymbolinvariable = iota //@symbol("workspacesymbolinvariable", "workspacesymbolinvariable", "Constant", "", "workspacesymbolinvariable") + randomgopherinvariable = iota //@symbol("randomgopherinvariable", "randomgopherinvariable", "Constant", "", "randomgopherinvariable") ) diff --git a/internal/lsp/testdata/lsp/primarymod/workspacesymbol/a/a.go.golden b/internal/lsp/testdata/lsp/primarymod/workspacesymbol/a/a.go.golden index 2a8788b8ed..c3f088577b 100644 --- a/internal/lsp/testdata/lsp/primarymod/workspacesymbol/a/a.go.golden +++ b/internal/lsp/testdata/lsp/primarymod/workspacesymbol/a/a.go.golden @@ -1,5 +1,5 @@ -- symbols -- -WorkspaceSymbolVariableA Variable 3:5-3:29 -WorkspaceSymbolConstantA Constant 5:7-5:31 -workspacesymbolinvariable Constant 8:2-8:27 +RandomGopherVariableA Variable 3:5-3:26 +RandomGopherConstantA Constant 5:7-5:28 +randomgopherinvariable Constant 8:2-8:24 diff --git a/internal/lsp/testdata/lsp/primarymod/workspacesymbol/b/b.go b/internal/lsp/testdata/lsp/primarymod/workspacesymbol/b/b.go index cbe98aba24..b90b3a9f0c 100644 --- a/internal/lsp/testdata/lsp/primarymod/workspacesymbol/b/b.go +++ b/internal/lsp/testdata/lsp/primarymod/workspacesymbol/b/b.go @@ -1,7 +1,7 @@ package b -var WorkspaceSymbolVariableB = "b" //@symbol("WorkspaceSymbolVariableB", "WorkspaceSymbolVariableB", "Variable", "", "WorkspaceSymbolVariableB") +var RandomGopherVariableB = "b" //@symbol("RandomGopherVariableB", "RandomGopherVariableB", "Variable", "", "RandomGopherVariableB") -type WorkspaceSymbolStructB struct { //@symbol("WorkspaceSymbolStructB", "WorkspaceSymbolStructB", "Struct", "", "WorkspaceSymbolStructB") - Bar int //@mark(bBar, "Bar"), symbol("Bar", "Bar", "Field", "WorkspaceSymbolStructB", "Bar") +type RandomGopherStructB struct { //@symbol("RandomGopherStructB", "RandomGopherStructB", "Struct", "", "RandomGopherStructB") + Bar int //@mark(bBar, "Bar"), symbol("Bar", "Bar", "Field", "RandomGopherStructB", "Bar") } diff --git a/internal/lsp/testdata/lsp/primarymod/workspacesymbol/b/b.go.golden b/internal/lsp/testdata/lsp/primarymod/workspacesymbol/b/b.go.golden index ecc8781c38..4711c9d91a 100644 --- a/internal/lsp/testdata/lsp/primarymod/workspacesymbol/b/b.go.golden +++ b/internal/lsp/testdata/lsp/primarymod/workspacesymbol/b/b.go.golden @@ -1,5 +1,5 @@ -- symbols -- -WorkspaceSymbolVariableB Variable 3:5-3:29 -WorkspaceSymbolStructB Struct 5:6-5:28 +RandomGopherVariableB Variable 3:5-3:26 +RandomGopherStructB Struct 5:6-5:25 Bar Field 6:2-6:5 diff --git a/internal/lsp/testdata/lsp/primarymod/workspacesymbol/fuzzy/fuzzy.go b/internal/lsp/testdata/lsp/primarymod/workspacesymbol/fuzzy/fuzzy.go index de03d3658b..4bc8b54baa 100644 --- a/internal/lsp/testdata/lsp/primarymod/workspacesymbol/fuzzy/fuzzy.go +++ b/internal/lsp/testdata/lsp/primarymod/workspacesymbol/fuzzy/fuzzy.go @@ -1,23 +1,23 @@ package fuzzy /*@ -workspacesymbolfuzzy("wsym", - WorkspaceSymbolVariableA, - WorkspaceSymbolConstantA, - workspacesymbolinvariable, - WorkspaceSymbolVariableB, - WorkspaceSymbolStructB, +workspacesymbolfuzzy("rgop", + RandomGopherVariableA, + RandomGopherConstantA, + randomgopherinvariable, + RandomGopherVariableB, + RandomGopherStructB, ) -workspacesymbolfuzzy("symbola", - WorkspaceSymbolVariableA, - WorkspaceSymbolConstantA, - workspacesymbolinvariable, - WorkspaceSymbolVariableB, +workspacesymbolfuzzy("randoma", + RandomGopherVariableA, + RandomGopherConstantA, + randomgopherinvariable, + RandomGopherVariableB, ) -workspacesymbolfuzzy("symbolb", - WorkspaceSymbolVariableA, - workspacesymbolinvariable, - WorkspaceSymbolVariableB, - WorkspaceSymbolStructB, +workspacesymbolfuzzy("randomb", + RandomGopherVariableA, + randomgopherinvariable, + RandomGopherVariableB, + RandomGopherStructB, ) */ diff --git a/internal/lsp/testdata/lsp/primarymod/workspacesymbol/fuzzy/randoma.golden b/internal/lsp/testdata/lsp/primarymod/workspacesymbol/fuzzy/randoma.golden new file mode 100644 index 0000000000..bfdcb218a9 --- /dev/null +++ b/internal/lsp/testdata/lsp/primarymod/workspacesymbol/fuzzy/randoma.golden @@ -0,0 +1,5 @@ +-- workspace_symbol -- +workspacesymbol/a/a.go:3:5-26 RandomGopherVariableA Variable +workspacesymbol/a/a.go:5:7-28 RandomGopherConstantA Constant +workspacesymbol/a/a.go:8:2-24 randomgopherinvariable Constant +workspacesymbol/b/b.go:3:5-26 RandomGopherVariableB Variable diff --git a/internal/lsp/testdata/lsp/primarymod/workspacesymbol/fuzzy/randomb.golden b/internal/lsp/testdata/lsp/primarymod/workspacesymbol/fuzzy/randomb.golden new file mode 100644 index 0000000000..d0fef3e6b4 --- /dev/null +++ b/internal/lsp/testdata/lsp/primarymod/workspacesymbol/fuzzy/randomb.golden @@ -0,0 +1,5 @@ +-- workspace_symbol -- +workspacesymbol/a/a.go:3:5-26 RandomGopherVariableA Variable +workspacesymbol/a/a.go:8:2-24 randomgopherinvariable Constant +workspacesymbol/b/b.go:3:5-26 RandomGopherVariableB Variable +workspacesymbol/b/b.go:5:6-25 RandomGopherStructB Struct diff --git a/internal/lsp/testdata/lsp/primarymod/workspacesymbol/fuzzy/rgop.golden b/internal/lsp/testdata/lsp/primarymod/workspacesymbol/fuzzy/rgop.golden new file mode 100644 index 0000000000..0c5fde3949 --- /dev/null +++ b/internal/lsp/testdata/lsp/primarymod/workspacesymbol/fuzzy/rgop.golden @@ -0,0 +1,6 @@ +-- workspace_symbol -- +workspacesymbol/a/a.go:3:5-26 RandomGopherVariableA Variable +workspacesymbol/a/a.go:5:7-28 RandomGopherConstantA Constant +workspacesymbol/a/a.go:8:2-24 randomgopherinvariable Constant +workspacesymbol/b/b.go:3:5-26 RandomGopherVariableB Variable +workspacesymbol/b/b.go:5:6-25 RandomGopherStructB Struct diff --git a/internal/lsp/testdata/lsp/primarymod/workspacesymbol/fuzzy/symbola.golden b/internal/lsp/testdata/lsp/primarymod/workspacesymbol/fuzzy/symbola.golden deleted file mode 100644 index ccfa859352..0000000000 --- a/internal/lsp/testdata/lsp/primarymod/workspacesymbol/fuzzy/symbola.golden +++ /dev/null @@ -1,5 +0,0 @@ --- workspace_symbol -- -workspacesymbol/a/a.go:3:5-29 WorkspaceSymbolVariableA Variable -workspacesymbol/a/a.go:5:7-31 WorkspaceSymbolConstantA Constant -workspacesymbol/a/a.go:8:2-27 workspacesymbolinvariable Constant -workspacesymbol/b/b.go:3:5-29 WorkspaceSymbolVariableB Variable diff --git a/internal/lsp/testdata/lsp/primarymod/workspacesymbol/fuzzy/symbolb.golden b/internal/lsp/testdata/lsp/primarymod/workspacesymbol/fuzzy/symbolb.golden deleted file mode 100644 index aa2601b4f4..0000000000 --- a/internal/lsp/testdata/lsp/primarymod/workspacesymbol/fuzzy/symbolb.golden +++ /dev/null @@ -1,5 +0,0 @@ --- workspace_symbol -- -workspacesymbol/a/a.go:3:5-29 WorkspaceSymbolVariableA Variable -workspacesymbol/a/a.go:8:2-27 workspacesymbolinvariable Constant -workspacesymbol/b/b.go:3:5-29 WorkspaceSymbolVariableB Variable -workspacesymbol/b/b.go:5:6-28 WorkspaceSymbolStructB Struct diff --git a/internal/lsp/testdata/lsp/primarymod/workspacesymbol/fuzzy/wsym.golden b/internal/lsp/testdata/lsp/primarymod/workspacesymbol/fuzzy/wsym.golden deleted file mode 100644 index b0b69c5dbd..0000000000 --- a/internal/lsp/testdata/lsp/primarymod/workspacesymbol/fuzzy/wsym.golden +++ /dev/null @@ -1,6 +0,0 @@ --- workspace_symbol -- -workspacesymbol/a/a.go:3:5-29 WorkspaceSymbolVariableA Variable -workspacesymbol/a/a.go:5:7-31 WorkspaceSymbolConstantA Constant -workspacesymbol/a/a.go:8:2-27 workspacesymbolinvariable Constant -workspacesymbol/b/b.go:3:5-29 WorkspaceSymbolVariableB Variable -workspacesymbol/b/b.go:5:6-28 WorkspaceSymbolStructB Struct diff --git a/internal/lsp/testdata/lsp/primarymod/workspacesymbol/randomgophervar.golden b/internal/lsp/testdata/lsp/primarymod/workspacesymbol/randomgophervar.golden new file mode 100644 index 0000000000..02e9954291 --- /dev/null +++ b/internal/lsp/testdata/lsp/primarymod/workspacesymbol/randomgophervar.golden @@ -0,0 +1,3 @@ +-- workspace_symbol -- +workspacesymbol/a/a.go:3:5-26 RandomGopherVariableA Variable +workspacesymbol/b/b.go:3:5-26 RandomGopherVariableB Variable diff --git a/internal/lsp/testdata/lsp/primarymod/workspacesymbol/workspacesymbol.go b/internal/lsp/testdata/lsp/primarymod/workspacesymbol/workspacesymbol.go index 7ab22904f7..bffb1dd4a6 100644 --- a/internal/lsp/testdata/lsp/primarymod/workspacesymbol/workspacesymbol.go +++ b/internal/lsp/testdata/lsp/primarymod/workspacesymbol/workspacesymbol.go @@ -2,8 +2,8 @@ package workspacesymbol /*@ workspacesymbol("") // The result is 0 symbols due to the limit(golang.org/cl/220939). -workspacesymbol("workspacesymbolvar", - WorkspaceSymbolVariableA, - WorkspaceSymbolVariableB, +workspacesymbol("randomgophervar", + RandomGopherVariableA, + RandomGopherVariableB, ) */ diff --git a/internal/lsp/testdata/lsp/primarymod/workspacesymbol/workspacesymbolvar.golden b/internal/lsp/testdata/lsp/primarymod/workspacesymbol/workspacesymbolvar.golden deleted file mode 100644 index 8650fad731..0000000000 --- a/internal/lsp/testdata/lsp/primarymod/workspacesymbol/workspacesymbolvar.golden +++ /dev/null @@ -1,3 +0,0 @@ --- workspace_symbol -- -workspacesymbol/a/a.go:3:5-29 WorkspaceSymbolVariableA Variable -workspacesymbol/b/b.go:3:5-29 WorkspaceSymbolVariableB Variable