From 159184481140c96d70e906e690bdca28affec6c1 Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Fri, 6 Jun 2014 19:11:46 +0200
Subject: [PATCH] WEB-11678 JavaScript debug: step into and step over do not
 change the line

---
 .../src/org/jetbrains/debugger/sourcemap/SourceMap.java     | 6 ++++++
 .../org/jetbrains/debugger/sourcemap/SourceResolver.java    | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/platform/script-debugger/backend/src/org/jetbrains/debugger/sourcemap/SourceMap.java b/platform/script-debugger/backend/src/org/jetbrains/debugger/sourcemap/SourceMap.java
index 0fb0cd1ac45d..a69b3af26f69 100644
--- a/platform/script-debugger/backend/src/org/jetbrains/debugger/sourcemap/SourceMap.java
+++ b/platform/script-debugger/backend/src/org/jetbrains/debugger/sourcemap/SourceMap.java
@@ -42,10 +42,16 @@ public class SourceMap {
     return sourceResolver.canonicalizedSources;
   }
 
+  @NotNull
   public MappingList getMappings() {
     return mappings;
   }
 
+  public int getSourceLineByRawLocation(int rawLine, int rawColumn) {
+    MappingEntry entry = getMappings().get(rawLine, rawColumn);
+    return entry == null ? -1: entry.getSourceLine();
+  }
+
   public boolean processMappingsInLine(@NotNull List<Url> sourceUrls,
                                        int sourceLine,
                                        @NotNull Processor<MappingEntry> mappingProcessor,
diff --git a/platform/script-debugger/backend/src/org/jetbrains/debugger/sourcemap/SourceResolver.java b/platform/script-debugger/backend/src/org/jetbrains/debugger/sourcemap/SourceResolver.java
index 50dbe57adf81..38693e4ac3ae 100644
--- a/platform/script-debugger/backend/src/org/jetbrains/debugger/sourcemap/SourceResolver.java
+++ b/platform/script-debugger/backend/src/org/jetbrains/debugger/sourcemap/SourceResolver.java
@@ -123,11 +123,11 @@ public class SourceResolver {
   }
 
   public interface Resolver {
-    int resolve(@NotNull VirtualFile sourceFile, @NotNull ObjectIntHashMap<Url> map);
+    int resolve(@Nullable VirtualFile sourceFile, @NotNull ObjectIntHashMap<Url> map);
   }
 
   @Nullable
-  public MappingList findMappings(@NotNull VirtualFile sourceFile, @NotNull SourceMap sourceMap, @NotNull Resolver resolver) {
+  public MappingList findMappings(@Nullable VirtualFile sourceFile, @NotNull SourceMap sourceMap, @NotNull Resolver resolver) {
     int index = resolver.resolve(sourceFile, canonicalizedSourcesMap);
     return index < 0 ? null : sourceMap.sourceIndexToMappings[index];
   }