From 5b2952838617f7ccf4b95da3e1345c38fcbd252b Mon Sep 17 00:00:00 2001 From: Natalia Selezneva Date: Wed, 29 Aug 2018 12:07:43 +0300 Subject: [PATCH] Scripting Console files shouldn't have scratch panel KT-25818 Fixed --- .../org/jetbrains/kotlin/idea/scratch/ui/ScratchFileHook.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/ui/ScratchFileHook.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/ui/ScratchFileHook.kt index 580c148f679..66f647acf25 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/ui/ScratchFileHook.kt +++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/ui/ScratchFileHook.kt @@ -17,6 +17,7 @@ package org.jetbrains.kotlin.idea.scratch.ui import com.intellij.ide.scratch.ScratchFileService +import com.intellij.ide.scratch.ScratchRootType import com.intellij.openapi.components.AbstractProjectComponent import com.intellij.openapi.fileEditor.FileEditorManager import com.intellij.openapi.fileEditor.FileEditorManagerListener @@ -52,7 +53,7 @@ class ScratchFileHook(project: Project) : AbstractProjectComponent(project) { private fun isPluggable(file: VirtualFile): Boolean { if (!file.isValid) return false - if (!ScratchFileService.isInScratchRoot(file)) return false + if (ScratchFileService.getInstance().getRootType(file) !is ScratchRootType) return false val psiFile = PsiManager.getInstance(myProject).findFile(file) ?: return false return ScratchFileLanguageProvider.get(psiFile.fileType) != null }