| Index: pkg/analysis_server/lib/src/services/completion/dart/completion_manager.dart
|
| diff --git a/pkg/analysis_server/lib/src/services/completion/dart/completion_manager.dart b/pkg/analysis_server/lib/src/services/completion/dart/completion_manager.dart
|
| index 6ab671d20899702db4f9336c143cc1adaba0fd1c..d80074b0c85444428fcd9ffa8cbc74c5a51ef965 100644
|
| --- a/pkg/analysis_server/lib/src/services/completion/dart/completion_manager.dart
|
| +++ b/pkg/analysis_server/lib/src/services/completion/dart/completion_manager.dart
|
| @@ -484,18 +484,15 @@ class ReplacementRange {
|
| }
|
| if (token is StringToken) {
|
| SimpleStringLiteral uri = new SimpleStringLiteral(token, token.lexeme);
|
| - Token previous = token.previous;
|
| - if (previous is KeywordToken) {
|
| - Keyword keyword = previous.keyword;
|
| - if (keyword == Keyword.IMPORT ||
|
| - keyword == Keyword.EXPORT ||
|
| - keyword == Keyword.PART) {
|
| - int start = uri.contentsOffset;
|
| - var end = uri.contentsEnd;
|
| - if (start <= requestOffset && requestOffset <= end) {
|
| - // Replacement range for import URI
|
| - return new ReplacementRange(start, end - start);
|
| - }
|
| + Keyword keyword = token.previous?.keyword;
|
| + if (keyword == Keyword.IMPORT ||
|
| + keyword == Keyword.EXPORT ||
|
| + keyword == Keyword.PART) {
|
| + int start = uri.contentsOffset;
|
| + var end = uri.contentsEnd;
|
| + if (start <= requestOffset && requestOffset <= end) {
|
| + // Replacement range for import URI
|
| + return new ReplacementRange(start, end - start);
|
| }
|
| }
|
| }
|
|
|