Skip to content

Commit b3ea857

Browse files
authored
Merge pull request #1060 from olafurpg/worksheet-windows
Disable flaky test on Window
2 parents f3d517c + c2b1cd2 commit b3ea857

File tree

1 file changed

+34
-32
lines changed

1 file changed

+34
-32
lines changed

tests/unit/src/test/scala/tests/worksheets/WorksheetLspSuite.scala

Lines changed: 34 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -4,45 +4,47 @@ import scala.meta.internal.metals.ClientExperimentalCapabilities
44
import scala.meta.internal.metals.UserConfiguration
55
import scala.meta.internal.metals.MetalsSlowTaskResult
66
import scala.concurrent.Promise
7+
import tests.BaseSuite
78

89
object WorksheetLspSuite extends BaseLspSuite("worksheet") {
910
override def experimentalCapabilities
1011
: Option[ClientExperimentalCapabilities] =
1112
Some(ClientExperimentalCapabilities(decorationProvider = true))
1213
override def userConfig: UserConfiguration =
1314
super.userConfig.copy(worksheetScreenWidth = 40, worksheetCancelTimeout = 1)
14-
testAsync("completion") {
15-
for {
16-
_ <- server.initialize(
17-
"""
18-
|/metals.json
19-
|{"a": {"libraryDependencies": ["com.lihaoyi::sourcecode:0.1.8"]}}
20-
|/a/src/main/scala/foo/Main.worksheet.sc
21-
|identity(42)
22-
|val name = sourcecode.Name.generate.value
23-
|""".stripMargin
24-
)
25-
_ <- server.didOpen("a/src/main/scala/foo/Main.worksheet.sc")
26-
_ <- server.didSave("a/src/main/scala/foo/Main.worksheet.sc")(identity)
27-
identity <- server.completion(
28-
"a/src/main/scala/foo/Main.worksheet.sc",
29-
"identity@@"
30-
)
31-
_ = assertNoDiff(identity, "identity[A](x: A): A")
32-
generate <- server.completion(
33-
"a/src/main/scala/foo/Main.worksheet.sc",
34-
"generate@@"
35-
)
36-
_ = assertNoDiff(generate, "generate: Name")
37-
_ = assertNoDiagnostics()
38-
_ = assertNoDiff(
39-
client.workspaceDecorations,
40-
"""|identity(42) // 42
41-
|val name = sourcecode.Name.generate.value // "name"
42-
|""".stripMargin
43-
)
44-
} yield ()
45-
}
15+
if (!BaseSuite.isWindows)
16+
testAsync("completion") {
17+
for {
18+
_ <- server.initialize(
19+
"""
20+
|/metals.json
21+
|{"a": {"libraryDependencies": ["com.lihaoyi::sourcecode:0.1.8"]}}
22+
|/a/src/main/scala/foo/Main.worksheet.sc
23+
|identity(42)
24+
|val name = sourcecode.Name.generate.value
25+
|""".stripMargin
26+
)
27+
_ <- server.didOpen("a/src/main/scala/foo/Main.worksheet.sc")
28+
_ <- server.didSave("a/src/main/scala/foo/Main.worksheet.sc")(identity)
29+
identity <- server.completion(
30+
"a/src/main/scala/foo/Main.worksheet.sc",
31+
"identity@@"
32+
)
33+
_ = assertNoDiff(identity, "identity[A](x: A): A")
34+
generate <- server.completion(
35+
"a/src/main/scala/foo/Main.worksheet.sc",
36+
"generate@@"
37+
)
38+
_ = assertNoDiff(generate, "generate: Name")
39+
_ = assertNoDiagnostics()
40+
_ = assertNoDiff(
41+
client.workspaceDecorations,
42+
"""|identity(42) // 42
43+
|val name = sourcecode.Name.generate.value // "name"
44+
|""".stripMargin
45+
)
46+
} yield ()
47+
}
4648

4749
testAsync("render") {
4850
for {

0 commit comments

Comments
 (0)