[analyzer] Migrate remaining LSP code to null-safe

Change-Id: I52c7d16bdaf9f68148a8d7a956330bc54608ec43
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/195980
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
Commit-Queue: Brian Wilkerson <brianwilkerson@google.com>

pkg/analysis_server/lib/lsp_protocol/protocol_custom_generated.dart

@@ -188,7 +188,7 @@ class CompletionItemResolutionInfo implements ToJsonable {
   }
 
   final String file;
-  final num offset;
+  final int offset;
 
   Map<String, dynamic> toJson() {
     var __result = <String, dynamic>{};
@@ -226,8 +226,8 @@ class CompletionItemResolutionInfo implements ToJsonable {
           reporter.reportError('must not be null');
           return false;
         }
-        if (!(obj['offset'] is num)) {
-          reporter.reportError('must be of type num');
+        if (!(obj['offset'] is int)) {
+          reporter.reportError('must be of type int');
           return false;
         }
       } finally {
@@ -295,11 +295,11 @@ class DartCompletionItemResolutionInfo
 
   final String displayUri;
   final String file;
-  final num iLength;
-  final num libId;
-  final num offset;
-  final num rLength;
-  final num rOffset;
+  final int iLength;
+  final int libId;
+  final int offset;
+  final int rLength;
+  final int rOffset;
 
   Map<String, dynamic> toJson() {
     var __result = <String, dynamic>{};
@@ -325,8 +325,8 @@ class DartCompletionItemResolutionInfo
           reporter.reportError('must not be null');
           return false;
         }
-        if (!(obj['libId'] is num)) {
-          reporter.reportError('must be of type num');
+        if (!(obj['libId'] is int)) {
+          reporter.reportError('must be of type int');
           return false;
         }
       } finally {
@@ -359,8 +359,8 @@ class DartCompletionItemResolutionInfo
           reporter.reportError('must not be null');
           return false;
         }
-        if (!(obj['rOffset'] is num)) {
-          reporter.reportError('must be of type num');
+        if (!(obj['rOffset'] is int)) {
+          reporter.reportError('must be of type int');
           return false;
         }
       } finally {
@@ -376,8 +376,8 @@ class DartCompletionItemResolutionInfo
           reporter.reportError('must not be null');
           return false;
         }
-        if (!(obj['iLength'] is num)) {
-          reporter.reportError('must be of type num');
+        if (!(obj['iLength'] is int)) {
+          reporter.reportError('must be of type int');
           return false;
         }
       } finally {
@@ -393,8 +393,8 @@ class DartCompletionItemResolutionInfo
           reporter.reportError('must not be null');
           return false;
         }
-        if (!(obj['rLength'] is num)) {
-          reporter.reportError('must be of type num');
+        if (!(obj['rLength'] is int)) {
+          reporter.reportError('must be of type int');
           return false;
         }
       } finally {
@@ -427,8 +427,8 @@ class DartCompletionItemResolutionInfo
           reporter.reportError('must not be null');
           return false;
         }
-        if (!(obj['offset'] is num)) {
-          reporter.reportError('must be of type num');
+        if (!(obj['offset'] is int)) {
+          reporter.reportError('must be of type int');
           return false;
         }
       } finally {
@@ -484,7 +484,7 @@ class DartDiagnosticServer implements ToJsonable {
     return DartDiagnosticServer(port: port);
   }
 
-  final num port;
+  final int port;
 
   Map<String, dynamic> toJson() {
     var __result = <String, dynamic>{};
@@ -504,8 +504,8 @@ class DartDiagnosticServer implements ToJsonable {
           reporter.reportError('must not be null');
           return false;
         }
-        if (!(obj['port'] is num)) {
-          reporter.reportError('must be of type num');
+        if (!(obj['port'] is int)) {
+          reporter.reportError('must be of type int');
           return false;
         }
       } finally {
@@ -1207,7 +1207,7 @@ class PubPackageCompletionItemResolutionInfo
   }
 
   final String file;
-  final num offset;
+  final int offset;
   final String packageName;
 
   Map<String, dynamic> toJson() {
@@ -1264,8 +1264,8 @@ class PubPackageCompletionItemResolutionInfo
           reporter.reportError('must not be null');
           return false;
         }
-        if (!(obj['offset'] is num)) {
-          reporter.reportError('must be of type num');
+        if (!(obj['offset'] is int)) {
+          reporter.reportError('must be of type int');
           return false;
         }
       } finally {

pkg/analysis_server/lib/lsp_protocol/protocol_generated.dart

@@ -6320,10 +6320,10 @@ class CompletionItemKind {
   const CompletionItemKind(this._value);
   const CompletionItemKind.fromJson(this._value);
 
-  final num _value;
+  final int _value;
 
   static bool canParse(Object obj, LspJsonReporter reporter) {
-    return obj is num;
+    return obj is int;
   }
 
   static const Text = CompletionItemKind(1);
@@ -6370,10 +6370,10 @@ class CompletionItemTag {
   const CompletionItemTag(this._value);
   const CompletionItemTag.fromJson(this._value);
 
-  final num _value;
+  final int _value;
 
   static bool canParse(Object obj, LspJsonReporter reporter) {
-    return obj is num;
+    return obj is int;
   }
 
   /// Render a completion as obsolete, usually using a strike-out.
@@ -10715,10 +10715,10 @@ class DocumentHighlightKind {
   const DocumentHighlightKind(this._value);
   const DocumentHighlightKind.fromJson(this._value);
 
-  final num _value;
+  final int _value;
 
   static bool canParse(Object obj, LspJsonReporter reporter) {
-    return obj is num;
+    return obj is int;
   }
 
   /// A textual occurrence.
@@ -13758,10 +13758,10 @@ class FileChangeType {
   const FileChangeType(this._value);
   const FileChangeType.fromJson(this._value);
 
-  final num _value;
+  final int _value;
 
   static bool canParse(Object obj, LspJsonReporter reporter) {
-    return obj is num;
+    return obj is int;
   }
 
   /// The file got created.
@@ -16902,7 +16902,7 @@ class InsertTextFormat {
   const InsertTextFormat._(this._value);
   const InsertTextFormat.fromJson(this._value);
 
-  final num _value;
+  final int _value;
 
   static bool canParse(Object obj, LspJsonReporter reporter) {
     switch (obj) {
@@ -18204,10 +18204,10 @@ class MessageType {
   const MessageType(this._value);
   const MessageType.fromJson(this._value);
 
-  final num _value;
+  final int _value;
 
   static bool canParse(Object obj, LspJsonReporter reporter) {
-    return obj is num;
+    return obj is int;
   }
 
   /// An error message.
@@ -19499,10 +19499,10 @@ class Position implements ToJsonable {
   ///
   /// If the character value is greater than the line length it defaults back to
   /// the line length.
-  final num character;
+  final int character;
 
   /// Line position in a document (zero-based).
-  final num line;
+  final int line;
 
   Map<String, dynamic> toJson() {
     var __result = <String, dynamic>{};
@@ -19523,8 +19523,8 @@ class Position implements ToJsonable {
           reporter.reportError('must not be null');
           return false;
         }
-        if (!(obj['line'] is num)) {
-          reporter.reportError('must be of type num');
+        if (!(obj['line'] is int)) {
+          reporter.reportError('must be of type int');
           return false;
         }
       } finally {
@@ -19540,8 +19540,8 @@ class Position implements ToJsonable {
           reporter.reportError('must not be null');
           return false;
         }
-        if (!(obj['character'] is num)) {
-          reporter.reportError('must be of type num');
+        if (!(obj['character'] is int)) {
+          reporter.reportError('must be of type int');
           return false;
         }
       } finally {
@@ -28247,10 +28247,10 @@ class SymbolKind {
   const SymbolKind(this._value);
   const SymbolKind.fromJson(this._value);
 
-  final num _value;
+  final int _value;
 
   static bool canParse(Object obj, LspJsonReporter reporter) {
-    return obj is num;
+    return obj is int;
   }
 
   static const File = SymbolKind(1);
@@ -29926,10 +29926,10 @@ class TextDocumentSaveReason {
   const TextDocumentSaveReason(this._value);
   const TextDocumentSaveReason.fromJson(this._value);
 
-  final num _value;
+  final int _value;
 
   static bool canParse(Object obj, LspJsonReporter reporter) {
-    return obj is num;
+    return obj is int;
   }
 
   /// Manually triggered, e.g. by the user pressing save, by starting debugging,
@@ -30183,10 +30183,10 @@ class TextDocumentSyncKind {
   const TextDocumentSyncKind(this._value);
   const TextDocumentSyncKind.fromJson(this._value);
 
-  final num _value;
+  final int _value;
 
   static bool canParse(Object obj, LspJsonReporter reporter) {
-    return obj is num;
+    return obj is int;
   }
 
   /// Documents should not be synced at all.
@@ -31206,10 +31206,10 @@ class WatchKind {
   const WatchKind(this._value);
   const WatchKind.fromJson(this._value);
 
-  final num _value;
+  final int _value;
 
   static bool canParse(Object obj, LspJsonReporter reporter) {
-    return obj is num;
+    return obj is int;
   }
 
   /// Interested in create events.

pkg/analysis_server/lib/src/analysis_server_abstract.dart

@@ -73,8 +73,8 @@ abstract class AbstractAnalysisServer {
   /// The object used to manage the SDK's known to this server.
   final DartSdkManager sdkManager;
 
-  /// The [SearchEngine] for this server, may be `null` if indexing is disabled.
-  SearchEngine? searchEngine;
+  /// The [SearchEngine] for this server.
+  late SearchEngine searchEngine;
 
   late ByteStore byteStore;
 

pkg/analysis_server/lib/src/edit/edit_domain.dart

@@ -85,9 +85,8 @@ class EditDomainHandler extends AbstractRequestHandler {
   /// [server].
   EditDomainHandler(AnalysisServer server) : super(server) {
     var search = searchEngine = server.searchEngine;
-    refactoringWorkspace = search == null
-        ? null
-        : RefactoringWorkspace(server.driverMap.values, search);
+    refactoringWorkspace =
+        RefactoringWorkspace(server.driverMap.values, search);
     _newRefactoringManager();
   }
 

pkg/analysis_server/lib/src/lsp/channel/lsp_byte_stream_channel.dart

@@ -2,8 +2,6 @@
 // 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.
 
-// @dart = 2.9
-
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
@@ -51,7 +49,7 @@ class LspByteStreamServerChannel implements LspServerCommunicationChannel {
 
   @override
   void listen(void Function(Message message) onMessage,
-      {Function onError, void Function() onDone}) {
+      {Function? onError, void Function()? onDone}) {
     _input.transform(LspPacketTransformer()).listen(
       (String data) => _readMessage(data, onMessage),
       onError: onError,
@@ -95,7 +93,7 @@ class LspByteStreamServerChannel implements LspServerCommunicationChannel {
   }
 
   /// Sends a message prefixed with the required LSP headers.
-  void _sendLsp(Map<String, Object> json) {
+  void _sendLsp(Map<String, dynamic> json) {
     // Don't send any further responses after the communication channel is
     // closed.
     if (_closeRequested) {

pkg/analysis_server/lib/src/lsp/channel/lsp_channel.dart

@@ -2,8 +2,6 @@
 // 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.
 
-// @dart = 2.9
-
 import 'package:analysis_server/lsp_protocol/protocol_generated.dart';
 import 'package:analysis_server/src/lsp/lsp_analysis_server.dart';
 

pkg/analysis_server/lib/src/lsp/handlers/commands/organize_imports.dart

@@ -2,8 +2,6 @@
 // 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.
 
-// @dart = 2.9
-
 import 'package:analysis_server/lsp_protocol/protocol_generated.dart';
 import 'package:analysis_server/lsp_protocol/protocol_special.dart';
 import 'package:analysis_server/src/lsp/constants.dart';
@@ -20,7 +18,7 @@ class OrganizeImportsCommandHandler extends SimpleEditCommandHandler {
   String get commandName => 'Organize Imports';
 
   @override
-  Future<ErrorOr<void>> handle(List<dynamic> arguments,
+  Future<ErrorOr<void>> handle(List<dynamic>? arguments,
       ProgressReporter reporter, CancellationToken cancellationToken) async {
     if (arguments == null || arguments.length != 1 || arguments[0] is! String) {
       return ErrorOr.error(ResponseError(
@@ -43,8 +41,8 @@ class OrganizeImportsCommandHandler extends SimpleEditCommandHandler {
     }
 
     return result.mapResult((result) {
-      final code = result.content;
-      final unit = result.unit;
+      final code = result.content!;
+      final unit = result.unit!;
 
       if (hasScanParseErrors(result.errors)) {
         // It's not uncommon for editors to run this command automatically on-save