Remove obsolete SCRIPT markers

2015-10-29 22:03:58 +03:00
parent c75d96b82c
commit b5f89100f6
27 changed files with 15 additions and 56 deletions
@@ -155,7 +155,6 @@ public interface KtNodeTypes {

    IElementType PACKAGE_DIRECTIVE = KtStubElementTypes.PACKAGE_DIRECTIVE;

-    // SCRIPT: script node type
    KtNodeType SCRIPT = new KtNodeType("SCRIPT", KtScript.class);

    IFileElementType TYPE_CODE_FRAGMENT = new KtTypeCodeFragmentType();
@@ -172,7 +172,6 @@ public class KtFile extends PsiFileBase implements KtDeclarationContainer, KtAnn
    @Override
    public void setPackageName(String packageName) { }

-    // SCRIPT: find script in file
    @Nullable
    public KtScript getScript() {
        return PsiTreeUtil.getChildOfType(this, KtScript.class);
@@ -280,12 +280,10 @@ public class KtPsiUtil {
        return qualifiedParent.getReceiverExpression() == expression || isLHSOfDot(qualifiedParent);
    }

-    // SCRIPT: is declaration in script?
    public static boolean isScriptDeclaration(@NotNull KtDeclaration namedDeclaration) {
        return getScript(namedDeclaration) != null;
    }

-    // SCRIPT: get script from top-level declaration
    @Nullable
    public static KtScript getScript(@NotNull KtDeclaration namedDeclaration) {
        PsiElement parent = namedDeclaration.getParent();
@@ -22,7 +22,6 @@ import org.jetbrains.annotations.NotNull;

 import java.util.List;

-// SCRIPT: Script declaration
 public class KtScript extends KtDeclarationImpl implements KtDeclarationContainer {

    public KtScript(@NotNull ASTNode node) {
@@ -23,13 +23,11 @@ import com.intellij.psi.stubs.PsiFileStubImpl
 import com.intellij.psi.tree.IStubFileElementType
 import com.intellij.util.io.StringRef
 import org.jetbrains.kotlin.name.FqName
-import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.psi.stubs.KotlinFileStub
 import org.jetbrains.kotlin.psi.stubs.KotlinImportDirectiveStub
 import org.jetbrains.kotlin.psi.stubs.elements.KtStubElementTypes

-// SCRIPT: PsiJetFileStubImpl knows about scripting
 public open class KotlinFileStubImpl(
        jetFile: KtFile?,
        private val packageName: StringRef,
@@ -112,7 +112,6 @@ public class BodyResolver {

        resolveFunctionBodies(c);

-        // SCRIPT: resolve script bodies
        scriptBodyResolverResolver.resolveScriptBodies(c);

        if (!c.getTopDownAnalysisMode().isLocalDeclarations()) {
@@ -649,7 +649,6 @@ public class DescriptorResolver {
        DeclarationDescriptor containingDeclaration = scope.getOwnerDescriptor();
        VariableDescriptor result;
        KotlinType type;
-        // SCRIPT: Create property descriptors
        if (KtPsiUtil.isScriptDeclaration(variable)) {
            PropertyDescriptorImpl propertyDescriptor = PropertyDescriptorImpl.create(
                    containingDeclaration,
@@ -33,10 +33,8 @@ import java.util.Map;

 import static org.jetbrains.kotlin.types.TypeUtils.NO_EXPECTED_TYPE;

-// SCRIPT: resolve symbols in scripts
 public class ScriptBodyResolver {
-
-    @NotNull private final ExpressionTypingServices expressionTypingServices;
+    private final ExpressionTypingServices expressionTypingServices;

    public ScriptBodyResolver(
            @NotNull ExpressionTypingServices expressionTypingServices
@@ -20,7 +20,6 @@ import com.intellij.openapi.util.Key;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.psi.KtScript;

-// SCRIPT: Resolve declarations in scripts
 public class ScriptPriorities {

    public static final Key<Integer> PRIORITY_KEY = Key.create(KtScript.class.getName() + ".priority");
@@ -158,7 +158,6 @@ public class TopDownAnalysisContext implements BodiesResolveContext {

    @NotNull
    public Collection<ClassDescriptorWithResolutionScopes> getAllClasses() {
-        // SCRIPT: all classes are declared classes + script classes
        Collection<ClassDescriptorWithResolutionScopes> scriptClasses = CollectionsKt.map(
                getScripts().values(),
                new Function1<ScriptDescriptor, ClassDescriptorWithResolutionScopes>() {
@@ -33,8 +33,8 @@ import org.jetbrains.kotlin.resolve.DescriptorUtils;
 import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilKt;
 import org.jetbrains.kotlin.resolve.calls.context.ResolutionContext;
 import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall;
-import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt;
 import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowValue.Kind;
+import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt;
 import org.jetbrains.kotlin.resolve.scopes.receivers.*;
 import org.jetbrains.kotlin.types.KotlinType;
 import org.jetbrains.kotlin.types.TypeUtils;
@@ -125,7 +125,6 @@ public class DataFlowValueFactory {
            @NotNull DeclarationDescriptor containingDeclarationOrModule
    ) {
        if (receiverValue instanceof TransientReceiver || receiverValue instanceof ScriptReceiver) {
-            // SCRIPT: smartcasts data flow
            KotlinType type = receiverValue.getType();
            return new DataFlowValue(receiverValue, type, STABLE_VALUE, getImmanentNullability(type));
        }
@@ -55,7 +55,6 @@ protected constructor(

    private fun resolveClassDescriptor(name: Name): List<ClassDescriptor> {
        return declarationProvider.getClassOrObjectDeclarations(name).map {
-            // SCRIPT: Creating a script class
            if (it is JetScriptInfo)
                LazyScriptClassDescriptor(c as ResolveSession, thisDescriptor, name, it)
            else
@@ -30,7 +30,6 @@ import org.jetbrains.kotlin.resolve.lazy.declarations.ClassMemberDeclarationProv
 import org.jetbrains.kotlin.storage.NotNullLazyValue
 import org.jetbrains.kotlin.utils.toReadOnlyList

-// SCRIPT: Members of a script class
 public class LazyScriptClassMemberScope protected constructor(
        private val resolveSession: ResolveSession,
        declarationProvider: ClassMemberDeclarationProvider,
@@ -21,17 +21,13 @@ import org.jetbrains.kotlin.descriptors.ScriptDescriptor;
 import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt;
 import org.jetbrains.kotlin.types.KotlinType;

-// SCRIPT: script receiver
 public class ScriptReceiver implements ThisReceiver {
-
-    @NotNull
    private final ScriptDescriptor scriptDescriptor;

    public ScriptReceiver(@NotNull ScriptDescriptor scriptDescriptor) {
        this.scriptDescriptor = scriptDescriptor;
    }

-
    @NotNull
    @Override
    public ScriptDescriptor getDeclarationDescriptor() {
@@ -159,7 +159,6 @@ public class ExpressionTypingServices {
    ) {
        List<KtExpression> block = StatementFilterKt.filterStatements(statementFilter, expression);

-        // SCRIPT: get code descriptor for script declaration
        DeclarationDescriptor containingDescriptor = context.scope.getOwnerDescriptor();
        if (containingDescriptor instanceof ScriptDescriptor) {
            if (!(expression.getParent() instanceof KtScript)) {