From 48f2fd8607b5504fba70af1e9155d6c70f3d4ea8 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Mon, 5 Mar 2018 12:39:09 +0300 Subject: [PATCH] Add explicit set of supported file types to KotlinPositionManager --- .../kotlin/idea/debugger/KotlinPositionManager.kt | 4 ++++ .../org/jetbrains/kotlin/idea/KotlinFileTypeFactory.java | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/KotlinPositionManager.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/KotlinPositionManager.kt index 13b9be57fc9..32d24bc6327 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/KotlinPositionManager.kt +++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/KotlinPositionManager.kt @@ -26,6 +26,7 @@ import com.intellij.debugger.engine.evaluation.EvaluationContext import com.intellij.debugger.impl.DebuggerUtilsEx import com.intellij.debugger.jdi.StackFrameProxyImpl import com.intellij.debugger.requests.ClassPrepareRequestor +import com.intellij.openapi.fileTypes.FileType import com.intellij.openapi.project.DumbService import com.intellij.openapi.roots.ProjectRootManager import com.intellij.openapi.util.Computable @@ -44,6 +45,7 @@ import com.sun.jdi.ReferenceType import com.sun.jdi.request.ClassPrepareRequest import org.jetbrains.kotlin.codegen.inline.KOTLIN_STRATA_NAME import org.jetbrains.kotlin.fileClasses.JvmFileClassUtil +import org.jetbrains.kotlin.idea.KotlinFileTypeFactory import org.jetbrains.kotlin.idea.codeInsight.CodeInsightUtils import org.jetbrains.kotlin.idea.debugger.breakpoints.getLambdasAtLineIfAny import org.jetbrains.kotlin.idea.debugger.evaluate.KotlinCodeFragmentFactory @@ -85,6 +87,8 @@ class KotlinPositionManager(private val myDebugProcess: DebugProcess) : MultiReq allKotlinFilesScope ) + override fun getAcceptedFileTypes(): Set = KotlinFileTypeFactory.KOTLIN_FILE_TYPES_SET + override fun evaluateCondition(context: EvaluationContext, frame: StackFrameProxyImpl, location: Location, expression: String): ThreeState? { return ThreeState.UNSURE } diff --git a/idea/src/org/jetbrains/kotlin/idea/KotlinFileTypeFactory.java b/idea/src/org/jetbrains/kotlin/idea/KotlinFileTypeFactory.java index 37d98c456ec..ffbaf49c112 100644 --- a/idea/src/org/jetbrains/kotlin/idea/KotlinFileTypeFactory.java +++ b/idea/src/org/jetbrains/kotlin/idea/KotlinFileTypeFactory.java @@ -16,13 +16,20 @@ package org.jetbrains.kotlin.idea; +import com.intellij.openapi.fileTypes.FileType; import com.intellij.openapi.fileTypes.FileTypeConsumer; import com.intellij.openapi.fileTypes.FileTypeFactory; import org.jetbrains.annotations.NotNull; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; + public class KotlinFileTypeFactory extends FileTypeFactory { public final static String[] KOTLIN_EXTENSIONS = new String[] { "kt", "kts" }; + private final static FileType[] KOTLIN_FILE_TYPES = new FileType[] { KotlinFileType.INSTANCE }; + public final static Set KOTLIN_FILE_TYPES_SET = new HashSet<>(Arrays.asList(KOTLIN_FILE_TYPES)); @Override public void createFileTypes(@NotNull FileTypeConsumer consumer) {