com.intellij.javascript.debugger, part 2

diff --git a/platform/script-debugger/debugger-ui/src/com/intellij/javascript/debugger/ExpressionInfoFactory.java b/platform/script-debugger/debugger-ui/src/com/intellij/javascript/debugger/ExpressionInfoFactory.java
new file mode 100644 (file)
index 0000000..6621493
--- /dev/null
+++ b/platform/script-debugger/debugger-ui/src/com/intellij/javascript/debugger/ExpressionInfoFactory.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2000-2016 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.javascript.debugger;
+
+import com.intellij.openapi.editor.Document;
+import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.psi.PsiElement;
+import com.intellij.xdebugger.evaluation.ExpressionInfo;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public interface ExpressionInfoFactory {
+  @NotNull
+  ExpressionInfo create(@NotNull PsiElement element, @NotNull Document document);
+
+  @Nullable
+  NameMapper createNameMapper(@NotNull VirtualFile file, @NotNull Document document);
+}

diff --git a/platform/script-debugger/debugger-ui/src/com/jetbrains/javascript/debugger/ExpressionInfoFactory.java b/platform/script-debugger/debugger-ui/src/com/jetbrains/javascript/debugger/ExpressionInfoFactory.java
deleted file mode 100644 (file)
index 2f57175..0000000
--- a/platform/script-debugger/debugger-ui/src/com/jetbrains/javascript/debugger/ExpressionInfoFactory.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.jetbrains.javascript.debugger;
-
-import com.intellij.javascript.debugger.NameMapper;
-import com.intellij.openapi.editor.Document;
-import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.psi.PsiElement;
-import com.intellij.xdebugger.evaluation.ExpressionInfo;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-public interface ExpressionInfoFactory {
-  @NotNull
-  ExpressionInfo create(@NotNull PsiElement element, @NotNull Document document);
-
-  @Nullable
-  NameMapper createNameMapper(@NotNull VirtualFile file, @NotNull Document document);
-}

diff --git a/platform/script-debugger/debugger-ui/src/com/jetbrains/javascript/debugger/JavaScriptDebugAware.java b/platform/script-debugger/debugger-ui/src/com/jetbrains/javascript/debugger/JavaScriptDebugAware.java
index bae71735c42c008362ae13553934b84d554d7967..21b092b213a409419ae0035bf3c84d3a92ac7492 100644 (file)
--- a/platform/script-debugger/debugger-ui/src/com/jetbrains/javascript/debugger/JavaScriptDebugAware.java
+++ b/platform/script-debugger/debugger-ui/src/com/jetbrains/javascript/debugger/JavaScriptDebugAware.java
@@ -15,6 +15,7 @@
  */
 package com.jetbrains.javascript.debugger;
 
+import com.intellij.javascript.debugger.ExpressionInfoFactory;
 import com.intellij.javascript.debugger.NameMapper;
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.extensions.ExtensionPointName;