sdk/lib/_internal/pub/lib/src/utils.dart - Issue 203413004: Provide URLs for assets from lib/ and asset/ in pub's websocket API.

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: sdk/lib/_internal/pub/lib/src/utils.dart

Issue 203413004: Provide URLs for assets from lib/ and asset/ in pub's websocket API. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart

Patch Set: fix some small bugs Created 6 years, 9 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 | « sdk/lib/_internal/pub/lib/src/barback/web_socket_api.dart ('k') | sdk/lib/_internal/pub/test/serve/web_socket/path_to_urls_errors_test.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: sdk/lib/_internal/pub/lib/src/utils.dart

diff --git a/sdk/lib/_internal/pub/lib/src/utils.dart b/sdk/lib/_internal/pub/lib/src/utils.dart

index 2584bc42f6f8e1468b15f0e0ad132ce92a28a01d..b249d2ded467e58adb757e41473954b7161009d3 100644

--- a/sdk/lib/_internal/pub/lib/src/utils.dart

+++ b/sdk/lib/_internal/pub/lib/src/utils.dart

@@ -233,14 +233,14 @@ String quoteRegExp(String string) {

/// Creates a URL string for [address]:[port].

///

/// Handles properly formatting IPv6 addresses.

-String baseUrlForAddress(InternetAddress address, int port) {

+Uri baseUrlForAddress(InternetAddress address, int port) {

// IPv6 addresses in URLs need to be enclosed in square brackets to avoid

// URL ambiguity with the ":" in the address.

if (address.type == InternetAddressType.IP_V6) {

- return "http://[${address.address}]:$port";

+ return new Uri(scheme: "http", host: "[${address.address}]", port: port);

}

- return "http://${address.address}:$port";

+ return new Uri(scheme: "http", host: address.address, port: port);

}

/// Flattens nested lists inside an iterable into a single list containing only