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

Remove deprecated declarations from project code, cleanup usages

Browse Source
This commit is contained in:
Alexander Udalov
2017-03-21 12:39:30 +03:00
parent 6a049c9ab5
commit 579238c3be
16 changed files with 18 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/context/context.kt
-1
View File
@@ -95,7 +95,6 @@ fun ModuleContext(module: ModuleDescriptor, project: Project): ModuleContext =
fun GlobalContext.withProject(project: Project): ProjectContext = ProjectContextImpl(project, this)
fun ProjectContext.withModule(module: ModuleDescriptor): ModuleContext = ModuleContextImpl(module, this)
@JvmOverloads
fun ContextForNewModule(
projectContext: ProjectContext,
moduleName: Name,
compiler/frontend/src/org/jetbrains/kotlin/psi/KtFile.java
+2 -3
View File
@@ -21,13 +21,13 @@ import com.intellij.lang.ASTNode;
import com.intellij.lang.FileASTNode;
import com.intellij.openapi.components.ServiceManager;
import com.intellij.openapi.fileTypes.FileType;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.*;
import com.intellij.psi.stubs.StubElement;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.util.FileContentUtilCore;
import com.intellij.util.IncorrectOperationException;
import kotlin.collections.ArraysKt;
import kotlin.collections.CollectionsKt;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -39,7 +39,6 @@ import org.jetbrains.kotlin.parsing.KotlinParserDefinition;
import org.jetbrains.kotlin.psi.stubs.KotlinFileStub;
import org.jetbrains.kotlin.psi.stubs.elements.KtPlaceHolderStubElementType;
import org.jetbrains.kotlin.psi.stubs.elements.KtStubElementTypes;
import org.jetbrains.kotlin.utils.CollectionsKt;
import java.util.Arrays;
import java.util.Collections;
@@ -279,7 +278,7 @@ public class KtFile extends PsiFileBase implements KtDeclarationContainer, KtAnn
PsiElement result = super.setName(name);
boolean willBeScript = name.endsWith(KotlinParserDefinition.STD_SCRIPT_EXT);
if (isScript() != willBeScript) {
FileContentUtilCore.reparseFiles(CollectionsKt.<VirtualFile>singletonOrEmptyList(getVirtualFile()));
FileContentUtilCore.reparseFiles(CollectionsKt.listOfNotNull(getVirtualFile()));
}
return result;
}
compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingContextUtils.kt
-2
View File
@@ -37,8 +37,6 @@ import org.jetbrains.kotlin.types.expressions.typeInfoFactory.noTypeInfo
import org.jetbrains.kotlin.types.typeUtil.makeNotNullable
import org.jetbrains.kotlin.util.slicedMap.ReadOnlySlice
operator fun <K, V: Any> BindingContext.get(slice: ReadOnlySlice<K, V>, key: K): V? = get(slice, key)
fun KtReturnExpression.getTargetFunctionDescriptor(context: BindingContext): FunctionDescriptor? {
val targetLabel = getTargetLabel()
if (targetLabel != null) return context[LABEL_TARGET, targetLabel]?.let { context[FUNCTION, it] }
compiler/frontend/src/org/jetbrains/kotlin/script/KotlinScriptDefinitionFromAnnotatedTemplate.kt
+1 -1
View File
@@ -95,7 +95,7 @@ open class KotlinScriptDefinitionFromAnnotatedTemplate(
}
fun makeScriptContents() = BasicScriptContents(file, getAnnotations = {
val classLoader = (template as Any)::class.java.classLoader
val classLoader = template::class.java.classLoader
try {
getAnnotationEntries(file, project)
.mapNotNull { psiAnn ->