Skip to content

Fix bug in file duplicate name handling logic #447

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.

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
merged 1 commit into from
Apr 19, 2025
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class KotlinClassFileGenerator {
) {
val fileNamesWithoutSuffix = currentDirExistsFileNamesWithoutKTSuffix(directory)
var kotlinClassForGenerateFile = kotlinClass
while (fileNamesWithoutSuffix.contains(kotlinClass.name)) {
while (fileNamesWithoutSuffix.contains(kotlinClassForGenerateFile.name)) {
kotlinClassForGenerateFile =
kotlinClassForGenerateFile.rename(newName = kotlinClassForGenerateFile.name + "X")
}
Expand Down Expand Up @@ -110,11 +110,21 @@ class KotlinClassFileGenerator {
}
append(classCodeContent)
}

var finalFileName = fileName.trim('`')
var ktFileName = "$finalFileName.kt"

// Check if file already exists and rename it by adding 'X' suffix if needed
val fileNamesWithoutSuffix = currentDirExistsFileNamesWithoutKTSuffix(directory)
while (fileNamesWithoutSuffix.contains(finalFileName)) {
finalFileName += "X"
ktFileName = "$finalFileName.kt"
}

// Create the file with the potentially modified name
executeCouldRollBackAction(project) {
val file =
psiFileFactory.createFileFromText("${fileName.trim('`')}.kt", KotlinFileType(), kotlinFileContent)
val file = psiFileFactory.createFileFromText(ktFileName, KotlinFileType(), kotlinFileContent)
directory.add(file)
}
}

}
Loading