Make Uri._makeQuery easier to analyze

sdk/lib/core/uri.dart

Index: sdk/lib/core/uri.dart
diff --git a/sdk/lib/core/uri.dart b/sdk/lib/core/uri.dart
index 456bcb7589769a20d1e84d41f915517caa11b7f0..813dc5bc89bff846a82146f0254c2de1308f56d8 100644
--- a/sdk/lib/core/uri.dart
+++ b/sdk/lib/core/uri.dart
@@ -1382,11 +1382,11 @@ class Uri {
   static String _makeQuery(
       String query, int start, int end,
       Map<String, dynamic/*String|Iterable<String>*/> queryParameters) {
-    if (query == null && queryParameters == null) return null;
     if (query != null && queryParameters != null) {
       throw new ArgumentError('Both query and queryParameters specified');
     }
     if (query != null) return _normalize(query, start, end, _queryCharTable);

[Lasse Reichstein Nielsen, 2016/08/17 10:53:12]

I hate seeing `if (query != null` twice.
How about:

if (query != null) {
  if (queryParameters == null) { 
    return _normalize(query, ...);
  }
  throw ...;
}
if (queryParameters == null) return null;
...

?

[sra1, 2016/08/17 17:41:35]

Done.

+    if (queryParameters == null) return null;
 
     var result = new StringBuffer();
     var separator = "";