From 142bc8670e35affdee2d86ceef2b9f7efdb99f66 Mon Sep 17 00:00:00 2001 From: "Gregory.Shrago" Date: Fri, 3 Oct 2014 22:54:52 +0400 Subject: [PATCH] ScratchWidget: use language substitutors --- .../src/com/intellij/ide/scratch/ScratchWidget.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/ide/scratch/ScratchWidget.java b/platform/lang-impl/src/com/intellij/ide/scratch/ScratchWidget.java index 8dbeb7200a77..9a455cad2e4a 100644 --- a/platform/lang-impl/src/com/intellij/ide/scratch/ScratchWidget.java +++ b/platform/lang-impl/src/com/intellij/ide/scratch/ScratchWidget.java @@ -28,6 +28,7 @@ import com.intellij.openapi.wm.CustomStatusBarWidget; import com.intellij.openapi.wm.StatusBarWidget; import com.intellij.openapi.wm.impl.status.EditorBasedWidget; import com.intellij.openapi.wm.impl.status.TextPanel; +import com.intellij.psi.LanguageSubstitutors; import com.intellij.testFramework.LightVirtualFile; import com.intellij.ui.ClickListener; import com.intellij.ui.awt.RelativePoint; @@ -50,7 +51,7 @@ class ScratchWidget extends EditorBasedWidget implements CustomStatusBarWidget.M new ClickListener() { @Override public boolean onClick(@NotNull MouseEvent e, int clickCount) { - final Project project = getProject(); + Project project = getProject(); Editor editor = getEditor(); final LightVirtualFile selectedFile = getScratchFile(); if (project == null || editor == null || selectedFile == null) return false; @@ -58,7 +59,7 @@ class ScratchWidget extends EditorBasedWidget implements CustomStatusBarWidget.M ListPopup popup = NewScratchFileAction.buildLanguagePopup(selectedFile.getLanguage(), new Consumer() { @Override public void consume(Language language) { - selectedFile.setLanguage(language); + selectedFile.setLanguage(LanguageSubstitutors.INSTANCE.substituteLanguage(language, selectedFile, myProject)); FileContentUtilCore.reparseFiles(selectedFile); update(); }