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

Merge pull request #9689 from igfoo/igfoo/makeprivate

Browse Source 
Kotlin: Make some more methods private
This commit is contained in:
Ian Lynagh
2022-06-23 21:28:07 +01:00
committed by GitHub
parent 71efffd79b bd8a8d00aa
commit eb1b3f801d
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt
View File

@@ -41,7 +41,7 @@ open class KotlinFileExtractor(
globalExtensionState: KotlinExtractorGlobalState globalExtensionState: KotlinExtractorGlobalState
): KotlinUsesExtractor(logger, tw, dependencyCollector, externalClassExtractor, primitiveTypeMapping, pluginContext, globalExtensionState) { ): KotlinUsesExtractor(logger, tw, dependencyCollector, externalClassExtractor, primitiveTypeMapping, pluginContext, globalExtensionState) {
inline fun <T> with(kind: String, element: IrElement, f: () -> T): T { private inline fun <T> with(kind: String, element: IrElement, f: () -> T): T {
val name = when (element) { val name = when (element) {
is IrFile -> element.name is IrFile -> element.name
is IrDeclarationWithName -> element.name.asString() is IrDeclarationWithName -> element.name.asString()
@@ -2192,7 +2192,7 @@ open class KotlinFileExtractor(
} }
} }
fun getStatementOriginOperator(origin: IrStatementOrigin?) = when (origin) { private fun getStatementOriginOperator(origin: IrStatementOrigin?) = when (origin) {
IrStatementOrigin.PLUSEQ -> "plus" IrStatementOrigin.PLUSEQ -> "plus"
IrStatementOrigin.MINUSEQ -> "minus" IrStatementOrigin.MINUSEQ -> "minus"
IrStatementOrigin.MULTEQ -> "times" IrStatementOrigin.MULTEQ -> "times"

6
java/kotlin-extractor/src/main/kotlin/KotlinUsesExtractor.kt
View File

@@ -190,7 +190,7 @@ open class KotlinUsesExtractor(
} }
// The Kotlin compiler internal representation of Outer<A, B>.Inner<C, D>.InnerInner<E, F>.someFunction<G, H>.LocalClass<I, J> is LocalClass<I, J, G, H, E, F, C, D, A, B>. This function returns [A, B, C, D, E, F, G, H, I, J]. // The Kotlin compiler internal representation of Outer<A, B>.Inner<C, D>.InnerInner<E, F>.someFunction<G, H>.LocalClass<I, J> is LocalClass<I, J, G, H, E, F, C, D, A, B>. This function returns [A, B, C, D, E, F, G, H, I, J].
fun orderTypeArgsLeftToRight(c: IrClass, argsIncludingOuterClasses: List<IrTypeArgument>?): List<IrTypeArgument>? { private fun orderTypeArgsLeftToRight(c: IrClass, argsIncludingOuterClasses: List<IrTypeArgument>?): List<IrTypeArgument>? {
if(argsIncludingOuterClasses.isNullOrEmpty()) if(argsIncludingOuterClasses.isNullOrEmpty())
return argsIncludingOuterClasses return argsIncludingOuterClasses
val ret = ArrayList<IrTypeArgument>() val ret = ArrayList<IrTypeArgument>()
@@ -237,7 +237,7 @@ open class KotlinUsesExtractor(
return UseClassInstanceResult(classTypeResult, extractClass) return UseClassInstanceResult(classTypeResult, extractClass)
} }
fun isArray(t: IrSimpleType) = t.isBoxedArray || t.isPrimitiveArray() private fun isArray(t: IrSimpleType) = t.isBoxedArray || t.isPrimitiveArray()
fun extractClassLaterIfExternal(c: IrClass) { fun extractClassLaterIfExternal(c: IrClass) {
if (isExternalDeclaration(c)) { if (isExternalDeclaration(c)) {
@@ -1464,7 +1464,7 @@ open class KotlinUsesExtractor(
return t return t
} }
fun eraseTypeParameter(t: IrTypeParameter) = private fun eraseTypeParameter(t: IrTypeParameter) =
erase(t.superTypes[0]) erase(t.superTypes[0])
/** /**

4
java/kotlin-extractor/src/main/kotlin/utils/Logger.kt
View File

@@ -226,7 +226,7 @@ open class Logger(val loggerBase: LoggerBase, open val tw: TrapWriter) {
loggerBase.info(tw, msg) loggerBase.info(tw, msg)
} }
fun warn(msg: String, extraInfo: String?) { private fun warn(msg: String, extraInfo: String?) {
loggerBase.warn(tw, msg, extraInfo) loggerBase.warn(tw, msg, extraInfo)
} }
fun warn(msg: String, exn: Throwable) { fun warn(msg: String, exn: Throwable) {
@@ -236,7 +236,7 @@ open class Logger(val loggerBase: LoggerBase, open val tw: TrapWriter) {
warn(msg, null) warn(msg, null)
} }
fun error(msg: String, extraInfo: String?) { private fun error(msg: String, extraInfo: String?) {
loggerBase.error(tw, msg, extraInfo) loggerBase.error(tw, msg, extraInfo)
} }
fun error(msg: String) { fun error(msg: String) {