Merge pull request #316185 from ShadowRZ/shadowrz/idea-community-src-update

jetbrains.{idea,pycharm}-community-src: 2023.3.2 -> 2024.1.3

pkgs/applications/editors/jetbrains/patches/no-download.patch

@@ -1,27 +1,20 @@
 --- a/build/deps/src/org/jetbrains/intellij/build/impl/BundledMavenDownloader.kt
 +++ b/build/deps/src/org/jetbrains/intellij/build/impl/BundledMavenDownloader.kt
-@@ -87,13 +87,13 @@
-           }
-           val targetFile = root.resolve("${split[1]}-${split[2]}.jar")
-           val uri = BuildDependenciesDownloader.getUriForMavenArtifact(
--            mavenRepository = BuildDependenciesConstants.MAVEN_CENTRAL_URL,
-+            mavenRepository = "MAVEN_REPO_HERE",
-             groupId = split[0],
-             artifactId = split[1],
-             version = split[2],
-             packaging = "jar"
-           )
--          targetFile to downloadFileToCacheLocation(uri.toString(), communityRoot)
-+          targetFile to Path.of(uri.toString())
-         }
+@@ -89,7 +89,7 @@
        }
-     }.asSequence().map { it.getCompleted() }.toMap()
-@@ -133,21 +133,6 @@
+       val file = root.resolve("${split[1]}-${split[2]}.jar")
+       val uri = BuildDependenciesDownloader.getUriForMavenArtifact(
+-        mavenRepository = BuildDependenciesConstants.MAVEN_CENTRAL_URL,
++        mavenRepository = "MAVEN_REPO_HERE",
+         groupId = split[0],
+         artifactId = split[1],
+         version = split[2],
+@@ -145,22 +145,7 @@
    }
- 
+
    suspend fun downloadMavenDistribution(communityRoot: BuildDependenciesCommunityRoot): Path {
 -    val extractDir = communityRoot.communityRoot.resolve("plugins/maven/maven36-server-impl/lib/maven3")
--    val properties = BuildDependenciesDownloader.getDependenciesProperties(communityRoot)
+-    val properties = BuildDependenciesDownloader.getDependencyProperties(communityRoot)
 -    val bundledMavenVersion = properties.property("bundledMavenVersion")
 -    mutex.withLock {
 -      val uri = BuildDependenciesDownloader.getUriForMavenArtifact(
@@ -38,7 +31,8 @@
 -    return extractDir
 +    return Path.of("MAVEN_PATH_HERE")
    }
- }
+
+   suspend fun downloadMavenTelemetryDependencies(communityRoot: BuildDependenciesCommunityRoot): Path =
 --- a/platform/build-scripts/downloader/src/org/jetbrains/intellij/build/dependencies/BuildDependenciesDownloader.kt
 +++ b/platform/build-scripts/downloader/src/org/jetbrains/intellij/build/dependencies/BuildDependenciesDownloader.kt
 @@ -70,7 +70,7 @@
@@ -52,19 +46,19 @@
      return URI.create("${base}/${groupStr}/${artifactId}/${version}/${artifactId}-${version}${classifierStr}.${packaging}")
 --- a/platform/build-scripts/downloader/src/org/jetbrains/intellij/build/dependencies/JdkDownloader.kt
 +++ b/platform/build-scripts/downloader/src/org/jetbrains/intellij/build/dependencies/JdkDownloader.kt
-@@ -25,11 +25,7 @@
+@@ -33,11 +33,7 @@
    }
