Changed Rename on a Kotlin package folder to rename the directory together with its packages

CHANGELOG.md

@@ -1,3 +1,4 @@
+- Changed **Refactor → Rename** for a Kotlin package folder to rename both the directory and the package: every Kotlin file inside receives the package derived from its new path (including files whose package did not match the directory), imports and supported Kotlin references in other files are updated, and **Undo Last Refactoring** restores the original paths, texts, and open-editor carets. On a Kotlin file, it also renames a matching top-level class and its supported Kotlin references, and reports a blocking conflict when the requested name cannot be used as a Kotlin class name or is already declared in the same package. **Rename Kotlin Package Directory...** still renames only the directory, **Change Kotlin Package...** still changes only the package, and Rename is no longer offered for the `src/main/kotlin` and `src/test/kotlin` source roots.
 - Added Java to Kotlin conversion: **Refactor → Convert to Kotlin** (in the main menu, the Java editor's right-click menu, and the context menu of a Java file in the Projects/Files windows) opens the standard Refactoring window with the file to convert, and pressing **Refactor** runs the conversion under NetBeans' progress dialog, which closes when the conversion finishes; the Java file is then replaced with a sibling Kotlin file produced by the IntelliJ IDEA K2 converter (getters/setters become properties, static-only classes become `object`s, inner classes become `inner class`es); nullability annotations on the Java declarations are carried over into Kotlin `?` types, the Kotlin file appears only after the conversion succeeds, a failed conversion leaves the Java file untouched, and **Undo Last Refactoring** restores the Java file and removes the Kotlin one in a single step.
 
 # 0.11.59 (2026-10-26)

CoreImpl/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.github.nbplugins</groupId>
     <artifactId>netbeans-plugin-kotlin</artifactId>
-    <version>0.12.12-SNAPSHOT</version>
+    <version>0.12.65-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>netbeans-plugin-kotlin-core-impl</artifactId>

KotlinCodeInsightImpl/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.github.nbplugins</groupId>
     <artifactId>netbeans-plugin-kotlin</artifactId>
-    <version>0.12.12-SNAPSHOT</version>
+    <version>0.12.65-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>netbeans-plugin-kotlin-code-insight-impl</artifactId>

KotlinCompilerCliBase/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.github.nbplugins</groupId>
     <artifactId>netbeans-plugin-kotlin</artifactId>
-    <version>0.12.12-SNAPSHOT</version>
+    <version>0.12.65-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>netbeans-plugin-kotlin-compiler-cli-base</artifactId>

KotlinFixesImpl/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.github.nbplugins</groupId>
     <artifactId>netbeans-plugin-kotlin</artifactId>
-    <version>0.12.12-SNAPSHOT</version>
+    <version>0.12.65-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>netbeans-plugin-kotlin-fixes-impl</artifactId>

KotlinFormatter/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.github.nbplugins</groupId>
     <artifactId>netbeans-plugin-kotlin</artifactId>
-    <version>0.12.12-SNAPSHOT</version>
+    <version>0.12.65-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>netbeans-plugin-kotlin-formatter</artifactId>

KotlinHighlighting/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.github.nbplugins</groupId>
     <artifactId>netbeans-plugin-kotlin</artifactId>
-    <version>0.12.12-SNAPSHOT</version>
+    <version>0.12.65-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>netbeans-plugin-kotlin-highlighting</artifactId>

KotlinIcons/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.github.nbplugins</groupId>
     <artifactId>netbeans-plugin-kotlin</artifactId>
-    <version>0.12.12-SNAPSHOT</version>
+    <version>0.12.65-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>netbeans-plugin-kotlin-icons</artifactId>

KotlinIntentionUtils/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.github.nbplugins</groupId>
     <artifactId>netbeans-plugin-kotlin</artifactId>
-    <version>0.12.12-SNAPSHOT</version>
+    <version>0.12.65-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>netbeans-plugin-kotlin-intention-utils</artifactId>

KotlinJ2K/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.github.nbplugins</groupId>
     <artifactId>netbeans-plugin-kotlin</artifactId>
-    <version>0.12.12-SNAPSHOT</version>
+    <version>0.12.65-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>netbeans-plugin-kotlin-j2k</artifactId>

KotlinRefactoring/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.github.nbplugins</groupId>
     <artifactId>netbeans-plugin-kotlin</artifactId>
-    <version>0.12.12-SNAPSHOT</version>
+    <version>0.12.65-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>netbeans-plugin-kotlin-refactoring</artifactId>
@@ -2018,8 +2018,10 @@ if (k2MoveFilesProcessor.exists()) {
 //      algorithm while removing only BaseRefactoringProcessor's IDEA command, modal progress,
 //      conflict-dialog, usage-view, and event-listener lifecycle. KaChangePackageComputer supplies
 //      a per-file target package plan (needed for recursive NetBeans folder selection) and invokes
-//      this lifecycle-free port for its actual usage discovery, conflict check, package rewrite,
-//      declaration map, and retargeting sequence.
+//      this lifecycle-free port for its actual usage discovery, conflict check, and package rewrite.
+//      Reference retargeting is NOT done here: in standalone mode updatePackageDirective invalidates
+//      every PSI smart pointer held by UsageInfo, so the computer rewrites imports and qualified
+//      references in the captured source text instead.
 def k2ChangePackageProcessor = new File(srcDir, 'org/jetbrains/kotlin/idea/k2/refactoring/move/processor/K2ChangePackageRefactoringProcessor.kt')
 if (k2ChangePackageProcessor.exists()) {
   def text = k2ChangePackageProcessor.text
@@ -2048,7 +2050,7 @@ if (k2ChangePackageProcessor.exists()) {
     text = text.substring(0, preprocessStart) + text.substring(performStart)
   }
   text = text.replace('    @OptIn(KaAllowAnalysisOnEdt::class)\n    override fun performRefactoring(usages: Array<out UsageInfo>) = allowAnalysisOnEdt {',
-                      '    fun findConflicts(usages: List<com.intellij.refactoring.util.MoveRenameUsageInfo>): com.intellij.util.containers.MultiMap<PsiElement, String> =\n        findAllMoveConflicts(descriptor.files, descriptor.target, usages)\n\n    fun prepareRefactoring(oldToNewMap: MutableMap<PsiElement, PsiElement>) {\n        val files = descriptor.files\n        files.forEach { it.updatePackageDirective(descriptor.target) }\n        files.forEach { file ->\n            oldToNewMap[file] = file\n            file.declarations.filterIsInstance<org.jetbrains.kotlin.psi.KtNamedDeclaration>().forEach { declaration ->\n                oldToNewMap[declaration] = declaration\n            }\n        }\n    }\n\n    fun retargetUsages(usages: Collection<UsageInfo>, oldToNewMap: Map<PsiElement, PsiElement>) {\n        retargetUsagesAfterMove(usages.toList(), oldToNewMap)\n    }\n\n    fun performRefactoring(usages: Collection<UsageInfo>) {\n        val oldToNewMap = linkedMapOf<PsiElement, PsiElement>()\n        prepareRefactoring(oldToNewMap)\n        retargetUsages(usages, oldToNewMap)\n    }')
+                      '    fun findConflicts(usages: List<com.intellij.refactoring.util.MoveRenameUsageInfo>): com.intellij.util.containers.MultiMap<PsiElement, String> =\n        findAllMoveConflicts(descriptor.files, descriptor.target, usages)\n\n    fun updatePackages() {\n        descriptor.files.forEach { it.updatePackageDirective(descriptor.target) }\n    }')
   text = text.replace('\n\n    override fun getBeforeData(): RefactoringEventData = RefactoringEventData().apply {\n        addElements(descriptor.files)\n    }', '')
   text = text.replace('        val files = descriptor.files\n        files.forEach { it.updatePackageDirective(descriptor.target) }\n        val oldToNewMap: MutableMap<PsiElement, PsiElement> = files.associateWith { it }.toMutableMap()\n        files.forEach { file -> file.allDeclarationsToUpdate.forEach { decl -> oldToNewMap[decl] = decl } }\n        retargetUsagesAfterMove(usages.toList(), oldToNewMap)\n    }', '')
   k2ChangePackageProcessor.text = text