Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
硅谷海盗
kotlin
提交
010090cd
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,发现更多精彩内容 >>
提交
010090cd
编写于
2月 25, 2012
作者:
N
Nikolay Krasko
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixes couple exceptions
上级
782ea7b1
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
37 addition
and
4 deletion
+37
-4
idea/src/org/jetbrains/jet/plugin/completion/handlers/JetFunctionInsertHandler.java
.../plugin/completion/handlers/JetFunctionInsertHandler.java
+1
-1
idea/src/org/jetbrains/jet/plugin/formatter/JetFormattingModelBuilder.java
...rains/jet/plugin/formatter/JetFormattingModelBuilder.java
+2
-0
idea/src/org/jetbrains/jet/plugin/quickfix/ImportClassHelper.java
.../org/jetbrains/jet/plugin/quickfix/ImportClassHelper.java
+8
-3
idea/tests/org/jetbrains/jet/plugin/quickfix/ImportClassHelperTest.java
.../jetbrains/jet/plugin/quickfix/ImportClassHelperTest.java
+26
-0
未找到文件。
idea/src/org/jetbrains/jet/plugin/completion/handlers/JetFunctionInsertHandler.java
浏览文件 @
010090cd
...
...
@@ -90,7 +90,7 @@ public class JetFunctionInsertHandler implements InsertHandler<LookupElement> {
// Insert () if it's not already exist
document
.
insertString
(
endOffset
,
"()"
);
bothParentheses
=
true
;
}
else
if
(
endOffset
+
1
<
documentText
.
length
()
&&
documentText
.
charAt
(
endOffset
)
==
')'
)
{
}
else
if
(
endOffset
+
1
<
documentText
.
length
()
&&
documentText
.
charAt
(
endOffset
+
1
)
==
')'
)
{
bothParentheses
=
true
;
}
...
...
idea/src/org/jetbrains/jet/plugin/formatter/JetFormattingModelBuilder.java
浏览文件 @
010090cd
...
...
@@ -44,6 +44,8 @@ public class JetFormattingModelBuilder implements FormattingModelBuilder {
private
static
SpacingBuilder
createSpacingBuilder
(
CodeStyleSettings
settings
)
{
return
new
SpacingBuilder
(
settings
)
.
after
(
NAMESPACE_HEADER
).
blankLines
(
1
)
.
before
(
IMPORT_DIRECTIVE
).
lineBreakInCode
()
.
between
(
IMPORT_DIRECTIVE
,
CLASS
).
blankLines
(
1
)
.
between
(
IMPORT_DIRECTIVE
,
FUN
).
blankLines
(
1
)
...
...
idea/src/org/jetbrains/jet/plugin/quickfix/ImportClassHelper.java
浏览文件 @
010090cd
...
...
@@ -89,9 +89,14 @@ public class ImportClassHelper {
}
else
{
List
<
JetDeclaration
>
declarations
=
file
.
getDeclarations
();
assert
!
declarations
.
isEmpty
();
JetDeclaration
firstDeclaration
=
declarations
.
iterator
().
next
();
firstDeclaration
.
getParent
().
addBefore
(
newDirective
,
firstDeclaration
);
if
(!
declarations
.
isEmpty
())
{
JetDeclaration
firstDeclaration
=
declarations
.
iterator
().
next
();
firstDeclaration
.
getParent
().
addBefore
(
newDirective
,
firstDeclaration
);
}
else
{
file
.
getNamespaceHeader
().
getParent
().
addAfter
(
newDirective
,
file
.
getNamespaceHeader
());
}
}
}
...
...
idea/tests/org/jetbrains/jet/plugin/quickfix/ImportClassHelperTest.java
浏览文件 @
010090cd
...
...
@@ -21,6 +21,8 @@ import com.intellij.openapi.application.ApplicationManager;
import
org.jetbrains.jet.lang.psi.JetFile
;
import
org.jetbrains.jet.plugin.PluginTestCaseBase
;
import
java.io.IOException
;
/**
* @author Nikolay Krasko
*/
...
...
@@ -48,6 +50,30 @@ public class ImportClassHelperTest extends LightDaemonAnalyzerTestCase {
checkResultByFile
(
getTestName
(
false
)
+
".kt.after"
);
}
public
void
testInsertInEmptyFile
()
throws
IOException
{
configureFromFileText
(
"testInsertInEmptyFile.kt"
,
""
);
ApplicationManager
.
getApplication
().
runWriteAction
(
new
Runnable
()
{
@Override
public
void
run
()
{
ImportClassHelper
.
addImportDirective
(
"java.util.ArrayList"
,
(
JetFile
)
getFile
());
}
});
checkResultByText
(
"import java.util.ArrayList"
);
}
public
void
testInsertInPackageOnlyFile
()
throws
IOException
{
configureFromFileText
(
"testInsertInPackageOnlyFile.kt"
,
"package some"
);
ApplicationManager
.
getApplication
().
runWriteAction
(
new
Runnable
()
{
@Override
public
void
run
()
{
ImportClassHelper
.
addImportDirective
(
"java.util.ArrayList"
,
(
JetFile
)
getFile
());
}
});
checkResultByText
(
"package some\n\nimport java.util.ArrayList"
);
}
@Override
protected
String
getTestDataPath
()
{
return
PluginTestCaseBase
.
getTestDataPathBase
()
+
"/quickfix/importHelper/"
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录