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

Partial body resolve: to take source Kotlin callables with Nothing type from caches

Browse Source
This commit is contained in:
Valentin Kipyatkov
2014-11-19 18:41:58 +03:00
parent 992cdd9fe2
commit e5579bcf32
23 changed files with 301 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/KotlinFunctionStub.java
+2
View File
@@ -28,4 +28,6 @@ public interface KotlinFunctionStub extends KotlinStubWithFqName<JetNamedFunctio
boolean hasBody();
boolean hasTypeParameterListBeforeFunctionName();
boolean isPossiblyNothingType();
}
compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/KotlinPropertyStub.java
+2
View File
@@ -26,4 +26,6 @@ public interface KotlinPropertyStub extends KotlinStubWithFqName<JetProperty> {
boolean hasInitializer();
boolean hasReceiverTypeRef();
boolean hasReturnTypeRef();
boolean isPossiblyNothingType();
}
compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetFileElementType.java
+1 -1
View File
@@ -36,7 +36,7 @@ import org.jetbrains.jet.plugin.JetLanguage;
import java.io.IOException;
public class JetFileElementType extends IStubFileElementType<KotlinFileStub> {
public static final int STUB_VERSION = 30;
public static final int STUB_VERSION = 31;
public JetFileElementType() {
super("jet.FILE", JetLanguage.INSTANCE);
compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetFunctionElementType.java
+7 -4
View File
@@ -23,8 +23,7 @@ import com.intellij.psi.stubs.StubOutputStream;
import com.intellij.util.io.StringRef;
import org.jetbrains.annotations.NonNls;
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.*;
import org.jetbrains.jet.lang.psi.stubs.KotlinFunctionStub;
import org.jetbrains.jet.lang.psi.stubs.impl.KotlinFunctionStubImpl;
import org.jetbrains.jet.lang.resolve.lazy.ResolveSessionUtils;
@@ -45,8 +44,10 @@ public class JetFunctionElementType extends JetStubElementType<KotlinFunctionStu
FqName fqName = ResolveSessionUtils.safeFqNameForLazyResolve(psi);
boolean hasBlockBody = psi.hasBlockBody();
boolean hasBody = psi.hasBody();
boolean isNothing = ElementsPackage.isPossiblyNothing(psi.getTypeReference());
return new KotlinFunctionStubImpl(parentStub, StringRef.fromString(psi.getName()), isTopLevel, fqName,
isExtension, hasBlockBody, hasBody, psi.hasTypeParameterListBeforeFunctionName());
isExtension, hasBlockBody, hasBody, psi.hasTypeParameterListBeforeFunctionName(),
isNothing);
}
@Override
@@ -61,6 +62,7 @@ public class JetFunctionElementType extends JetStubElementType<KotlinFunctionStu
dataStream.writeBoolean(stub.hasBlockBody());
dataStream.writeBoolean(stub.hasBody());
dataStream.writeBoolean(stub.hasTypeParameterListBeforeFunctionName());
dataStream.writeBoolean(stub.isPossiblyNothingType());
}
@NotNull
@@ -76,9 +78,10 @@ public class JetFunctionElementType extends JetStubElementType<KotlinFunctionStu
boolean hasBlockBody = dataStream.readBoolean();
boolean hasBody = dataStream.readBoolean();
boolean hasTypeParameterListBeforeFunctionName = dataStream.readBoolean();
boolean possiblyNothingType = dataStream.readBoolean();
return new KotlinFunctionStubImpl(parentStub, name, isTopLevel, fqName, isExtension, hasBlockBody, hasBody,
hasTypeParameterListBeforeFunctionName);
hasTypeParameterListBeforeFunctionName, possiblyNothingType);
}
@Override
compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetPropertyElementType.java
+5 -1
View File
@@ -47,6 +47,7 @@ public class JetPropertyElementType extends JetStubElementType<KotlinPropertyStu
psi.isVar(), psi.isTopLevel(), psi.hasDelegate(),
psi.hasDelegateExpression(), psi.hasInitializer(),
psi.getReceiverTypeReference() != null, psi.getTypeReference() != null,
ElementsPackage.isPossiblyNothing(psi.getTypeReference()),
ResolveSessionUtils.safeFqNameForLazyResolve(psi)
);
}
@@ -61,6 +62,7 @@ public class JetPropertyElementType extends JetStubElementType<KotlinPropertyStu
dataStream.writeBoolean(stub.hasInitializer());
dataStream.writeBoolean(stub.hasReceiverTypeRef());
dataStream.writeBoolean(stub.hasReturnTypeRef());
dataStream.writeBoolean(stub.isPossiblyNothingType());
FqName fqName = stub.getFqName();
dataStream.writeName(fqName != null ? fqName.asString() : null);
@@ -77,12 +79,14 @@ public class JetPropertyElementType extends JetStubElementType<KotlinPropertyStu
boolean hasInitializer = dataStream.readBoolean();
boolean hasReceiverTypeRef = dataStream.readBoolean();
boolean hasReturnTypeRef = dataStream.readBoolean();
boolean possiblyNothing = dataStream.readBoolean();
StringRef fqNameAsString = dataStream.readName();
FqName fqName = fqNameAsString != null ? new FqName(fqNameAsString.toString()) : null;
return new KotlinPropertyStubImpl(parentStub, name, isVar, isTopLevel, hasDelegate,
hasDelegateExpression, hasInitializer, hasReceiverTypeRef, hasReturnTypeRef, fqName);
hasDelegateExpression, hasInitializer, hasReceiverTypeRef, hasReturnTypeRef, possiblyNothing,
fqName);
}
@Override
compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/Util.kt
+23
View File
@@ -0,0 +1,23 @@
/*
* Copyright 2010-2014 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jetbrains.jet.lang.psi.stubs.elements
import org.jetbrains.jet.lang.psi.JetUserType
import org.jetbrains.jet.lang.psi.JetTypeReference
fun JetTypeReference?.isPossiblyNothing()
= (this?.getTypeElement() as? JetUserType)?.getReferencedName() == "Nothing"
compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/KotlinFunctionStubImpl.java
+9 -1
View File
@@ -34,6 +34,7 @@ public class KotlinFunctionStubImpl extends KotlinStubBaseImpl<JetNamedFunction>
private final boolean hasBlockBody;
private final boolean hasBody;
private final boolean hasTypeParameterListBeforeFunctionName;
private final boolean possiblyNothingType;
public KotlinFunctionStubImpl(
@NotNull StubElement parent,
@@ -43,7 +44,8 @@ public class KotlinFunctionStubImpl extends KotlinStubBaseImpl<JetNamedFunction>
boolean isExtension,
boolean hasBlockBody,
boolean hasBody,
boolean hasTypeParameterListBeforeFunctionName
boolean hasTypeParameterListBeforeFunctionName,
boolean possiblyNothingType
) {
super(parent, JetStubElementTypes.FUNCTION);
@@ -58,6 +60,7 @@ public class KotlinFunctionStubImpl extends KotlinStubBaseImpl<JetNamedFunction>
this.hasBlockBody = hasBlockBody;
this.hasBody = hasBody;
this.hasTypeParameterListBeforeFunctionName = hasTypeParameterListBeforeFunctionName;
this.possiblyNothingType = possiblyNothingType;
}
@Override
@@ -95,4 +98,9 @@ public class KotlinFunctionStubImpl extends KotlinStubBaseImpl<JetNamedFunction>
public FqName getFqName() {
return fqName;
}
@Override
public boolean isPossiblyNothingType() {
return possiblyNothingType;
}
}
compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/KotlinPropertyStubImpl.java
+8
View File
@@ -33,6 +33,7 @@ public class KotlinPropertyStubImpl extends KotlinStubBaseImpl<JetProperty> impl
private final boolean hasInitializer;
private final boolean hasReceiverTypeRef;
private final boolean hasReturnTypeRef;
private final boolean possiblyNothingType;
private final FqName fqName;
public KotlinPropertyStubImpl(
@@ -45,6 +46,7 @@ public class KotlinPropertyStubImpl extends KotlinStubBaseImpl<JetProperty> impl
boolean hasInitializer,
boolean hasReceiverTypeRef,
boolean hasReturnTypeRef,
boolean possiblyNothingType,
@Nullable FqName fqName
) {
super(parent, JetStubElementTypes.PROPERTY);
@@ -64,6 +66,7 @@ public class KotlinPropertyStubImpl extends KotlinStubBaseImpl<JetProperty> impl
this.hasInitializer = hasInitializer;
this.hasReceiverTypeRef = hasReceiverTypeRef;
this.hasReturnTypeRef = hasReturnTypeRef;
this.possiblyNothingType = possiblyNothingType;
this.fqName = fqName;
}
@@ -102,6 +105,11 @@ public class KotlinPropertyStubImpl extends KotlinStubBaseImpl<JetProperty> impl
return hasReturnTypeRef;
}
@Override
public boolean isPossiblyNothingType() {
return possiblyNothingType;
}
@Nullable
@Override
public FqName getFqName() {