Fix "Non default constructors for extension class"

This commit is contained in:
Dmitry Gridin
2019-08-01 13:52:47 +03:00
parent 9ea2446ec0
commit 832c8e0e20
8 changed files with 61 additions and 96 deletions
@@ -1,17 +1,6 @@
/*
* Copyright 2010-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.idea.core.script
@@ -27,11 +16,10 @@ import org.jetbrains.kotlin.resolve.jvm.KotlinSafeClassFinder
class KotlinScriptDependenciesClassFinder(
project: Project,
private val scriptDependenciesManager: ScriptDependenciesManager
private val project: Project
) : NonClasspathClassFinder(project), KotlinSafeClassFinder {
override fun calcClassRoots(): List<VirtualFile> = scriptDependenciesManager.getAllScriptsDependenciesClassFiles().toList()
override fun calcClassRoots(): List<VirtualFile> = ScriptDependenciesManager.getInstance(project)
.getAllScriptsDependenciesClassFiles().toList()
override fun findClass(qualifiedName: String, scope: GlobalSearchScope): PsiClass? {
tailrec fun findClassInner(parentQualifier: String, inners: List<String> = emptyList()): PsiClass? {
@@ -39,7 +27,7 @@ class KotlinScriptDependenciesClassFinder(
val parentClass = super.findClass(parentQualifier, scope)
if (parentClass != null) {
if (inners.isNotEmpty()) {
val innerClass = inners.fold<String, PsiClass?>(parentClass) { c: PsiClass?, name: String ->
val innerClass = inners.fold(parentClass) { c: PsiClass?, name: String ->
c?.findInnerClassByName(name, false)
}
if (innerClass != null) return innerClass