- 
-   fun getJdkHome(communityRoot: BuildDependenciesCommunityRoot, os: OS, arch: Arch, infoLog: (String) -> Unit): Path {
--    val jdkUrl = getUrl(communityRoot, os, arch)
--    val jdkArchive = BuildDependenciesDownloader.downloadFileToCacheLocation(communityRoot, jdkUrl)
--    val jdkExtracted = BuildDependenciesDownloader.extractFileToCacheLocation(
--      communityRoot, jdkArchive, BuildDependenciesExtractOptions.STRIP_ROOT)
--    infoLog("jps-bootstrap JDK is at $jdkExtracted")
+
+   suspend fun getJdkHome(communityRoot: BuildDependenciesCommunityRoot, os: OS, arch: Arch, infoLog: (String) -> Unit): Path {
+-    val jdkUrl = getUrl(communityRoot = communityRoot, os = os, arch = arch)
+-    val jdkArchive = downloadFileToCacheLocation(url = jdkUrl.toString(), communityRoot = communityRoot)
+-    val jdkExtracted = BuildDependenciesDownloader.extractFileToCacheLocation(communityRoot = communityRoot,
+-                                                                              archiveFile = jdkArchive,
+-                                                                              BuildDependenciesExtractOptions.STRIP_ROOT)
 +    val jdkExtracted = Path.of("JDK_PATH_HERE")
- 
-     val jdkHome: Path = if (os == OS.MACOSX) {
-       jdkExtracted.resolve("Contents").resolve("Home")
+     val jdkHome = if (os == OS.MACOSX) jdkExtracted.resolve("Contents").resolve("Home") else jdkExtracted
+     infoLog("JPS-bootstrap JDK (jdkHome=$jdkHome, executable=${getJavaExecutable(jdkHome)})")
+     return jdkHome
 --- a/platform/build-scripts/src/org/jetbrains/intellij/build/LinuxDistributionCustomizer.kt
 +++ b/platform/build-scripts/src/org/jetbrains/intellij/build/LinuxDistributionCustomizer.kt
 @@ -46,7 +46,7 @@
@@ -98,23 +92,24 @@
        val tarGzPath = buildTarGz(arch = arch, runtimeDir = runtimeDir, unixDistPath = osAndArchSpecificDistPath, suffix = suffix(arch))
 --- a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/brokenPlugins.kt
 +++ b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/brokenPlugins.kt
-@@ -11,6 +11,7 @@
- import java.nio.file.Files
- import java.nio.file.Path
+@@ -9,6 +9,8 @@
+ import java.io.ByteArrayOutputStream
+ import java.io.DataOutputStream
  import java.util.*
++import java.nio.file.Path
 +import kotlin.io.path.readText
- 
+
  private const val MARKETPLACE_BROKEN_PLUGINS_URL = "https://plugins.jetbrains.com/files/brokenPlugins.json"
- 
-@@ -22,7 +23,7 @@
- 
+
+@@ -19,7 +21,7 @@
+   val span = Span.current()
+
    val allBrokenPlugins = try {
-     val jsonFormat = Json { ignoreUnknownKeys = true }
 -    val content = downloadAsText(MARKETPLACE_BROKEN_PLUGINS_URL)
 +    val content = Path.of("BROKEN_PLUGINS_HERE").readText()
-     jsonFormat.decodeFromString(ListSerializer(MarketplaceBrokenPlugin.serializer()), content)
+     @Suppress("JSON_FORMAT_REDUNDANT")
+     Json { ignoreUnknownKeys = true }.decodeFromString(ListSerializer(MarketplaceBrokenPlugin.serializer()), content)
    }
-   catch (e: Exception) {
 --- a/platform/build-scripts/src/org/jetbrains/intellij/build/kotlin/KotlinCompilerDependencyDownloader.kt
 +++ b/platform/build-scripts/src/org/jetbrains/intellij/build/kotlin/KotlinCompilerDependencyDownloader.kt
 @@ -23,31 +23,11 @@
@@ -151,3 +146,17 @@
    }
  
    fun getKotlinJpsPluginVersion(communityRoot: BuildDependenciesCommunityRoot): String {
+--- a/platform/build-scripts/downloader/src/ktor.kt
++++ b/platform/build-scripts/downloader/src/ktor.kt
+@@ -221,6 +221,11 @@
+   val lock = fileLocks.getLock(targetPath.hashCode())
+   lock.lock()
+   try {
++    if (url.startsWith("/")) {
++      var sourceUrl = Path.of(url)
++      Files.copy(sourceUrl, target)
++    }
++
+     if (Files.exists(target)) {
+       Span.current().addEvent("use asset from cache", Attributes.of(
+         AttributeKey.stringKey("url"), url,

pkgs/applications/editors/jetbrains/patches/restarter-no-static-crt-override.patch

@@ -1,9 +0,0 @@
---- a/.cargo/config.toml
-+++ b/.cargo/config.toml
-@@ -3,6 +3,3 @@
- 
- [target.'cfg(all(target_os = "macos", target_arch = "x86_64"))']
- rustflags = ["-C", "link-arg=-mmacosx-version-min=10.15"]
--
--[target.'cfg(all(target_os = "linux", target_arch = "x86_64"))']
--rustflags = ["-C", "target-feature=+crt-static"]

pkgs/applications/editors/jetbrains/source/build.nix

@@ -115,7 +115,6 @@ let
     pname = "restarter";
     version = buildVer;
     inherit src;
-    patches = [ ../patches/restarter-no-static-crt-override.patch ];
     sourceRoot = "source/native/restarter";
     cargoHash = restarterHash;
   };
@@ -188,11 +187,11 @@ let
       repoUrl = "https://cache-redirector.jetbrains.com/maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-ide-plugin-dependencies";
       groupId = builtins.replaceStrings [ "." ] [ "/" ] "org.jetbrains.kotlin";
       artefactId = "kotlin-jps-plugin-classpath";
-      version = "1.9.10";
+      version = "1.9.22";
     in
     fetchurl {
       url = repoUrl + "/" + groupId + "/" + artefactId + "/" + version + "/" + artefactId + "-" + version + ".jar";
-      hash = "sha256-gpB4lg6wailtxSgPyyOrarXCL9+DszojaYGC4ULgU3c=";
+      hash = "sha256-ZPfEceGoIChDmjIAjjhDZpyMWQ7/DtP9Ll4YIrZN+PM=";
     };
 
     targetClass = if buildType == "pycharm" then "intellij.pycharm.community.build" else "intellij.idea.community.build";
@@ -231,7 +230,7 @@ stdenvNoCC.mkDerivation rec {
       -e 's|MAVEN_REPO_HERE|${mvnRepo}/.m2/repository/|' \
       -e 's|MAVEN_PATH_HERE|${maven}/maven|' \
       -i build/deps/src/org/jetbrains/intellij/build/impl/BundledMavenDownloader.kt
-    echo '${buildVer}' > build.txt
+    echo '${buildVer}.SNAPSHOT' > build.txt
   '';
 
   configurePhase = ''

pkgs/applications/editors/jetbrains/source/default.nix

@@ -3,21 +3,21 @@
 
 {
   idea-community = callPackage ./build.nix {
-    buildVer = "233.13135.103";
+    buildVer = "241.17890.1";
     buildType = "idea";
-    ideaHash = "sha256-ld6qvc0ceERrLSJOC07JEgDmg3lEYdU/XgjZXgzWTAg=";
-    androidHash = "sha256-D8zKkmPOx4RliAtyq2Z8Up2u224blP0SjNjW3yO7nSQ=";
-    jpsHash = "sha256-0cmn0N1UVNzw1hNOpy+9HhkHHNq+rVKnfXM+LjHAQ40=";
-    restarterHash = "sha256-56GqBY/w8expWTXSP3Bad9u7QV3q8LpNN8nd8tk+Zzk=";
+    ideaHash = "sha256-jWFnewxRkriSmV6CgGX1r//uaErMINfx3Z+JpkE34jk=";
+    androidHash = "sha256-hX2YdRYNRg0guskNiYfxdl9osgZojRen82IhgA6G0Eo=";
+    jpsHash = "sha256-Abr7L1FyqzRoUSDtsJs3cTEdkhORY5DzsQnOo5irVRI=";
+    restarterHash = "sha256-XdjyuJUQMvhC0fl6sMj0sRWlqgUb3ZgBmKKXcD3egkk=";
     mvnDeps = ./idea_maven_artefacts.json;
   };
   pycharm-community = callPackage ./build.nix {
-    buildVer = "233.13135.95";
+    buildVer = "241.17890.14";
     buildType = "pycharm";
-    ideaHash = "sha256-avRdwIr+uSXZhcMeamfy7OMYy0Ez7qWljwPc5V6n/60=";
-    androidHash = "sha256-D8zKkmPOx4RliAtyq2Z8Up2u224blP0SjNjW3yO7nSQ=";
-    jpsHash = "sha256-0cmn0N1UVNzw1hNOpy+9HhkHHNq+rVKnfXM+LjHAQ40=";
-    restarterHash = "sha256-YW+5Jl0EWqBj7iRkk70NFL+gccK9/tAOlm/n08XKH8M=";
+    ideaHash = "sha256-tTB91/RHEWP/ZILPNFAbolVBLvgjLXTdD/uF/pdJ22Y=";
+    androidHash = "sha256-hX2YdRYNRg0guskNiYfxdl9osgZojRen82IhgA6G0Eo=";
+    jpsHash = "sha256-Abr7L1FyqzRoUSDtsJs3cTEdkhORY5DzsQnOo5irVRI=";
+    restarterHash = "sha256-TbTIz9pc5wqL54TAMRoQ/9Ax/qsDp+r+h5jn2ub0hes=";
     mvnDeps = ./idea_maven_artefacts.json;
   };
 }