diff --git a/platform/script-debugger/debugger-ui/src/com/jetbrains/javascript/debugger/NameMapper.java b/platform/script-debugger/debugger-ui/src/com/jetbrains/javascript/debugger/NameMapper.java
index 7fc7bd69aa06..9865a9e6813a 100644
--- a/platform/script-debugger/debugger-ui/src/com/jetbrains/javascript/debugger/NameMapper.java
+++ b/platform/script-debugger/debugger-ui/src/com/jetbrains/javascript/debugger/NameMapper.java
@@ -32,7 +32,7 @@ import static org.jetbrains.rpc.CommandProcessor.LOG;
 
 public class NameMapper {
   public static final String S1 = ",()[]{}=";
-  private static final CharMatcher NAME_TRIMMER = CharMatcher.INVISIBLE.or(CharMatcher.anyOf(S1 + ".&:"));
+  protected static final CharMatcher NAME_TRIMMER = CharMatcher.INVISIBLE.or(CharMatcher.anyOf(S1 + ".&:"));
   // don't trim trailing .&: - could be part of expression
   private static final CharMatcher OPERATOR_TRIMMER = CharMatcher.INVISIBLE.or(CharMatcher.anyOf(S1));
 
@@ -75,7 +75,7 @@ public class NameMapper {
     }
 
     String sourceEntryName = sourceEntry.getName();
-    String generatedName = extractName(getGeneratedName(generatedDocument, sourceMap, sourceEntry), true);
+    String generatedName = extractName(getGeneratedName(generatedDocument, sourceMap, sourceEntry));
     if (!generatedName.isEmpty()) {
       String sourceName = sourceEntryName;
       if (sourceName == null) {
@@ -106,8 +106,8 @@ public class NameMapper {
   }
 
   @NotNull
-  protected String extractName(@NotNull CharSequence rawGeneratedName, boolean isLastToken) {
-    return trimName(rawGeneratedName, isLastToken);
+  protected String extractName(@NotNull CharSequence rawGeneratedName) {
+    return NAME_TRIMMER.trimFrom(rawGeneratedName);
   }
 
   @NotNull
diff --git a/platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/DebugProcessImpl.java b/platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/DebugProcessImpl.java
index 3baf3725f6ee..405de9c33d64 100644
--- a/platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/DebugProcessImpl.java
+++ b/platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/DebugProcessImpl.java
@@ -296,4 +296,8 @@ public abstract class DebugProcessImpl<C extends VmConnection> extends XDebugPro
       return true;
     }
   }
+
+  public void saveResolvedFile(@NotNull Url url, @NotNull VirtualFile file) {
+    urlToFileCache.putIfAbsent(url, file);
+  }
 }
\ No newline at end of file