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

Introduce isFromSourceCodeInScope function

Browse Source 
See `VirtualFileBoundJavaClass` interface
This commit is contained in:
baratynskiy
2017-05-15 12:48:04 +03:00
committed by Mikhail Glukhikh
parent 91412b0ee9
commit eb85e9f5f3
7 changed files with 29 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/javac-wrapper/src/org/jetbrains/kotlin/javac/KotlinClassifiersCache.kt
+9 -1
View File
@@ -16,6 +16,8 @@
package org.jetbrains.kotlin.javac
import com.intellij.openapi.vfs.VirtualFile
import com.intellij.psi.search.SearchScope
import org.jetbrains.kotlin.descriptors.Visibility
import org.jetbrains.kotlin.fileClasses.javaFileFacadeFqName
import org.jetbrains.kotlin.load.java.structure.*
@@ -29,6 +31,7 @@ import org.jetbrains.kotlin.javac.wrappers.trees.find
import org.jetbrains.kotlin.javac.wrappers.trees.findInner
import org.jetbrains.kotlin.javac.wrappers.trees.tryToResolveByFqName
import org.jetbrains.kotlin.javac.wrappers.trees.tryToResolveInJavaLang
import org.jetbrains.kotlin.load.java.structure.impl.VirtualFileBoundJavaClass
class KotlinClassifiersCache(sourceFiles: Collection<KtFile>,
private val javac: JavacWrapper) {
@@ -58,7 +61,7 @@ class KotlinClassifiersCache(sourceFiles: Collection<KtFile>,
class MockKotlinClassifier(override val fqName: FqName,
private val classOrObject: KtClassOrObject,
val hasTypeParameters: Boolean,
private val javac: JavacWrapper) : JavaClass {
private val javac: JavacWrapper) : VirtualFileBoundJavaClass {
override val isAbstract: Boolean
get() = throw UnsupportedOperationException("Should not be called")
@@ -114,6 +117,9 @@ class MockKotlinClassifier(override val fqName: FqName,
override val lightClassOriginKind
get() = LightClassOriginKind.SOURCE
override val virtualFile: VirtualFile?
get() = null
override val methods: Collection<JavaMethod>
get() = throw UnsupportedOperationException("Should not be called")
@@ -132,6 +138,8 @@ class MockKotlinClassifier(override val fqName: FqName,
override val isDeprecatedInJavaDoc: Boolean
get() = throw UnsupportedOperationException("Should not be called")
override fun isFromSourceCodeInScope(scope: SearchScope) = true
override fun findAnnotation(fqName: FqName) =
throw UnsupportedOperationException("Should not be called")
compiler/javac-wrapper/src/org/jetbrains/kotlin/javac/wrappers/symbols/SymbolBasedClass.kt
+3
View File
@@ -18,6 +18,7 @@ package org.jetbrains.kotlin.javac.wrappers.symbols
import com.intellij.openapi.vfs.VirtualFile
import com.intellij.psi.CommonClassNames
import com.intellij.psi.search.SearchScope
import org.jetbrains.kotlin.descriptors.Visibility
import org.jetbrains.kotlin.javac.JavacWrapper
import org.jetbrains.kotlin.load.java.structure.*
@@ -116,6 +117,8 @@ class SymbolBasedClass(
file?.let { javac.toVirtualFile(it) }
}
override fun isFromSourceCodeInScope(scope: SearchScope): Boolean = false
override fun findInnerClass(name: Name) = innerClasses[name]
}
compiler/javac-wrapper/src/org/jetbrains/kotlin/javac/wrappers/trees/TreeBasedClass.kt
+6 -2
View File
@@ -17,6 +17,7 @@
package org.jetbrains.kotlin.javac.wrappers.trees
import com.intellij.openapi.vfs.VirtualFile
import com.intellij.psi.search.SearchScope
import com.sun.source.tree.Tree
import com.sun.source.util.TreePath
import com.sun.tools.javac.code.Flags
@@ -26,6 +27,7 @@ import org.jetbrains.kotlin.descriptors.Visibilities.PUBLIC
import org.jetbrains.kotlin.descriptors.Visibility
import org.jetbrains.kotlin.javac.JavacWrapper
import org.jetbrains.kotlin.load.java.structure.*
import org.jetbrains.kotlin.load.java.structure.impl.VirtualFileBoundJavaClass
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.name.Name
import javax.tools.JavaFileObject
@@ -35,7 +37,7 @@ class TreeBasedClass(
treePath: TreePath,
javac: JavacWrapper,
val file: JavaFileObject
) : TreeBasedElement<JCTree.JCClassDecl>(tree, treePath, javac), JavaClass {
) : TreeBasedElement<JCTree.JCClassDecl>(tree, treePath, javac), VirtualFileBoundJavaClass {
override val name: Name
get() = Name.identifier(tree.simpleName.toString())
@@ -144,10 +146,12 @@ class TreeBasedClass(
override val innerClassNames: Collection<Name>
get() = innerClasses.keys
val virtualFile: VirtualFile? by lazy {
override val virtualFile: VirtualFile? by lazy {
javac.toVirtualFile(file)
}
override fun isFromSourceCodeInScope(scope: SearchScope): Boolean = true
override fun findInnerClass(name: Name) = innerClasses[name]
}