From ffbd2eb7eebf569b8aefd970cf59851aaf2869a3 Mon Sep 17 00:00:00 2001 From: Brian Wilkerson Date: Wed, 13 Nov 2019 17:10:09 +0000 Subject: [PATCH] Address comments from an earlier CL Change-Id: I6a47cb76e6babeea422791fb6b1887dd244c2f5e Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/125120 Commit-Queue: Brian Wilkerson Reviewed-by: Samuel Rawlins Reviewed-by: Paul Berry --- .../src/edit/nnbd_migration/instrumentation_information.dart | 4 ++-- .../lib/src/edit/nnbd_migration/instrumentation_listener.dart | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/analysis_server/lib/src/edit/nnbd_migration/instrumentation_information.dart b/pkg/analysis_server/lib/src/edit/nnbd_migration/instrumentation_information.dart index 937cf9e6464..6510931c407 100644 --- a/pkg/analysis_server/lib/src/edit/nnbd_migration/instrumentation_information.dart +++ b/pkg/analysis_server/lib/src/edit/nnbd_migration/instrumentation_information.dart @@ -20,8 +20,8 @@ class InstrumentationInformation { /// The node used for type sources that are never `null`. NullabilityNodeInfo never; - /// Expando associating [NodeInformation] wich [NullabilityNodeInfo] objects. - Expando nodeInformation = Expando(); + /// A map associating [NodeInformation] with [NullabilityNodeInfo] objects. + Map nodeInformation = {}; /// A list of the steps in the propagation of nullability information through /// the nullability graph, to report details of the step that was performed diff --git a/pkg/analysis_server/lib/src/edit/nnbd_migration/instrumentation_listener.dart b/pkg/analysis_server/lib/src/edit/nnbd_migration/instrumentation_listener.dart index ce66ed89a9e..0f977eddb05 100644 --- a/pkg/analysis_server/lib/src/edit/nnbd_migration/instrumentation_listener.dart +++ b/pkg/analysis_server/lib/src/edit/nnbd_migration/instrumentation_listener.dart @@ -86,7 +86,7 @@ class InstrumentationListener implements NullabilityMigrationInstrumentation { } String _filePathForSource(Source source) { - return source.toString(); + return source.fullName; } /// Return the source information associated with the given [source], creating