Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix CI to make up for latest changes in dotty #6181

Merged
merged 2 commits into from Mar 5, 2024
Merged

Fix CI to make up for latest changes in dotty #6181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f79b234
Fix CI to make up for latest changes in dotty
rochala Feb 29, 2024
e444b2d
Properly mark nightly versions
rochala Mar 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 9 additions & 7 deletions tests/cross/src/test/scala/tests/pc/CompletionInterpolatorSuite.scala
View file
Open in desktop
Expand Up @@ -54,11 +54,11 @@ class CompletionInterpolatorSuite extends BaseCompletionSuite {

checkEdit(
"string2",
s"""|object Main {
| val myName = ""
| def message = "$$myNa@@me"
|}
|""".stripMargin,
"""|object Main {
| val myName = ""
| def message = "$myNa@@me"
|}
|""".stripMargin,
"""|object Main {
| val myName = ""
| def message = s"${myName$0}me"
Expand Down Expand Up @@ -371,7 +371,7 @@ class CompletionInterpolatorSuite extends BaseCompletionSuite {
)
),
"""|object Main {
|
|
| s"Hello $List.e@@ "
|}
|""".stripMargin,
Expand Down Expand Up @@ -593,8 +593,10 @@ class CompletionInterpolatorSuite extends BaseCompletionSuite {
filter = _.contains("hello")
)

// This case will not be supported as every modern editor automatically insterts closing brace
// and it is non trivial to correctly find completion query for this scenario.
checkEditLine(
"brace-token-error-pos",
"brace-token-error-pos".tag(IgnoreForScala3CompilerPC),
"""|object Main {
| val hello = ""
| ___
Expand Down
20 changes: 14 additions & 6 deletions tests/cross/src/test/scala/tests/pc/CompletionKeywordSuite.scala
View file
Open in desktop
Expand Up @@ -46,7 +46,8 @@ class CompletionKeywordSuite extends BaseCompletionSuite {
|""".stripMargin,
">=3.4.1-RC1-bin-20240201-hash-NIGHTLY" ->
"""|transparentTrait - scala.annotation (commit: '')
|""".stripMargin
|""".stripMargin,
">=3.4.2-RC1-bin-20240301-hash-NIGHTLY" -> ""
),
includeCommitCharacter = true
)
Expand Down Expand Up @@ -77,7 +78,8 @@ class CompletionKeywordSuite extends BaseCompletionSuite {
|""".stripMargin,
">=3.4.1-RC1-bin-20240201-hash-NIGHTLY" ->
"""|transparentTrait - scala.annotation (commit: '')
|""".stripMargin
|""".stripMargin,
">=3.4.2-RC1-bin-20240301-hash-NIGHTLY" -> ""
),
includeCommitCharacter = true
)
Expand Down Expand Up @@ -488,7 +490,8 @@ class CompletionKeywordSuite extends BaseCompletionSuite {
"""|def
|derived - scala.CanEqual
|deprecated - scala.runtime.stdLibPatches.language
|""".stripMargin
|""".stripMargin,
">=3.4.2-RC1-bin-20240301-hash-NIGHTLY" -> "def"
)
)

Expand All @@ -513,7 +516,10 @@ class CompletionKeywordSuite extends BaseCompletionSuite {
"3.4" -> """|val
|var
|varargs - scala.annotation
|""".stripMargin
|""".stripMargin,
">=3.4.2-RC1-bin-20240301-hash-NIGHTLY" ->
"""|val
|var""".stripMargin
)
)

Expand Down Expand Up @@ -605,7 +611,8 @@ class CompletionKeywordSuite extends BaseCompletionSuite {
|unsafeNulls - scala.runtime.stdLibPatches.language (commit: '')
|unused - scala.annotation (commit: '')
|unshared - scala.annotation.internal (commit: '')
|""".stripMargin
|""".stripMargin,
">=3.4.2-RC1-bin-20240301-hash-NIGHTLY" -> "using (commit: '')"
),
topLines = Some(5)
)
Expand Down Expand Up @@ -649,7 +656,8 @@ class CompletionKeywordSuite extends BaseCompletionSuite {
|unused - scala.annotation
|unshared - scala.annotation.internal
|unspecialized - scala.annotation
|""".stripMargin
|""".stripMargin,
">=3.4.2-RC1-bin-20240301-hash-NIGHTLY" -> ""
),
topLines = Some(5)
)
Expand Down
3 changes: 2 additions & 1 deletion tests/cross/src/test/scala/tests/pc/CompletionPatternSuite.scala
View file
Open in desktop
Expand Up @@ -82,7 +82,8 @@ class CompletionPatternSuite extends BaseCompletionSuite {
">=3.4.1-RC1-bin-20240201-hash-NIGHTLY" ->
"""|macros - scala.languageFeature.experimental
|macroImpl - scala.reflect.macros.internal
|""".stripMargin
|""".stripMargin,
">=3.4.2-RC1-bin-20240301-hash-NIGHTLY" -> ""
)
)

Expand Down