commit 201cc4e4a6b34d9ad7518c89b4cbe0d4a7a8907a from: ale date: Thu Jul 23 19:21:20 2026 UTC Corrige el build: Gradle 9, bundledModule y tipos de ChangeProvider - nixpkgs.gradle (8.14.4) no alcanza el mínimo de Gradle 9.0.0 que exige el plugin org.jetbrains.intellij.platform 2.18.1; el devShell ahora usa gradle_9 (9.5.1). - com.intellij.modules.vcs es un módulo bundleado, no un plugin: bundledPlugin(...) -> bundledModule(...). - processUnversionedFile espera FilePath, no VirtualFile; LocallyDeletedChange tiene un solo argumento (FilePath). Ignora .intellijPlatform/ (caché del Gradle plugin, análogo a .gradle/). 'nix develop -c gradle buildPlugin' genera build/distributions/gotvcs-intellij-0.1.0.zip. commit - 701fffebad34d0f36f5fd2165569f42d177ffef9 commit + 201cc4e4a6b34d9ad7518c89b4cbe0d4a7a8907a blob - 0c3abb32d3d895c1ae2f491674e66390df9ca4df blob + ed48283764068633e7102fc70bf8042ea1e85d87 --- .gitignore +++ .gitignore @@ -1,6 +1,7 @@ build/ .gradle/ .idea/ +.intellijPlatform/ *.iml out/ result blob - a92b719b88f2202e25972fea0e34acd7c6aad573 blob + aea216e59d2b617678c7ddc914983c2b264dc53e --- build.gradle.kts +++ build.gradle.kts @@ -17,7 +17,7 @@ repositories { dependencies { intellijPlatform { local(providers.gradleProperty("ideLocalPath").get()) - bundledPlugin("com.intellij.modules.vcs") + bundledModule("com.intellij.modules.vcs") } } blob - f8e71a911910a9c90ccc407775ebd6e10aab7fa6 blob + eae7ab1733d476a6e3c77ef243affabde717f66c --- flake.nix +++ flake.nix @@ -13,7 +13,7 @@ devShells.${system}.default = pkgs.mkShell { packages = [ pkgs.jdk21 - pkgs.gradle + pkgs.gradle_9 ]; JAVA_HOME = "${pkgs.jdk21}/lib/openjdk"; blob - /dev/null blob + fdfbda4640bbe5ad60823df0d307fac44b8a00f8 (mode 644) --- /dev/null +++ flake.lock @@ -0,0 +1,27 @@ +{ + "nodes": { + "nixpkgs": { + "locked": { + "lastModified": 1784497964, + "narHash": "sha256-vlHUuqAcbcH2RKmHbPiuQzbv1pnzzavXnI62RD0bqCU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "241313f4e8e508cb9b13278c2b0fa25b9ca27163", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} blob - 5d5d3b53a52c1f7cb2b933f3284eaa56abb6524a blob + aa3ca7d9f9e8d1e61942a98c450ac8363ad603ca --- src/main/kotlin/dev/nezzontli/gotvcs/GotChangeProvider.kt +++ src/main/kotlin/dev/nezzontli/gotvcs/GotChangeProvider.kt @@ -9,7 +9,6 @@ import com.intellij.openapi.vcs.changes.ChangelistBuil import com.intellij.openapi.vcs.changes.CurrentContentRevision import com.intellij.openapi.vcs.changes.LocallyDeletedChange import com.intellij.openapi.vcs.changes.VcsDirtyScope -import com.intellij.openapi.vfs.LocalFileSystem import com.intellij.openapi.vfs.VirtualFile import com.intellij.vcsUtil.VcsUtil import java.io.File @@ -31,12 +30,9 @@ class GotChangeProvider(private val commandLine: GotCo val filePath = VcsUtil.getFilePath(absoluteFile, false) when (entry.code) { - '?' -> { - val virtualFile = LocalFileSystem.getInstance().findFileByIoFile(absoluteFile) - if (virtualFile != null) builder.processUnversionedFile(virtualFile) - } + '?' -> builder.processUnversionedFile(filePath) - '!' -> builder.processLocallyDeletedFile(LocallyDeletedChange(filePath, filePath.path)) + '!' -> builder.processLocallyDeletedFile(LocallyDeletedChange(filePath)) 'M', 'm', 'C' -> { val status = if (entry.code == 'C') FileStatus.MERGED_WITH_CONFLICTS else FileStatus.MODIFIED