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

Issue 27386. Fix for 'use similar' Quick Fix for import-prefixed identifiers.

Browse source 
R=brianwilkerson@google.com
BUG= https://github.com/dart-lang/sdk/issues/27386

Review URL: https://codereview.chromium.org/2361483002 .
This commit is contained in:
Konstantin Shcheglov 2016-09-21 10:02:20 -07:00
parent 454289dbe3
commit e82cbea8fe
2 changed files with 91 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
pkg/analysis_server/lib/src/services/correction/fix_internal.dart
View file

@ -1808,31 +1808,44 @@ class FixProcessor {
}
void _addFix_undefinedClass_useSimilar() {
AstNode node = this.node;
// Prepare the optional import prefix name.
String prefixName = null;
if (node is SimpleIdentifier && node.staticElement is PrefixElement) {
AstNode parent = node.parent;
if (parent is PrefixedIdentifier &&
parent.prefix == node &&
parent.parent is TypeName) {
prefixName = (node as SimpleIdentifier).name;
node = parent.identifier;
}
}
// Process if looks like a type.
if (_mayBeTypeIdentifier(node)) {
// Prepare for selecting the closest element.
String name = (node as SimpleIdentifier).name;
_ClosestElementFinder finder = new _ClosestElementFinder(
name,
(Element element) => element is ClassElement,
MAX_LEVENSHTEIN_DISTANCE);
// find closest element
{
// elements of this library
// Check elements of this library.
if (prefixName == null) {
for (CompilationUnitElement unit in unitLibraryElement.units) {
finder._updateList(unit.types);
}
// elements from imports
for (ImportElement importElement in unitLibraryElement.imports) {
if (importElement.prefix == null) {
Map<String, Element> namespace = getImportNamespace(importElement);
finder._updateList(namespace.values);
}
}
// Check elements from imports.
for (ImportElement importElement in unitLibraryElement.imports) {
if (importElement.prefix?.name == prefixName) {
Map<String, Element> namespace = getImportNamespace(importElement);
finder._updateList(namespace.values);
}
}
// if we have close enough element, suggest to use it
// If we have a close enough element, suggest to use it.
if (finder._element != null) {
String closestName = finder._element.name;
_addReplaceEdit(rf.rangeNode(node), closestName);
// add proposal
// Add proposal.
if (closestName != null) {
_addFix(DartFixKind.CHANGE_TO, [closestName]);
}
@ -1942,24 +1955,39 @@ class FixProcessor {
}
void _addFix_undefinedFunction_useSimilar() {
AstNode node = this.node;
if (node is SimpleIdentifier) {
String name = (node as SimpleIdentifier).name;
// Prepare the optional import prefix name.
String prefixName = null;
{
AstNode invocation = node.parent;
if (invocation is MethodInvocation && invocation.methodName == node) {
Expression target = invocation.target;
if (target is SimpleIdentifier &&
target.staticElement is PrefixElement) {
prefixName = target.name;
}
}
}
// Prepare for selecting the closest element.
_ClosestElementFinder finder = new _ClosestElementFinder(
name,
node.name,
(Element element) => element is FunctionElement,
MAX_LEVENSHTEIN_DISTANCE);
// this library
for (CompilationUnitElement unit in unitLibraryElement.units) {
finder._updateList(unit.functions);
// Check to this library units.
if (prefixName == null) {
for (CompilationUnitElement unit in unitLibraryElement.units) {
finder._updateList(unit.functions);
}
}
// imports
// Check unprefixed imports.
for (ImportElement importElement in unitLibraryElement.imports) {
if (importElement.prefix == null) {
if (importElement.prefix?.name == prefixName) {
Map<String, Element> namespace = getImportNamespace(importElement);
finder._updateList(namespace.values);
}
}
// if we have close enough element, suggest to use it
// If we have a close enough element, suggest to use it.
if (finder._element != null) {
String closestName = finder._element.name;
_addReplaceEdit(rf.rangeNode(node), closestName);

44
pkg/analysis_server/test/services/correction/fix_test.dart
View file

@ -3971,6 +3971,23 @@ const a = const A();
''');
}
test_undefinedClass_useSimilar_BAD_prefixed() async {
resolveTestUnit('''
import 'dart:async' as c;
main() {
c.Fture v = null;
}
''');
await assertHasFix(
DartFixKind.CHANGE_TO,
'''
import 'dart:async' as c;
main() {
c.Future v = null;
}
''');
}
test_undefinedClass_useSimilar_fromImport() async {
resolveTestUnit('''
main() {
@ -4370,6 +4387,33 @@ main() {
''');
}
test_undefinedFunction_useSimilar_prefixed_fromImport() async {
resolveTestUnit('''
import 'dart:core' as c;
main() {
c.prnt(42);
}
''');
await assertHasFix(
DartFixKind.CHANGE_TO,
'''
import 'dart:core' as c;
main() {
c.print(42);
}
''');
}
test_undefinedFunction_useSimilar_prefixed_ignoreLocal() async {
resolveTestUnit('''
import 'dart:async' as c;
main() {
c.main();
}
''');
await assertNoFix(DartFixKind.CHANGE_TO);
}
test_undefinedFunction_useSimilar_thisLibrary() async {
resolveTestUnit('''
myFunction() {}