Make a marker interface to allow ScriptDependenciesClassFilter to be used in the resolving
This commit is contained in:
+2
-1
@@ -172,7 +172,8 @@ public class KotlinJavaPsiFacade {
|
|||||||
getProject().getExtensions(PsiElementFinder.EP_NAME), new Function1<PsiElementFinder, Boolean>() {
|
getProject().getExtensions(PsiElementFinder.EP_NAME), new Function1<PsiElementFinder, Boolean>() {
|
||||||
@Override
|
@Override
|
||||||
public Boolean invoke(PsiElementFinder finder) {
|
public Boolean invoke(PsiElementFinder finder) {
|
||||||
return !(finder instanceof NonClasspathClassFinder || finder instanceof KotlinFinderMarker || finder instanceof PsiElementFinderImpl);
|
return (finder instanceof KotlinSafeClassFinder) ||
|
||||||
|
!(finder instanceof NonClasspathClassFinder || finder instanceof KotlinFinderMarker || finder instanceof PsiElementFinderImpl);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,19 @@
|
|||||||
|
/*
|
||||||
|
* 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.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.jetbrains.kotlin.resolve.jvm
|
||||||
|
|
||||||
|
interface KotlinSafeClassFinder
|
||||||
+2
-1
@@ -27,11 +27,12 @@ import com.intellij.psi.search.GlobalSearchScope
|
|||||||
import com.intellij.util.containers.ConcurrentFactoryMap
|
import com.intellij.util.containers.ConcurrentFactoryMap
|
||||||
import org.jetbrains.kotlin.idea.caches.resolve.CustomizedScriptModuleSearchScope
|
import org.jetbrains.kotlin.idea.caches.resolve.CustomizedScriptModuleSearchScope
|
||||||
import org.jetbrains.kotlin.load.java.JavaClassFinderImpl
|
import org.jetbrains.kotlin.load.java.JavaClassFinderImpl
|
||||||
|
import org.jetbrains.kotlin.resolve.jvm.KotlinSafeClassFinder
|
||||||
|
|
||||||
@Suppress("unused") // project extension
|
@Suppress("unused") // project extension
|
||||||
class KotlinScriptDependenciesClassFinder(project: Project,
|
class KotlinScriptDependenciesClassFinder(project: Project,
|
||||||
private val kotlinScriptConfigurationManager: KotlinScriptConfigurationManager
|
private val kotlinScriptConfigurationManager: KotlinScriptConfigurationManager
|
||||||
) : NonClasspathClassFinder(project) {
|
) : NonClasspathClassFinder(project), KotlinSafeClassFinder {
|
||||||
|
|
||||||
private val myCaches = object : ConcurrentFactoryMap<VirtualFile, PackageDirectoryCache>() {
|
private val myCaches = object : ConcurrentFactoryMap<VirtualFile, PackageDirectoryCache>() {
|
||||||
override fun create(file: VirtualFile): PackageDirectoryCache? {
|
override fun create(file: VirtualFile): PackageDirectoryCache? {
|
||||||
|
|||||||
Reference in New Issue
Block a user