Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
硅谷海盗
kotlin
提交
2500dc9b
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,发现更多精彩内容 >>
提交
2500dc9b
编写于
12月 19, 2016
作者:
N
Nikolay Krasko
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
"Go to Type Declaration" is broken for stdlib types (KT-13001)
#KT-13001Fixed
上级
6ca5ba36
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
48 addition
and
10 deletion
+48
-10
idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinTypeDeclarationProvider.kt
.../kotlin/idea/codeInsight/KotlinTypeDeclarationProvider.kt
+1
-3
idea/testData/navigation/gotoTypeDeclaration/builtinTypeStdlib.test
...ata/navigation/gotoTypeDeclaration/builtinTypeStdlib.test
+8
-0
idea/tests/org/jetbrains/kotlin/idea/navigation/AbstractGotoActionTest.kt
...etbrains/kotlin/idea/navigation/AbstractGotoActionTest.kt
+33
-7
idea/tests/org/jetbrains/kotlin/idea/navigation/GotoTypeDeclarationTestGenerated.java
...lin/idea/navigation/GotoTypeDeclarationTestGenerated.java
+6
-0
未找到文件。
idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinTypeDeclarationProvider.kt
浏览文件 @
2500dc9b
...
...
@@ -36,8 +36,6 @@ class KotlinTypeDeclarationProvider : TypeDeclarationProvider {
val
type
=
callableDescriptor
.
returnType
?:
return
emptyArray
()
val
classifierDescriptor
=
type
.
constructor
.
declarationDescriptor
?:
return
emptyArray
()
val
typeElement
=
DescriptorToSourceUtils
.
descriptorToDeclaration
(
classifierDescriptor
)
?:
return
emptyArray
()
return
arrayOf
(
typeElement
)
return
DescriptorToSourceUtilsIde
.
getAllDeclarations
(
symbol
.
project
,
classifierDescriptor
).
toTypedArray
()
}
}
idea/testData/navigation/gotoTypeDeclaration/builtinTypeStdlib.test
0 → 100644
浏览文件 @
2500dc9b
// FILE: before.kt
fun
foo
(
a
:
Any
)
{
val
b
=
1
foo
(
<
caret
>
b
)
}
// FILE: after.kt
public
class
<
caret
>
Int
private
constructor
()
:
Number
(),
Comparable
<
Int
>
{
\ No newline at end of file
idea/tests/org/jetbrains/kotlin/idea/navigation/AbstractGotoActionTest.kt
浏览文件 @
2500dc9b
...
...
@@ -18,12 +18,15 @@ package org.jetbrains.kotlin.idea.navigation
import
com.intellij.codeInsight.CodeInsightActionHandler
import
com.intellij.openapi.actionSystem.ActionManager
import
com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase
import
com.intellij.openapi.fileEditor.FileEditorManager
import
com.intellij.openapi.fileEditor.ex.FileEditorManagerEx
import
com.intellij.openapi.util.TextRange
import
org.jetbrains.kotlin.idea.KotlinFileType
import
org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
import
org.jetbrains.kotlin.test.KotlinTestUtils
import
org.junit.Assert
abstract
class
AbstractGotoActionTest
:
LightCodeInsightFixtureTestCase
()
{
abstract
class
AbstractGotoActionTest
:
Kotlin
LightCodeInsightFixtureTestCase
()
{
protected
abstract
val
actionName
:
String
protected
fun
doTest
(
testPath
:
String
)
{
...
...
@@ -31,12 +34,35 @@ abstract class AbstractGotoActionTest : LightCodeInsightFixtureTestCase() {
myFixture
.
configureByText
(
KotlinFileType
.
INSTANCE
,
parts
[
0
])
val
goto
Super
Action
=
ActionManager
.
getInstance
().
getAction
(
actionName
)
as
CodeInsightActionHandler
goto
Super
Action
.
invoke
(
project
,
myFixture
.
editor
,
myFixture
.
file
)
val
gotoAction
=
ActionManager
.
getInstance
().
getAction
(
actionName
)
as
CodeInsightActionHandler
gotoAction
.
invoke
(
project
,
myFixture
.
editor
,
myFixture
.
file
)
val
text
=
myFixture
.
getDocument
(
myFixture
.
file
).
text
val
afterText
=
StringBuilder
(
text
).
insert
(
editor
.
caretModel
.
offset
,
"<caret>"
).
toString
()
val
fileEditorManager
=
FileEditorManager
.
getInstance
(
myFixture
.
project
)
as
FileEditorManagerEx
val
currentEditor
=
fileEditorManager
.
selectedTextEditor
?:
editor
Assert
.
assertEquals
(
parts
[
1
],
afterText
)
if
(
currentEditor
==
editor
)
{
val
text
=
myFixture
.
getDocument
(
myFixture
.
file
).
text
val
afterText
=
StringBuilder
(
text
).
insert
(
editor
.
caretModel
.
offset
,
"<caret>"
).
toString
()
Assert
.
assertEquals
(
parts
[
1
],
afterText
)
}
else
{
val
fileOffset
=
currentEditor
.
caretModel
.
offset
val
lineNumber
=
currentEditor
.
document
.
getLineNumber
(
fileOffset
)
val
lineStart
=
currentEditor
.
document
.
getLineStartOffset
(
lineNumber
)
val
lineEnd
=
currentEditor
.
document
.
getLineEndOffset
(
lineNumber
)
val
inLineOffset
=
fileOffset
-
lineStart
val
line
=
currentEditor
.
document
.
getText
(
TextRange
(
lineStart
,
lineEnd
))
val
withCaret
=
with
(
StringBuilder
())
{
append
(
line
)
insert
(
inLineOffset
,
"<caret>"
)
toString
()
}
Assert
.
assertEquals
(
parts
[
1
],
withCaret
)
}
}
override
fun
getProjectDescriptor
()
=
getProjectDescriptorFromTestName
()
}
idea/tests/org/jetbrains/kotlin/idea/navigation/GotoTypeDeclarationTestGenerated.java
浏览文件 @
2500dc9b
...
...
@@ -36,6 +36,12 @@ public class GotoTypeDeclarationTestGenerated extends AbstractGotoTypeDeclaratio
KotlinTestUtils
.
assertAllTestsPresentByMetadata
(
this
.
getClass
(),
new
File
(
"idea/testData/navigation/gotoTypeDeclaration"
),
Pattern
.
compile
(
"^(.+)\\.test$"
),
TargetBackend
.
ANY
,
true
);
}
@TestMetadata
(
"builtinTypeStdlib.test"
)
public
void
testBuiltinTypeStdlib
()
throws
Exception
{
String
fileName
=
KotlinTestUtils
.
navigationMetadata
(
"idea/testData/navigation/gotoTypeDeclaration/builtinTypeStdlib.test"
);
doTest
(
fileName
);
}
@TestMetadata
(
"explicitParameterInLambda.test"
)
public
void
testExplicitParameterInLambda
()
throws
Exception
{
String
fileName
=
KotlinTestUtils
.
navigationMetadata
(
"idea/testData/navigation/gotoTypeDeclaration/explicitParameterInLambda.test"
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录