languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-10-08 02:48:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix metrics for built-in identifiers outside directives

Browse source 
Change-Id: I285199b8dd168215a1a41de9de77a83ddfa57d10
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/203665
Reviewed-by: Konstantin Shcheglov <scheglov@google.com>
Commit-Queue: Brian Wilkerson <brianwilkerson@google.com>
This commit is contained in:
Brian Wilkerson 2021-06-15 00:40:59 +00:00 committed by commit-bot@chromium.org
parent b98d761fcc
commit 1a7895f56f
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
pkg/analysis_server/tool/code_completion/visitors.dart
View file

@ -158,9 +158,12 @@ class ExpectedCompletionsVisitor extends RecursiveAstVisitor<void> {
.getLocation(entity.offset)
.columnNumber;
bool isKeyword() => kind == protocol.CompletionSuggestionKind.KEYWORD;
// Some special cases in the if and if-else blocks, 'import' from the
// DAS is "import '';" which we want to be sure to match.
if (entity.toString() == 'async') {
var lexeme = entity.toString();
if (lexeme == 'async') {
expectedCompletions.add(ExpectedCompletion.specialCompletionString(
filePath,
entity,
@ -169,7 +172,7 @@ class ExpectedCompletionsVisitor extends RecursiveAstVisitor<void> {
ASYNC_STAR,
kind,
elementKind));
} else if (entity.toString() == 'default') {
} else if (lexeme == 'default') {
expectedCompletions.add(ExpectedCompletion.specialCompletionString(
filePath,
entity,
@ -178,7 +181,7 @@ class ExpectedCompletionsVisitor extends RecursiveAstVisitor<void> {
DEFAULT_COLON,
kind,
elementKind));
} else if (entity.toString() == 'deferred') {
} else if (lexeme == 'deferred') {
expectedCompletions.add(ExpectedCompletion.specialCompletionString(
filePath,
entity,
@ -187,7 +190,7 @@ class ExpectedCompletionsVisitor extends RecursiveAstVisitor<void> {
DEFERRED_AS,
kind,
elementKind));
} else if (entity.toString() == 'export') {
} else if (lexeme == 'export' && isKeyword()) {
expectedCompletions.add(ExpectedCompletion.specialCompletionString(
filePath,
entity,
@ -196,7 +199,7 @@ class ExpectedCompletionsVisitor extends RecursiveAstVisitor<void> {
EXPORT_STATEMENT,
kind,
elementKind));
} else if (entity.toString() == 'import') {
} else if (lexeme == 'import' && isKeyword()) {
expectedCompletions.add(ExpectedCompletion.specialCompletionString(
filePath,
entity,
@ -205,7 +208,7 @@ class ExpectedCompletionsVisitor extends RecursiveAstVisitor<void> {
IMPORT_STATEMENT,
kind,
elementKind));
} else if (entity.toString() == 'part') {
} else if (lexeme == 'part' && isKeyword()) {
expectedCompletions.add(ExpectedCompletion.specialCompletionString(
filePath,
entity,
@ -214,7 +217,7 @@ class ExpectedCompletionsVisitor extends RecursiveAstVisitor<void> {
PART_STATEMENT,
kind,
elementKind));
} else if (entity.toString() == 'sync') {
} else if (lexeme == 'sync') {
expectedCompletions.add(ExpectedCompletion.specialCompletionString(
filePath,
entity,
@ -223,7 +226,7 @@ class ExpectedCompletionsVisitor extends RecursiveAstVisitor<void> {
SYNC_STAR,
kind,
elementKind));
} else if (entity.toString() == 'yield') {
} else if (lexeme == 'yield') {
expectedCompletions.add(ExpectedCompletion.specialCompletionString(
filePath,
entity,