azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix irregular PSI structure for classes without body

Browse Source
This commit is contained in:
Alexey Sedunov
2013-10-03 17:44:22 +04:00
parent bdc908d45f
commit 28b3db53fe
51 changed files with 47 additions and 336 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/quickfix/override/nothingToOverride/afterAddFunctionNoBody.kt
+3 -3
View File
@@ -1,8 +1,8 @@
// "Add 'open fun f()' to 'A'" "true"
trait A
{
trait A {
open fun f()
}
class B : A {
<caret>override fun f() {}
override fun f() {}
}
idea/tests/org/jetbrains/jet/plugin/stubs/JetStubsTest.java
+3 -11
View File
@@ -76,7 +76,6 @@ public class JetStubsTest extends LightCodeInsightFixtureTestCase {
doBuildTest("class C { class object { fun foo() {} }}",
"PsiJetFileStubImpl[package=]\n" +
" CLASS:PsiJetClassStubImpl[name=C fqn=C superNames=[]]\n" +
" TYPE_PARAMETER_LIST:PsiJetTypeParameterListStubImpl\n" +
" OBJECT_DECLARATION:PsiJetObjectStubImpl[class-object name=null fqName=null]\n" +
" FUN:PsiJetFunctionStubImpl[name=foo]\n" +
" VALUE_PARAMETER_LIST:PsiJetParameterListStubImpl\n");
@@ -118,7 +117,6 @@ public class JetStubsTest extends LightCodeInsightFixtureTestCase {
"}",
"PsiJetFileStubImpl[package=]\n" +
" CLASS:PsiJetClassStubImpl[name=More fqn=More superNames=[]]\n" +
" TYPE_PARAMETER_LIST:PsiJetTypeParameterListStubImpl\n" +
" PROPERTY:PsiJetPropertyStubImpl[val name=test typeText=Int bodyText=11]\n");
}
@@ -147,7 +145,6 @@ public class JetStubsTest extends LightCodeInsightFixtureTestCase {
"}\n",
"PsiJetFileStubImpl[package=]\n" +
" CLASS:PsiJetClassStubImpl[name=Test fqn=Test superNames=[]]\n" +
" TYPE_PARAMETER_LIST:PsiJetTypeParameterListStubImpl\n" +
" VALUE_PARAMETER_LIST:PsiJetParameterListStubImpl\n" +
" PROPERTY:PsiJetPropertyStubImpl[val name=test typeText=null bodyText=12]\n" +
" FUN:PsiJetFunctionStubImpl[name=more]\n" +
@@ -158,7 +155,6 @@ public class JetStubsTest extends LightCodeInsightFixtureTestCase {
doBuildTest("enum class Test { First\n Second\n }",
"PsiJetFileStubImpl[package=]\n" +
" CLASS:PsiJetClassStubImpl[enumClass name=Test fqn=Test superNames=[]]\n" +
" TYPE_PARAMETER_LIST:PsiJetTypeParameterListStubImpl\n" +
" ENUM_ENTRY:PsiJetClassStubImpl[enumEntry name=First fqn=Test.First superNames=[]]\n" +
" ENUM_ENTRY:PsiJetClassStubImpl[enumEntry name=Second fqn=Test.Second superNames=[]]\n"
);
@@ -167,17 +163,14 @@ public class JetStubsTest extends LightCodeInsightFixtureTestCase {
public void testAnnotationClass() {
doBuildTest("annotation class Test",
"PsiJetFileStubImpl[package=]\n" +
" CLASS:PsiJetClassStubImpl[isAnnotation name=Test fqn=Test superNames=[]]\n" +
" TYPE_PARAMETER_LIST:PsiJetTypeParameterListStubImpl\n");
" CLASS:PsiJetClassStubImpl[isAnnotation name=Test fqn=Test superNames=[]]\n");
}
public void testInnerClass() {
doBuildTest("class A { inner class B { } }",
"PsiJetFileStubImpl[package=]\n" +
" CLASS:PsiJetClassStubImpl[name=A fqn=A superNames=[]]\n" +
" TYPE_PARAMETER_LIST:PsiJetTypeParameterListStubImpl\n" +
" CLASS:PsiJetClassStubImpl[inner name=B fqn=A.B superNames=[]]\n" +
" TYPE_PARAMETER_LIST:PsiJetTypeParameterListStubImpl\n");
" CLASS:PsiJetClassStubImpl[inner name=B fqn=A.B superNames=[]]\n");
}
public void testNamedObject() {
@@ -190,8 +183,7 @@ public class JetStubsTest extends LightCodeInsightFixtureTestCase {
doBuildTest("Deprecated class Test {}",
"PsiJetFileStubImpl[package=]\n" +
" CLASS:PsiJetClassStubImpl[name=Test fqn=Test superNames=[]]\n" +
" ANNOTATION_ENTRY:PsiJetAnnotationStubImpl[shortName=Deprecated]\n" +
" TYPE_PARAMETER_LIST:PsiJetTypeParameterListStubImpl\n");
" ANNOTATION_ENTRY:PsiJetAnnotationStubImpl[shortName=Deprecated]\n");
}
public void testAnnotationOnFunction() {