summaryrefslogtreecommitdiff
path: root/platform/script-debugger/backend/src/org/jetbrains
diff options
context:
space:
mode:
Diffstat (limited to 'platform/script-debugger/backend/src/org/jetbrains')
-rwxr-xr-xplatform/script-debugger/backend/src/org/jetbrains/debugger/Breakpoint.java5
-rw-r--r--platform/script-debugger/backend/src/org/jetbrains/debugger/DebugEventAdapter.java2
-rwxr-xr-xplatform/script-debugger/backend/src/org/jetbrains/debugger/DebugEventListener.java2
-rw-r--r--platform/script-debugger/backend/src/org/jetbrains/debugger/VmBase.java1
-rw-r--r--platform/script-debugger/backend/src/org/jetbrains/debugger/sourcemap/SourceMapDecoder.java4
5 files changed, 7 insertions, 7 deletions
diff --git a/platform/script-debugger/backend/src/org/jetbrains/debugger/Breakpoint.java b/platform/script-debugger/backend/src/org/jetbrains/debugger/Breakpoint.java
index 41b6a35b5e8d..f2180d66a069 100755
--- a/platform/script-debugger/backend/src/org/jetbrains/debugger/Breakpoint.java
+++ b/platform/script-debugger/backend/src/org/jetbrains/debugger/Breakpoint.java
@@ -24,11 +24,6 @@ public abstract class Breakpoint {
@NotNull
public abstract BreakpointTarget getTarget();
- /**
- * Returns line number of the breakpoint. As source is changed (typically with LiveEdit feature,
- * and particularly by calling {@link ScriptManager#setSourceOnRemote}) this value
- * may become stale.
- */
public abstract int getLine();
/**
diff --git a/platform/script-debugger/backend/src/org/jetbrains/debugger/DebugEventAdapter.java b/platform/script-debugger/backend/src/org/jetbrains/debugger/DebugEventAdapter.java
index 51cf25e1aefb..10a2444fc834 100644
--- a/platform/script-debugger/backend/src/org/jetbrains/debugger/DebugEventAdapter.java
+++ b/platform/script-debugger/backend/src/org/jetbrains/debugger/DebugEventAdapter.java
@@ -26,7 +26,7 @@ public abstract class DebugEventAdapter implements DebugEventListener {
}
@Override
- public void scriptContentChanged(Script newScript) {
+ public void scriptContentChanged(@NotNull Script newScript) {
}
@Override
diff --git a/platform/script-debugger/backend/src/org/jetbrains/debugger/DebugEventListener.java b/platform/script-debugger/backend/src/org/jetbrains/debugger/DebugEventListener.java
index 5b73448d39c7..a8038bed8f41 100755
--- a/platform/script-debugger/backend/src/org/jetbrains/debugger/DebugEventListener.java
+++ b/platform/script-debugger/backend/src/org/jetbrains/debugger/DebugEventListener.java
@@ -50,7 +50,7 @@ public interface DebugEventListener extends EventListener {
/**
* Reports that script source has been altered in remote VM.
*/
- void scriptContentChanged(Script newScript);
+ void scriptContentChanged(@NotNull Script newScript);
/**
* Reports a navigation event on the target.
diff --git a/platform/script-debugger/backend/src/org/jetbrains/debugger/VmBase.java b/platform/script-debugger/backend/src/org/jetbrains/debugger/VmBase.java
index befe4221e011..b2ebd332c623 100644
--- a/platform/script-debugger/backend/src/org/jetbrains/debugger/VmBase.java
+++ b/platform/script-debugger/backend/src/org/jetbrains/debugger/VmBase.java
@@ -19,6 +19,7 @@ public abstract class VmBase implements Vm {
return evaluateContext;
}
+ @NotNull
protected abstract EvaluateContext computeEvaluateContext();
@NotNull
diff --git a/platform/script-debugger/backend/src/org/jetbrains/debugger/sourcemap/SourceMapDecoder.java b/platform/script-debugger/backend/src/org/jetbrains/debugger/sourcemap/SourceMapDecoder.java
index 431a1156ae89..c033a6979f09 100644
--- a/platform/script-debugger/backend/src/org/jetbrains/debugger/sourcemap/SourceMapDecoder.java
+++ b/platform/script-debugger/backend/src/org/jetbrains/debugger/sourcemap/SourceMapDecoder.java
@@ -135,6 +135,10 @@ public final class SourceMapDecoder {
}
List<String> sources = readSources(sourcesReader, sourceRoot);
+ if (sources.isEmpty()) {
+ // empty map, meteor can report such ugly maps
+ return null;
+ }
@SuppressWarnings("unchecked")
List<MappingEntry>[] reverseMappingsBySourceUrl = new List[sources.size()];