Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
硅谷海盗
kotlin
提交
99b922e5
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,发现更多精彩内容 >>
提交
99b922e5
编写于
4月 02, 2012
作者:
E
Evgeny Gerashchenko
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Made proper highlighting for variables invoked as functions.
上级
8a4e07e3
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
12 addition
and
13 deletion
+12
-13
idea/src/org/jetbrains/jet/plugin/highlighter/FunctionsHighlightingVisitor.java
.../jet/plugin/highlighter/FunctionsHighlightingVisitor.java
+2
-5
idea/src/org/jetbrains/jet/plugin/highlighter/PropertiesHighlightingVisitor.java
...jet/plugin/highlighter/PropertiesHighlightingVisitor.java
+4
-4
idea/src/org/jetbrains/jet/plugin/highlighter/VariablesHighlightingVisitor.java
.../jet/plugin/highlighter/VariablesHighlightingVisitor.java
+6
-4
未找到文件。
idea/src/org/jetbrains/jet/plugin/highlighter/FunctionsHighlightingVisitor.java
浏览文件 @
99b922e5
...
@@ -18,10 +18,7 @@ package org.jetbrains.jet.plugin.highlighter;
...
@@ -18,10 +18,7 @@ package org.jetbrains.jet.plugin.highlighter;
import
com.intellij.lang.annotation.AnnotationHolder
;
import
com.intellij.lang.annotation.AnnotationHolder
;
import
com.intellij.psi.PsiElement
;
import
com.intellij.psi.PsiElement
;
import
org.jetbrains.jet.lang.descriptors.ConstructorDescriptor
;
import
org.jetbrains.jet.lang.descriptors.*
;
import
org.jetbrains.jet.lang.descriptors.DeclarationDescriptor
;
import
org.jetbrains.jet.lang.descriptors.FunctionDescriptor
;
import
org.jetbrains.jet.lang.descriptors.NamespaceDescriptor
;
import
org.jetbrains.jet.lang.psi.*
;
import
org.jetbrains.jet.lang.psi.*
;
import
org.jetbrains.jet.lang.resolve.BindingContext
;
import
org.jetbrains.jet.lang.resolve.BindingContext
;
import
org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverDescriptor
;
import
org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverDescriptor
;
...
@@ -78,7 +75,7 @@ public class FunctionsHighlightingVisitor extends AfterAnalysisHighlightingVisit
...
@@ -78,7 +75,7 @@ public class FunctionsHighlightingVisitor extends AfterAnalysisHighlightingVisit
holder
.
createInfoAnnotation
(
callee
,
null
).
setTextAttributes
(
holder
.
createInfoAnnotation
(
callee
,
null
).
setTextAttributes
(
JetHighlightingColors
.
CONSTRUCTOR_CALL
);
JetHighlightingColors
.
CONSTRUCTOR_CALL
);
}
}
else
if
(
calleeDescriptor
instanceof
FunctionDescriptor
)
{
else
if
(
calleeDescriptor
instanceof
FunctionDescriptor
&&
!(
calleeDescriptor
instanceof
VariableAsFunctionDescriptor
)
)
{
FunctionDescriptor
fun
=
(
FunctionDescriptor
)
calleeDescriptor
;
FunctionDescriptor
fun
=
(
FunctionDescriptor
)
calleeDescriptor
;
if
(
fun
.
getReceiverParameter
()
!=
ReceiverDescriptor
.
NO_RECEIVER
)
{
if
(
fun
.
getReceiverParameter
()
!=
ReceiverDescriptor
.
NO_RECEIVER
)
{
holder
.
createInfoAnnotation
(
callee
,
null
).
setTextAttributes
(
holder
.
createInfoAnnotation
(
callee
,
null
).
setTextAttributes
(
...
...
idea/src/org/jetbrains/jet/plugin/highlighter/PropertiesHighlightingVisitor.java
浏览文件 @
99b922e5
...
@@ -19,10 +19,7 @@ package org.jetbrains.jet.plugin.highlighter;
...
@@ -19,10 +19,7 @@ package org.jetbrains.jet.plugin.highlighter;
import
com.intellij.lang.annotation.AnnotationHolder
;
import
com.intellij.lang.annotation.AnnotationHolder
;
import
com.intellij.psi.PsiElement
;
import
com.intellij.psi.PsiElement
;
import
org.jetbrains.annotations.NotNull
;
import
org.jetbrains.annotations.NotNull
;
import
org.jetbrains.jet.lang.descriptors.DeclarationDescriptor
;
import
org.jetbrains.jet.lang.descriptors.*
;
import
org.jetbrains.jet.lang.descriptors.NamespaceDescriptor
;
import
org.jetbrains.jet.lang.descriptors.PropertyDescriptor
;
import
org.jetbrains.jet.lang.descriptors.VariableDescriptor
;
import
org.jetbrains.jet.lang.psi.*
;
import
org.jetbrains.jet.lang.psi.*
;
import
org.jetbrains.jet.lang.resolve.BindingContext
;
import
org.jetbrains.jet.lang.resolve.BindingContext
;
import
org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverDescriptor
;
import
org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverDescriptor
;
...
@@ -36,6 +33,9 @@ class PropertiesHighlightingVisitor extends AfterAnalysisHighlightingVisitor {
...
@@ -36,6 +33,9 @@ class PropertiesHighlightingVisitor extends AfterAnalysisHighlightingVisitor {
@Override
@Override
public
void
visitSimpleNameExpression
(
JetSimpleNameExpression
expression
)
{
public
void
visitSimpleNameExpression
(
JetSimpleNameExpression
expression
)
{
DeclarationDescriptor
target
=
bindingContext
.
get
(
BindingContext
.
REFERENCE_TARGET
,
expression
);
DeclarationDescriptor
target
=
bindingContext
.
get
(
BindingContext
.
REFERENCE_TARGET
,
expression
);
if
(
target
instanceof
VariableAsFunctionDescriptor
)
{
target
=
((
VariableAsFunctionDescriptor
)
target
).
getVariableDescriptor
();
}
if
(!(
target
instanceof
PropertyDescriptor
))
{
if
(!(
target
instanceof
PropertyDescriptor
))
{
return
;
return
;
}
}
...
...
idea/src/org/jetbrains/jet/plugin/highlighter/VariablesHighlightingVisitor.java
浏览文件 @
99b922e5
...
@@ -19,10 +19,7 @@ package org.jetbrains.jet.plugin.highlighter;
...
@@ -19,10 +19,7 @@ package org.jetbrains.jet.plugin.highlighter;
import
com.intellij.lang.annotation.AnnotationHolder
;
import
com.intellij.lang.annotation.AnnotationHolder
;
import
com.intellij.psi.PsiElement
;
import
com.intellij.psi.PsiElement
;
import
org.jetbrains.annotations.NotNull
;
import
org.jetbrains.annotations.NotNull
;
import
org.jetbrains.jet.lang.descriptors.DeclarationDescriptor
;
import
org.jetbrains.jet.lang.descriptors.*
;
import
org.jetbrains.jet.lang.descriptors.LocalVariableDescriptor
;
import
org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor
;
import
org.jetbrains.jet.lang.descriptors.VariableDescriptor
;
import
org.jetbrains.jet.lang.psi.*
;
import
org.jetbrains.jet.lang.psi.*
;
import
org.jetbrains.jet.lang.resolve.BindingContext
;
import
org.jetbrains.jet.lang.resolve.BindingContext
;
import
org.jetbrains.jet.lang.types.JetType
;
import
org.jetbrains.jet.lang.types.JetType
;
...
@@ -88,6 +85,11 @@ class VariablesHighlightingVisitor extends AfterAnalysisHighlightingVisitor {
...
@@ -88,6 +85,11 @@ class VariablesHighlightingVisitor extends AfterAnalysisHighlightingVisitor {
}
}
private
void
highlightVariable
(
@NotNull
PsiElement
elementToHighlight
,
@NotNull
DeclarationDescriptor
descriptor
)
{
private
void
highlightVariable
(
@NotNull
PsiElement
elementToHighlight
,
@NotNull
DeclarationDescriptor
descriptor
)
{
if
(
descriptor
instanceof
VariableAsFunctionDescriptor
)
{
descriptor
=
((
VariableAsFunctionDescriptor
)
descriptor
).
getVariableDescriptor
();
//noinspection ConstantConditions
if
(
descriptor
==
null
)
return
;
}
if
(
descriptor
instanceof
VariableDescriptor
)
{
if
(
descriptor
instanceof
VariableDescriptor
)
{
VariableDescriptor
variableDescriptor
=
(
VariableDescriptor
)
descriptor
;
VariableDescriptor
variableDescriptor
=
(
VariableDescriptor
)
descriptor
;
if
(
variableDescriptor
.
isVar
())
{
if
(
variableDescriptor
.
isVar
())
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录