azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor: remove unused parameter

Browse Source
This commit is contained in:
Pavel V. Talanov
2015-05-14 13:47:22 +03:00
parent 257b8f31e7
commit ade898775c
7 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/ImportDirectiveProcessor.kt
+1 -2
View File
@@ -34,8 +34,7 @@ public class ImportDirectiveProcessor(
importDirective: JetImportDirective,
moduleDescriptor: ModuleDescriptor,
trace: BindingTrace,
lookupMode: QualifiedExpressionResolver.LookupMode,
allowClassesFromDefaultPackage: Boolean
lookupMode: QualifiedExpressionResolver.LookupMode
): JetScope {
if (importDirective.isAbsoluteInRootPackage()) {
trace.report(Errors.UNSUPPORTED.on(importDirective, "TypeHierarchyResolver")) // TODO
compiler/frontend/src/org/jetbrains/kotlin/resolve/QualifiedExpressionResolver.java
+2 -3
View File
@@ -76,10 +76,9 @@ public class QualifiedExpressionResolver {
@NotNull JetImportDirective importDirective,
@NotNull ModuleDescriptor moduleDescriptor,
@NotNull BindingTrace trace,
@NotNull LookupMode lookupMode,
boolean allowClassesFromDefaultPackage
@NotNull LookupMode lookupMode
) {
return importDirectiveProcessor.processImportReference(importDirective, moduleDescriptor, trace, lookupMode, allowClassesFromDefaultPackage);
return importDirectiveProcessor.processImportReference(importDirective, moduleDescriptor, trace, lookupMode);
}
@NotNull
compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyFileScope.kt
+4 -4
View File
@@ -76,10 +76,10 @@ class LazyFileScope private constructor(
val packageFragment = resolveSession.getPackageFragment(file.getPackageFqName())
.sure { "Could not find fragment ${file.getPackageFqName()} for file ${file.getName()}" }
val aliasImportResolver = LazyImportResolver(resolveSession, moduleDescriptor, AliasImportsIndexed(imports), traceForImportResolve, true)
val allUnderImportResolver = LazyImportResolver(resolveSession, moduleDescriptor, AllUnderImportsIndexed(imports), traceForImportResolve, true)
val defaultAliasImportResolver = LazyImportResolver(resolveSession, moduleDescriptor, AliasImportsIndexed(defaultImports), traceForDefaultImportResolve, false)
val defaultAllUnderImportResolver = LazyImportResolver(resolveSession, moduleDescriptor, AllUnderImportsIndexed(defaultImports), traceForDefaultImportResolve, false)
val aliasImportResolver = LazyImportResolver(resolveSession, moduleDescriptor, AliasImportsIndexed(imports), traceForImportResolve)
val allUnderImportResolver = LazyImportResolver(resolveSession, moduleDescriptor, AllUnderImportsIndexed(imports), traceForImportResolve)
val defaultAliasImportResolver = LazyImportResolver(resolveSession, moduleDescriptor, AliasImportsIndexed(defaultImports), traceForDefaultImportResolve)
val defaultAllUnderImportResolver = LazyImportResolver(resolveSession, moduleDescriptor, AllUnderImportsIndexed(defaultImports), traceForDefaultImportResolve)
val scopeChain = ArrayList<JetScope>()
compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyImportScope.kt
+2 -3
View File
@@ -67,8 +67,7 @@ class LazyImportResolver(
val resolveSession: ResolveSession,
val moduleDescriptor: ModuleDescriptor,
val indexedImports: IndexedImports,
private val traceForImportResolve: BindingTrace,
private val includeRootPackageClasses: Boolean
private val traceForImportResolve: BindingTrace
) {
private val importedScopesProvider = resolveSession.getStorageManager().createMemoizedFunction {
directive: JetImportDirective -> ImportDirectiveResolveCache(directive)
@@ -99,7 +98,7 @@ class LazyImportResolver(
try {
val resolver = resolveSession.getQualifiedExpressionResolver()
val directiveImportScope = resolver.processImportReference(
directive, moduleDescriptor, traceForImportResolve, mode, includeRootPackageClasses)
directive, moduleDescriptor, traceForImportResolve, mode)
val descriptors = if (directive.isAllUnder()) emptyList() else directiveImportScope.getAllDescriptors()
if (mode == LookupMode.EVERYTHING) {