1.2.5 BUG修复

DragonKnightOfBreeze · Nov 27, 2023 · 488d44e · 488d44e
1 parent 556f23c
commit 488d44e
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 18 deletions.
diff --git a/src/main/kotlin/icu/windea/pls/core/search/ParadoxComplexEnumValueSearcher.kt b/src/main/kotlin/icu/windea/pls/core/search/ParadoxComplexEnumValueSearcher.kt
@@ -37,7 +37,8 @@ class ParadoxComplexEnumValueSearcher : QueryExecutorBase<ParadoxComplexEnumValu
             fileData.forEachFast f@{ info ->
                 if(enumName != info.enumName) return@f
                 if(name != null && name != info.name) return@f
-                val r = info.withVirtualFile(file) { consumer.process(info) }
+                info.virtualFile = file
+                val r = consumer.process(info)
                 if(!r) return@p false
             }
 

diff --git a/src/main/kotlin/icu/windea/pls/core/search/ParadoxInlineScriptUsageSearcher.kt b/src/main/kotlin/icu/windea/pls/core/search/ParadoxInlineScriptUsageSearcher.kt
@@ -35,7 +35,8 @@ class ParadoxInlineScriptUsageSearcher : QueryExecutorBase<ParadoxInlineScriptUs
             if(fileData.isEmpty()) return@p true
             fileData.forEachFast f@{ info ->
                 if(expression != info.expression) return@f
-                val r = info.withVirtualFile(file) { consumer.process(info) }
+                info.virtualFile = file
+                val r = consumer.process(info)
                 if(!r) return@p false
             }
 

diff --git a/src/main/kotlin/icu/windea/pls/core/search/ParadoxLocalisationParameterSearcher.kt b/src/main/kotlin/icu/windea/pls/core/search/ParadoxLocalisationParameterSearcher.kt
@@ -34,7 +34,8 @@ class ParadoxLocalisationParameterSearcher : QueryExecutorBase<ParadoxLocalisati
             fileData.forEachFast f@{ info ->
                 if(localisationName != info.localisationName) return@f
                 if(name != null && name != info.name) return@f
-                val r = info.withVirtualFile(file) { consumer.process(info) }
+                info.virtualFile = file
+                val r = consumer.process(info)
                 if(!r) return@p false
             }
 

diff --git a/src/main/kotlin/icu/windea/pls/core/search/ParadoxParameterSearcher.kt b/src/main/kotlin/icu/windea/pls/core/search/ParadoxParameterSearcher.kt
@@ -34,7 +34,8 @@ class ParadoxParameterSearcher : QueryExecutorBase<ParadoxParameterInfo, Paradox
             fileData.forEachFast f@{ info -> 
                 if(contextKey != info.contextKey) return@f
                 if(name != null && name != info.name) return@f
-                val r = info.withVirtualFile(file) { consumer.process(info) }
+                info.virtualFile = file
+                val r = consumer.process(info)
                 if(!r) return@p false
             }
 

diff --git a/src/main/kotlin/icu/windea/pls/core/search/ParadoxValueSetValueSearcher.kt b/src/main/kotlin/icu/windea/pls/core/search/ParadoxValueSetValueSearcher.kt
@@ -39,7 +39,8 @@ class ParadoxValueSetValueSearcher : QueryExecutorBase<ParadoxValueSetValueInfo,
             fileData.forEachFast f@{ info ->
                 if(info.valueSetName !in valueSetNames) return@f
                 if(name != null && name != info.name) return@f
-                val r = info.withVirtualFile(file) { consumer.process(info) }
+                info.virtualFile = file
+                val r = consumer.process(info)
                 if(!r) return@p false
             }
 

diff --git a/src/main/kotlin/icu/windea/pls/model/expressionInfo/ParadoxExpressionInfo.kt b/src/main/kotlin/icu/windea/pls/model/expressionInfo/ParadoxExpressionInfo.kt
@@ -17,9 +17,3 @@ interface ParadoxExpressionInfo {
     var virtualFile: VirtualFile?
 }
 
-inline fun <T> ParadoxExpressionInfo.withVirtualFile(virtualFile: VirtualFile, action: () -> T): T {
-    this.virtualFile = virtualFile
-    val r = action()
-    this.virtualFile = null
-    return r
-}
diff --git a/src/main/resources/messages/PlsIconBundle.properties b/src/main/resources/messages/PlsIconBundle.properties
@@ -2,12 +2,11 @@
 
 ### Icon tooltips
 
-icon.icons.library.tooltip=Library
-icon.icons.ddsFile.tooltip=DDS file
-icon.icons.cwtFile.tooltip=Cwt file
-icon.icons.paradoxScriptFile.tooltip=Paradox script file
-icon.icons.paradoxLocalisationFile.tooltip=Paradox localisation file
-icon.icons.descriptorFile.tooltip=Mod descriptor file
+icon.icons.fileTypes.cwt.tooltip=Cwt file
+icon.icons.fileTypes.cwtConfig.tooltip=Cwt config file
+icon.icons.fileTypes.paradoxScript.tooltip=Paradox script file
+icon.icons.fileTypes.paradoxLocalisation.tooltip=Paradox localisation file
+icon.icons.fileTypes.modDescriptor.tooltip=Mod descriptor file
 
 icon.icons.cwtProperty.tooltip=Cwt property
 icon.icons.cwtValue.tooltip=Cwt value
@@ -52,6 +51,5 @@ icon.icons.tag.tooltip=Tag
 icon.icons.templateExpression.tooltip=Template expression
 icon.icons.alias.tooltip=Alias
 icon.icons.pathReference.tooltip=Path reference
-
 icon.icons.eventNamespace.tooltip=Event namespace
 icon.icons.eventId.tooltip=Event ID