Merge "Add linenumber to location property in protolog viewer config" into main (fa938653) · Commits · e / os / android_frameworks_base

tools/protologtool/src/com/android/protolog/tool/ProtoLogCallProcessorImpl.kt

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -119,7 +119,8 @@ class ProtoLogCallProcessorImpl(
	}		}

	logCallVisitor?.processCall(call, messageString, getLevelForMethodName(		logCallVisitor?.processCall(call, messageString, getLevelForMethodName(
	call.name.toString(), call, context), groupMap.getValue(groupName))		call.name.toString(), call, context), groupMap.getValue(groupName),
			context.lineNumber)
	} else if (call.name.id == "init") {		} else if (call.name.id == "init") {
	// No processing		// No processing
	} else {		} else {

+7 −1

Original line number	Original line	Diff line number	Diff line
	@@ -20,5 +20,11 @@ import com.android.internal.protolog.common.LogLevel
	import com.github.javaparser.ast.expr.MethodCallExpr		import com.github.javaparser.ast.expr.MethodCallExpr

	interface ProtoLogCallVisitor {		interface ProtoLogCallVisitor {
	fun processCall(call: MethodCallExpr, messageString: String, level: LogLevel, group: LogGroup)		fun processCall(
			call: MethodCallExpr,
			messageString: String,
			level: LogLevel,
			group: LogGroup,
			lineNumber: Int
			)
	}		}

+5 −3

Original line number	Original line	Diff line number	Diff line
	@@ -69,7 +69,8 @@ object ProtoLogTool {
	val messageString: String,		val messageString: String,
	val logLevel: LogLevel,		val logLevel: LogLevel,
	val logGroup: LogGroup,		val logGroup: LogGroup,
	val position: String		val position: String,
			val lineNumber: Int,
	)		)

	private fun showHelpAndExit() {		private fun showHelpAndExit() {
	@@ -435,9 +436,10 @@ object ProtoLogTool {
	call: MethodCallExpr,		call: MethodCallExpr,
	messageString: String,		messageString: String,
	level: LogLevel,		level: LogLevel,
	group: LogGroup		group: LogGroup,
			lineNumber: Int,
	) {		) {
	val logCall = LogCall(messageString, level, group, packagePath)		val logCall = LogCall(messageString, level, group, packagePath, lineNumber)
	calls.add(logCall)		calls.add(logCall)
	}		}
	}		}

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -91,7 +91,8 @@ class SourceTransformer(
	call: MethodCallExpr,		call: MethodCallExpr,
	messageString: String,		messageString: String,
	level: LogLevel,		level: LogLevel,
	group: LogGroup		group: LogGroup,
			lineNumber: Int,
	) {		) {
	validateCall(call)		validateCall(call)
	val processedCallStatement =		val processedCallStatement =

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -59,7 +59,7 @@ class ViewerConfigProtoBuilder : ProtoLogTool.ProtologViewerConfigBuilder {
	.setLevel(		.setLevel(
	ProtoLogLevel.forNumber(log.logLevel.id))		ProtoLogLevel.forNumber(log.logLevel.id))
	.setGroupId(groupId)		.setGroupId(groupId)
	.setLocation(log.position)		.setLocation("${log.position}:${log.lineNumber}")
	)		)
	}		}