Explicitly filter out classes found by DataBindingClassFinder and DataBindingComponentClassFinder for scope without sources (KT-12402)
This change is temporary, and it should be reverted when the original problem in DataBinding IDE support is fixed.
This commit is contained in:
committed by
Yan Zhulanow
parent
4188ef6e53
commit
951868f590
+19
@@ -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 GlobalSearchScopeWithModuleSources
|
||||
+29
-1
@@ -43,6 +43,7 @@ import kotlin.jvm.functions.Function1;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
import org.jetbrains.kotlin.idea.KotlinLanguage;
|
||||
import org.jetbrains.kotlin.load.java.JavaClassFinderImpl;
|
||||
import org.jetbrains.kotlin.name.FqName;
|
||||
import org.jetbrains.kotlin.progress.ProgressIndicatorAndCompilationCanceledStatus;
|
||||
import org.jetbrains.kotlin.name.ClassId;
|
||||
@@ -117,7 +118,30 @@ public class KotlinJavaPsiFacade {
|
||||
}
|
||||
else {
|
||||
PsiClass aClass = finder.findClass(qualifiedName, scope);
|
||||
if (aClass != null) return aClass;
|
||||
if (aClass != null) {
|
||||
if (scope instanceof JavaClassFinderImpl.FilterOutKotlinSourceFilesScope) {
|
||||
GlobalSearchScope baseScope = ((JavaClassFinderImpl.FilterOutKotlinSourceFilesScope) scope).getBase();
|
||||
boolean isSourcesScope = baseScope instanceof GlobalSearchScopeWithModuleSources;
|
||||
|
||||
if (!isSourcesScope) {
|
||||
Object originalFinder = (finder instanceof KotlinPsiElementFinderWrapperImpl)
|
||||
? ((KotlinPsiElementFinderWrapperImpl) finder).getOriginal()
|
||||
: finder;
|
||||
|
||||
// Temporary fix for #KT-12402
|
||||
boolean isAndroidDataBindingClassWriter = originalFinder.getClass().getName()
|
||||
.equals("com.android.tools.idea.databinding.DataBindingClassFinder");
|
||||
boolean isAndroidDataBindingComponentClassWriter = originalFinder.getClass().getName()
|
||||
.equals("com.android.tools.idea.databinding.DataBindingComponentClassFinder");
|
||||
|
||||
if (isAndroidDataBindingClassWriter || isAndroidDataBindingComponentClassWriter) {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return aClass;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -286,6 +310,10 @@ public class KotlinJavaPsiFacade {
|
||||
this.finder = finder;
|
||||
}
|
||||
|
||||
public PsiElementFinder getOriginal() {
|
||||
return finder;
|
||||
}
|
||||
|
||||
@Override
|
||||
public PsiClass findClass(@NotNull String qualifiedName, @NotNull GlobalSearchScope scope) {
|
||||
return finder.findClass(qualifiedName, scope);
|
||||
|
||||
Reference in New Issue
Block a user