From b5f89100f6bd551d81dd5bbca2e188d7894abe67 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Thu, 29 Oct 2015 22:03:58 +0300 Subject: [PATCH] Remove obsolete SCRIPT markers --- .../kotlin/codegen/ExpressionCodegen.java | 3 --- .../kotlin/codegen/KotlinCodegenFacade.java | 7 ++++--- .../kotlin/codegen/MultifileClassCodegen.kt | 15 ++++++--------- .../jetbrains/kotlin/codegen/PackageCodegen.java | 1 - .../jetbrains/kotlin/codegen/ScriptCodegen.java | 1 - .../codegen/binding/CodegenAnnotatingVisitor.java | 2 +- .../kotlin/codegen/binding/CodegenBinding.java | 8 ++------ .../kotlin/codegen/context/CodegenContext.java | 2 -- .../kotlin/codegen/context/ScriptContext.java | 1 - .../src/org/jetbrains/kotlin/KtNodeTypes.java | 1 - .../src/org/jetbrains/kotlin/psi/KtFile.java | 1 - .../src/org/jetbrains/kotlin/psi/KtPsiUtil.java | 2 -- .../src/org/jetbrains/kotlin/psi/KtScript.java | 1 - .../kotlin/psi/stubs/impl/KotlinFileStubImpl.kt | 2 -- .../jetbrains/kotlin/resolve/BodyResolver.java | 1 - .../kotlin/resolve/DescriptorResolver.java | 1 - .../kotlin/resolve/ScriptBodyResolver.java | 4 +--- .../kotlin/resolve/ScriptPriorities.java | 1 - .../kotlin/resolve/TopDownAnalysisContext.java | 1 - .../calls/smartcasts/DataFlowValueFactory.java | 3 +-- .../lazy/descriptors/AbstractLazyMemberScope.kt | 1 - .../descriptors/LazyScriptClassMemberScope.kt | 1 - .../resolve/scopes/receivers/ScriptReceiver.java | 4 ---- .../expressions/ExpressionTypingServices.java | 1 - .../kotlin/codegen/CodegenTestFiles.java | 1 - .../resolve/IDELightClassGenerationSupport.kt | 4 ---- .../jetbrains/kotlin/idea/formatter/JetBlock.java | 1 - 27 files changed, 15 insertions(+), 56 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java index 4bf346f2ba9..ce5dd2e4c2f 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java @@ -2579,7 +2579,6 @@ public class ExpressionCodegen extends KtVisitor impleme } } else if (receiverValue instanceof ScriptReceiver) { - // SCRIPT: generate script return generateScript((ScriptReceiver) receiverValue); } else if (receiverValue instanceof ExtensionReceiver) { @@ -2598,7 +2597,6 @@ public class ExpressionCodegen extends KtVisitor impleme return context.generateReceiver(descriptor, state, false); } - // SCRIPT: generate script, move to ScriptingUtil private StackValue generateScript(@NotNull ScriptReceiver receiver) { CodegenContext cur = context; StackValue result = StackValue.LOCAL_0; @@ -3393,7 +3391,6 @@ public class ExpressionCodegen extends KtVisitor impleme Type varType = asmType(variableDescriptor.getType()); StackValue storeTo; - // SCRIPT: Variable at the top of the script is generated as field if (KtPsiUtil.isScriptDeclaration(variableDeclaration)) { KtScript scriptPsi = KtPsiUtil.getScript(variableDeclaration); assert scriptPsi != null; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/KotlinCodegenFacade.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/KotlinCodegenFacade.java index 19a45fbee0d..75ae8925781 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/KotlinCodegenFacade.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/KotlinCodegenFacade.java @@ -21,14 +21,16 @@ import com.intellij.util.containers.MultiMap; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.fileClasses.JvmFileClassInfo; -import org.jetbrains.kotlin.progress.ProgressIndicatorAndCompilationCanceledStatus; import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.progress.ProgressIndicatorAndCompilationCanceledStatus; import org.jetbrains.kotlin.psi.KtFile; import org.jetbrains.kotlin.psi.KtScript; import org.jetbrains.kotlin.resolve.ScriptNameUtil; import org.jetbrains.org.objectweb.asm.Type; -import java.util.*; +import java.util.Collection; +import java.util.HashSet; +import java.util.Set; import static org.jetbrains.kotlin.codegen.binding.CodegenBinding.registerClassNameForScript; @@ -37,7 +39,6 @@ public class KotlinCodegenFacade { public static void prepareForCompilation(@NotNull GenerationState state) { for (KtFile file : state.getFiles()) { if (file.isScript()) { - // SCRIPT: register class name for scripting from this file, move outside of this function KtScript script = file.getScript(); assert script != null; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/MultifileClassCodegen.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/MultifileClassCodegen.kt index 4c6d18deaa8..03b3c29558c 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/MultifileClassCodegen.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/MultifileClassCodegen.kt @@ -162,17 +162,14 @@ public class MultifileClassCodegen( val partContext = state.rootContext.intoMultifileClassPart(packageFragment, facadeClassType, partType, file) for (declaration in file.declarations) { - if (declaration is KtProperty || declaration is KtNamedFunction) { - generatePart = true - } - else if (declaration is KtClassOrObject) { - if (state.generateDeclaredClassFilter.shouldGenerateClass(declaration)) { + when (declaration) { + is KtProperty, is KtNamedFunction -> { + generatePart = true + } + is KtClassOrObject -> if (state.generateDeclaredClassFilter.shouldGenerateClass(declaration)) { generateClassOrObject(declaration, partContext) } - } - else if (declaration is KtScript) { - // SCRIPT: generate script code, should be separate execution branch - if (state.generateDeclaredClassFilter.shouldGenerateScript(declaration)) { + is KtScript -> if (state.generateDeclaredClassFilter.shouldGenerateScript(declaration)) { ScriptCodegen.createScriptCodegen(declaration, state, partContext).generate() } } diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/PackageCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/PackageCodegen.java index 9ddd394f816..cd961ac6446 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/PackageCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/PackageCodegen.java @@ -101,7 +101,6 @@ public class PackageCodegen { else if (declaration instanceof KtScript) { KtScript script = (KtScript) declaration; - // SCRIPT: generate script code, should be separate execution branch if (state.getGenerateDeclaredClassFilter().shouldGenerateScript(script)) { ScriptCodegen.createScriptCodegen(script, state, packagePartContext).generate(); } diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ScriptCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ScriptCodegen.java index 8f3c911138b..2243b03a894 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ScriptCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ScriptCodegen.java @@ -44,7 +44,6 @@ import static org.jetbrains.kotlin.resolve.jvm.AsmTypes.OBJECT_TYPE; import static org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin.NO_ORIGIN; import static org.jetbrains.org.objectweb.asm.Opcodes.*; -// SCRIPT: script code generator public class ScriptCodegen extends MemberCodegen { public static ScriptCodegen createScriptCodegen( diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenAnnotatingVisitor.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenAnnotatingVisitor.java index 569069f03f0..fbfa08c7c58 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenAnnotatingVisitor.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenAnnotatingVisitor.java @@ -161,7 +161,7 @@ class CodegenAnnotatingVisitor extends KtVisitorVoid { @Override public void visitJetFile(@NotNull KtFile file) { if (file.isScript()) { - // SCRIPT: should be replaced with VisitScript override + // TODO: replace with visitScript override //noinspection ConstantConditions ClassDescriptor classDescriptor = bindingContext.get(CLASS_FOR_SCRIPT, bindingContext.get(SCRIPT, file.getScript())); classStack.push(classDescriptor); diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenBinding.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenBinding.java index 38e45161acd..48e5974ff2a 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenBinding.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenBinding.java @@ -89,7 +89,6 @@ public class CodegenBinding { return Boolean.TRUE.equals(bindingContext.get(ENUM_ENTRY_CLASS_NEED_SUBCLASS, classDescriptor)); } - // SCRIPT: Generate asmType for script, move to ScriptingUtil @NotNull public static Type asmTypeForScriptDescriptor(BindingContext bindingContext, @NotNull ScriptDescriptor scriptDescriptor) { ClassDescriptor classDescriptor = bindingContext.get(CLASS_FOR_SCRIPT, scriptDescriptor); @@ -97,7 +96,6 @@ public class CodegenBinding { return getAsmType(bindingContext, classDescriptor); } - // SCRIPT: Generate asmType for script, move to ScriptingUtil @NotNull public static Type asmTypeForScriptPsi(BindingContext bindingContext, @NotNull KtScript script) { ScriptDescriptor scriptDescriptor = bindingContext.get(SCRIPT, script); @@ -198,7 +196,6 @@ public class CodegenBinding { innerClasses.add(inner); } - // SCRIPT: register asmType for script, move to ScriptingUtil public static void registerClassNameForScript( @NotNull BindingTrace trace, @NotNull KtScript script, @@ -227,15 +224,14 @@ public class CodegenBinding { // todo: we use Set and add given files but ignoring other scripts because something non-clear kept in binding // for scripts especially in case of REPL - // SCRIPT: collect fq names for files that are not scripts - HashSet names = new HashSet(); + Set names = new HashSet(); for (KtFile file : files) { if (!file.isScript()) { names.add(file.getPackageFqName()); } } - HashSet answer = new HashSet(); + Set answer = new HashSet(); answer.addAll(files); for (FqName name : names) { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/CodegenContext.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/CodegenContext.java index 39336d90879..97eca2a117f 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/CodegenContext.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/CodegenContext.java @@ -32,7 +32,6 @@ import org.jetbrains.kotlin.resolve.DescriptorUtils; import org.jetbrains.kotlin.storage.LockBasedStorageManager; import org.jetbrains.kotlin.storage.NullableLazyValue; import org.jetbrains.kotlin.types.KotlinType; -import org.jetbrains.kotlin.types.TypeUtils; import org.jetbrains.org.objectweb.asm.Type; import java.util.*; @@ -312,7 +311,6 @@ public abstract class CodegenContext { return new ConstructorContext(descriptor, getContextKind(), this, closure); } - // SCRIPT: generate into script, move to ScriptingUtil @NotNull public ScriptContext intoScript( @NotNull ScriptDescriptor script, diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/ScriptContext.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/ScriptContext.java index 9db829601c3..fc84e4f0e55 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/ScriptContext.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/ScriptContext.java @@ -25,7 +25,6 @@ import org.jetbrains.kotlin.descriptors.ScriptDescriptor; import java.util.List; -// SCRIPT: script as field owner context public class ScriptContext extends FieldOwnerContext { private final ScriptDescriptor scriptDescriptor; private final List earlierScripts; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/KtNodeTypes.java b/compiler/frontend/src/org/jetbrains/kotlin/KtNodeTypes.java index 1e992aa02ba..57e704170e4 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/KtNodeTypes.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/KtNodeTypes.java @@ -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(); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtFile.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtFile.java index 4263a3654b3..f98e3038352 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtFile.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtFile.java @@ -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); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtPsiUtil.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtPsiUtil.java index 2b1636d9633..d3e7ddf59bc 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtPsiUtil.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtPsiUtil.java @@ -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(); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtScript.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtScript.java index 05d218db914..5d30a736662 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtScript.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtScript.java @@ -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) { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinFileStubImpl.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinFileStubImpl.kt index 0d722b13697..f5cee23e081 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinFileStubImpl.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinFileStubImpl.kt @@ -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, diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java index 2d2c633de56..8d4d9f68ebc 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java @@ -112,7 +112,6 @@ public class BodyResolver { resolveFunctionBodies(c); - // SCRIPT: resolve script bodies scriptBodyResolverResolver.resolveScriptBodies(c); if (!c.getTopDownAnalysisMode().isLocalDeclarations()) { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java index fd342ec7fc3..f69a782e74c 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java @@ -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, diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/ScriptBodyResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ScriptBodyResolver.java index 5f0c5d079f1..b6cc5d4308d 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/ScriptBodyResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ScriptBodyResolver.java @@ -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 diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/ScriptPriorities.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ScriptPriorities.java index 6720d1a7504..efae36e86bf 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/ScriptPriorities.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ScriptPriorities.java @@ -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 PRIORITY_KEY = Key.create(KtScript.class.getName() + ".priority"); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TopDownAnalysisContext.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TopDownAnalysisContext.java index db1053a3984..16c84b25b39 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TopDownAnalysisContext.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TopDownAnalysisContext.java @@ -158,7 +158,6 @@ public class TopDownAnalysisContext implements BodiesResolveContext { @NotNull public Collection getAllClasses() { - // SCRIPT: all classes are declared classes + script classes Collection scriptClasses = CollectionsKt.map( getScripts().values(), new Function1() { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/DataFlowValueFactory.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/DataFlowValueFactory.java index 567b817691b..e02fc5ce1b3 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/DataFlowValueFactory.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/DataFlowValueFactory.java @@ -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)); } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/AbstractLazyMemberScope.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/AbstractLazyMemberScope.kt index 5f31030e7f1..1e2868d44fe 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/AbstractLazyMemberScope.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/AbstractLazyMemberScope.kt @@ -55,7 +55,6 @@ protected constructor( private fun resolveClassDescriptor(name: Name): List { return declarationProvider.getClassOrObjectDeclarations(name).map { - // SCRIPT: Creating a script class if (it is JetScriptInfo) LazyScriptClassDescriptor(c as ResolveSession, thisDescriptor, name, it) else diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyScriptClassMemberScope.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyScriptClassMemberScope.kt index 1e8959374e0..89ae34ec6df 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyScriptClassMemberScope.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyScriptClassMemberScope.kt @@ -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, diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/receivers/ScriptReceiver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/receivers/ScriptReceiver.java index 7560e9b8d45..5eb11a6d647 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/receivers/ScriptReceiver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/receivers/ScriptReceiver.java @@ -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() { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingServices.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingServices.java index 49d6e11f31b..3360f017e2b 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingServices.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingServices.java @@ -159,7 +159,6 @@ public class ExpressionTypingServices { ) { List 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)) { diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestFiles.java b/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestFiles.java index 6ec066b0c76..9dbb6254426 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestFiles.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestFiles.java @@ -120,7 +120,6 @@ public class CodegenTestFiles { List scriptParameterTypes = Lists.newArrayList(); List scriptParameterValues = Lists.newArrayList(); - // SCRIPT: extract script params, move to ScriptingUtil if (file.isScript()) { Pattern scriptParametersPattern = Pattern.compile("param: (\\S+): (\\S+): (\\S.*)"); Matcher scriptParametersMatcher = scriptParametersPattern.matcher(file.getText()); diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.kt index ffd8ce84b79..5b8d2c64721 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.kt @@ -37,8 +37,6 @@ import org.jetbrains.kotlin.idea.stubindex.* import org.jetbrains.kotlin.idea.stubindex.JetSourceFilterScope.kotlinSourceAndClassFiles import org.jetbrains.kotlin.idea.util.ProjectRootsUtil import org.jetbrains.kotlin.incremental.components.NoLookupLocation -import org.jetbrains.kotlin.load.kotlin.PackageClassUtils -import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.psiUtil.getElementTextWithContext @@ -205,10 +203,8 @@ public class IDELightClassGenerationSupport(private val project: Project) : Ligh } } - private fun forceResolvePackageDeclarations(files: Collection, session: ResolveSession) { for (file in files) { - // SCRIPT: not supported if (file.isScript) continue val packageFqName = file.packageFqName diff --git a/idea/src/org/jetbrains/kotlin/idea/formatter/JetBlock.java b/idea/src/org/jetbrains/kotlin/idea/formatter/JetBlock.java index 49eb6e08cf7..13e1457e2ed 100644 --- a/idea/src/org/jetbrains/kotlin/idea/formatter/JetBlock.java +++ b/idea/src/org/jetbrains/kotlin/idea/formatter/JetBlock.java @@ -436,7 +436,6 @@ public class JetBlock extends AbstractBlock { ASTNode childParent = child.getTreeParent(); IElementType childType = child.getElementType(); - // SCRIPT: Avoid indenting script top BLOCK contents if (childParent != null && childParent.getTreeParent() != null) { if (childParent.getElementType() == BLOCK && childParent.getTreeParent().getElementType() == SCRIPT) { return Indent.getNoneIndent();