Skip to content

Commit d251f34

Browse files
committed
Cleanup lint
1 parent 0d3573f commit d251f34

File tree

3 files changed

+12
-11
lines changed

3 files changed

+12
-11
lines changed

src/main/kotlin/io/bazel/kotlin/plugin/jdeps/k2/checker/declaration/FileChecker.kt

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@ import org.jetbrains.kotlin.diagnostics.DiagnosticReporter
66
import org.jetbrains.kotlin.fir.analysis.checkers.MppCheckerKind
77
import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext
88
import org.jetbrains.kotlin.fir.analysis.checkers.declaration.FirFileChecker
9-
import org.jetbrains.kotlin.fir.scopes.getFunctions
109
import org.jetbrains.kotlin.fir.declarations.FirFile
1110
import org.jetbrains.kotlin.fir.declarations.FirResolvedImport
1211
import org.jetbrains.kotlin.fir.declarations.fullyExpandedClass
13-
import org.jetbrains.kotlin.fir.scopes.impl.declaredMemberScope
1412
import org.jetbrains.kotlin.fir.resolve.providers.symbolProvider
13+
import org.jetbrains.kotlin.fir.scopes.FirContainingNamesAwareScope
14+
import org.jetbrains.kotlin.fir.scopes.getFunctions
15+
import org.jetbrains.kotlin.fir.scopes.impl.declaredMemberScope
1516
import org.jetbrains.kotlin.fir.symbols.impl.FirAnonymousObjectSymbol
1617
import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol
1718
import org.jetbrains.kotlin.fir.symbols.impl.FirRegularClassSymbol
1819
import org.jetbrains.kotlin.fir.symbols.impl.FirTypeAliasSymbol
19-
import org.jetbrains.kotlin.fir.scopes.FirContainingNamesAwareScope
2020
import org.jetbrains.kotlin.name.ClassId
2121

2222
internal class FileChecker(
@@ -61,10 +61,15 @@ private fun FirResolvedImport.resolveToFun(context: CheckerContext): FirCallable
6161

6262
val parentClassId = resolvedParentClassId ?: return null
6363

64-
val classSymbol = context.session.symbolProvider
65-
.getClassLikeSymbolByClassId(parentClassId) as? FirRegularClassSymbol ?: return null
64+
val classSymbol =
65+
context.session.symbolProvider
66+
.getClassLikeSymbolByClassId(parentClassId) as? FirRegularClassSymbol ?: return null
6667

67-
val classMemberScope:FirContainingNamesAwareScope = context.session.declaredMemberScope(classSymbol.fir, memberRequiredPhase = null)
68+
val classMemberScope: FirContainingNamesAwareScope =
69+
context.session.declaredMemberScope(
70+
classSymbol.fir,
71+
memberRequiredPhase = null,
72+
)
6873

6974
return classMemberScope?.getFunctions(funName)?.orEmpty()?.firstOrNull()
7075
}

src/main/starlark/core/compile/cli/toolchain.bzl

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
11
load("//src/main/starlark/core/compile:common.bzl", "JAVA_RUNTIME_TOOLCHAIN_TYPE", "JAVA_TOOLCHAIN_TYPE")
2-
load(
3-
"//src/main/starlark/core/options:opts.kotlinc.bzl",
4-
"KotlincOptions",
5-
)
62
load(":compile.bzl", "build_deploy_jar", "compile_kotlin_for_jvm", "write_jvm_launcher")
73

84
KotlincJvmCompileInfo = provider(

src/test/starlark/compile/common_tests.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def _outputs(env, got):
3838
got_java_info.source_jars().contains(env.ctx.file.source_jar)
3939

4040
# get actions
41-
source = got_target.action_generating(env.ctx.file.source_jar.short_path)
41+
got_target.action_generating(env.ctx.file.source_jar.short_path)
4242

4343
compile = got_target.action_generating(env.ctx.file.class_jar.short_path)
4444
compile.contains_at_least_inputs(

0 commit comments

Comments
 (0)