Skip to content

fix: 修复项目别名与物理路径不一致时无法生成实体类 #185

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.

Sign up for GitHub

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

Open
yinjiaming666 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix: 修复项目别名与物理路径不一致时无法生成实体类 #185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
53a5a89
fix: 修复项目别名与物理路径不一致时无法生成实体类
yinjiaming666 Aug 10, 2026
2d4985f
Merge remote-tracking branch 'origin/master'
yinjiaming666 Aug 10, 2026
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
12 changes: 9 additions & 3 deletions src/main/kotlin/com/github/zhangruiyu/flutterjsonbeanfactory/file/FileHelpers.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import com.intellij.openapi.command.CommandProcessor
import com.intellij.openapi.command.WriteCommandAction
import com.intellij.openapi.project.Project
import com.intellij.openapi.project.guessProjectDir
import com.intellij.openapi.vfs.VfsUtilCore
import com.intellij.openapi.vfs.VirtualFile
import com.intellij.psi.PsiDirectory
import com.intellij.psi.PsiManager
Expand Down Expand Up @@ -159,11 +160,12 @@ object FileHelpers {
* 获取所有符合生成的file
*/
fun getAllEntityFiles(project: Project): List<Pair<HelperFileGeneratorInfo, String>> {
val pubSpecConfig = YamlHelper.getPubSpecConfig(project)
val pubSpecConfig = YamlHelper.getPubSpecConfig(project) ?: return emptyList()
val libRoot = pubSpecConfig.pubRoot.lib ?: return emptyList()
val psiManager = PsiManager.getInstance(project)
return FilenameIndex.getAllFilesByExt(project, "dart").filter {
//不过滤entity结尾了
(it.path.contains("${project.name}/lib/") || it.path.contains("${pubSpecConfig?.name}/lib/")) && !it.path.contains("freezed")
isUnderLibRoot(it, libRoot) && !it.path.contains("freezed")
}.sortedBy {
println(it.path)
it.path
Expand All @@ -177,7 +179,7 @@ object FileHelpers {
} else {
//包名
val packageName = (it.path).substringAfter("/lib/")
dartFileHelperClassGeneratorInfo to "import 'package:${pubSpecConfig?.name}/${packageName}';"
dartFileHelperClassGeneratorInfo to "import 'package:${pubSpecConfig.name}/${packageName}';"
}
} catch (e: Exception) {
val errorString = "error file: ${it},stackTrace: ${e.stackTraceToString()}"
Expand All @@ -188,6 +190,10 @@ object FileHelpers {
}
}

internal fun isUnderLibRoot(file: VirtualFile, libRoot: VirtualFile): Boolean {
return VfsUtilCore.isAncestor(libRoot, file, false)
}

/**
* 判断项目中是否包含这个file
*/
Expand Down
16 changes: 16 additions & 0 deletions src/test/kotlin/com/github/zhangruiyu/flutterjsonbeanfactory/MyPluginTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.github.zhangruiyu.flutterjsonbeanfactory

import com.github.zhangruiyu.flutterjsonbeanfactory.action.dart_to_helper.node.GeneratorDartClassNodeToHelperInfo
import com.github.zhangruiyu.flutterjsonbeanfactory.file.FileHelpers
import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess
import com.intellij.testFramework.TestDataPath
import com.intellij.testFramework.fixtures.BasePlatformTestCase
Expand Down Expand Up @@ -58,4 +59,19 @@ class MapEntity {
fun testRename() {
myFixture.testRename("foo.xml", "foo_after.xml", "a2")
}

fun testEntityFileScopeUsesPhysicalLibRoot() {
val entityFile = myFixture.addFileToProject(
"physical-directory/lib/model/user_entity.dart",
"class UserEntity {}",
).virtualFile
val outsideFile = myFixture.addFileToProject(
"physical-directory/test/user_entity_test.dart",
"class UserEntityTest {}",
).virtualFile
val libRoot = entityFile.parent.parent

assertTrue(FileHelpers.isUnderLibRoot(entityFile, libRoot))
assertFalse(FileHelpers.isUnderLibRoot(outsideFile, libRoot))
}
}
Loading