Make nameOffset name more precise on Directives and remove -2 suffix from other nameOffset fields.

Change-Id: I5832c7340726ba82ea1e3bac5c88441fd318a2f2
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/444391
Reviewed-by: Konstantin Shcheglov <[email protected]>
Reviewed-by: Johnni Winther <[email protected]>
Commit-Queue: Konstantin Shcheglov <[email protected]>

Author: fshcheglov

pkg/analyzer/lib/src/dart/analysis/driver.dart

@@ -109,7 +109,7 @@ testFineAfterLibraryAnalyzerHook;
 // TODO(scheglov): Clean up the list of implicitly analyzed files.
 class AnalysisDriver {
   /// The version of data format, should be incremented on every format change.
-  static const int DATA_VERSION = 511;
+  static const int DATA_VERSION = 512;
 
   /// The number of exception contexts allowed to write. Once this field is
   /// zero, we stop writing any new exception contexts in this process.