Make SdkLibrary.shortName consistently include 'dart:'

pkg/analysis_server/test/mock_sdk.dart

 // Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library testing.mock_sdk;
 
 import 'package:analyzer/file_system/file_system.dart' as resource;
 import 'package:analyzer/file_system/memory_file_system.dart' as resource;
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/sdk.dart';
 import 'package:analyzer/src/generated/source.dart';
 
 
 class MockSdk implements DartSdk {
   static const _MockSdkLibrary LIB_CORE =
-      const _MockSdkLibrary('core', '/lib/core/core.dart', '''
+      const _MockSdkLibrary('dart:core', '/lib/core/core.dart', '''
 library dart.core;
 
+import 'dart:async';
+
 class Object {
   bool operator ==(other) => identical(this, other);
 }
 
 class Function {}
 class StackTrace {}
 class Symbol {}
 class Type {}
 
 abstract class Comparable<T> {
@@ skipping 35 matching lines @@
   void operator []=(int index, E value);
 }
 class Map<K, V> extends Object {}
 
 external bool identical(Object a, Object b);
 
 void print(Object object) {}
 ''');
 
   static const _MockSdkLibrary LIB_ASYNC =
-      const _MockSdkLibrary('async', '/lib/async/async.dart', '''
+      const _MockSdkLibrary('dart:async', '/lib/async/async.dart', '''
 library dart.async;
+
+import 'dart:math';
+
 class Future {
   static Future wait(List<Future> futures) => null;
 }
 
 class Stream<T> {}
 ''');
 
   static const _MockSdkLibrary LIB_MATH =
-      const _MockSdkLibrary('math', '/lib/math/math.dart', '''
+      const _MockSdkLibrary('dart:math', '/lib/math/math.dart', '''
 library dart.math;
 const double E = 2.718281828459045;
 const double PI = 3.1415926535897932;
 num min(num a, num b) => 0;
 num max(num a, num b) => 0;
 class Random {}
 ''');
 
   static const _MockSdkLibrary LIB_HTML =
-      const _MockSdkLibrary('html', '/lib/html/dartium/html_dartium.dart', '''
+      const _MockSdkLibrary('dart:html', '/lib/html/dartium/html_dartium.dart', '''
 library dart.html;
 class HtmlElement {}
 ''');
 
   static const List<SdkLibrary> LIBRARIES = const [
       LIB_CORE,
       LIB_ASYNC,
       LIB_MATH,
       LIB_HTML,];
 
@@ skipping 26 matching lines @@
     String libPath = '/lib';
     if (!filePath.startsWith("$libPath/")) {
       return null;
     }
     for (SdkLibrary library in LIBRARIES) {
       String libraryPath = library.path;
       if (filePath.replaceAll('\\', '/') == libraryPath) {
         String path = library.shortName;
         try {
           resource.File file = provider.getResource(uri.path);
-          Uri dartUri = new Uri(scheme: 'dart', path: library.shortName);
+          Uri dartUri = new Uri(scheme: 'dart', path: path);
           return file.createSource(dartUri);
         } catch (exception) {
           return null;
         }
       }
       if (filePath.startsWith("$libraryPath/")) {
         String pathInLibrary = filePath.substring(libraryPath.length + 1);
         String path = '${library.shortName}/${pathInLibrary}';
         try {
           resource.File file = provider.getResource(uri.path);
@@ skipping 61 matching lines @@
   bool get isInternal => throw unimplemented;
 
   @override
   bool get isShared => throw unimplemented;
 
   @override
   bool get isVmLibrary => throw unimplemented;
 
   UnimplementedError get unimplemented => new UnimplementedError();
 }