@@ -8,6 +8,7 @@ import 'dart:html';
 import 'dart:async';
 import 'package:observatory/models.dart'
     show IsolateRef, SourceLocation, Script, ScriptRepository;
+import 'package:observatory/service.dart' as S;
 import 'package:observatory/src/elements/helpers/rendering_scheduler.dart';
 import 'package:observatory/src/elements/helpers/tag.dart';
 import 'package:observatory/src/elements/helpers/uris.dart';
@@ -48,6 +49,19 @@ class SourceLinkElement extends CustomElement implements Renderable {
     _repository.get(_isolate, _location.script.id).then((script) {
       _script = script;
       _r.dirty();
+    }, onError: (e) {
+      // The script object has expired, likely due to a hot reload.
+      (_isolate as S.Isolate).getScripts().then((scripts) {
+        for (final script in scripts) {
+          if (script.uri == _location.script.uri) {
+            _script = script;
+            _r.dirty();
+            return;
+          }
+        }
+        // Rethrow the original exception if we can't find a match.
+        throw e;
+      });
     });
     _r.enable();
   }
 
@@ -1453,6 +1453,12 @@ class Isolate extends ServiceObjectOwner implements M.Isolate {
     return isolate.invokeRpc('getObject', params);
   }
 
+  Future<List<Script>> getScripts() async {
+    final response = await invokeRpc('getScripts', {}) as ServiceMap;
+    assert(response.type == 'ScriptList');
+    return response['scripts'].cast<Script>();
+  }
+
   Future<Map> _fetchDirect({int count: kDefaultFieldLimit}) async {
     return invokeRpcNoUpgrade('getIsolate', {});
   }
 
@@ -799,6 +799,8 @@ void IsolateReloadContext::Reload(bool force_reload,
   // Other errors (e.g. a parse error) are captured by the reload system.
   if (result.IsError()) {
     FinalizeFailedLoad(Error::Cast(result));
+  } else {
+    ReportSuccess();
   }
 }
Original file line number	Diff line number	Diff line change
`@@ -1453,6 +1453,12 @@ class Isolate extends ServiceObjectOwner implements M.Isolate {`
`1453`	`1453`	`return isolate.invokeRpc('getObject', params);`
`1454`	`1454`	`}`
`1455`	`1455`
	`1456`	`+ Future<List<Script>> getScripts() async {`
	`1457`	`+ final response = await invokeRpc('getScripts', {}) as ServiceMap;`
	`1458`	`+ assert(response.type == 'ScriptList');`
	`1459`	`+ return response['scripts'].cast<Script>();`
	`1460`	`+ }`
	`1461`	`+`
`1456`	`1462`	`Future<Map> _fetchDirect({int count: kDefaultFieldLimit}) async {`
`1457`	`1463`	`return invokeRpcNoUpgrade('getIsolate', {});`
`1458`	`1464`	`}`
Original file line number	Diff line number	Diff line change
`@@ -799,6 +799,8 @@ void IsolateReloadContext::Reload(bool force_reload,`
`799`	`799`	`// Other errors (e.g. a parse error) are captured by the reload system.`
`800`	`800`	`if (result.IsError()) {`
`801`	`801`	`FinalizeFailedLoad(Error::Cast(result));`
	`802`	`+ } else {`
	`803`	`+ ReportSuccess();`
`802`	`804`	`}`
`803`	`805`	`}`
`804`	`806`