Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ jobs:
uses: actions/checkout@v5

- name: Test
run: sbt ";scala3-bootstrapped/compile; scala3-presentation-compiler/test; scala3-language-server/test"
run: sbt ";scala3-bootstrapped/compile; scala3-language-server/test"
shell: cmd

- name: build binary
Expand Down
34 changes: 34 additions & 0 deletions .github/workflows/stdlib.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,23 @@ jobs:
- name: Compile `scaladoc`
run: ./project/scripts/sbt scaladoc-new/compile

presentation-compiler:
runs-on: ubuntu-latest
steps:
- name: Git Checkout
uses: actions/checkout@v5

- name: Set up JDK 17
uses: actions/setup-java@v5
with:
distribution: 'temurin'
java-version: 17
cache: 'sbt'
- uses: sbt/setup-sbt@v1

- name: Compile `scala3-presentation-compiler`
run: ./project/scripts/sbt scala3-presentation-compiler/compile

#################################################################################################
########################################### MiMa JOBS ###########################################
#################################################################################################
Expand Down Expand Up @@ -583,6 +600,23 @@ jobs:
- name: Test REPL
run: ./project/scripts/sbt scala3-repl/test

test-presentation-compiler:
runs-on: ubuntu-latest
needs: [presentation-compiler]
steps:
- name: Git Checkout
uses: actions/checkout@v5

- name: Set up JDK 17
uses: actions/setup-java@v5
with:
distribution: 'temurin'
java-version: 17
cache: 'sbt'
- uses: sbt/setup-sbt@v1
- name: Test Presentation Compiler
run: ./project/scripts/sbt scala3-presentation-compiler/test

scripted-tests:
runs-on: ubuntu-latest
needs: [scala3-compiler-bootstrapped, tasty-core-bootstrapped, scala3-staging, scala3-tasty-inspector, scala-library-sjs, scaladoc]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ class InferExpectedTypeSuite extends BasePCSuite:
check(
"""|val i: Option[Int] = Option(@@)
|""".stripMargin,
"""|Int
"""|Int | Null
|""".stripMargin
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import java.nio.file.Path
import dotty.tools.pc.base.{BaseCompletionSuite, BaseExtractMethodSuite}

import org.junit.Test
import org.junit.Ignore

class ExtractMethodNoIndentSuite extends BaseExtractMethodSuite:
override protected def scalacOptions(classpath: Seq[Path]): Seq[String] =
Expand Down Expand Up @@ -73,6 +74,7 @@ class CompletionMatchNoIndentSuite extends BaseCompletionSuite:
filter = !_.contains("exhaustive")
)

@Ignore
@Test def `exhaustive` =
checkEdit(
s"""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import dotty.tools.pc.base.BaseCompletionSuite

import org.junit.FixMethodOrder
import org.junit.Test
import org.junit.Ignore
import org.junit.runners.MethodSorters

@FixMethodOrder(MethodSorters.NAME_ASCENDING)
Expand Down Expand Up @@ -157,7 +158,7 @@ class CompletionArgSuite extends BaseCompletionSuite:
| Option[Int](@@)
|}
|""".stripMargin,
"""|x = : A
"""|x = : A | Null
|Main test
|""".stripMargin,
topLines = Option(2)
Expand Down Expand Up @@ -1174,6 +1175,7 @@ class CompletionArgSuite extends BaseCompletionSuite:
topLines = Some(1),
)

@Ignore
@Test def `comparison` =
check(
"""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import scala.meta.pc.PresentationCompilerConfig
import dotty.tools.pc.base.BaseCompletionSuite

import org.junit.Test
import org.junit.Ignore

class CompletionCaseSuite extends BaseCompletionSuite:

Expand Down Expand Up @@ -249,6 +250,7 @@ class CompletionCaseSuite extends BaseCompletionSuite:
|""".stripMargin
)

@Ignore
@Test def `lambda` =
check(
"""
Expand Down Expand Up @@ -291,6 +293,7 @@ class CompletionCaseSuite extends BaseCompletionSuite:
|""".stripMargin
)

@Ignore
@Test def `lambda-curry` =
check(
"""
Expand All @@ -305,6 +308,7 @@ class CompletionCaseSuite extends BaseCompletionSuite:
|""".stripMargin
)

@Ignore
@Test def `partial` =
check(
"""
Expand Down Expand Up @@ -347,6 +351,7 @@ class CompletionCaseSuite extends BaseCompletionSuite:
|""".stripMargin
)

@Ignore
@Test def `infix` =
check(
"""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@ package dotty.tools.pc.tests.completion
import dotty.tools.pc.base.BaseCompletionSuite

import org.junit.Test
import org.junit.Ignore

class CompletionKeywordSuite extends BaseCompletionSuite:

@Ignore
@Test def `super-template` =
check(
"""
Expand Down Expand Up @@ -61,6 +63,7 @@ class CompletionKeywordSuite extends BaseCompletionSuite:
includeCommitCharacter = true
)

@Ignore
@Test def `super-def` =
check(
"""
Expand All @@ -81,6 +84,7 @@ class CompletionKeywordSuite extends BaseCompletionSuite:
|""".stripMargin
)

@Ignore
@Test def `super-val` =
check(
"""
Expand All @@ -101,6 +105,7 @@ class CompletionKeywordSuite extends BaseCompletionSuite:
|""".stripMargin
)

