Skip to content
Merged
Changes from all commits
Commits
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
42 changes: 41 additions & 1 deletion src/main/scala/io/appthreat/atom/slicing/UsageSlicing.scala
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ object UsageSlicing:
val language = atom.metaData.language.headOption
val root = atom.metaData.root.headOption

declarations
val filteredDecls = declarations
.to(LazyList)
.filterNot(_.name == "*")
.filter(d =>
Expand All @@ -59,10 +59,18 @@ object UsageSlicing:
config.excludeOperatorCalls
)
)

val mainSlices = filteredDecls
.map { decl =>
exec.submit(() => computeUsageSlice(atom, decl, typeMap, config.excludeOperatorCalls))
}
.flatMap(f => Try(f.get(5, TimeUnit.SECONDS)).toOption.flatten)

val annotationSlices = filteredDecls.collect {
case param: MethodParameterIn if !param.name.matches("(this|self)") => param
}.flatMap(param => paramAnnotationSlices(param, typeMap))

(mainSlices ++ annotationSlices)
.groupBy { case (method, _) => method }
.view
.filterKeys(m => !isExcludedMethod(m))
Expand Down Expand Up @@ -103,6 +111,38 @@ object UsageSlicing:
case _ => None
end computeUsageSlice

private def paramAnnotationSlices(
param: MethodParameterIn,
typeMap: Map[String, String]
): List[(Method, ObjectUsageSlice)] =
param.annotation.map { ann =>
val annDef = CallDef(
param.name,
ann.fullName,
Option(ann.code).filter(_.nonEmpty).orElse(Option(ann.fullName)),
Some(param.method.isExternal),
ann.lineNumber.map(_.intValue()),
ann.columnNumber.map(_.intValue()),
label = ann.label
)
val annCall = ObservedCall(
if ann.fullName.nonEmpty then ann.fullName else ann.name,
Option(ann.code).filter(_.nonEmpty).orElse(Option(ann.fullName)),
List.empty,
"",
Some(param.method.isExternal),
ann.lineNumber.map(_.intValue()),
ann.columnNumber.map(_.intValue())
)
param.method -> ObjectUsageSlice(
targetObj = annDef,
definedBy = Some(annDef),
invokedCalls = List(annCall),
argToCalls = List.empty
)
}.toList
end paramAnnotationSlices

private def createMethodObjectUsageSlice(
m: Method,
invokedCalls: List[ObservedCall],
Expand Down
Loading