hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-18 01:33:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup getLabel

Browse Source
This commit is contained in:
Tamas Vajk
2021-09-16 15:03:55 +02:00
committed by Ian Lynagh
parent 48d019ebbe
commit 7ecb3650cb
2 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
java/kotlin-extractor/src/main/kotlin/KotlinExtractorExtension.kt
View File

@@ -256,6 +256,8 @@ class KotlinFileExtractor(val logger: FileLogger, val tw: FileTrapWriter, val fi
}
}
fun getLabel(element: IrElement) : String? {
when (element) {
is IrFile -> return "@\"${element.path};sourcefile\"" // todo: remove copy-pasted code
@@ -266,13 +268,14 @@ class KotlinFileExtractor(val logger: FileLogger, val tw: FileTrapWriter, val fi
is IrProperty -> return getPropertyLabel(element)
// Fresh entities:
is IrBody -> return "*"
is IrExpression -> return "*"
is IrBody -> return null
is IrExpression -> return null
// todo:
is IrField -> return null
// todo add others:
else -> return null
else -> {
logger.warnElement(Severity.ErrorSevere, "Unhandled element type: ${element::class}", element)
return null
}
}
}

10
java/kotlin-extractor/src/main/kotlin/comments/CommentExtractor.kt
View File

@@ -88,15 +88,7 @@ class CommentExtractor(private val fileExtractor: KotlinFileExtractor) {
file.accept(IrVisitorLookup(ownerPsi, file), owners)
for (ownerIr in owners) {
val label = fileExtractor.getLabel(ownerIr)
if (label == null) {
logger.warn(Severity.Warn, "Couldn't get label for element: $ownerIr")
continue
}
if (label == "*") {
logger.info("Skipping fresh entity label for element: $ownerIr")
continue
}
val label = fileExtractor.getLabel(ownerIr) ?: continue
val existingLabel = tw.getExistingLabelFor<DbTop>(label)
if (existingLabel == null) {
logger.warn(Severity.Warn, "Couldn't get existing label for $label")