editor/tools/plugins/com.google.dart.tools.debug.core/src/com/google/dart/tools/debug/core/server/ServerDebugStackFrame.java - Issue 10690002: Fix some issues when debugging against package: libraries (Dartium and command-line).

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 10690002: Fix some issues when debugging against package: libraries (Dartium and command-line). (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/

Patch Set: Created 8 years, 6 months 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

« no previous file with comments | « compiler/java/com/google/dart/compiler/SystemLibraryManager.java ('k') | editor/tools/plugins/com.google.dart.tools.debug.core/src/com/google/dart/tools/debug/core/server/ServerRemoteScriptSourceContainer.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: editor/tools/plugins/com.google.dart.tools.debug.core/src/com/google/dart/tools/debug/core/server/ServerDebugStackFrame.java

===================================================================

--- editor/tools/plugins/com.google.dart.tools.debug.core/src/com/google/dart/tools/debug/core/server/ServerDebugStackFrame.java (revision 9145)

+++ editor/tools/plugins/com.google.dart.tools.debug.core/src/com/google/dart/tools/debug/core/server/ServerDebugStackFrame.java (working copy)

@@ -14,6 +14,9 @@

package com.google.dart.tools.debug.core.server;

+import com.google.dart.compiler.SystemLibraryManager;

+import com.google.dart.tools.core.DartCore;

+import com.google.dart.tools.core.internal.model.SystemLibraryManagerProvider;

import com.google.dart.tools.debug.core.source.ISourceLookup;

import org.eclipse.debug.core.DebugException;

@@ -105,6 +108,12 @@

public String getSourceLocationPath() {

URI uri = URI.create(vmFrame.getLocation().getUrl());

+ // Resolve a package: reference.

+ if (SystemLibraryManager.isPackageUri(uri) && DartCore.getPlugin().getPackageRootPref() != null) {

+ uri = SystemLibraryManagerProvider.getSystemLibraryManager().resolvePackageUri(

+ vmFrame.getLocation().getUrl());

+ }

if ("file".equals(uri.getScheme())) {

return uri.getPath();

} else {