Simplify trimming vm service Uris (#625)

* Simplify trimming vm service Uris

* tweak changelog message

Author: kenzieschmoll

packages/devtools/CHANGELOG.md

@@ -1,8 +1,9 @@
 ## 0.0.19 - 2019-05-?? (in progress)
-* Update DevTools server to better handle failures when launching browsers
+* Update DevTools server to better handle failures when launching browsers.
+* Support additional formats for VM service uris.
 
 ## 0.0.18 - 2019-04-30
-* Fix release bug (0.0.17-dev.1 did not include build folder)
+* Fix release bug (0.0.17-dev.1 did not include build folder).
 * Add CPU profiler (preview) to timeline page.
 * CPU flame chart UI improvements and bug fixes.
 * Bug fixes for DevTools on Windows.

packages/devtools/lib/src/utils.dart

@@ -150,22 +150,10 @@ String longestFittingSubstring(
 /// For example, given a [value] of http://127.0.0.1:60667/72K34Xmq0X0=/#/vm,
 /// this method will return the URI http://127.0.0.1:60667/72K34Xmq0X0=/.
 Uri getTrimmedUri(String value) {
-  final startingUri = Uri.parse(value);
-  final startingPath = startingUri.path;
-
-  if (startingPath.isEmpty || startingPath == '/') {
-    return Uri.parse(value);
-  }
-
-  // [startingPath] should be of the form "/72K34Xmq0X0=/", but it could have
-  // trailing characters. Trim any excess chars beyond the second slash in the
-  // uri path.
-  final pathParts = startingPath.split('/');
-  final newPath = pathParts.take(2).join('/');
-  final indexOfPath = value.indexOf(newPath);
-
-  // Add a trailing slash to the path.
-  return Uri.parse(value.substring(0, indexOfPath + newPath.length) + '/');
+  final uri = Uri.parse(value.trim());
+  return uri
+      .removeFragment()
+      .replace(path: uri.path.endsWith('/') ? uri.path : '${uri.path}/');
 }
 
 class Property<T> {

packages/devtools/test/utils_test.dart

@@ -231,7 +231,7 @@ void main() {
       );
       expect(
         getTrimmedUri('http://127.0.0.1:60667').toString(),
-        equals('http://127.0.0.1:60667'),
+        equals('http://127.0.0.1:60667/'),
       );
       expect(
         getTrimmedUri('http://127.0.0.1:60667/').toString(),