Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(25)

Unified Diff: editor/tools/plugins/com.google.dart.tools.debug.core/src/com/google/dart/tools/debug/core/server/ServerDebugTarget.java

Issue 11364134: Merge libv1. (Closed) Base URL: https://dart.googlecode.com/svn/experimental/lib_v2/dart
Patch Set: Reupload due to error Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: editor/tools/plugins/com.google.dart.tools.debug.core/src/com/google/dart/tools/debug/core/server/ServerDebugTarget.java
diff --git a/editor/tools/plugins/com.google.dart.tools.debug.core/src/com/google/dart/tools/debug/core/server/ServerDebugTarget.java b/editor/tools/plugins/com.google.dart.tools.debug.core/src/com/google/dart/tools/debug/core/server/ServerDebugTarget.java
index 96e8eefc8f213dd6c67e858f1153ff76fefa976f..a5f1164a565f148354d3c58fb4a14607f6e76975 100644
--- a/editor/tools/plugins/com.google.dart.tools.debug.core/src/com/google/dart/tools/debug/core/server/ServerDebugTarget.java
+++ b/editor/tools/plugins/com.google.dart.tools.debug.core/src/com/google/dart/tools/debug/core/server/ServerDebugTarget.java
@@ -35,6 +35,7 @@ import org.eclipse.debug.core.model.IMemoryBlock;
import org.eclipse.debug.core.model.IProcess;
import org.eclipse.debug.core.model.IThread;
+import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
@@ -514,6 +515,16 @@ public class ServerDebugTarget extends ServerDebugElement implements IDebugTarge
+ locationUrl.substring(index + DartCore.PACKAGES_DIRECTORY_PATH.length());
}
+
+ index = locationUrl.indexOf(DartCore.LIB_DIRECTORY_PATH);
+ if (index != -1) {
+ String packageName = DartCore.getSelfLinkedPackageName(file.getProject());
+ if (packageName != null) {
+ locationUrl = PackageLibraryManager.PACKAGE_SCHEME_SPEC + packageName + File.separator
+ + locationUrl.substring(index + DartCore.LIB_DIRECTORY_PATH.length());
+ }
+ }
+
return locationUrl;
}

Powered by Google App Engine
This is Rietveld 408576698