use LanguageUtil

diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/TextWithImportsImpl.java b/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/TextWithImportsImpl.java
index a73169ac02eabce59a257b9142e006af316958f8..cf0786258b34432d858d6bbff2c50c5b29f2fc85 100644 (file)
--- a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/TextWithImportsImpl.java
+++ b/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/TextWithImportsImpl.java
@@ -16,6 +16,7 @@
 package com.intellij.debugger.engine.evaluation;
 
 import com.intellij.debugger.ui.DebuggerEditorImpl;
+import com.intellij.lang.LanguageUtil;
 import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.openapi.fileTypes.FileTypeManager;
 import com.intellij.openapi.fileTypes.StdFileTypes;
@@ -26,7 +27,6 @@ import com.intellij.psi.*;
 import com.intellij.xdebugger.XExpression;
 import com.intellij.xdebugger.evaluation.EvaluationMode;
 import com.intellij.xdebugger.impl.breakpoints.XExpressionImpl;
-import com.intellij.xdebugger.impl.ui.XDebuggerEditorBase;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -136,7 +136,7 @@ public final class TextWithImportsImpl implements TextWithImports{
   public static XExpression toXExpression(@Nullable TextWithImports text) {
     if (text != null && !text.getText().isEmpty()) {
       return new XExpressionImpl(text.getText(),
-                                 XDebuggerEditorBase.getFileTypeLanguage(text.getFileType()),
+                                 LanguageUtil.getFileTypeLanguage(text.getFileType()),
                                  StringUtil.nullize(text.getImports()),
                                  getMode(text.getKind()));
     }
@@ -169,7 +169,7 @@ public final class TextWithImportsImpl implements TextWithImports{
       return new TextWithImportsImpl(getKind(expression.getMode()),
                                      expression.getExpression(),
                                      StringUtil.notNullize(expression.getCustomInfo()),
-                                     expression.getLanguage() != null ? expression.getLanguage().getAssociatedFileType() : null);
+                                     LanguageUtil.getLanguageFileType(expression.getLanguage()));
     }
   }
 }

diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/handlers/XDebuggerEvaluateActionHandler.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/handlers/XDebuggerEvaluateActionHandler.java
index 9afff78ef6e55f5f3b4d67b45b3ba398c7b17478..65f0aeadde5034a78c8b0ee561d97bfd04f36e77 100644 (file)
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/handlers/XDebuggerEvaluateActionHandler.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/handlers/XDebuggerEvaluateActionHandler.java
@@ -16,6 +16,7 @@
 package com.intellij.xdebugger.impl.actions.handlers;
 
 import com.intellij.lang.Language;
+import com.intellij.lang.LanguageUtil;
 import com.intellij.openapi.actionSystem.CommonDataKeys;
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Document;
@@ -36,7 +37,6 @@ import com.intellij.xdebugger.frame.XStackFrame;
 import com.intellij.xdebugger.frame.XValue;
 import com.intellij.xdebugger.impl.breakpoints.XExpressionImpl;
 import com.intellij.xdebugger.impl.evaluate.XDebuggerEvaluationDialog;
-import com.intellij.xdebugger.impl.ui.XDebuggerEditorBase;
 import com.intellij.xdebugger.impl.ui.tree.actions.XDebuggerTreeActionBase;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -108,11 +108,11 @@ public class XDebuggerEvaluateActionHandler extends XDebuggerActionHandler {
       if (stackFrame != null) {
         XSourcePosition position = stackFrame.getSourcePosition();
         if (position != null) {
-          language = XDebuggerEditorBase.getFileTypeLanguage(position.getFile().getFileType());
+          language = LanguageUtil.getFileLanguage(position.getFile());
         }
       }
       if (language == null && file != null) {
-        language = XDebuggerEditorBase.getFileTypeLanguage(file.getFileType());
+        language = LanguageUtil.getFileTypeLanguage(file.getFileType());
       }
       expression = new XExpressionImpl(expression.getExpression(), language, expression.getCustomInfo(), expression.getMode());
     }

diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebuggerEditorBase.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebuggerEditorBase.java
index 81ac51d233379bd4db93f85e94a29f420a3ad692..d9a4573d0ea44f37ecdbd69427241a9d6d1199ea 100644 (file)
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebuggerEditorBase.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebuggerEditorBase.java
@@ -17,14 +17,13 @@ package com.intellij.xdebugger.impl.ui;
 
 import com.intellij.ide.DataManager;
 import com.intellij.lang.Language;
+import com.intellij.lang.LanguageUtil;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.actionSystem.DefaultActionGroup;
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.fileTypes.FileType;
-import com.intellij.openapi.fileTypes.LanguageFileType;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.popup.JBPopupFactory;
 import com.intellij.openapi.ui.popup.ListPopup;
@@ -156,10 +155,10 @@ public abstract class XDebuggerEditorBase {
     Language language = text.getLanguage();
     if (language == null) {
       if (mySourcePosition != null) {
-        language = getFileTypeLanguage(mySourcePosition.getFile().getFileType());
+        language = LanguageUtil.getFileLanguage(mySourcePosition.getFile());
       }
       if (language == null) {
-        language = getFileTypeLanguage(getEditorsProvider().getFileType());
+        language = LanguageUtil.getFileTypeLanguage(getEditorsProvider().getFileType());
       }
     }
     text = new XExpressionImpl(text.getExpression(), language, text.getCustomInfo(), getMode());
@@ -182,14 +181,6 @@ public abstract class XDebuggerEditorBase {
     doSetText(text);
   }
 
-  @Nullable
-  public static Language getFileTypeLanguage(@Nullable FileType fileType) {
-    if (fileType instanceof LanguageFileType) {
-      return ((LanguageFileType)fileType).getLanguage();
-    }
-    return null;
-  }
-
   public abstract XExpression getExpression();
 
   @Nullable