Skip to content

Sync with the ultimate master #1042

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

Merged
auduchinok merged 1 commit into from
Jan 20, 2026
Merged

Sync with the ultimate master #1042

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 8 additions & 9 deletions .../kotlin/com/jetbrains/rider/plugins/fsharp/test/cases/projectModel/FcsModuleReaderTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import com.intellij.openapi.editor.impl.EditorImpl
import com.intellij.openapi.fileEditor.ex.FileEditorManagerEx
import com.intellij.openapi.project.Project
import com.intellij.platform.backend.workspace.WorkspaceModel
import com.jetbrains.rider.test.framework.executeWithGold
import com.jetbrains.rdclient.util.idea.pumpMessages
import com.jetbrains.rider.daemon.util.hasErrors
import com.jetbrains.rider.editors.getProjectModelId
Expand All @@ -21,7 +20,7 @@ import com.jetbrains.rider.test.annotations.TestSettings
import com.jetbrains.rider.test.base.ProjectModelBaseTest
import com.jetbrains.rider.test.enums.BuildTool
import com.jetbrains.rider.test.enums.sdk.SdkVersion
import com.jetbrains.rider.test.framework.assertAllProjectsWereLoaded
import com.jetbrains.rider.test.framework.executeWithGold
import com.jetbrains.rider.test.framework.frameworkLogger
import com.jetbrains.rider.test.scriptingApi.*
import com.jetbrains.rider.util.idea.syncFromBackend
Expand Down Expand Up @@ -118,7 +117,7 @@ class FcsModuleReaderTest : ProjectModelBaseTest() {
fun testUnloadReloadCSharp() {
executeWithGold(testGoldFile) {
withNonFSharpProjectReferences {
assertAllProjectsWereLoaded(project)
assertAllProjectsWereLoaded()
dumpModuleReader(it, "Init", project)

openFsFileDumpModuleReader(it, "1. Open F# file", true, emptyList())
Expand Down Expand Up @@ -147,7 +146,7 @@ class FcsModuleReaderTest : ProjectModelBaseTest() {
fun testTypeInsideClassUnloadReload() {
executeWithGold(testGoldFile) {
withNonFSharpProjectReferences {
assertAllProjectsWereLoaded(project)
assertAllProjectsWereLoaded()
openFsFileDumpModuleReader(it, "Init", true, emptyList())

addReference(project, arrayOf("ProjectReferencesCSharp", "FSharpProject"), "<CSharpProject>")
Expand Down Expand Up @@ -201,7 +200,7 @@ class FcsModuleReaderTest : ProjectModelBaseTest() {
fun testTypeOutsideClassUnloadReload() {
executeWithGold(testGoldFile) {
withNonFSharpProjectReferences {
assertAllProjectsWereLoaded(project)
assertAllProjectsWereLoaded()
openFsFileDumpModuleReader(it, "Init", true, emptyList())

addReference(project, arrayOf("ProjectReferencesCSharp", "FSharpProject"), "<CSharpProject>")
Expand All @@ -228,7 +227,7 @@ class FcsModuleReaderTest : ProjectModelBaseTest() {
fun testLoadReferenced() {
executeWithGold(testGoldFile) {
withNonFSharpProjectReferences {
assertAllProjectsWereLoaded(project)
assertAllProjectsWereLoaded()
openFsFileDumpModuleReader(it, "Init", false, listOf("CSharpProject"))

waitForDaemonCloseAllOpenEditors(project)
Expand All @@ -245,7 +244,7 @@ class FcsModuleReaderTest : ProjectModelBaseTest() {
@Test
fun testGotoUsagesFromCSharp() {
withNonFSharpProjectReferences {
assertAllProjectsWereLoaded(project)
assertAllProjectsWereLoaded()
withOpenedEditor("CSharpProject/Class1.cs", "Class1.cs") {
waitForNextDaemon()
callAction(IdeActions.ACTION_GOTO_DECLARATION)
Expand All @@ -258,7 +257,7 @@ class FcsModuleReaderTest : ProjectModelBaseTest() {
@Test
fun testGotoUsagesFromCSharpChangeCSharp() {
withNonFSharpProjectReferences {
assertAllProjectsWereLoaded(project)
assertAllProjectsWereLoaded()
withOpenedEditor("CSharpProject/Class1.cs", "Class1.cs") {
typeWithLatency("1")
waitForNextDaemon()
Expand All @@ -272,7 +271,7 @@ class FcsModuleReaderTest : ProjectModelBaseTest() {
@Test
fun testGotoUsagesFromCSharpChangeCSharp2() {
withNonFSharpProjectReferences {
assertAllProjectsWereLoaded(project)
assertAllProjectsWereLoaded()

withOpenedEditor("FSharpProject/Library.fs") {
waitForNextDaemon()
Expand Down
7 changes: 3 additions & 4 deletions ...tlin/com/jetbrains/rider/plugins/fsharp/test/cases/projectModel/FcsProjectProviderTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import com.jetbrains.rider.test.annotations.TestSettings
import com.jetbrains.rider.test.base.PerTestSolutionTestBase
import com.jetbrains.rider.test.enums.BuildTool
import com.jetbrains.rider.test.enums.sdk.SdkVersion
import com.jetbrains.rider.test.framework.assertAllProjectsWereLoaded
import com.jetbrains.rider.test.scriptingApi.*
import com.jetbrains.rider.util.idea.syncFromBackend
import org.testng.annotations.BeforeMethod
Expand Down Expand Up @@ -63,7 +62,7 @@ class FcsProjectProviderTest : PerTestSolutionTestBase() {
@Solution("ProjectReferencesFSharp")
@Test
fun projectReferencesFSharp() {
assertAllProjectsWereLoaded(project)
assertAllProjectsWereLoaded()
assertHasErrorsAndProjectStampAndReferences("ReferenceFrom/Library.fs", true, emptyList())

waitForDaemonCloseAllOpenEditors(project)
Expand All @@ -88,7 +87,7 @@ class FcsProjectProviderTest : PerTestSolutionTestBase() {
@Test
@Solution("ProjectReferencesCSharp")
fun projectReferencesCSharp() {
assertAllProjectsWereLoaded(project)
assertAllProjectsWereLoaded()
assertHasErrorsAndProjectStampAndReferences("FSharpProject/Library.fs", true, emptyList())

waitForDaemonCloseAllOpenEditors(project)
Expand Down Expand Up @@ -121,7 +120,7 @@ class FcsProjectProviderTest : PerTestSolutionTestBase() {
@Solution("ProjectReferencesCSharp")
fun projectReferencesCSharpNoModuleReader() {
withoutNonFSharpProjectReferences {
assertAllProjectsWereLoaded(project)
assertAllProjectsWereLoaded()
assertHasErrorsAndProjectStampAndReferences("FSharpProject/Library.fs", true, emptyList())

waitForDaemonCloseAllOpenEditors(project)
Expand Down
Loading