languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-10-04 16:35:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tweak for navigation for URIs.

Browse source 
R=brianwilkerson@google.com
BUG=

Review URL: https://codereview.chromium.org//1246833002 .
This commit is contained in:
Konstantin Shcheglov 2015-07-20 15:07:00 -07:00
parent fb4a42279b
commit d5d0017e21
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -262,7 +262,7 @@ class _DartUnitNavigationComputerVisitor extends RecursiveAstVisitor {
if (element != null) { if (element != null) {
Source source = element.source; Source source = element.source;
if (element.context.exists(source)) { if (element.context.exists(source)) {
computer._addRegion_tokenStart_nodeEnd(node.keyword, node.uri, element); computer._addRegionForNode(node.uri, element);
} }
} }
} }

12
pkg/analysis_server/test/analysis/notification_navigation_test.dart
View file

@ -506,7 +506,7 @@ main() {
var libFile = addFile('$projectPath/bin/lib.dart', libCode); var libFile = addFile('$projectPath/bin/lib.dart', libCode);
addTestFile('export "lib.dart";'); addTestFile('export "lib.dart";');
return prepareNavigation().then((_) { return prepareNavigation().then((_) {
assertHasRegionString('export "lib.dart"'); assertHasRegionString('"lib.dart"');
assertHasFileTarget(libFile, libCode.indexOf('lib;'), 'lib'.length); assertHasFileTarget(libFile, libCode.indexOf('lib;'), 'lib'.length);
}); });
} }
@ -514,7 +514,7 @@ main() {
test_string_export_unresolvedUri() { test_string_export_unresolvedUri() {
addTestFile('export "no.dart";'); addTestFile('export "no.dart";');
return prepareNavigation().then((_) { return prepareNavigation().then((_) {
assertNoRegionString('export "no.dart"'); assertNoRegionString('"no.dart"');
}); });
} }
@ -523,7 +523,7 @@ main() {
var libFile = addFile('$projectPath/bin/lib.dart', libCode); var libFile = addFile('$projectPath/bin/lib.dart', libCode);
addTestFile('import "lib.dart";'); addTestFile('import "lib.dart";');
return prepareNavigation().then((_) { return prepareNavigation().then((_) {
assertHasRegionString('import "lib.dart"'); assertHasRegionString('"lib.dart"');
assertHasFileTarget(libFile, libCode.indexOf('lib;'), 'lib'.length); assertHasFileTarget(libFile, libCode.indexOf('lib;'), 'lib'.length);
}); });
} }
@ -538,7 +538,7 @@ main() {
test_string_import_unresolvedUri() { test_string_import_unresolvedUri() {
addTestFile('import "no.dart";'); addTestFile('import "no.dart";');
return prepareNavigation().then((_) { return prepareNavigation().then((_) {
assertNoRegionString('import "no.dart"'); assertNoRegionString('"no.dart"');
}); });
} }
@ -550,7 +550,7 @@ library lib;
part "test_unit.dart"; part "test_unit.dart";
'''); ''');
return prepareNavigation().then((_) { return prepareNavigation().then((_) {
assertHasRegionString('part "test_unit.dart"'); assertHasRegionString('"test_unit.dart"');
assertHasFileTarget(unitFile, 0, 0); assertHasFileTarget(unitFile, 0, 0);
}); });
} }
@ -561,7 +561,7 @@ library lib;
part "test_unit.dart"; part "test_unit.dart";
'''); ''');
return prepareNavigation().then((_) { return prepareNavigation().then((_) {
assertNoRegionString('part "test_unit.dart"'); assertNoRegionString('"test_unit.dart"');
}); });
} }

4
pkg/analysis_server/test/integration/analysis/navigation_test.dart
View file

@ -100,7 +100,7 @@ part of foo;
// as a navigation target? // as a navigation target?
checkLocal('Class<int>', 'Class<TypeParameter>', ElementKind.CLASS); checkLocal('Class<int>', 'Class<TypeParameter>', ElementKind.CLASS);
checkRemote( checkRemote(
"part 'test2.dart';", r'test2.dart$', ElementKind.COMPILATION_UNIT); "'test2.dart';", r'test2.dart$', ElementKind.COMPILATION_UNIT);
checkLocal('Class<int>.constructor', checkLocal('Class<int>.constructor',
'constructor(); /* constructor declaration */', 'constructor(); /* constructor declaration */',
ElementKind.CONSTRUCTOR); ElementKind.CONSTRUCTOR);
@ -113,7 +113,7 @@ part of foo;
checkLocal('FunctionTypeAlias parameter', 'FunctionTypeAlias();', checkLocal('FunctionTypeAlias parameter', 'FunctionTypeAlias();',
ElementKind.FUNCTION_TYPE_ALIAS); ElementKind.FUNCTION_TYPE_ALIAS);
checkLocal('field)', 'field;', ElementKind.GETTER); checkLocal('field)', 'field;', ElementKind.GETTER);
checkRemote("import 'dart:async'", r'async\.dart$', ElementKind.LIBRARY); checkRemote("'dart:async'", r'async\.dart$', ElementKind.LIBRARY);
checkLocal( checkLocal(
'localVariable.field', 'localVariable =', ElementKind.LOCAL_VARIABLE); 'localVariable.field', 'localVariable =', ElementKind.LOCAL_VARIABLE);
checkLocal('method();', 'method() {', ElementKind.METHOD); checkLocal('method();', 'method() {', ElementKind.METHOD);