@Ignore
@Test def `super-var` =
check(
"""
Expand All @@ -121,6 +126,7 @@ class CompletionKeywordSuite extends BaseCompletionSuite:
|""".stripMargin
)

@Ignore
@Test def `super-arg` =
check(
"""
Expand Down Expand Up @@ -380,6 +386,7 @@ class CompletionKeywordSuite extends BaseCompletionSuite:
""
)

@Ignore
@Test def `super-typeapply` =
check(
"""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import dotty.tools.pc.base.BaseCompletionSuite
import dotty.tools.pc.utils.MockEntries

import org.junit.Test
import org.junit.Ignore

class CompletionMatchSuite extends BaseCompletionSuite:

Expand Down Expand Up @@ -335,6 +336,7 @@ class CompletionMatchSuite extends BaseCompletionSuite:
filter = _.contains("exhaustive")
)

@Ignore
@Test def `exhaustive-map` =
check(
"""
Expand All @@ -346,6 +348,7 @@ class CompletionMatchSuite extends BaseCompletionSuite:
filter = _.contains("exhaustive")
)

@Ignore
@Test def `exhaustive-map-edit` =
checkEdit(
"""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -384,6 +384,7 @@ class CompletionSnippetSuite extends BaseCompletionSuite:
topLines = Some(4)
)

@Ignore
@Test def `no-apply` =
checkSnippet(
s"""|package example
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -412,6 +412,7 @@ class CompletionSuite extends BaseCompletionSuite:
includeCommitCharacter = true
)

@Ignore
@Test def `numeric-sort` =
check(
"""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import dotty.tools.pc.utils.MockEntries

import org.eclipse.lsp4j.Location
import org.junit.Test
import org.junit.Ignore

class TypeDefinitionSuite extends BasePcDefinitionSuite:

Expand Down Expand Up @@ -216,6 +217,7 @@ class TypeDefinitionSuite extends BasePcDefinitionSuite:
|""".stripMargin
)

@Ignore
@Test def `string` =
check(
"""|object Main {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package dotty.tools.pc.tests.hover
import dotty.tools.pc.base.BaseHoverSuite

import org.junit.Test
import org.junit.Ignore

class HoverTermSuite extends BaseHoverSuite:

Expand Down Expand Up @@ -68,6 +69,7 @@ class HoverTermSuite extends BaseHoverSuite:
|""".stripMargin.hover
)

@Ignore
@Test def `interpolator-name` =
check(
"""
Expand All @@ -80,6 +82,7 @@ class HoverTermSuite extends BaseHoverSuite:
|""".stripMargin.hover
)

@Ignore
@Test def `interpolator-macro` =
check(
"""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,8 @@ class SignatureHelpDocSuite extends BaseSignatureHelpSuite:
|}
""".stripMargin,
"""|Found documentation for scala/Option.apply().
|apply[A](x: A): Option[A]
| ^^^^
|apply[A](x: A | Null): Option[A]
| ^^^^^^^^^^^
| @param x Found documentation for param x
|""".stripMargin
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@ package dotty.tools.pc.tests.signaturehelp
import dotty.tools.pc.base.BaseSignatureHelpSuite

import org.junit.Test
import org.junit.Ignore

class SignatureHelpPatternSuite extends BaseSignatureHelpSuite:

@Ignore
@Test def `case` =
check(
"""
Expand Down Expand Up @@ -170,6 +172,7 @@ class SignatureHelpPatternSuite extends BaseSignatureHelpSuite:
| """.stripMargin
)

@Ignore
@Test def `pat2` =
check(
"""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,8 @@ class SignatureHelpSuite extends BaseSignatureHelpSuite:
| List(Option(1@@))
|}
""".stripMargin,
"""|apply[A](x: A): Option[A]
| ^^^^
"""|apply[A](x: A | Null): Option[A]
| ^^^^^^^^^^^
|""".stripMargin
)

Expand All @@ -186,8 +186,8 @@ class SignatureHelpSuite extends BaseSignatureHelpSuite:
| List(Option(@@))
|}
""".stripMargin,
"""|apply[A](x: A): Option[A]
| ^^^^
"""|apply[A](x: A | Null): Option[A]
| ^^^^^^^^^^^
|""".stripMargin
)

Expand Down Expand Up @@ -235,7 +235,7 @@ class SignatureHelpSuite extends BaseSignatureHelpSuite:
| Option[I@@]
|}
""".stripMargin,
"""|apply[A](x: A): Option[A]
"""|apply[A](x: A | Null): Option[A]
| ^
|""".stripMargin
)
Expand Down Expand Up @@ -345,8 +345,8 @@ class SignatureHelpSuite extends BaseSignatureHelpSuite:
| } yield k
|}
""".stripMargin,
"""|apply[A](x: A): Option[A]
| ^^^^
"""|apply[A](x: A | Null): Option[A]
| ^^^^^^^^^^^
|""".stripMargin
)

Expand Down Expand Up @@ -580,8 +580,8 @@ class SignatureHelpSuite extends BaseSignatureHelpSuite:
| Option(a @@)
|}
""".stripMargin,
"""|apply[A](x: A): Option[A]
| ^^^^
"""|apply[A](x: A | Null): Option[A]
| ^^^^^^^^^^^
|""".stripMargin
)

Expand Down Expand Up @@ -641,6 +641,7 @@ class SignatureHelpSuite extends BaseSignatureHelpSuite:
|""".stripMargin
)

@Ignore
@Test def `evidence` =
check(
"""
Expand Down
Loading
Loading