Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
硅谷海盗
kotlin
提交
bf8e53ef
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,发现更多精彩内容 >>
提交
bf8e53ef
编写于
3月 30, 2012
作者:
E
Evgeny Gerashchenko
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Added highlighting for parameters.
上级
25bbc912
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
20 addition
and
8 deletion
+20
-8
idea/src/org/jetbrains/jet/plugin/highlighter/JetColorSettingsPage.java
...etbrains/jet/plugin/highlighter/JetColorSettingsPage.java
+1
-0
idea/src/org/jetbrains/jet/plugin/highlighter/JetHighlightingColors.java
...tbrains/jet/plugin/highlighter/JetHighlightingColors.java
+8
-3
idea/src/org/jetbrains/jet/plugin/highlighter/VariablesHighlightingVisitor.java
.../jet/plugin/highlighter/VariablesHighlightingVisitor.java
+11
-5
未找到文件。
idea/src/org/jetbrains/jet/plugin/highlighter/JetColorSettingsPage.java
浏览文件 @
bf8e53ef
...
...
@@ -132,6 +132,7 @@ public class JetColorSettingsPage implements ColorSettingsPage {
new
AttributesDescriptor
(
"Mutable variable, parameter or property"
,
JetHighlightingColors
.
MUTABLE_VARIABLE
),
new
AttributesDescriptor
(
"Local variable"
,
JetHighlightingColors
.
LOCAL_VARIABLE
),
new
AttributesDescriptor
(
"Parameter"
,
JetHighlightingColors
.
PARAMETER
),
new
AttributesDescriptor
(
"Closure or anonymous object bound variable"
,
JetHighlightingColors
.
WRAPPED_INTO_REF
),
new
AttributesDescriptor
(
"Instance property"
,
JetHighlightingColors
.
INSTANCE_PROPERTY
),
...
...
idea/src/org/jetbrains/jet/plugin/highlighter/JetHighlightingColors.java
浏览文件 @
bf8e53ef
...
...
@@ -161,14 +161,19 @@ public class JetHighlightingColors {
CodeInsightColors
.
ANNOTATION_NAME_ATTRIBUTES
.
getDefaultAttributes
()
);
public
static
final
TextAttributesKey
MUTABLE_VARIABLE
=
TextAttributesKey
.
createTextAttributesKey
(
"KOTLIN_MUTABLE_VARIABLE"
,
new
TextAttributes
(
null
,
null
,
Color
.
BLACK
,
EffectType
.
LINE_UNDERSCORE
,
0
)
);
public
static
final
TextAttributesKey
LOCAL_VARIABLE
=
TextAttributesKey
.
createTextAttributesKey
(
"KOTLIN_LOCAL_VARIABLE"
,
CodeInsightColors
.
LOCAL_VARIABLE_ATTRIBUTES
.
getDefaultAttributes
()
);
public
static
final
TextAttributesKey
MUTABLE_VARIABLE
=
TextAttributesKey
.
createTextAttributesKey
(
"KOTLIN_
MUTABLE_VARIABLE
"
,
new
TextAttributes
(
null
,
null
,
Color
.
BLACK
,
EffectType
.
LINE_UNDERSCORE
,
0
)
public
static
final
TextAttributesKey
PARAMETER
=
TextAttributesKey
.
createTextAttributesKey
(
"KOTLIN_
PARAMETER
"
,
CodeInsightColors
.
PARAMETER_ATTRIBUTES
.
getDefaultAttributes
(
)
);
public
static
final
TextAttributesKey
WRAPPED_INTO_REF
=
TextAttributesKey
.
createTextAttributesKey
(
...
...
idea/src/org/jetbrains/jet/plugin/highlighter/VariablesHighlightingVisitor.java
浏览文件 @
bf8e53ef
...
...
@@ -89,17 +89,23 @@ class VariablesHighlightingVisitor extends AfterAnalysisHighlightingVisitor {
private
void
highlightVariable
(
@NotNull
PsiElement
elementToHighlight
,
@NotNull
DeclarationDescriptor
descriptor
)
{
if
(
descriptor
instanceof
VariableDescriptor
)
{
if
(((
VariableDescriptor
)
descriptor
).
isVar
())
{
VariableDescriptor
variableDescriptor
=
(
VariableDescriptor
)
descriptor
;
if
(
variableDescriptor
.
isVar
())
{
holder
.
createInfoAnnotation
(
elementToHighlight
,
null
).
setTextAttributes
(
JetHighlightingColors
.
MUTABLE_VARIABLE
);
}
}
if
(
descriptor
instanceof
LocalVariableDescriptor
)
{
LocalVariableDescriptor
variableDescriptor
=
(
LocalVariableDescriptor
)
descriptor
;
if
(
Boolean
.
TRUE
.
equals
(
bindingContext
.
get
(
MUST_BE_WRAPPED_IN_A_REF
,
variableDescriptor
)))
{
holder
.
createInfoAnnotation
(
elementToHighlight
,
"Wrapped into a ref-object to be modifier when captured in a closure"
).
setTextAttributes
(
JetHighlightingColors
.
WRAPPED_INTO_REF
);
}
holder
.
createInfoAnnotation
(
elementToHighlight
,
null
).
setTextAttributes
(
JetHighlightingColors
.
LOCAL_VARIABLE
);
if
(
descriptor
instanceof
LocalVariableDescriptor
)
{
holder
.
createInfoAnnotation
(
elementToHighlight
,
null
).
setTextAttributes
(
JetHighlightingColors
.
LOCAL_VARIABLE
);
}
if
(
descriptor
instanceof
ValueParameterDescriptor
)
{
holder
.
createInfoAnnotation
(
elementToHighlight
,
null
).
setTextAttributes
(
JetHighlightingColors
.
PARAMETER
);
}
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录