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

Recovery for initializer if no LBRACE

Browse Source 
- If no LBRACE after 'init' keyword parse initializer without body
- Made getBody() nullable, appropriate checks added
This commit is contained in:
Denis Zharkov
2015-03-18 19:58:15 +03:00
parent f4ed05cd90
commit eefea26d54
11 changed files with 130 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java
+4 -1
View File
@@ -330,7 +330,10 @@ public abstract class MemberCodegen<T extends JetElement/* TODO: & JetDeclaratio
}
}
else if (declaration instanceof JetClassInitializer) {
codegen.invoke().gen(((JetClassInitializer) declaration).getBody(), Type.VOID_TYPE);
JetExpression body = ((JetClassInitializer) declaration).getBody();
if (body != null) {
codegen.invoke().gen(body, Type.VOID_TYPE);
}
}
}
}
compiler/frontend/src/org/jetbrains/kotlin/parsing/JetParsing.java
+6 -1
View File
@@ -846,7 +846,12 @@ public class JetParsing extends AbstractJetParsing {
}
else if (at(INIT_KEYWORD)) {
advance(); // init
parseBlock();
if (at(LBRACE)) {
parseBlock();
}
else {
mark().error("Expecting '{' after 'init'");
}
declType = ANONYMOUS_INITIALIZER;
}
else if (at(CONSTRUCTOR_KEYWORD)) {
compiler/frontend/src/org/jetbrains/kotlin/psi/JetClassInitializer.java
+2 -4
View File
@@ -38,11 +38,9 @@ public class JetClassInitializer extends JetDeclarationStub<KotlinPlaceHolderStu
return visitor.visitAnonymousInitializer(this, data);
}
@NotNull
@Nullable
public JetExpression getBody() {
JetExpression body = findChildByClass(JetExpression.class);
assert body != null;
return body;
return findChildByClass(JetExpression.class);
}
@Nullable
compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java
+4 -1
View File
@@ -458,7 +458,10 @@ public class BodyResolver {
JetScope scopeForInitializers = classDescriptor.getScopeForInitializerResolution();
if (!classDescriptor.getConstructors().isEmpty()) {
expressionTypingServices.getType(scopeForInitializers, anonymousInitializer.getBody(), NO_EXPECTED_TYPE, c.getOuterDataFlowInfo(), trace);
JetExpression body = anonymousInitializer.getBody();
if (body != null) {
expressionTypingServices.getType(scopeForInitializers, body, NO_EXPECTED_TYPE, c.getOuterDataFlowInfo(), trace);
}
processModifiersOnInitializer(anonymousInitializer, scopeForInitializers);
}
else {
compiler/testData/psi/recovery/initRecovery.kt
+13
View File
@@ -0,0 +1,13 @@
class A {
init
}
class B {
Ann init
val x = 1
init
fun foo() {}
init
init
init {}
}
compiler/testData/psi/recovery/initRecovery.txt
+84
View File
@@ -0,0 +1,84 @@
JetFile: initRecovery.kt
PACKAGE_DIRECTIVE
<empty list>
CLASS
PsiElement(class)('class')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('A')
PsiWhiteSpace(' ')
CLASS_BODY
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
ANONYMOUS_INITIALIZER
PsiElement(init)('init')
PsiErrorElement:Expecting '{' after 'init'
<empty list>
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n\n')
CLASS
PsiElement(class)('class')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('B')
PsiWhiteSpace(' ')
CLASS_BODY
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
ANONYMOUS_INITIALIZER
MODIFIER_LIST
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Ann')
PsiWhiteSpace(' ')
PsiElement(init)('init')
PsiErrorElement:Expecting '{' after 'init'
<empty list>
PsiWhiteSpace('\n ')
PROPERTY
PsiElement(val)('val')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('x')
PsiWhiteSpace(' ')
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
INTEGER_CONSTANT
PsiElement(INTEGER_LITERAL)('1')
PsiWhiteSpace('\n ')
ANONYMOUS_INITIALIZER
PsiElement(init)('init')
PsiErrorElement:Expecting '{' after 'init'
<empty list>
PsiWhiteSpace('\n ')
FUN
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foo')
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
BLOCK
PsiElement(LBRACE)('{')
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n ')
ANONYMOUS_INITIALIZER
PsiElement(init)('init')
PsiErrorElement:Expecting '{' after 'init'
<empty list>
PsiWhiteSpace('\n ')
ANONYMOUS_INITIALIZER
PsiElement(init)('init')
PsiErrorElement:Expecting '{' after 'init'
<empty list>
PsiWhiteSpace('\n ')
ANONYMOUS_INITIALIZER
PsiElement(init)('init')
PsiWhiteSpace(' ')
BLOCK
PsiElement(LBRACE)('{')
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
compiler/tests/org/jetbrains/kotlin/parsing/JetParsingTestGenerated.java
+6
View File
@@ -1564,6 +1564,12 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest {
doParsingTest(fileName);
}
@TestMetadata("initRecovery.kt")
public void testInitRecovery() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/initRecovery.kt");
doParsingTest(fileName);
}
@TestMetadata("InvalidCharInSingleLineLambda.kt")
public void testInvalidCharInSingleLineLambda() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/InvalidCharInSingleLineLambda.kt");
idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/extractFunctionForDebuggerUtil.kt
+2 -2
View File
@@ -179,8 +179,8 @@ private fun addDebugExpressionBeforeContextElement(codeFragment: JetCodeFragment
fun insertNewInitializer(classBody: JetClassBody): PsiElement? {
val initializer = psiFactory.createAnonymousInitializer()
val newInitializer = (classBody.addAfter(initializer, classBody.getFirstChild()) as JetClassInitializer)
val block = newInitializer.getBody() as JetBlockExpression
return block.getLastChild()
val block = newInitializer.getBody() as JetBlockExpression?
return block?.getLastChild()
}
val elementBefore = when {
idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCalleeMethodsTreeStructure.java
+4 -1
View File
@@ -70,7 +70,10 @@ public class KotlinCalleeMethodsTreeStructure extends KotlinCallTreeStructure {
JetClassBody body = classOrObject.getBody();
if (body != null) {
for (JetClassInitializer initializer : body.getAnonymousInitializers()) {
elementsToAnalyze.add(initializer.getBody());
JetExpression initializerBody = initializer.getBody();
if (initializerBody != null) {
elementsToAnalyze.add(initializerBody);
}
}
for (JetProperty property : body.getProperties()) {
JetExpression initializer = property.getInitializer();
idea/src/org/jetbrains/kotlin/idea/quickfix/AddInitKeywordFix.kt
+1 -1
View File
@@ -44,7 +44,7 @@ public class AddInitKeywordFix(element: JetClassInitializer) : JetIntentionActio
val psiFactory = JetPsiFactory(file)
val initKeyword = psiFactory.createInitKeyword()
val anchor = element.getBody()
val anchor = element.getBody() ?: return
element.addBefore(initKeyword, anchor)
element.addBefore(psiFactory.createWhiteSpace(), anchor)
js/js.translator/src/org/jetbrains/kotlin/js/translate/initializer/InitializerVisitor.java
+4 -1
View File
@@ -58,7 +58,10 @@ public final class InitializerVisitor extends TranslatorVisitor<Void> {
@Override
public Void visitAnonymousInitializer(@NotNull JetClassInitializer initializer, @NotNull TranslationContext context) {
result.add(translateAsStatementAndMergeInBlockIfNeeded(initializer.getBody(), context));
JetExpression initializerBody = initializer.getBody();
if (initializerBody != null) {
result.add(translateAsStatementAndMergeInBlockIfNeeded(initializerBody, context));
}
return null;
}