Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
硅谷海盗
kotlin
提交
f5d8ae05
K
kotlin
项目概览
硅谷海盗
/
kotlin
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
K
kotlin
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
f5d8ae05
编写于
12月 11, 2020
作者:
I
Igor Yakovlev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[FIR IDE] LC add caching to light facades
上级
da54dbba
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
33 addition
and
2 deletion
+33
-2
idea/idea-fir/src/org/jetbrains/kotlin/idea/caches/resolve/IDEKotlinAsJavaSupport.kt
...ains/kotlin/idea/caches/resolve/IDEKotlinAsJavaSupport.kt
+9
-2
idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/classes/firLightClassUtils.kt
...etbrains/kotlin/idea/asJava/classes/firLightClassUtils.kt
+24
-0
未找到文件。
idea/idea-fir/src/org/jetbrains/kotlin/idea/caches/resolve/IDEKotlinAsJavaSupport.kt
浏览文件 @
f5d8ae05
...
@@ -6,25 +6,32 @@
...
@@ -6,25 +6,32 @@
package
org.jetbrains.kotlin.idea.caches.resolve
package
org.jetbrains.kotlin.idea.caches.resolve
import
com.intellij.openapi.project.Project
import
com.intellij.openapi.project.Project
import
com.intellij.openapi.util.Key
import
com.intellij.openapi.util.UserDataHolder
import
com.intellij.psi.PsiManager
import
com.intellij.psi.PsiManager
import
com.intellij.psi.search.GlobalSearchScope
import
com.intellij.psi.search.GlobalSearchScope
import
com.intellij.psi.util.CachedValueProvider
import
com.intellij.psi.util.CachedValuesManager
import
org.jetbrains.kotlin.analyzer.KotlinModificationTrackerService
import
org.jetbrains.kotlin.asJava.classes.KtLightClass
import
org.jetbrains.kotlin.asJava.classes.KtLightClass
import
org.jetbrains.kotlin.idea.asJava.FirLightClassForFacade
import
org.jetbrains.kotlin.idea.asJava.FirLightClassForFacade
import
org.jetbrains.kotlin.idea.asJava.classes.createFirLightClassNoCache
import
org.jetbrains.kotlin.idea.asJava.classes.getOrCreateFirLightClass
import
org.jetbrains.kotlin.idea.asJava.classes.getOrCreateFirLightClass
import
org.jetbrains.kotlin.idea.asJava.classes.getOrCreateFirLightFacade
import
org.jetbrains.kotlin.name.FqName
import
org.jetbrains.kotlin.name.FqName
import
org.jetbrains.kotlin.psi.KtClassOrObject
import
org.jetbrains.kotlin.psi.KtClassOrObject
import
org.jetbrains.kotlin.psi.KtFile
import
org.jetbrains.kotlin.psi.KtScript
import
org.jetbrains.kotlin.psi.KtScript
class
IDEKotlinAsJavaFirSupport
(
project
:
Project
)
:
IDEKotlinAsJavaSupport
(
project
)
{
class
IDEKotlinAsJavaFirSupport
(
project
:
Project
)
:
IDEKotlinAsJavaSupport
(
project
)
{
//TODO Make caching
override
fun
createLightClassForFacade
(
manager
:
PsiManager
,
facadeClassFqName
:
FqName
,
searchScope
:
GlobalSearchScope
):
KtLightClass
?
{
override
fun
createLightClassForFacade
(
manager
:
PsiManager
,
facadeClassFqName
:
FqName
,
searchScope
:
GlobalSearchScope
):
KtLightClass
?
{
val
sources
=
findFilesForFacade
(
facadeClassFqName
,
searchScope
)
val
sources
=
findFilesForFacade
(
facadeClassFqName
,
searchScope
)
.
filterNot
{
it
.
isCompiled
}
.
filterNot
{
it
.
isCompiled
}
if
(
sources
.
isEmpty
())
return
null
if
(
sources
.
isEmpty
())
return
null
return
FirLightClassForFacade
(
manager
,
facadeClassFqName
,
sources
)
return
getOrCreateFirLightFacade
(
sources
,
facadeClassFqName
)
}
}
override
fun
createLightClassForScript
(
script
:
KtScript
):
KtLightClass
?
=
null
override
fun
createLightClassForScript
(
script
:
KtScript
):
KtLightClass
?
=
null
...
...
idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/classes/firLightClassUtils.kt
浏览文件 @
f5d8ae05
...
@@ -28,6 +28,7 @@ import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtSymbolWithDeclar
...
@@ -28,6 +28,7 @@ import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtSymbolWithDeclar
import
org.jetbrains.kotlin.idea.frontend.api.types.KtClassType
import
org.jetbrains.kotlin.idea.frontend.api.types.KtClassType
import
org.jetbrains.kotlin.idea.frontend.api.types.KtType
import
org.jetbrains.kotlin.idea.frontend.api.types.KtType
import
org.jetbrains.kotlin.lexer.KtTokens
import
org.jetbrains.kotlin.lexer.KtTokens
import
org.jetbrains.kotlin.name.FqName
import
org.jetbrains.kotlin.psi.*
import
org.jetbrains.kotlin.psi.*
import
org.jetbrains.kotlin.psi.psiUtil.containingClass
import
org.jetbrains.kotlin.psi.psiUtil.containingClass
import
java.util.*
import
java.util.*
...
@@ -79,6 +80,29 @@ fun createFirLightClassNoCache(classOrObject: KtClassOrObject): KtLightClass? {
...
@@ -79,6 +80,29 @@ fun createFirLightClassNoCache(classOrObject: KtClassOrObject): KtLightClass? {
}
}
}
}
fun
getOrCreateFirLightFacade
(
ktFiles
:
List
<
KtFile
>,
facadeClassFqName
:
FqName
,
):
FirLightClassForFacade
?
{
val
firstFile
=
ktFiles
.
firstOrNull
()
?:
return
null
//TODO Make caching keyed by all files
return
CachedValuesManager
.
getCachedValue
(
firstFile
)
{
CachedValueProvider
.
Result
.
create
(
getOrCreateFirLightFacadeNoCache
(
ktFiles
,
facadeClassFqName
),
KotlinModificationTrackerService
.
getInstance
(
firstFile
.
project
).
outOfBlockModificationTracker
)
}
}
fun
getOrCreateFirLightFacadeNoCache
(
ktFiles
:
List
<
KtFile
>,
facadeClassFqName
:
FqName
,
):
FirLightClassForFacade
?
{
val
firstFile
=
ktFiles
.
firstOrNull
()
?:
return
null
return
FirLightClassForFacade
(
firstFile
.
manager
,
facadeClassFqName
,
ktFiles
)
}
private
fun
lightClassForEnumEntry
(
ktEnumEntry
:
KtEnumEntry
):
KtLightClass
?
{
private
fun
lightClassForEnumEntry
(
ktEnumEntry
:
KtEnumEntry
):
KtLightClass
?
{
if
(
ktEnumEntry
.
body
==
null
)
return
null
if
(
ktEnumEntry
.
body
==
null
)
return
null
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录