Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
硅谷海盗
kotlin
提交
71b916ae
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,发现更多精彩内容 >>
提交
71b916ae
编写于
6月 05, 2020
作者:
I
Ilya Kirillov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
FIR IDE: rename AnalysisSessionFirImpl -> FirAnalysisSession
上级
52a42235
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
18 addition
and
19 deletion
+18
-19
idea/idea-fir/src/org/jetbrains/kotlin/idea/fir/highlighter/KotlinFirPsiChecker.kt
...brains/kotlin/idea/fir/highlighter/KotlinFirPsiChecker.kt
+2
-2
idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/FirAnalysisSession.kt
...brains/kotlin/idea/frontend/api/fir/FirAnalysisSession.kt
+2
-2
idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/references/FirKtReference.kt
...rc/org/jetbrains/kotlin/idea/references/FirKtReference.kt
+2
-2
idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/references/FirSimpleNameReference.kt
...etbrains/kotlin/idea/references/FirSimpleNameReference.kt
+2
-2
idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/references/KtDestructuringDeclarationReferenceFirImpl.kt
.../references/KtDestructuringDeclarationReferenceFirImpl.kt
+2
-2
idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/references/KtFirReferenceResolver.kt
...etbrains/kotlin/idea/references/KtFirReferenceResolver.kt
+2
-2
idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/references/KtForLoopInReferenceFirImpl.kt
...ins/kotlin/idea/references/KtForLoopInReferenceFirImpl.kt
+2
-3
idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/references/KtInvokeFunctionReferenceFirImpl.kt
...otlin/idea/references/KtInvokeFunctionReferenceFirImpl.kt
+2
-2
idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/references/KtPropertyDelegationMethodsReferenceFirImpl.kt
...references/KtPropertyDelegationMethodsReferenceFirImpl.kt
+2
-2
未找到文件。
idea/idea-fir/src/org/jetbrains/kotlin/idea/fir/highlighter/KotlinFirPsiChecker.kt
浏览文件 @
71b916ae
...
...
@@ -10,7 +10,7 @@ import com.intellij.psi.PsiElement
import
org.jetbrains.kotlin.diagnostics.Diagnostic
import
org.jetbrains.kotlin.idea.fir.highlighter.visitors.FirAfterResolveHighlightingVisitor
import
org.jetbrains.kotlin.idea.frontend.api.FrontendAnalysisSession
import
org.jetbrains.kotlin.idea.frontend.api.fir.
AnalysisSessionFirImpl
import
org.jetbrains.kotlin.idea.frontend.api.fir.
FirAnalysisSession
import
org.jetbrains.kotlin.idea.highlighter.AbstractKotlinPsiChecker
import
org.jetbrains.kotlin.idea.highlighter.Diagnostic2Annotation
import
org.jetbrains.kotlin.idea.highlighter.IdeErrorMessages
...
...
@@ -24,7 +24,7 @@ class KotlinFirPsiChecker : AbstractKotlinPsiChecker() {
override
fun
annotateElement
(
element
:
PsiElement
,
containingFile
:
KtFile
,
holder
:
AnnotationHolder
)
{
if
(
element
!
is
KtElement
)
return
val
analysisSession
=
AnalysisSessionFirImpl
()
val
analysisSession
=
FirAnalysisSession
()
highlightDiagnostics
(
element
,
analysisSession
,
holder
)
...
...
idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/
AnalysisSessionFirImpl
.kt
→
idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/
FirAnalysisSession
.kt
浏览文件 @
71b916ae
...
...
@@ -29,11 +29,11 @@ import org.jetbrains.kotlin.name.Name
import
org.jetbrains.kotlin.psi.*
import
org.jetbrains.kotlin.types.model.KotlinTypeMarker
class
AnalysisSessionFirImpl
:
FrontendAnalysisSession
()
{
class
FirAnalysisSession
:
FrontendAnalysisSession
()
{
override
fun
getSmartCastedToTypes
(
expression
:
KtExpression
):
Collection
<
KotlinTypeMarker
>?
{
// TODO filter out not used smartcasts
return
(
expression
.
toFir
()
as
?
FirExpressionWithSmartcast
)
?.
typesFromSmartCast
return
expression
.
getOrBuildFirSafe
<
FirExpressionWithSmartcast
>(
)
?.
typesFromSmartCast
}
@OptIn
(
ExperimentalStdlibApi
::
class
)
...
...
idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/references/FirKtReference.kt
浏览文件 @
71b916ae
...
...
@@ -6,10 +6,10 @@
package
org.jetbrains.kotlin.idea.references
import
com.intellij.psi.PsiElement
import
org.jetbrains.kotlin.idea.frontend.api.fir.
AnalysisSessionFirImpl
import
org.jetbrains.kotlin.idea.frontend.api.fir.
FirAnalysisSession
interface
FirKtReference
:
KtReference
{
fun
getResolvedToPsi
(
analysisSession
:
AnalysisSessionFirImpl
):
Collection
<
PsiElement
>
fun
getResolvedToPsi
(
analysisSession
:
FirAnalysisSession
):
Collection
<
PsiElement
>
override
val
resolver
get
()
=
KtFirReferenceResolver
}
\ No newline at end of file
idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/references/FirSimpleNameReference.kt
浏览文件 @
71b916ae
...
...
@@ -6,7 +6,7 @@
package
org.jetbrains.kotlin.idea.references
import
com.intellij.psi.PsiElement
import
org.jetbrains.kotlin.idea.frontend.api.fir.
AnalysisSessionFirImpl
import
org.jetbrains.kotlin.idea.frontend.api.fir.
FirAnalysisSession
import
org.jetbrains.kotlin.name.FqName
import
org.jetbrains.kotlin.psi.KtImportAlias
import
org.jetbrains.kotlin.psi.KtSimpleNameExpression
...
...
@@ -14,7 +14,7 @@ import org.jetbrains.kotlin.psi.KtSimpleNameExpression
internal
class
KtSimpleNameReferenceFirImpl
(
expression
:
KtSimpleNameExpression
)
:
KtSimpleNameReference
(
expression
),
FirKtReference
{
override
fun
getResolvedToPsi
(
analysisSession
:
AnalysisSessionFirImpl
)
=
FirReferenceResolveHelper
.
resolveSimpleNameReference
(
this
)
override
fun
getResolvedToPsi
(
analysisSession
:
FirAnalysisSession
)
=
FirReferenceResolveHelper
.
resolveSimpleNameReference
(
this
)
override
fun
doCanBeReferenceTo
(
candidateTarget
:
PsiElement
):
Boolean
{
return
true
// TODO
...
...
idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/references/KtDestructuringDeclarationReferenceFirImpl.kt
浏览文件 @
71b916ae
...
...
@@ -9,7 +9,7 @@ import com.intellij.psi.PsiElement
import
org.jetbrains.kotlin.fir.declarations.FirProperty
import
org.jetbrains.kotlin.fir.expressions.FirComponentCall
import
org.jetbrains.kotlin.idea.fir.*
import
org.jetbrains.kotlin.idea.frontend.api.fir.
AnalysisSessionFirImpl
import
org.jetbrains.kotlin.idea.frontend.api.fir.
FirAnalysisSession
import
org.jetbrains.kotlin.psi.KtDestructuringDeclarationEntry
class
KtDestructuringDeclarationReferenceFirImpl
(
...
...
@@ -18,7 +18,7 @@ class KtDestructuringDeclarationReferenceFirImpl(
override
fun
canRename
():
Boolean
=
false
//todo
override
fun
getResolvedToPsi
(
analysisSession
:
AnalysisSessionFirImpl
analysisSession
:
FirAnalysisSession
):
Collection
<
PsiElement
>
{
val
fir
=
expression
.
getOrBuildFirSafe
<
FirProperty
>()
?:
return
emptyList
()
val
componentFunctionSymbol
=
(
fir
.
initializer
as
?
FirComponentCall
)
?.
getCalleeSymbol
()
?:
return
emptyList
()
...
...
idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/references/KtFirReferenceResolver.kt
浏览文件 @
71b916ae
...
...
@@ -9,7 +9,7 @@ import com.intellij.psi.PsiElement
import
com.intellij.psi.PsiElementResolveResult
import
com.intellij.psi.ResolveResult
import
com.intellij.psi.impl.source.resolve.ResolveCache
import
org.jetbrains.kotlin.idea.frontend.api.fir.
AnalysisSessionFirImpl
import
org.jetbrains.kotlin.idea.frontend.api.fir.
FirAnalysisSession
object
KtFirReferenceResolver
:
ResolveCache
.
PolyVariantResolver
<
KtReference
>
{
class
KotlinResolveResult
(
element
:
PsiElement
)
:
PsiElementResolveResult
(
element
)
...
...
@@ -17,7 +17,7 @@ object KtFirReferenceResolver : ResolveCache.PolyVariantResolver<KtReference> {
override
fun
resolve
(
ref
:
KtReference
,
incompleteCode
:
Boolean
):
Array
<
ResolveResult
>
{
check
(
ref
is
FirKtReference
)
{
"reference should be FirKtReference, but was ${ref::class}"
}
check
(
ref
is
AbstractKtReference
<
*
>)
{
"reference should be AbstractKtReference, but was ${ref::class}"
}
val
analysisSession
=
AnalysisSessionFirImpl
()
val
analysisSession
=
FirAnalysisSession
()
val
resolveToPsiElements
=
ref
.
getResolvedToPsi
(
analysisSession
)
return
resolveToPsiElements
.
map
{
KotlinResolveResult
(
it
)
}.
toTypedArray
()
}
...
...
idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/references/KtForLoopInReferenceFirImpl.kt
浏览文件 @
71b916ae
...
...
@@ -6,7 +6,6 @@
package
org.jetbrains.kotlin.idea.references
import
com.intellij.psi.PsiElement
import
org.jetbrains.kotlin.fir.FirSession
import
org.jetbrains.kotlin.fir.declarations.FirProperty
import
org.jetbrains.kotlin.fir.expressions.FirFunctionCall
import
org.jetbrains.kotlin.fir.expressions.FirQualifiedAccessExpression
...
...
@@ -14,12 +13,12 @@ import org.jetbrains.kotlin.fir.expressions.FirWhileLoop
import
org.jetbrains.kotlin.idea.fir.findPsi
import
org.jetbrains.kotlin.idea.fir.getOrBuildFirSafe
import
org.jetbrains.kotlin.idea.fir.getResolvedSymbolOfNameReference
import
org.jetbrains.kotlin.idea.frontend.api.fir.
AnalysisSessionFirImpl
import
org.jetbrains.kotlin.idea.frontend.api.fir.
FirAnalysisSession
import
org.jetbrains.kotlin.psi.KtForExpression
open
class
KtForLoopInReferenceFirImpl
(
expression
:
KtForExpression
)
:
KtForLoopInReference
(
expression
),
FirKtReference
{
override
fun
getResolvedToPsi
(
analysisSession
:
AnalysisSessionFirImpl
analysisSession
:
FirAnalysisSession
):
Collection
<
PsiElement
>
{
val
firLoop
=
expression
.
getOrBuildFirSafe
<
FirWhileLoop
>()
?:
return
emptyList
()
val
condition
=
firLoop
.
condition
as
?
FirFunctionCall
...
...
idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/references/KtInvokeFunctionReferenceFirImpl.kt
浏览文件 @
71b916ae
...
...
@@ -7,7 +7,7 @@ package org.jetbrains.kotlin.idea.references
import
com.intellij.psi.PsiElement
import
org.jetbrains.kotlin.idea.frontend.api.VariableAsFunctionLikeCallInfo
import
org.jetbrains.kotlin.idea.frontend.api.fir.
AnalysisSessionFirImpl
import
org.jetbrains.kotlin.idea.frontend.api.fir.
FirAnalysisSession
import
org.jetbrains.kotlin.psi.KtCallExpression
import
org.jetbrains.kotlin.psi.KtExpression
...
...
@@ -16,7 +16,7 @@ class KtInvokeFunctionReferenceFirImpl(expression: KtCallExpression) : KtInvokeF
TODO
(
"Not yet implemented"
)
}
override
fun
getResolvedToPsi
(
analysisSession
:
AnalysisSessionFirImpl
):
Collection
<
PsiElement
>
{
override
fun
getResolvedToPsi
(
analysisSession
:
FirAnalysisSession
):
Collection
<
PsiElement
>
{
val
call
=
analysisSession
.
resolveCall
(
expression
)
?:
return
emptyList
()
if
(
call
is
VariableAsFunctionLikeCallInfo
)
{
return
listOf
(
call
.
invokeFunction
)
...
...
idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/references/KtPropertyDelegationMethodsReferenceFirImpl.kt
浏览文件 @
71b916ae
...
...
@@ -12,7 +12,7 @@ import org.jetbrains.kotlin.fir.expressions.FirFunctionCall
import
org.jetbrains.kotlin.fir.expressions.FirReturnExpression
import
org.jetbrains.kotlin.fir.expressions.FirStatement
import
org.jetbrains.kotlin.idea.fir.*
import
org.jetbrains.kotlin.idea.frontend.api.fir.
AnalysisSessionFirImpl
import
org.jetbrains.kotlin.idea.frontend.api.fir.
FirAnalysisSession
import
org.jetbrains.kotlin.psi.KtElement
import
org.jetbrains.kotlin.psi.KtPropertyDelegate
...
...
@@ -20,7 +20,7 @@ class KtPropertyDelegationMethodsReferenceFirImpl(
element
:
KtPropertyDelegate
)
:
KtPropertyDelegationMethodsReference
(
element
),
FirKtReference
{
override
fun
getResolvedToPsi
(
analysisSession
:
AnalysisSessionFirImpl
analysisSession
:
FirAnalysisSession
):
Collection
<
PsiElement
>
{
val
property
=
(
expression
.
parent
as
?
KtElement
)
?.
getOrBuildFirSafe
<
FirProperty
>()
?:
return
emptyList
()
if
(
property
.
delegate
==
null
)
return
emptyList
()
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录