Unverified Commit bc4bda02 authored by Jenn Magder's avatar Jenn Magder Committed by GitHub

Migrate analysis to null safety (#79525)

parent 06fa590c
...@@ -2,12 +2,9 @@ ...@@ -2,12 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
// @dart = 2.8
import 'dart:async'; import 'dart:async';
import 'dart:math' as math; import 'dart:math' as math;
import 'package:meta/meta.dart';
import 'package:process/process.dart'; import 'package:process/process.dart';
import '../base/common.dart'; import '../base/common.dart';
...@@ -24,12 +21,12 @@ class AnalysisServer { ...@@ -24,12 +21,12 @@ class AnalysisServer {
AnalysisServer( AnalysisServer(
this.sdkPath, this.sdkPath,
this.directories, { this.directories, {
@required FileSystem fileSystem, required FileSystem fileSystem,
@required ProcessManager processManager, required ProcessManager processManager,
@required Logger logger, required Logger logger,
@required Platform platform, required Platform platform,
@required Terminal terminal, required Terminal terminal,
String protocolTrafficLog, String? protocolTrafficLog,
}) : _fileSystem = fileSystem, }) : _fileSystem = fileSystem,
_processManager = processManager, _processManager = processManager,
_logger = logger, _logger = logger,
...@@ -44,9 +41,9 @@ class AnalysisServer { ...@@ -44,9 +41,9 @@ class AnalysisServer {
final Logger _logger; final Logger _logger;
final Platform _platform; final Platform _platform;
final Terminal _terminal; final Terminal _terminal;
final String _protocolTrafficLog; final String? _protocolTrafficLog;
Process _process; Process? _process;
final StreamController<bool> _analyzingController = final StreamController<bool> _analyzingController =
StreamController<bool>.broadcast(); StreamController<bool>.broadcast();
final StreamController<FileAnalysisErrors> _errorsController = final StreamController<FileAnalysisErrors> _errorsController =
...@@ -77,14 +74,14 @@ class AnalysisServer { ...@@ -77,14 +74,14 @@ class AnalysisServer {
_logger.printTrace('dart ${command.skip(1).join(' ')}'); _logger.printTrace('dart ${command.skip(1).join(' ')}');
_process = await _processManager.start(command); _process = await _processManager.start(command);
// This callback hookup can't throw. // This callback hookup can't throw.
unawaited(_process.exitCode.whenComplete(() => _process = null)); unawaited(_process!.exitCode.whenComplete(() => _process = null));
final Stream<String> errorStream = _process.stderr final Stream<String> errorStream = _process!.stderr
.transform<String>(utf8.decoder) .transform<String>(utf8.decoder)
.transform<String>(const LineSplitter()); .transform<String>(const LineSplitter());
errorStream.listen(_logger.printError); errorStream.listen(_logger.printError);
final Stream<String> inStream = _process.stdout final Stream<String> inStream = _process!.stdout
.transform<String>(utf8.decoder) .transform<String>(utf8.decoder)
.transform<String>(const LineSplitter()); .transform<String>(const LineSplitter());
inStream.listen(_handleServerResponse); inStream.listen(_handleServerResponse);
...@@ -103,7 +100,7 @@ class AnalysisServer { ...@@ -103,7 +100,7 @@ class AnalysisServer {
Stream<FileAnalysisErrors> get onErrors => _errorsController.stream; Stream<FileAnalysisErrors> get onErrors => _errorsController.stream;
Future<int> get onExit => _process.exitCode; Future<int?> get onExit async => _process?.exitCode;
void _sendCommand(String method, Map<String, dynamic> params) { void _sendCommand(String method, Map<String, dynamic> params) {
final String message = json.encode(<String, dynamic>{ final String message = json.encode(<String, dynamic>{
...@@ -111,7 +108,7 @@ class AnalysisServer { ...@@ -111,7 +108,7 @@ class AnalysisServer {
'method': method, 'method': method,
'params': params, 'params': params,
}); });
_process.stdin.writeln(message); _process?.stdin.writeln(message);
_logger.printTrace('==> $message'); _logger.printTrace('==> $message');
} }
...@@ -124,19 +121,23 @@ class AnalysisServer { ...@@ -124,19 +121,23 @@ class AnalysisServer {
if (response['event'] != null) { if (response['event'] != null) {
final String event = response['event'] as String; final String event = response['event'] as String;
final dynamic params = response['params']; final dynamic params = response['params'];
Map<String, dynamic>? paramsMap;
if (params is Map<String, dynamic>) { if (params is Map<String, dynamic>) {
paramsMap = castStringKeyedMap(params);
}
if (paramsMap != null) {
if (event == 'server.status') { if (event == 'server.status') {
_handleStatus(castStringKeyedMap(response['params'])); _handleStatus(paramsMap);
} else if (event == 'analysis.errors') { } else if (event == 'analysis.errors') {
_handleAnalysisIssues(castStringKeyedMap(response['params'])); _handleAnalysisIssues(paramsMap);
} else if (event == 'server.error') { } else if (event == 'server.error') {
_handleServerError(castStringKeyedMap(response['params'])); _handleServerError(paramsMap);
} }
} }
} else if (response['error'] != null) { } else if (response['error'] != null) {
// Fields are 'code', 'message', and 'stackTrace'. // Fields are 'code', 'message', and 'stackTrace'.
final Map<String, dynamic> error = castStringKeyedMap(response['error']); final Map<String, dynamic> error = castStringKeyedMap(response['error']!)!;
_logger.printError( _logger.printError(
'Error response from the server: ${error['code']} ${error['message']}'); 'Error response from the server: ${error['code']} ${error['message']}');
if (error['stackTrace'] != null) { if (error['stackTrace'] != null) {
...@@ -168,7 +169,7 @@ class AnalysisServer { ...@@ -168,7 +169,7 @@ class AnalysisServer {
final String file = issueInfo['file'] as String; final String file = issueInfo['file'] as String;
final List<dynamic> errorsList = issueInfo['errors'] as List<dynamic>; final List<dynamic> errorsList = issueInfo['errors'] as List<dynamic>;
final List<AnalysisError> errors = errorsList final List<AnalysisError> errors = errorsList
.map<Map<String, dynamic>>(castStringKeyedMap) .map<Map<String, dynamic>>((dynamic e) => castStringKeyedMap(e) ?? <String, dynamic>{})
.map<AnalysisError>((Map<String, dynamic> json) { .map<AnalysisError>((Map<String, dynamic> json) {
return AnalysisError(WrittenError.fromJson(json), return AnalysisError(WrittenError.fromJson(json),
fileSystem: _fileSystem, fileSystem: _fileSystem,
...@@ -182,7 +183,7 @@ class AnalysisServer { ...@@ -182,7 +183,7 @@ class AnalysisServer {
} }
} }
Future<bool> dispose() async { Future<bool?> dispose() async {
await _analyzingController.close(); await _analyzingController.close();
await _errorsController.close(); await _errorsController.close();
return _process?.kill(); return _process?.kill();
...@@ -200,9 +201,9 @@ enum AnalysisSeverity { ...@@ -200,9 +201,9 @@ enum AnalysisSeverity {
class AnalysisError implements Comparable<AnalysisError> { class AnalysisError implements Comparable<AnalysisError> {
AnalysisError( AnalysisError(
this.writtenError, { this.writtenError, {
@required Platform platform, required Platform platform,
@required Terminal terminal, required Terminal terminal,
@required FileSystem fileSystem, required FileSystem fileSystem,
}) : _platform = platform, }) : _platform = platform,
_terminal = terminal, _terminal = terminal,
_fileSystem = fileSystem; _fileSystem = fileSystem;
...@@ -224,7 +225,6 @@ class AnalysisError implements Comparable<AnalysisError> { ...@@ -224,7 +225,6 @@ class AnalysisError implements Comparable<AnalysisError> {
case AnalysisSeverity.none: case AnalysisSeverity.none:
return writtenError.severity; return writtenError.severity;
} }
return null;
} }
String get type => writtenError.type; String get type => writtenError.type;
...@@ -269,14 +269,14 @@ class AnalysisError implements Comparable<AnalysisError> { ...@@ -269,14 +269,14 @@ class AnalysisError implements Comparable<AnalysisError> {
/// [AnalysisError] in plain text content. /// [AnalysisError] in plain text content.
class WrittenError { class WrittenError {
WrittenError._({ WrittenError._({
@required this.severity, required this.severity,
@required this.type, required this.type,
@required this.message, required this.message,
@required this.code, required this.code,
@required this.file, required this.file,
@required this.startLine, required this.startLine,
@required this.startColumn, required this.startColumn,
@required this.offset, required this.offset,
}); });
/// { /// {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment