Handle cases where a non-dart file is being edited (issue 32160)

bwilkerson · commit-bot@chromium.org · commit ae5534a39441 · 2018-02-14T18:27:33.000Z
Change-Id: Icd7d1ff0ecb4515163281c9a85a1b1927e864fbe Reviewed-on: https://dart-review.googlesource.com/41400 Reviewed-by: Konstantin Shcheglov <scheglov@google.com> Commit-Queue: Brian Wilkerson <brianwilkerson@google.com>
diff --git a/pkg/analyzer_plugin/lib/src/utilities/change_builder/change_builder_dart.dart b/pkg/analyzer_plugin/lib/src/utilities/change_builder/change_builder_dart.dart
@@ -50,7 +50,7 @@ class DartChangeBuilderImpl extends ChangeBuilderImpl
   @override
   Future<DartFileEditBuilderImpl> createFileEditBuilder(String path) async {
     ResolveResult result = await session.getResolvedAst(path);
-    ResultState state = result.state;
+    ResultState state = result?.state ?? ResultState.INVALID_FILE_TYPE;
     if (state == ResultState.INVALID_FILE_TYPE) {
       throw new AnalysisException('Cannot analyze "$path"');
     }

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ class DartChangeBuilderImpl extends ChangeBuilderImpl`
`50`	`50`	`@override`
`51`	`51`	`Future<DartFileEditBuilderImpl> createFileEditBuilder(String path) async {`
`52`	`52`	`ResolveResult result = await session.getResolvedAst(path);`
`53`		`- ResultState state = result.state;`
	`53`	`+ ResultState state = result?.state ?? ResultState.INVALID_FILE_TYPE;`
`54`	`54`	`if (state == ResultState.INVALID_FILE_TYPE) {`
`55`	`55`	`throw new AnalysisException('Cannot analyze "$path"');`
`56`	`56`	`}`