From d5d0017e21012560a76405581b32d4d4541b3e29 Mon Sep 17 00:00:00 2001
From: Konstantin Shcheglov <scheglov@google.com>
Date: Mon, 20 Jul 2015 15:07:00 -0700
Subject: [PATCH] Tweak for navigation for URIs.

R=brianwilkerson@google.com
BUG=

Review URL: https://codereview.chromium.org//1246833002 .
---
 .../lib/src/computer/computer_navigation.dart        |  2 +-
 .../test/analysis/notification_navigation_test.dart  | 12 ++++++------
 .../test/integration/analysis/navigation_test.dart   |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkg/analysis_server/lib/src/computer/computer_navigation.dart b/pkg/analysis_server/lib/src/computer/computer_navigation.dart
index 12973796c51..b1caf9b57a1 100644
--- a/pkg/analysis_server/lib/src/computer/computer_navigation.dart
+++ b/pkg/analysis_server/lib/src/computer/computer_navigation.dart
@@ -262,7 +262,7 @@ class _DartUnitNavigationComputerVisitor extends RecursiveAstVisitor {
     if (element != null) {
       Source source = element.source;
       if (element.context.exists(source)) {
-        computer._addRegion_tokenStart_nodeEnd(node.keyword, node.uri, element);
+        computer._addRegionForNode(node.uri, element);
       }
     }
   }
diff --git a/pkg/analysis_server/test/analysis/notification_navigation_test.dart b/pkg/analysis_server/test/analysis/notification_navigation_test.dart
index 13d54cd9e54..6c440471ca4 100644
--- a/pkg/analysis_server/test/analysis/notification_navigation_test.dart
+++ b/pkg/analysis_server/test/analysis/notification_navigation_test.dart
@@ -506,7 +506,7 @@ main() {
     var libFile = addFile('$projectPath/bin/lib.dart', libCode);
     addTestFile('export "lib.dart";');
     return prepareNavigation().then((_) {
-      assertHasRegionString('export "lib.dart"');
+      assertHasRegionString('"lib.dart"');
       assertHasFileTarget(libFile, libCode.indexOf('lib;'), 'lib'.length);
     });
   }
@@ -514,7 +514,7 @@ main() {
   test_string_export_unresolvedUri() {
     addTestFile('export "no.dart";');
     return prepareNavigation().then((_) {
-      assertNoRegionString('export "no.dart"');
+      assertNoRegionString('"no.dart"');
     });
   }
 
@@ -523,7 +523,7 @@ main() {
     var libFile = addFile('$projectPath/bin/lib.dart', libCode);
     addTestFile('import "lib.dart";');
     return prepareNavigation().then((_) {
-      assertHasRegionString('import "lib.dart"');
+      assertHasRegionString('"lib.dart"');
       assertHasFileTarget(libFile, libCode.indexOf('lib;'), 'lib'.length);
     });
   }
@@ -538,7 +538,7 @@ main() {
   test_string_import_unresolvedUri() {
     addTestFile('import "no.dart";');
     return prepareNavigation().then((_) {
-      assertNoRegionString('import "no.dart"');
+      assertNoRegionString('"no.dart"');
     });
   }
 
@@ -550,7 +550,7 @@ library lib;
 part "test_unit.dart";
 ''');
     return prepareNavigation().then((_) {
-      assertHasRegionString('part "test_unit.dart"');
+      assertHasRegionString('"test_unit.dart"');
       assertHasFileTarget(unitFile, 0, 0);
     });
   }
@@ -561,7 +561,7 @@ library lib;
 part "test_unit.dart";
 ''');
     return prepareNavigation().then((_) {
-      assertNoRegionString('part "test_unit.dart"');
+      assertNoRegionString('"test_unit.dart"');
     });
   }
 
diff --git a/pkg/analysis_server/test/integration/analysis/navigation_test.dart b/pkg/analysis_server/test/integration/analysis/navigation_test.dart
index 310e882d458..c633811ade0 100644
--- a/pkg/analysis_server/test/integration/analysis/navigation_test.dart
+++ b/pkg/analysis_server/test/integration/analysis/navigation_test.dart
@@ -100,7 +100,7 @@ part of foo;
       // as a navigation target?
       checkLocal('Class<int>', 'Class<TypeParameter>', ElementKind.CLASS);
       checkRemote(
-          "part 'test2.dart';", r'test2.dart$', ElementKind.COMPILATION_UNIT);
+          "'test2.dart';", r'test2.dart$', ElementKind.COMPILATION_UNIT);
       checkLocal('Class<int>.constructor',
           'constructor(); /* constructor declaration */',
           ElementKind.CONSTRUCTOR);
@@ -113,7 +113,7 @@ part of foo;
       checkLocal('FunctionTypeAlias parameter', 'FunctionTypeAlias();',
           ElementKind.FUNCTION_TYPE_ALIAS);
       checkLocal('field)', 'field;', ElementKind.GETTER);
-      checkRemote("import 'dart:async'", r'async\.dart$', ElementKind.LIBRARY);
+      checkRemote("'dart:async'", r'async\.dart$', ElementKind.LIBRARY);
       checkLocal(
           'localVariable.field', 'localVariable =', ElementKind.LOCAL_VARIABLE);
       checkLocal('method();', 'method() {', ElementKind.METHOD);