Skip to content

Commit 1b933b5

Browse files
committed
fix 尝试修复空文件的生成
1 parent a28a0f5 commit 1b933b5

File tree

3 files changed

+11
-22
lines changed

3 files changed

+11
-22
lines changed

src/main/java/com/crzsc/plugin/provider/AssetsLineMarkerProvider.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,7 @@ class AssetsLineMarkerProvider : LineMarkerProvider {
3636
var assetName: String? = null
3737
if (module != null) {
3838
FileHelperNew.getPubSpecConfig(module)?.let {
39-
assetName = FileHelperNew.getGeneratedFile(
40-
it
41-
).name
39+
assetName = FileHelperNew.getGeneratedFileName(it)
4240
}
4341
}
4442
val filenameCorrect = element.containingFile.name.equals(

src/main/java/com/crzsc/plugin/utils/FileGenerator.kt

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -67,23 +67,7 @@ class FileGenerator(private val project: Project) {
6767
}
6868
if (map.isEmpty()) {
6969
// showNotify("assets path is empty")
70-
// 如果意外走进来了 尝试删除
71-
try {
72-
val file = FileHelperNew.getGeneratedFile(config)
73-
if (file.exists()) {
74-
file.delete(this)
75-
}
76-
file.parent?.let {
77-
if (it.exists() && it.children.isEmpty()) {
78-
it.delete(this)
79-
}
80-
}
81-
} catch (
82-
e: Exception
83-
) {
84-
e.printStackTrace()
85-
}
86-
println("${config.module} assets map is empty, delete existing file.")
70+
println("${config.module} assets map is empty, skip")
8771
return
8872
}
8973
val content = StringBuilder()

src/main/java/com/crzsc/plugin/utils/FileHelperNew.kt

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,16 +193,23 @@ object FileHelperNew {
193193
return child ?: createChildDirectory(requestor, name)
194194
}
195195

196+
/**
197+
* 获取需要生成的文件 如果没有则会创建文件
198+
*/
196199
fun getGeneratedFile(config: ModulePubSpecConfig): VirtualFile {
197200
return getGeneratedFilePath(config).let {
198-
val configName = readSetting(config, Constants.KEY_OUTPUT_FILENAME) ?: PluginSetting.instance.fileName
201+
val configName = getGeneratedFileName(config)
199202
return@let it.findOrCreateChildData(
200203
it,
201-
"${configName ?: Constants.DEFAULT_CLASS_NAME.lowercase()}.dart"
204+
"$configName.dart"
202205
)
203206
}
204207
}
205208

209+
fun getGeneratedFileName(config: ModulePubSpecConfig): String =
210+
readSetting(config, Constants.KEY_OUTPUT_FILENAME) as? String ?: PluginSetting.instance.fileName
211+
?: Constants.DEFAULT_CLASS_NAME.lowercase()
212+
206213
}
207214

208215
/**

0 commit comments

Comments
 (0)