Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
硅谷海盗
kotlin
提交
0210a495
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,发现更多精彩内容 >>
提交
0210a495
编写于
6月 15, 2011
作者:
A
Andrey Breslav
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Services for completion
上级
46208ad1
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
41 addition
and
22 deletion
+41
-22
idea/src/org/jetbrains/jet/lang/psi/JetSimpleNameExpression.java
...c/org/jetbrains/jet/lang/psi/JetSimpleNameExpression.java
+32
-19
idea/src/org/jetbrains/jet/lang/resolve/BindingTraceContext.java
...c/org/jetbrains/jet/lang/resolve/BindingTraceContext.java
+1
-1
idea/src/org/jetbrains/jet/lang/resolve/WritableScopeImpl.java
...src/org/jetbrains/jet/lang/resolve/WritableScopeImpl.java
+1
-0
idea/src/org/jetbrains/jet/lang/resolve/WriteThroughScope.java
...src/org/jetbrains/jet/lang/resolve/WriteThroughScope.java
+5
-0
idea/src/org/jetbrains/jet/lang/types/JetTypeInferrer.java
idea/src/org/jetbrains/jet/lang/types/JetTypeInferrer.java
+2
-2
未找到文件。
idea/src/org/jetbrains/jet/lang/psi/JetSimpleNameExpression.java
浏览文件 @
0210a495
...
...
@@ -15,6 +15,7 @@ import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
import
org.jetbrains.jet.lang.parsing.JetExpressionParsing
;
import
org.jetbrains.jet.lang.resolve.AnalyzingUtils
;
import
org.jetbrains.jet.lang.resolve.BindingContext
;
import
org.jetbrains.jet.lang.resolve.JetScope
;
import
org.jetbrains.jet.lang.types.JetType
;
import
org.jetbrains.jet.lexer.JetTokens
;
import
org.jetbrains.jet.resolve.DescriptorRenderer
;
...
...
@@ -89,25 +90,15 @@ public class JetSimpleNameExpression extends JetReferenceExpression {
BindingContext
bindingContext
=
AnalyzingUtils
.
analyzeFileWithCache
(
file
);
final
JetType
expressionType
=
bindingContext
.
getExpressionType
(
receiverExpression
);
if
(
expressionType
!=
null
)
{
List
<
LookupElement
>
result
=
Lists
.
newArrayList
();
for
(
final
DeclarationDescriptor
descriptor
:
expressionType
.
getMemberScope
().
getAllDescriptors
())
{
result
.
add
(
new
LookupElement
()
{
@NotNull
@Override
public
String
getLookupString
()
{
return
descriptor
.
getName
();
}
@Override
public
void
renderElement
(
LookupElementPresentation
presentation
)
{
presentation
.
setItemText
(
descriptor
.
getName
());
presentation
.
setTypeText
(
DescriptorRenderer
.
TEXT
.
render
(
descriptor
));
}
}
);
}
return
result
.
toArray
();
return
collectLookupElements
(
expressionType
.
getMemberScope
());
}
}
else
{
JetFile
file
=
(
JetFile
)
getContainingFile
();
BindingContext
bindingContext
=
AnalyzingUtils
.
analyzeFileWithCache
(
file
);
JetScope
resolutionScope
=
bindingContext
.
getResolutionScope
(
JetSimpleNameExpression
.
this
);
if
(
resolutionScope
!=
null
)
{
return
collectLookupElements
(
resolutionScope
);
}
}
...
...
@@ -116,6 +107,28 @@ public class JetSimpleNameExpression extends JetReferenceExpression {
};
}
private
Object
[]
collectLookupElements
(
JetScope
scope
)
{
List
<
LookupElement
>
result
=
Lists
.
newArrayList
();
for
(
final
DeclarationDescriptor
descriptor
:
scope
.
getAllDescriptors
())
{
result
.
add
(
new
LookupElement
()
{
@NotNull
@Override
public
String
getLookupString
()
{
return
descriptor
.
getName
();
}
@Override
public
void
renderElement
(
LookupElementPresentation
presentation
)
{
presentation
.
setItemText
(
descriptor
.
getName
());
presentation
.
setTypeText
(
DescriptorRenderer
.
TEXT
.
render
(
descriptor
));
}
}
);
}
return
result
.
toArray
();
}
@Override
public
void
accept
(
JetVisitor
visitor
)
{
visitor
.
visitSimpleNameExpression
(
this
);
...
...
idea/src/org/jetbrains/jet/lang/resolve/BindingTraceContext.java
浏览文件 @
0210a495
...
...
@@ -127,7 +127,7 @@ public class BindingTraceContext implements BindingContext, BindingTrace {
@Override
public
void
recordResolutionScope
(
@NotNull
JetExpression
expression
,
@NotNull
JetScope
scope
)
{
safePut
(
resolutionScopes
,
expression
,
scope
);
resolutionScopes
.
put
(
expression
,
scope
);
}
@Override
...
...
idea/src/org/jetbrains/jet/lang/resolve/WritableScopeImpl.java
浏览文件 @
0210a495
...
...
@@ -38,6 +38,7 @@ public class WritableScopeImpl extends WritableScopeWithImports {
public
WritableScopeImpl
(
@NotNull
JetScope
scope
,
@NotNull
DeclarationDescriptor
owner
,
@NotNull
ErrorHandler
errorHandler
)
{
super
(
scope
,
errorHandler
);
this
.
ownerDeclarationDescriptor
=
owner
;
this
.
allDescriptors
.
addAll
(
scope
.
getAllDescriptors
());
}
@NotNull
...
...
idea/src/org/jetbrains/jet/lang/resolve/WriteThroughScope.java
浏览文件 @
0210a495
...
...
@@ -146,4 +146,9 @@ public class WriteThroughScope extends WritableScopeWithImports {
public
void
setThisType
(
@NotNull
JetType
thisType
)
{
writableWorker
.
setThisType
(
thisType
);
}
@Override
public
Collection
<
DeclarationDescriptor
>
getAllDescriptors
()
{
return
writableWorker
.
getAllDescriptors
();
}
}
idea/src/org/jetbrains/jet/lang/types/JetTypeInferrer.java
浏览文件 @
0210a495
...
...
@@ -641,6 +641,7 @@ public class JetTypeInferrer {
@Nullable
public
final
JetType
getType
(
@NotNull
JetExpression
expression
)
{
assert
result
==
null
;
trace
.
recordResolutionScope
(
expression
,
scope
);
if
(
trace
.
isProcessed
(
expression
))
{
return
trace
.
getBindingContext
().
getExpressionType
(
expression
);
}
...
...
@@ -667,7 +668,6 @@ public class JetTypeInferrer {
}
trace
.
markAsProcessed
(
expression
);
trace
.
recordResolutionScope
(
expression
,
scope
);
return
result
;
}
...
...
@@ -1127,7 +1127,7 @@ public class JetTypeInferrer {
JetWhenExpression
subWhen
=
whenEntry
.
getSubWhen
();
JetExpression
bodyExpression
=
subWhen
==
null
?
whenEntry
.
getExpression
()
:
subWhen
;
if
(
bodyExpression
!=
null
)
{
JetType
type
=
getType
(
scopeToExtend
,
bodyExpression
,
fals
e
,
newDataFlowInfo
);
JetType
type
=
getType
(
scopeToExtend
,
bodyExpression
,
tru
e
,
newDataFlowInfo
);
if
(
type
!=
null
)
{
expressionTypes
.
add
(
type
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录