-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
5 changed files
with
106 additions
and
38 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
110 changes: 86 additions & 24 deletions
110
library/src/main/java/com/michaelflisar/lumberjack/data/StackData.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,37 +1,99 @@ | ||
| package com.michaelflisar.lumberjack.data | ||
|
|
||
| import com.michaelflisar.lumberjack.L | ||
| import java.util.regex.Pattern | ||
|
|
||
|
|
||
| class StackData( | ||
| val className: String, | ||
| val simpleFileName: String, | ||
| val methodName: String, | ||
| val line: Int | ||
| ) { | ||
| class StackData { | ||
|
|
||
| companion object { | ||
| private val ANONYMOUS_CLASS = Pattern.compile("(\\$\\d+)+$") | ||
| } | ||
|
|
||
| fun create(t: Throwable?, callStackIndex: Int): StackData { | ||
| val stackTrace = t?.stackTrace ?: Throwable().stackTrace | ||
| val index = if (t != null) 0 else (callStackIndex + 1) | ||
| if (stackTrace.size <= index) { | ||
| throw IllegalStateException( | ||
| "Synthetic stacktrace didn't have enough elements: are you using proguard?" | ||
| ) | ||
| } | ||
| val element = stackTrace[index] | ||
| var tag = element.className | ||
| val m = ANONYMOUS_CLASS.matcher(tag) | ||
| if (m.find()) { | ||
| tag = m.replaceAll("") | ||
| lateinit var element: StackTraceElement | ||
| private set | ||
| var element2: StackTraceElement? = null | ||
| private set | ||
|
|
||
| val className by lazy { | ||
| getClassName(element) | ||
| } | ||
|
|
||
| val className2 by lazy { | ||
| getClassName(element2) | ||
| } | ||
|
|
||
| constructor(t: Throwable?, callStackIndex: Int) { | ||
|
|
||
| val stackTrace = t?.stackTrace ?: Throwable().stackTrace | ||
| val index = if (t != null) 0 else (callStackIndex + 1) | ||
|
|
||
| element = getElement(stackTrace, index) | ||
| if (L.advancedLambdaLogging) { | ||
| // functions can not start with numbers, so of the class name ends with a number, this must be a lambda which is handled as anonymous function | ||
| val split = element.className.split("$") | ||
| if (split.lastOrNull()?.toIntOrNull() != null) { | ||
| // example from demo: | ||
| // com.michaelflisar.lumberjack.demo.MainActivity$onCreate$func$1 | ||
| // => so we need to go up +2, because we want to get the line in onCreate where the caller executes the lambda | ||
| element2 = element | ||
| element = getElement(stackTrace, index + 2) | ||
| } | ||
| return StackData(tag, element.fileName, element.methodName, element.lineNumber) | ||
| } | ||
| } | ||
|
|
||
| val simpleClassName: String = className.substring(className.lastIndexOf('.') + 1) | ||
| val stackTag = "$simpleClassName:$line $methodName" | ||
| val link = "$simpleFileName:$line" | ||
| // ------------------------ | ||
| // functions | ||
| // ------------------------ | ||
|
|
||
| fun getStackTag(): String { | ||
| val simpleClassName = getSimpleClassName(className) | ||
| var tag = "$simpleClassName:${element.lineNumber} ${element.methodName}" | ||
| element2?.let { | ||
| val simpleClassName2 = getSimpleClassName(className2) | ||
| val extra = simpleClassName2.replace(simpleClassName, "") | ||
| tag += " ($extra:${it.lineNumber})" | ||
| } | ||
| return tag | ||
| } | ||
|
|
||
| fun getLink(): String { | ||
| var link = "(${element.fileName}:${element.lineNumber})" | ||
| // AndroidStudio does not support 2 clickable links... | ||
| element2?.let { | ||
| link += " | (${it.fileName}:${it.lineNumber})" | ||
| } | ||
| return link | ||
| } | ||
|
|
||
| fun getCallingPackageName(): String { | ||
| return className | ||
| } | ||
|
|
||
| // ------------------------ | ||
| // private helper functions | ||
| // ------------------------ | ||
|
|
||
| private fun getElement(stackTrace: Array<StackTraceElement>, index: Int): StackTraceElement { | ||
| if (stackTrace.size <= index) { | ||
| throw IllegalStateException( | ||
| "Synthetic stacktrace didn't have enough elements: are you using proguard?" | ||
| ) | ||
| } | ||
| return stackTrace[index] | ||
| } | ||
|
|
||
| private fun getClassName(element: StackTraceElement?): String { | ||
| if (element == null) | ||
| return "" | ||
| var tag = element.className | ||
| val m = ANONYMOUS_CLASS.matcher(tag) | ||
| if (m.find()) { | ||
| tag = m.replaceAll("") | ||
| } | ||
| return tag | ||
| } | ||
|
|
||
| private fun getSimpleClassName(className: String): String { | ||
| return className.substring(className.lastIndexOf('.') + 1) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters