From a728b10d181a00eb526387913e822eaeccaa6981 Mon Sep 17 00:00:00 2001
From: Aleksandra Zdrojowa <aleksandra.zdrojowa@jetbrains.com>
Date: Wed, 29 May 2024 10:21:33 +0200
Subject: [PATCH] [prod/test sources] change fields order in ProjectData

---
 .../scala/org/jetbrains/sbt/extractors/ProjectExtractor.scala | 4 +---
 shared/src/main/scala/org/jetbrains/sbt/structure/data.scala  | 2 +-
 .../scala/org/jetbrains/sbt/structure/dataSerializers.scala   | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/extractor/src/main/scala/org/jetbrains/sbt/extractors/ProjectExtractor.scala b/extractor/src/main/scala/org/jetbrains/sbt/extractors/ProjectExtractor.scala
index 748342a..699dc7d 100644
--- a/extractor/src/main/scala/org/jetbrains/sbt/extractors/ProjectExtractor.scala
+++ b/extractor/src/main/scala/org/jetbrains/sbt/extractors/ProjectExtractor.scala
@@ -81,8 +81,8 @@ class ProjectExtractor(
       settingData,
       taskData,
       commandData,
+      mainSourceDirectories,
       testSourceDirectories,
-      mainSourceDirectories
     )
   }
 
@@ -347,8 +347,6 @@ object ProjectExtractor extends SbtStateOps with TaskOps {
       val sourceConfigurations = StructureKeys.sourceConfigurations.value
       val testConfigurations = StructureKeys.testConfigurations.value
 
-      // note: because we are extracting ConfigurationData with all sourceConfigurations and testConfigurations we also have to take sourceDirectories
-      // in all configurations
       val mainSourceDirectories = Keys.sourceDirectory.in(projectRef)
         .forAllConfigurations(state, sourceConfigurations)
         .map(_._2).distinct
diff --git a/shared/src/main/scala/org/jetbrains/sbt/structure/data.scala b/shared/src/main/scala/org/jetbrains/sbt/structure/data.scala
index 590f14c..f8cdbe1 100644
--- a/shared/src/main/scala/org/jetbrains/sbt/structure/data.scala
+++ b/shared/src/main/scala/org/jetbrains/sbt/structure/data.scala
@@ -76,8 +76,8 @@ case class ProjectData(
   settings: Seq[SettingData],
   tasks: Seq[TaskData],
   commands: Seq[CommandData],
+  mainSourceDirectories: Seq[File],
   testSourceDirectories: Seq[File],
-  mainSourceDirectories: Seq[File]
 )
 
 case class SettingData(label: String, description: Option[String], rank: Int, stringValue: Option[String])
diff --git a/shared/src/main/scala/org/jetbrains/sbt/structure/dataSerializers.scala b/shared/src/main/scala/org/jetbrains/sbt/structure/dataSerializers.scala
index cb847d4..31f3a8b 100644
--- a/shared/src/main/scala/org/jetbrains/sbt/structure/dataSerializers.scala
+++ b/shared/src/main/scala/org/jetbrains/sbt/structure/dataSerializers.scala
@@ -522,7 +522,7 @@ trait DataSerializers {
       tryDeps.right.map { dependencies =>
         ProjectData(id, buildURI, name, organization, version, base, packagePrefix, basePackages,
           target, configurations, java, scala, compileOrder,
-          dependencies, resolvers, play2, settings, tasks, commands, testSourceDirectories, mainSourceDirectories)
+          dependencies, resolvers, play2, settings, tasks, commands, mainSourceDirectories, testSourceDirectories)
       }
 
     }