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

EA-39113 Fail for "object { fun testing() = 12 }"

Browse Source
This commit is contained in:
Nikolay Krasko
2012-09-11 13:30:19 +04:00
parent ec6af86761
commit 603d85f29d
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetFunctionElementType.java
+2 -2
View File
@@ -25,8 +25,8 @@ import com.intellij.psi.stubs.StubOutputStream;
import com.intellij.util.io.StringRef; import com.intellij.util.io.StringRef;
import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.psi.JetNamedFunction; import org.jetbrains.jet.lang.psi.JetNamedFunction;
import org.jetbrains.jet.lang.psi.stubs.PsiJetFileStub;
import org.jetbrains.jet.lang.psi.stubs.PsiJetFunctionStub; import org.jetbrains.jet.lang.psi.stubs.PsiJetFunctionStub;
import org.jetbrains.jet.lang.psi.stubs.impl.PsiJetFunctionStubImpl; import org.jetbrains.jet.lang.psi.stubs.impl.PsiJetFunctionStubImpl;
import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.FqName;
@@ -67,7 +67,7 @@ public class JetFunctionElementType extends JetStubElementType<PsiJetFunctionStu
@Override @Override
public PsiJetFunctionStub createStub(@NotNull JetNamedFunction psi, @NotNull StubElement parentStub) { public PsiJetFunctionStub createStub(@NotNull JetNamedFunction psi, @NotNull StubElement parentStub) {
final boolean isTopLevel = parentStub instanceof PsiJetFileStub; final boolean isTopLevel = psi.getParent() instanceof JetFile;
final boolean isExtension = psi.getReceiverTypeRef() != null; final boolean isExtension = psi.getReceiverTypeRef() != null;
FqName qualifiedName = psi.getQualifiedName(); FqName qualifiedName = psi.getQualifiedName();
idea/tests/org/jetbrains/jet/plugin/stubs/JetStubsTest.java
+7
View File
@@ -75,6 +75,13 @@ public class JetStubsTest extends LightCodeInsightFixtureTestCase {
" TYPE_PARAMETER:PsiJetTypeParameterStubImpl[name=T extendText=null]\n"); " TYPE_PARAMETER:PsiJetTypeParameterStubImpl[name=T extendText=null]\n");
} }
public void testFunctionInNotNamedObject() {
doBuildTest("object { fun testing() = 12 }",
"PsiJetFileStubImpl[package=]\n" +
" FUN:PsiJetFunctionStubImpl[name=testing]\n" +
" VALUE_PARAMETER_LIST:PsiJetParameterListStubImpl\n");
}
public void testFunctionParameters() { public void testFunctionParameters() {
doBuildTest("fun some(t: Int, other: String = \"hello\") { }", doBuildTest("fun some(t: Int, other: String = \"hello\") { }",
"PsiJetFileStubImpl[package=]\n" + "PsiJetFileStubImpl[package=]\n" +