Version 2.18.0-147.0.dev

Merge commit '1c27154f41827e1155d948c9dda67ecc39e79655' into 'dev'

Author: Dart CI

pkg/analysis_server/lib/src/cider/rename.dart

@@ -53,6 +53,8 @@ class CanRenameResponse {
     } else if (element is ConstructorElement) {
       status = validateConstructorName(name);
       _analyzePossibleConflicts(element, status, name);
+    } else if (element is ImportElement) {
+      status = validateImportPrefixName(name);
     }
 
     if (status == null) {
@@ -125,34 +127,9 @@ class CheckNameResponse {
     for (var element in elements) {
       matches.addAll(await fileResolver.findReferences2(element));
     }
-
     FlutterWidgetRename? flutterRename;
-    var flutterState = canRename._flutterWidgetState;
-    if (flutterState != null) {
-      var stateClass = flutterState.state;
-      var stateName = flutterState.newName;
-      var match = await fileResolver.findReferences2(stateClass);
-      var sourcePath = stateClass.source.fullName;
-      var location = stateClass.enclosingElement.lineInfo
-          .getLocation(stateClass.nameOffset);
-      CiderSearchMatch ciderMatch;
-      var searchInfo = CiderSearchInfo(
-          location, stateClass.nameLength, MatchKind.DECLARATION);
-      try {
-        ciderMatch = match.firstWhere((m) => m.path == sourcePath);
-        ciderMatch.references.add(searchInfo);
-      } catch (_) {
-        match.add(CiderSearchMatch(sourcePath, [], [searchInfo]));
-      }
-      var replacements = match
-          .map((m) => CiderReplaceMatch(
-              m.path,
-              m.references
-                  .map((p) => ReplaceInfo(
-                      stateName, p.startPosition, stateClass.nameLength))
-                  .toList()))
-          .toList();
-      flutterRename = FlutterWidgetRename(stateName, match, replacements);
+    if (canRename._flutterWidgetState != null) {
+      flutterRename = await _computeFlutterStateName();
     }
     var replaceMatches = <CiderReplaceMatch>[];
     if (element is ConstructorElement) {
@@ -179,6 +156,30 @@ class CheckNameResponse {
           replaceMatches.addMatch(result.path, result.matches.toList());
         }
       }
+    } else if (element is ImportElement) {
+      var replaceInfo = <ReplaceInfo>[];
+      for (var match in matches) {
+        for (var ref in match.references) {
+          if (newName.isEmpty) {
+            replaceInfo.add(ReplaceInfo('', ref.startPosition, ref.length));
+          } else {
+            var identifier = await _getInterpolationIdentifier(
+                match.path, ref.startPosition);
+            if (identifier != null) {
+              var lineInfo = canRename.lineInfo;
+              replaceInfo.add(ReplaceInfo('{$newName.${identifier.name}}',
+                  lineInfo.getLocation(identifier.offset), identifier.length));
+            } else {
+              replaceInfo
+                  .add(ReplaceInfo('$newName.', ref.startPosition, ref.length));
+            }
+          }
+        }
+        replaceMatches.addMatch(match.path, replaceInfo);
+        var sourcePath = element.source.fullName;
+        var infos = await _addElementDeclaration(element, sourcePath);
+        replaceMatches.addMatch(sourcePath, infos);
+      }
     } else {
       for (var match in matches) {
         replaceMatches.addMatch(
@@ -213,6 +214,32 @@ class CheckNameResponse {
             lineInfo.getLocation(element.setter!.nameOffset),
             element.setter!.nameLength));
       }
+    } else if (element is ImportElement) {
+      var prefix = element.prefix;
+      var unit =
+          (await canRename._fileResolver.resolve2(path: sourcePath)).unit;
+      var index = element.library.imports.indexOf(element);
+      var node = unit.directives.whereType<ImportDirective>().elementAt(index);
+      if (newName.isEmpty) {
+        // We should not get `prefix == null` because we check in
+        // `checkNewName` that the new name is different.
+        if (prefix == null) {
+          return infos;
+        }
+        var prefixEnd = prefix.nameOffset + prefix.nameLength;
+        infos.add(ReplaceInfo(newName, lineInfo.getLocation(node.uri.end),
+            prefixEnd - node.uri.end));
+      } else {
+        if (prefix == null) {
+          var uriEnd = node.uri.end;
+          infos.add(
+              ReplaceInfo(' as $newName', lineInfo.getLocation(uriEnd), 0));
+        } else {
+          var offset = prefix.nameOffset;
+          var length = prefix.nameLength;
+          infos.add(ReplaceInfo(newName, lineInfo.getLocation(offset), length));
+        }
+      }
     } else {
       var location = (await canRename._fileResolver.resolve2(path: sourcePath))
           .lineInfo
@@ -222,6 +249,53 @@ class CheckNameResponse {
     return infos;
   }
 
+  Future<FlutterWidgetRename?> _computeFlutterStateName() async {
+    var flutterState = canRename._flutterWidgetState;
+    var stateClass = flutterState!.state;
+    var stateName = flutterState.newName;
+    var match = await canRename._fileResolver.findReferences2(stateClass);
+    var sourcePath = stateClass.source.fullName;
+    var location =
+        stateClass.enclosingElement.lineInfo.getLocation(stateClass.nameOffset);
+    CiderSearchMatch ciderMatch;
+    var searchInfo =
+        CiderSearchInfo(location, stateClass.nameLength, MatchKind.DECLARATION);
+    try {
+      ciderMatch = match.firstWhere((m) => m.path == sourcePath);
+      ciderMatch.references.add(searchInfo);
+    } catch (_) {
+      match.add(CiderSearchMatch(sourcePath, [searchInfo]));
+    }
+    var replacements = match
+        .map((m) => CiderReplaceMatch(
+            m.path,
+            m.references
+                .map((p) => ReplaceInfo(
+                    stateName, p.startPosition, stateClass.nameLength))
+                .toList()))
+        .toList();
+    return FlutterWidgetRename(stateName, match, replacements);
+  }
+
+  /// If the given [reference] is before an interpolated [SimpleIdentifier] in
+  /// an [InterpolationExpression] without surrounding curly brackets, return
+  /// it. Otherwise return `null`.
+  Future<SimpleIdentifier?> _getInterpolationIdentifier(
+      String path, CharacterLocation loc) async {
+    var resolvedUnit = await canRename._fileResolver.resolve2(path: path);
+    var lineInfo = resolvedUnit.lineInfo;
+    var node = NodeLocator(
+            lineInfo.getOffsetOfLine(loc.lineNumber - 1) + loc.columnNumber)
+        .searchWithin(resolvedUnit.unit);
+    if (node is SimpleIdentifier) {
+      var parent = node.parent;
+      if (parent is InterpolationExpression && parent.rightBracket == null) {
+        return node;
+      }
+    }
+    return null;
+  }
+
   Future<CiderReplaceMatch?> _replaceSyntheticConstructor() async {
     var element = canRename.refactoringElement.element;
     var classElement = element.enclosingElement;
@@ -313,6 +387,9 @@ class CiderRenameComputer {
     if (element is ConstructorElement) {
       return true;
     }
+    if (element is ImportElement) {
+      return true;
+    }
     if (element is LabelElement || element is LocalElement) {
       return true;
     }

pkg/analysis_server/test/src/cider/rename_test.dart

@@ -651,6 +651,131 @@ void f() {
         [ReplaceInfo('bar', CharacterLocation(1, 1), 3)]);
   }
 
+  void test_rename_import() async {
+    var testCode = '''
+import 'dart:async';
+^import 'dart:math' show Random, min hide max;
+void f() {
+  Future f;
+  Random r;
+  min(1, 2);
+}
+''';
+
+    var result = await _rename(testCode, 'newName');
+    _assertTestChangeResult('''
+import 'dart:async';
+import 'dart:math' as newName show Random, min hide max;
+void f() {
+  Future f;
+  newName.Random r;
+  newName.min(1, 2);
+}
+''', result!.replaceMatches.first.matches);
+  }
+
+  void test_rename_import_hasCurlyBrackets() async {
+    var testCode = r'''
+// test
+^import 'dart:async';
+void f() {
+  Future f;
+  print('Future type: ${Future}');
+}
+''';
+
+    var result = await _rename(testCode, 'newName');
+    _assertTestChangeResult(r'''
+// test
+import 'dart:async' as newName;
+void f() {
+  newName.Future f;
+  print('Future type: ${newName.Future}');
+}
+''', result!.replaceMatches.first.matches);
+  }
+
+  void test_rename_import_noCurlyBrackets() async {
+    var testCode = r'''
+// test
+^import 'dart:async';
+void f() {
+  Future f;
+  print('Future type: $Future');
+}
+''';
+    var result = await _rename(testCode, 'newName');
+    _assertTestChangeResult(r'''
+// test
+import 'dart:async' as newName;
+void f() {
+  newName.Future f;
+  print('Future type: ${newName.Future}');
+}
+''', result!.replaceMatches.first.matches);
+  }
+
+  void test_rename_import_onPrefixElement() async {
+    var testCode = '''
+import 'dart:async' as test;
+import 'dart:math' as test;
+void f() {
+  test.Future f;
+  ^test.pi;
+  test.e;
+}
+''';
+    var result = await _rename(testCode, 'newName');
+    _assertTestChangeResult('''
+import 'dart:async' as test;
+import 'dart:math' as newName;
+void f() {
+  test.Future f;
+  newName.pi;
+  newName.e;
+}
+''', result!.replaceMatches.first.matches);
+  }
+
+  void test_rename_import_prefix() async {
+    var testCode = '''
+import 'dart:math' as test;
+^import 'dart:async' as test;
+void f() {
+  test.max(1, 2);
+  test.Future f;
+}
+''';
+    var result = await _rename(testCode, 'newName');
+    _assertTestChangeResult('''
+import 'dart:math' as test;
+import 'dart:async' as newName;
+void f() {
+  test.max(1, 2);
+  newName.Future f;
+}
+''', result!.replaceMatches.first.matches);
+  }
+
+  void test_rename_import_remove_prefix() async {
+    var testCode = '''
+import 'dart:math' as test;
+^import 'dart:async' as test;
+void f() {
+  test.Future f;
+}
+''';
+
+    var result = await _rename(testCode, '');
+    _assertTestChangeResult('''
+import 'dart:math' as test;
+import 'dart:async';
+void f() {
+  Future f;
+}
+''', result!.replaceMatches.first.matches);
+  }
+
   void test_rename_local() async {
     var testCode = '''
 void foo() {

pkg/analysis_server/tool/code_completion/corpus.dart

@@ -6,8 +6,6 @@ import 'dart:convert';
 import 'dart:io';
 
 import 'package:analyzer/src/util/file_paths.dart' as file_paths;
-import 'package:html/parser.dart' show parse;
-import 'package:http/http.dart' as http;
 import 'package:path/path.dart' as path;
 
 /// Generate or update corpus data.
@@ -63,7 +61,6 @@ final updateExistingClones = false;
 
 final _appDir =
     path.join(_homeDir, 'completion_metrics', 'third_party', 'apps');
-final _client = http.Client();
 
 final _homeDir = Platform.isWindows
     ? Platform.environment['LOCALAPPDATA']!
@@ -90,12 +87,6 @@ Future<CloneResult> _clone(String repo) async {
   return CloneResult(result.exitCode, cloneDir, msg: result.stderr as String);
 }
 
-Future<String> _getBody(String url) async => (await _getResponse(url)).body;
-
-Future<http.Response> _getResponse(String url) async =>
-    _client.get(Uri.parse(url),
-        headers: const {'User-Agent': 'dart.pkg.completion_metrics'});
-
 bool _hasPubspec(FileSystemEntity f) =>
     f is Directory &&
     File(path.join(f.path, file_paths.pubspecYaml)).existsSync();
@@ -130,38 +121,3 @@ class CloneResult {
   final String msg;
   CloneResult(this.exitCode, this.directory, {this.msg = ''});
 }
-
-class RepoList {
-  static const itsallwidgetsRssFeed = 'https://itsallwidgets.com/app/feed';
-
-  // (Re) generate the list of github repos on itsallwidgets.com
-  static Future<List<String>> fromItsAllWidgetsRssFeed() async {
-    final repos = <String>{};
-
-    final body = await _getBody(itsallwidgetsRssFeed);
-    final doc = parse(body);
-    final entries = doc.querySelectorAll('entry');
-    for (var entry in entries) {
-      final link = entry.querySelector('link');
-      if (link == null) {
-        continue;
-      }
-      final href = link.attributes['href'];
-      if (href == null) {
-        continue;
-      }
-      final body = await _getBody(href);
-      final doc = parse(body);
-      final links = doc.querySelectorAll('a');
-      for (var link in links) {
-        final href = link.attributes['href'];
-        if (href != null && href.startsWith('https://github.com/')) {
-          print(href);
-          repos.add(href);
-          continue;
-        }
-      }
-    }
-    return repos.toList();
-  }
-}