languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-09-05 00:13:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make AnalysisResult.path non-nullable.

Browse source 
Change-Id: I861643f6c5493b6990c0bacddd81643aaba8e368
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/206560
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
This commit is contained in:
Konstantin Shcheglov 2021-07-12 18:21:11 +00:00 committed by commit-bot@chromium.org
parent b3fb8c55e5
commit 672d66cea0
41 changed files with 49 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/analysis_server/lib/src/analysis_server.dart
View file

@ -679,7 +679,7 @@ class ServerContextManagerCallbacks extends ContextManagerCallbacks {
@override
void listenAnalysisDriver(analysis.AnalysisDriver analysisDriver) {
analysisDriver.results.listen((result) {
var path = result.path!;
var path = result.path;
filesToFlush.add(path);
if (analysisServer.isAnalyzed(path)) {
_notificationManager.recordAnalysisErrors(NotificationManager.serverId,

3
pkg/analysis_server/lib/src/computer/computer_outline.dart
View file

@ -87,9 +87,6 @@ class DartUnitOutlineComputer {
Location _getLocationOffsetLength(int offset, int length) {
var path = resolvedUnit.path;
if (path == null) {
throw StateError('DartUnitOutlineComputer called with invalid result');
}
var startLocation = resolvedUnit.lineInfo.getLocation(offset);
var startLine = startLocation.lineNumber;
var startColumn = startLocation.columnNumber;

5
pkg/analysis_server/lib/src/computer/import_elements_computer.dart
View file

@ -32,8 +32,7 @@ class ImportElementsComputer {
Future<SourceChange> createEdits(
List<ImportedElements> importedElementsList) async {
var unit = libraryResult.unit;
var path = libraryResult.path;
if (unit == null || path == null) {
if (unit == null) {
// We should never reach this point because the libraryResult should be
// valid.
return SourceChange('');
@ -50,7 +49,7 @@ class ImportElementsComputer {
}
var builder = ChangeBuilder(session: libraryResult.session);
await builder.addDartFileEdit(path, (builder) {
await builder.addDartFileEdit(libraryResult.path, (builder) {
for (var importedElements in filteredImportedElements) {
var matchingImports =
_findMatchingImports(existingImports, importedElements);

2
pkg/analysis_server/lib/src/domains/completion/available_suggestions.dart
View file

@ -24,7 +24,7 @@ void computeIncludedSetList(
var context = tracker.getContext(analysisContext);
if (context == null) return;
var librariesObject = context.getLibraries(resolvedUnit.path!);
var librariesObject = context.getLibraries(resolvedUnit.path);
var importedUriSet = resolvedUnit.libraryElement.importedLibraries
.map((importedLibrary) => importedLibrary.source.uri)

2
pkg/analysis_server/lib/src/edit/edit_domain.dart
View file

@ -611,7 +611,7 @@ class EditDomainHandler extends AbstractRequestHandler {
var provider = TopLevelDeclarationsProvider(tracker);
return provider.get(
result.session.analysisContext,
result.path!,
result.path,
name,
);
}, extensionCache: server.getExtensionCacheFor(result));

2
pkg/analysis_server/lib/src/flutter/flutter_notifications.dart
View file

@ -15,7 +15,7 @@ void sendFlutterNotificationOutline(
var outline = computer.compute();
// send notification
var params = protocol.FlutterOutlineParams(
resolvedUnit.path!,
resolvedUnit.path,
outline,
);
server.sendNotification(params.toNotification());

2
pkg/analysis_server/lib/src/lsp/handlers/handler_code_actions.dart
View file

@ -309,7 +309,7 @@ class CodeActionHandler extends MessageHandler<CodeActionParams,
var tracker = server.declarationsTracker!;
return TopLevelDeclarationsProvider(tracker).get(
unit.session.analysisContext,
unit.path!,
unit.path,
name,
);
}, extensionCache: server.getExtensionCacheFor(unit));

2
pkg/analysis_server/lib/src/lsp/handlers/handler_completion.dart
View file

@ -374,7 +374,7 @@ class CompletionHandler
importingUris.first == '${library.uri}';
}).map((item) => declarationToCompletionItem(
capabilities,
unit.path!,
unit.path,
offset,
includedSet,
library,

5
pkg/analysis_server/lib/src/lsp/lsp_analysis_server.dart
View file

@ -826,11 +826,6 @@ class LspServerContextManagerCallbacks extends ContextManagerCallbacks {
analysisDriver.results.listen((result) {
var path = result.path;
if (path == null) {
// This shouldn't occur - result.path is marked with a TODO to become
// non-nullable.
return;
}
filesToFlush.add(path);
if (analysisServer.isAnalyzed(path)) {
final serverErrors = protocol.doAnalysisError_listFromEngine(result);

2
pkg/analysis_server/lib/src/operation/operation_analysis.dart
View file

@ -112,7 +112,7 @@ void sendAnalysisNotificationOutline(
// send notification
var params = protocol.AnalysisOutlineParams(
resolvedUnit.path!, fileKind, outline,
resolvedUnit.path, fileKind, outline,
libraryName: libraryName);
server.sendNotification(params.toNotification());
});

2
pkg/analysis_server/lib/src/services/completion/dart/completion_manager.dart
View file

@ -100,7 +100,7 @@ class DartCompletionManager {
}) async {
request.checkAborted();
var pathContext = request.resourceProvider.pathContext;
if (!file_paths.isDart(pathContext, request.result.path!)) {
if (!file_paths.isDart(pathContext, request.result.path)) {
return const <CompletionSuggestion>[];
}

2
pkg/analysis_server/lib/src/services/completion/dart/suggestion_builder.dart
View file

@ -704,7 +704,7 @@ class SuggestionBuilder {
ExecutableElement element, bool invokeSuper) async {
var displayTextBuffer = StringBuffer();
var builder = ChangeBuilder(session: request.result.session);
await builder.addDartFileEdit(request.result.path!, (builder) {
await builder.addDartFileEdit(request.result.path, (builder) {
builder.addReplacement(range.node(targetId), (builder) {
builder.writeOverride(
element,

2
pkg/analysis_server/lib/src/services/completion/postfix/postfix_completion.dart
View file

@ -264,7 +264,7 @@ class PostfixCompletionProcessor {
String get eol => utils.endOfLine;
String get file => completionContext.resolveResult.path!;
String get file => completionContext.resolveResult.path;
String get key => completionContext.key;

2
pkg/analysis_server/lib/src/services/completion/statement/statement_completion.dart
View file

@ -120,7 +120,7 @@ class StatementCompletionProcessor {
String get eol => utils.endOfLine;
String get file => statementContext.resolveResult.path!;
String get file => statementContext.resolveResult.path;
LineInfo get lineInfo => statementContext.resolveResult.lineInfo;

2
pkg/analysis_server/lib/src/services/correction/base_processor.dart
View file

@ -33,7 +33,7 @@ abstract class BaseProcessor {
this.selectionLength = 0,
required this.resolvedResult,
required this.workspace,
}) : file = resolvedResult.path!,
}) : file = resolvedResult.path,
session = resolvedResult.session,
sessionHelper = AnalysisSessionHelper(resolvedResult.session),
typeProvider = resolvedResult.typeProvider,

4
pkg/analysis_server/lib/src/services/correction/bulk_fix_processor.dart
View file

@ -336,7 +336,7 @@ class BulkFixProcessor {
await compute(producer);
var newHash = computeChangeHash();
if (newHash != oldHash) {
changeMap.add(result.path!, code);
changeMap.add(result.path, code);
}
}
@ -401,7 +401,7 @@ class BulkFixProcessor {
if (useConfigFiles) {
var provider = result.session.resourceProvider;
var context = provider.pathContext;
var dartFileName = result.path!;
var dartFileName = result.path;
var configFileName = '${context.withoutExtension(dartFileName)}.config';
var configFile = provider.getFile(configFileName);
try {

2
pkg/analysis_server/lib/src/services/correction/dart/abstract_producer.dart
View file

@ -249,7 +249,7 @@ class CorrectionProducerContext {
this.overrideSet,
this.selectionOffset = -1,
this.selectionLength = 0,
}) : file = resolvedResult.path!,
}) : file = resolvedResult.path,
session = resolvedResult.session,
sessionHelper = AnalysisSessionHelper(resolvedResult.session),
typeProvider = resolvedResult.typeProvider,

2
pkg/analysis_server/lib/src/services/correction/dart/convert_part_of_to_uri.dart
View file

@ -27,7 +27,7 @@ class ConvertPartOfToUri extends CorrectionProducer {
}
var libraryPath = resolvedResult.libraryElement.source.fullName;
var partPath = resolvedResult.path!;
var partPath = resolvedResult.path;
var relativePath = relative(libraryPath, from: dirname(partPath));
var uri = Uri.file(relativePath).toString();
var replacementRange = range.node(libraryName);

6
pkg/analysis_server/lib/src/services/flutter/property.dart
View file

@ -118,7 +118,7 @@ class PropertyDescription {
);
}
await builder.addDartFileEdit(resolvedUnit.path!, (builder) {
await builder.addDartFileEdit(resolvedUnit.path, (builder) {
_changeCode(builder, (builder) {
var expression = value.expression;
if (expression != null) {
@ -155,7 +155,7 @@ class PropertyDescription {
}
var beginOffset = argumentExpression.offset;
await builder.addDartFileEdit(resolvedUnit.path!, (builder) {
await builder.addDartFileEdit(resolvedUnit.path, (builder) {
builder.addDeletion(
SourceRange(beginOffset, endOffset - beginOffset),
);
@ -559,7 +559,7 @@ class _EdgeInsetsProperty {
var builder = ChangeBuilder(session: property.resolvedUnit.session);
await builder.addDartFileEdit(property.resolvedUnit.path!, (builder) {
await builder.addDartFileEdit(property.resolvedUnit.path, (builder) {
property._changeCode(builder, (builder) {
if (leftCode == rightCode && topCode == bottomCode) {
builder.writeReference(classEdgeInsets);

2
pkg/analysis_server/lib/src/services/refactoring/extract_local.dart
View file

@ -61,7 +61,7 @@ class ExtractLocalRefactoringImpl extends RefactoringImpl
utils = CorrectionUtils(resolveResult);
}
String get file => resolveResult.path!;
String get file => resolveResult.path;
@override
String get refactoringName => 'Extract Local Variable';

2
pkg/analysis_server/lib/src/services/refactoring/extract_widget.dart
View file

@ -144,7 +144,7 @@ class ExtractWidgetRefactoringImpl extends RefactoringImpl
Future<SourceChange> createChange() async {
var builder =
ChangeBuilder(session: sessionHelper.session, eol: utils.endOfLine);
await builder.addDartFileEdit(resolveResult.path!, (builder) {
await builder.addDartFileEdit(resolveResult.path, (builder) {
final expression = _expression;
final statements = _statements;
if (expression != null) {

3
pkg/analysis_server/lib/src/services/refactoring/move_file.dart
View file

@ -113,8 +113,7 @@ class MoveFileRefactoringImpl extends RefactoringImpl
}
if (newDir != oldDir) {
await changeBuilder.addDartFileEdit(definingUnitResult.path!,
(builder) {
await changeBuilder.addDartFileEdit(definingUnitResult.path, (builder) {
for (var directive in definingUnitResult.unit!.directives) {
if (directive is UriBasedDirective) {
_updateUriReference(builder, directive, oldDir, newDir);

2
pkg/analysis_server/test/protocol_server_test.dart
View file

@ -361,7 +361,7 @@ class MockAnalysisSession implements AnalysisSession {
Map<String, FileResult> fileResults = {};
void addFileResult(FileResult result) {
fileResults[result.path!] = result;
fileResults[result.path] = result;
}
@override

2
pkg/analysis_server/tool/code_completion/completion_metrics.dart
View file

@ -1315,7 +1315,7 @@ class CompletionMetricsComputer {
}
for (var result in results) {
_resolvedUnitResult = result;
var filePath = result.path!;
var filePath = result.path;
// Use the ExpectedCompletionsVisitor to compute the set of expected
// completions for this CompilationUnit.
final visitor = ExpectedCompletionsVisitor(filePath);

3
pkg/analyzer/CHANGELOG.md
View file

@ -1,3 +1,6 @@
## 2.1.0
* Changed `AnalysisResult.path` to be non-nullable.
## 2.0.0
* Removed deprecated `Scope.lookup2()`.
* Removed deprecated setters in API of AST.

4
pkg/analyzer/lib/dart/analysis/results.dart
View file

@ -17,9 +17,7 @@ import 'package:analyzer/src/generated/source.dart';
abstract class AnalysisResult {
/// The absolute and normalized path of the file that was analyzed.
/// If [state] is not [ResultState.VALID], throws [StateError].
///
/// TODO(migration): should not be nullable
String? get path;
String get path;
/// Return the session used to compute this result.
/// If [state] is not [ResultState.VALID], throws [StateError].

2
pkg/analyzer/lib/src/dart/analysis/driver.dart
View file

@ -1148,7 +1148,7 @@ class AnalysisDriver implements AnalysisDriverGeneric {
// last time, so we don't need to produce it again now.
} else {
_resultController.add(result);
_lastProducedSignatures[result.path!] = result._signature;
_lastProducedSignatures[result.path] = result._signature;
}
} catch (exception, stackTrace) {
_reportException(path, exception, stackTrace);

12
pkg/analyzer/lib/src/dart/analysis/results.dart
View file

@ -17,7 +17,7 @@ abstract class AnalysisResultImpl implements AnalysisResult {
final AnalysisSession session;
@override
final String? path;
final String path;
@override
final Uri uri;
@ -79,14 +79,11 @@ class ParsedLibraryResultImpl extends AnalysisResultImpl
final List<ParsedUnitResult>? units;
ParsedLibraryResultImpl(
AnalysisSession session, String? path, Uri uri, this.units)
AnalysisSession session, String path, Uri uri, this.units)
: super(session, path, uri);
@override
ResultState get state {
if (path == null) {
return ResultState.NOT_A_FILE;
}
return ResultState.VALID;
}
@ -168,14 +165,11 @@ class ResolvedLibraryResultImpl extends AnalysisResultImpl
final List<ResolvedUnitResult>? units;
ResolvedLibraryResultImpl(
AnalysisSession session, String? path, Uri uri, this.element, this.units)
AnalysisSession session, String path, Uri uri, this.element, this.units)
: super(session, path, uri);
@override
ResultState get state {
if (path == null) {
return ResultState.NOT_A_FILE;
}
return ResultState.VALID;
}

2
pkg/analyzer/test/generated/constant_test.dart
View file

@ -497,7 +497,7 @@ $context
var expression = findNode.variableDeclaration('x =').initializer!;
var file = getFile(result.path!);
var file = getFile(result.path);
var evaluator = ConstantEvaluator(
file.createSource(result.uri),
result.libraryElement as LibraryElementImpl,

4
pkg/analyzer/test/src/dart/analysis/driver_test.dart
View file

@ -3028,7 +3028,7 @@ class F extends X {}
driver.changeFile(b);
await waitForIdleWithoutExceptions();
List<String> analyzedPaths = allResults.map((r) => r.path!).toList();
List<String> analyzedPaths = allResults.map((r) => r.path).toList();
// The changed file must be the first.
expect(analyzedPaths[0], b);
@ -3070,7 +3070,7 @@ class F extends X {}
driver.changeFile(a);
await waitForIdleWithoutExceptions();
List<String> analyzedPaths = allResults.map((r) => r.path!).toList();
List<String> analyzedPaths = allResults.map((r) => r.path).toList();
// The changed files must be the first.
expect(analyzedPaths[0], a);

4
pkg/analyzer/test/src/dart/micro/simple_file_resolver_test.dart
View file

@ -1007,7 +1007,7 @@ void func() {
}
''');
_assertDiscoveredLibraryForParts([result.path!]);
_assertDiscoveredLibraryForParts([result.path]);
}
test_resolve_part_of_uri() async {
@ -1028,7 +1028,7 @@ void func() {
}
''');
_assertDiscoveredLibraryForParts([result.path!]);
_assertDiscoveredLibraryForParts([result.path]);
}
test_resolveFile_cache() async {

2
pkg/analyzer/test/verify_diagnostics_test.dart
View file

@ -321,7 +321,7 @@ class DocumentationValidator {
/// Extract documentation from the file that was parsed to produce the given
/// [result].
Future<void> _validateFile(ParsedUnitResult result) async {
filePath = result.path!;
filePath = result.path;
hasWrittenFilePath = false;
CompilationUnit unit = result.unit;
for (CompilationUnitMember declaration in unit.declarations) {

2
pkg/analyzer_plugin/lib/src/utilities/change_builder/change_builder_dart.dart
View file

@ -1281,7 +1281,7 @@ class DartFileEditBuilderImpl extends FileEditBuilderImpl
/// the given [resolvedUnit] and [timeStamp].
DartFileEditBuilderImpl(ChangeBuilderImpl changeBuilder, this.resolvedUnit,
int timeStamp, this.libraryChangeBuilder)
: super(changeBuilder, resolvedUnit.path!, timeStamp);
: super(changeBuilder, resolvedUnit.path, timeStamp);
@override
bool get hasEdits =>

2
pkg/analyzer_plugin/lib/src/utilities/folding/folding.dart
View file

@ -21,7 +21,7 @@ class DartFoldingRequestImpl implements DartFoldingRequest {
DartFoldingRequestImpl(this.resourceProvider, this.result);
@override
String get path => result.path!;
String get path => result.path;
}
/// A concrete implementation of [FoldingCollector].

2
pkg/analyzer_plugin/lib/src/utilities/highlights/highlights.dart
View file

@ -21,7 +21,7 @@ class DartHighlightsRequestImpl implements DartHighlightsRequest {
DartHighlightsRequestImpl(this.resourceProvider, this.result);
@override
String get path => result.path!;
String get path => result.path;
}
/// A concrete implementation of [HighlightsCollector].

2
pkg/analyzer_plugin/lib/src/utilities/kythe/entries.dart
View file

@ -19,7 +19,7 @@ class DartEntryRequestImpl implements DartEntryRequest {
DartEntryRequestImpl(this.resourceProvider, this.result);
@override
String get path => result.path!;
String get path => result.path;
}
/// A concrete implementation of [EntryCollector].

2
pkg/analyzer_plugin/lib/src/utilities/navigation/navigation.dart
View file

@ -28,7 +28,7 @@ class DartNavigationRequestImpl implements DartNavigationRequest {
this.resourceProvider, this.offset, this.length, this.result);
@override
String get path => result.path!;
String get path => result.path;
}
/// A concrete implementation of [NavigationCollector].

2
pkg/analyzer_plugin/lib/src/utilities/occurrences/occurrences.dart
View file

@ -20,7 +20,7 @@ class DartOccurrencesRequestImpl implements DartOccurrencesRequest {
DartOccurrencesRequestImpl(this.resourceProvider, this.result);
@override
String get path => result.path!;
String get path => result.path;
}
/// A concrete implementation of [OccurrencesCollector].

2
pkg/analyzer_plugin/lib/src/utilities/outline/outline.dart
View file

@ -20,7 +20,7 @@ class DartOutlineRequestImpl implements DartOutlineRequest {
DartOutlineRequestImpl(this.resourceProvider, this.result);
@override
String get path => result.path!;
String get path => result.path;
}
/// A concrete implementation of [OutlineCollector].

2
pkg/nnbd_migration/lib/migration_cli.dart
View file

@ -1093,7 +1093,7 @@ class _FixCodeProcessor extends Object {
});
await processResources((ResolvedUnitResult result) async {
_progressBar.tick();
if (_migrationCli.shouldBeMigrated(result.path!)) {
if (_migrationCli.shouldBeMigrated(result.path)) {
await _task!.finalizeUnit(result);
}
});

2
pkg/nnbd_migration/lib/src/front_end/info_builder.dart
View file

@ -111,7 +111,7 @@ class InfoBuilder {
// referenced (we'll just skip the entire library because we'll only
// ever see its parts).
sourceInfo ??= SourceInformation();
var edit = listener!.sourceChange.getFileEdit(unitResult.path!);
var edit = listener!.sourceChange.getFileEdit(unitResult.path);
var unit = _explainUnit(sourceInfo, unitResult, edit);
if (_pathsToProcess!.contains(unitResult.path)) {
units.add(unit);