@@ -3,6 +3,8 @@ package dotty.tools.languageserver
3
3
import org .junit .Test
4
4
import org .eclipse .lsp4j .{CompletionItemKind , DocumentHighlightKind , SymbolKind }
5
5
6
+ import dotty .tools .dotc .core .StdNames .nme .WorksheetWrapper
7
+ import dotty .tools .dotc .core .NameOps .NameDecorator
6
8
import dotty .tools .languageserver .util .Code ._
7
9
import dotty .tools .languageserver .util .embedded .CodeMarker
8
10
@@ -168,17 +170,17 @@ class WorksheetTest {
168
170
ws """ /** A class */ class ${m1}Foo ${m2} { /** A method */ def ${m3}bar ${m4} = 123 }
169
171
val x = new ${m5}Foo ${m6}
170
172
x. ${m7}bar ${m8}""" .withSource
171
- .hover(m1 to m2, hoverContent(" Worksheet .Foo" , " /** A class */" ))
173
+ .hover(m1 to m2, hoverContent(s " ${ WorksheetWrapper } .Foo " , " /** A class */" ))
172
174
.hover(m3 to m4, hoverContent(" Int" , " /** A method */" ))
173
- .hover(m5 to m6, hoverContent(" Worksheet .Foo" , " /** A class */" ))
175
+ .hover(m5 to m6, hoverContent(s " ${ WorksheetWrapper } .Foo " , " /** A class */" ))
174
176
.hover(m7 to m8, hoverContent(" Int" , " /** A method */" ))
175
177
}
176
178
177
179
@ Test def worksheetDocumentSymbol (): Unit = {
178
180
ws """ class ${m1}Foo ${m2} {
179
181
def ${m3}bar ${m4} = 123
180
182
} """ .withSource
181
- .documentSymbol(m1, (m1 to m2).symInfo(" Foo" , SymbolKind .Class , " Worksheet$ " ),
183
+ .documentSymbol(m1, (m1 to m2).symInfo(" Foo" , SymbolKind .Class , WorksheetWrapper .moduleClassName.toString ),
182
184
(m3 to m4).symInfo(" bar" , SymbolKind .Method , " Foo" ))
183
185
}
184
186
@@ -188,7 +190,7 @@ class WorksheetTest {
188
190
def ${m3}bar ${m4} = 123
189
191
} """ ,
190
192
code """ class ${m5}Baz ${m6}"""
191
- ).symbol(" Foo" , (m1 to m2).symInfo(" Foo" , SymbolKind .Class , " Worksheet$ " ))
193
+ ).symbol(" Foo" , (m1 to m2).symInfo(" Foo" , SymbolKind .Class , WorksheetWrapper .moduleClassName.toString ))
192
194
.symbol(" bar" , (m3 to m4).symInfo(" bar" , SymbolKind .Method , " Foo" ))
193
195
.symbol(" Baz" , (m5 to m6).symInfo(" Baz" , SymbolKind .Class ))
194
196
}
0 commit comments