azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FE 1.0] Fix new compilation warnings after #KT-63208

Browse Source
This commit is contained in:
Kirill Rakhman
2024-01-08 16:40:06 +01:00
committed by Space Team
parent 8bfc4675c4
commit dc0f4e6995
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/LazyTopDownAnalyzer.kt
+1 -1
View File
@@ -100,7 +100,7 @@ class LazyTopDownAnalyzer(
assert(file.isScript() || packageDirective != null) { "No package in a non-script file: " + file } assert(file.isScript() || packageDirective != null) { "No package in a non-script file: " + file }
packageDirective?.accept(this) packageDirective?.accept(this)
c.addFile(file) c.addFile(file)
topLevelFqNames.put(file.packageFqName, packageDirective) if (packageDirective != null) topLevelFqNames.put(file.packageFqName, packageDirective)
} }
override fun visitPackageDirective(directive: KtPackageDirective) { override fun visitPackageDirective(directive: KtPackageDirective) {
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CandidateResolver.kt
+1 -1
View File
@@ -389,7 +389,7 @@ class CandidateResolver(
} }
} }
} }
argumentTypes.add(resultingType) if (resultingType != null) argumentTypes.add(resultingType)
candidateCall.recordArgumentMatchStatus(argument, matchStatus) candidateCall.recordArgumentMatchStatus(argument, matchStatus)
} }
} }
compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/AbstractPsiBasedDeclarationProvider.kt
+1 -1
View File
@@ -54,7 +54,7 @@ abstract class AbstractPsiBasedDeclarationProvider(storageManager: StorageManage
is KtClassOrObject -> is KtClassOrObject ->
classesAndObjects.put(declaration.nameAsName.safeNameForLazyResolve(), KtClassInfoUtil.createClassOrObjectInfo(declaration)) classesAndObjects.put(declaration.nameAsName.safeNameForLazyResolve(), KtClassInfoUtil.createClassOrObjectInfo(declaration))
is KtScript -> is KtScript ->
scripts.put(KtScriptInfo(declaration).script.nameAsName, KtScriptInfo(declaration)) scripts.put(KtScriptInfo(declaration).script.nameAsName!!, KtScriptInfo(declaration))
is KtDestructuringDeclaration -> { is KtDestructuringDeclaration -> {
for (entry in declaration.entries) { for (entry in declaration.entries) {
val name = entry.nameAsName.safeNameForLazyResolve() val name = entry.nameAsName.safeNameForLazyResolve()