Version 2.14.0-363.0.dev

Merge commit '32038798c6a719d54c198c57bc82e2773b0fccf5' into 'dev'

Author: Dart CI

.dart_tool/package_config.json

@@ -244,7 +244,7 @@
       "name": "dds",
       "rootUri": "../pkg/dds",
       "packageUri": "lib/",
-      "languageVersion": "2.14"
+      "languageVersion": "2.12"
     },
     {
       "name": "dev_compiler",

DEPS

@@ -139,7 +139,7 @@ vars = {
   "ply_rev": "604b32590ffad5cbb82e4afef1d305512d06ae93",
   "pool_rev": "7abe634002a1ba8a0928eded086062f1307ccfae",
   "process_rev": "56ece43b53b64c63ae51ec184b76bd5360c28d0b",
-  "protobuf_rev": "0d03fd588df69e9863e2a2efc0059dee8f18d5b2",
+  "protobuf_rev": "c1eb6cb51af39ccbaa1a8e19349546586a5c8e31",
   "pub_rev": "70b1a4f9229a36bac6340ec7eae2b2068baac96c",
   "pub_semver_rev": "f50d80ef10c4b2fa5f4c8878036a4d9342c0cc82",
   "resource_rev": "6b79867d0becf5395e5819a75720963b8298e9a7",

pkg/_fe_analyzer_shared/lib/src/messages/codes.dart

@@ -279,7 +279,7 @@ class DiagnosticMessageFromJson implements DiagnosticMessage {
       this.severity, this.uri, this.involvedFiles, this.codeName);
 
   factory DiagnosticMessageFromJson.fromJson(String jsonString) {
-    Map<String, Object> decoded = json.decode(jsonString);
+    Map<String, Object?> decoded = json.decode(jsonString);
     List<String> ansiFormatted =
         new List<String>.from(_asListOfString(decoded["ansiFormatted"]));
     List<String> plainTextFormatted =

pkg/analysis_server/lib/src/analysis_server.dart

@@ -55,7 +55,6 @@ import 'package:analyzer_plugin/protocol/protocol_common.dart' hide Element;
 import 'package:analyzer_plugin/src/utilities/navigation/navigation.dart';
 import 'package:analyzer_plugin/utilities/navigation/navigation_dart.dart';
 import 'package:http/http.dart' as http;
-import 'package:process/process.dart';
 import 'package:telemetry/crash_reporting.dart';
 import 'package:telemetry/telemetry.dart' as telemetry;
 import 'package:watcher/watcher.dart';
@@ -131,7 +130,6 @@ class AnalysisServer extends AbstractAnalysisServer {
     CrashReportingAttachmentsBuilder crashReportingAttachmentsBuilder,
     InstrumentationService instrumentationService, {
     http.Client? httpClient,
-    ProcessManager? processManager,
     RequestStatisticsHelper? requestStatistics,
     DiagnosticServer? diagnosticServer,
     this.detachableFileSystemManager,
@@ -145,7 +143,6 @@ class AnalysisServer extends AbstractAnalysisServer {
           baseResourceProvider,
           instrumentationService,
           httpClient,
-          processManager,
           NotificationManager(channel, baseResourceProvider.pathContext),
           requestStatistics: requestStatistics,
           enableBazelWatcher: enableBazelWatcher,
@@ -432,11 +429,9 @@ class AnalysisServer extends AbstractAnalysisServer {
     bool isPubspec(String filePath) =>
         file_paths.isPubspecYaml(resourceProvider.pathContext, filePath);
 
-    // When pubspecs are opened, trigger pre-loading of pub package names and
-    // versions.
-    final pubspecs = files.where(isPubspec).toList();
-    if (pubspecs.isNotEmpty) {
-      pubPackageService.beginCachePreloads(pubspecs);
+    // When a pubspec is opened, trigger package name caching for completion.
+    if (!pubPackageService.isRunning && files.any(isPubspec)) {
+      pubPackageService.beginPackageNamePreload();
     }
 
     priorityFiles.clear();
@@ -692,18 +687,6 @@ class ServerContextManagerCallbacks extends ContextManagerCallbacks {
     analysisDriver.priorityFiles = analysisServer.priorityFiles.toList();
   }
 
-  @override
-  void pubspecChanged(String pubspecPath) {
-    analysisServer.pubPackageService.fetchPackageVersionsViaPubOutdated(
-        pubspecPath,
-        pubspecWasModified: true);
-  }
-
-  @override
-  void pubspecRemoved(String pubspecPath) {
-    analysisServer.pubPackageService.flushPackageCaches(pubspecPath);
-  }
-
   @override
   void recordAnalysisErrors(String path, List<AnalysisError> errors) {
     filesToFlush.add(path);

pkg/analysis_server/lib/src/analysis_server_abstract.dart

@@ -19,7 +19,6 @@ import 'package:analysis_server/src/services/completion/dart/documentation_cache
 import 'package:analysis_server/src/services/completion/dart/extension_cache.dart';
 import 'package:analysis_server/src/services/correction/namespace.dart';
 import 'package:analysis_server/src/services/pub/pub_api.dart';
-import 'package:analysis_server/src/services/pub/pub_command.dart';
 import 'package:analysis_server/src/services/pub/pub_package_service.dart';
 import 'package:analysis_server/src/services/search/element_visitors.dart';
 import 'package:analysis_server/src/services/search/search_engine.dart';
@@ -53,7 +52,6 @@ import 'package:analyzer/src/util/file_paths.dart' as file_paths;
 import 'package:collection/collection.dart';
 import 'package:http/http.dart' as http;
 import 'package:meta/meta.dart';
-import 'package:process/process.dart';
 
 /// Implementations of [AbstractAnalysisServer] implement a server that listens
 /// on a [CommunicationChannel] for analysis messages and process them.
@@ -154,26 +152,14 @@ abstract class AbstractAnalysisServer {
     ResourceProvider baseResourceProvider,
     this.instrumentationService,
     http.Client? httpClient,
-    ProcessManager? processManager,
     this.notificationManager, {
     this.requestStatistics,
     bool enableBazelWatcher = false,
   })  : resourceProvider = OverlayResourceProvider(baseResourceProvider),
         pubApi = PubApi(instrumentationService, httpClient,
             Platform.environment['PUB_HOSTED_URL']) {
-    // We can only use a LocalProcessManager to run pub commands when backed by
-    // a real file system, otherwise we may try to run commands in folders that
-    // don't really exist. If processManager was supplied, it's likely a mock
-    // from a test in which case the pub command should still be created.
-    if (baseResourceProvider is PhysicalResourceProvider) {
-      processManager ??= LocalProcessManager();
-    }
-    final pubCommand = processManager != null
-        ? PubCommand(instrumentationService, processManager)
-        : null;
-
-    pubPackageService = PubPackageService(
-        instrumentationService, baseResourceProvider, pubApi, pubCommand);
+    pubPackageService =
+        PubPackageService(instrumentationService, baseResourceProvider, pubApi);
     performance = performanceDuringStartup;
 
     pluginManager = PluginManager(

pkg/analysis_server/lib/src/context_manager.dart

@@ -122,12 +122,6 @@ abstract class ContextManagerCallbacks {
   /// TODO(scheglov) Just pass results in here?
   void listenAnalysisDriver(AnalysisDriver driver);
 
-  /// The `pubspec.yaml` at [path] was added/modified.
-  void pubspecChanged(String path);
-
-  /// The `pubspec.yaml` at [path] was removed.
-  void pubspecRemoved(String path);
-
   /// Record error information for the file with the given [path].
   void recordAnalysisErrors(String path, List<protocol.AnalysisError> errors);
 }
@@ -572,21 +566,12 @@ class ContextManagerImpl implements ContextManager {
 
     _instrumentationService.logWatchEvent('<unknown>', path, type.toString());
 
-    final isPubpsec = file_paths.isPubspecYaml(pathContext, path);
     if (file_paths.isAnalysisOptionsYaml(pathContext, path) ||
         file_paths.isDotPackages(pathContext, path) ||
         file_paths.isPackageConfigJson(pathContext, path) ||
-        isPubpsec ||
+        file_paths.isPubspecYaml(pathContext, path) ||
         false) {
       _createAnalysisContexts();
-
-      if (isPubpsec) {
-        if (type == ChangeType.REMOVE) {
-          callbacks.pubspecRemoved(path);
-        } else {
-          callbacks.pubspecChanged(path);
-        }
-      }
       return;
     }
 
@@ -741,12 +726,6 @@ class NoopContextManagerCallbacks implements ContextManagerCallbacks {
   @override
   void listenAnalysisDriver(AnalysisDriver driver) {}
 
-  @override
-  void pubspecChanged(String pubspecPath) {}
-
-  @override
-  void pubspecRemoved(String pubspecPath) {}
-
   @override
   void recordAnalysisErrors(String path, List<protocol.AnalysisError> errors) {}
 }

pkg/analysis_server/lib/src/lsp/lsp_analysis_server.dart

@@ -52,7 +52,6 @@ import 'package:analyzer_plugin/src/protocol/protocol_internal.dart' as plugin;
 import 'package:collection/collection.dart';
 import 'package:http/http.dart' as http;
 import 'package:meta/meta.dart';
-import 'package:process/process.dart';
 import 'package:watcher/watcher.dart';
 
 /// Instances of the class [LspAnalysisServer] implement an LSP-based server
@@ -127,7 +126,6 @@ class LspAnalysisServer extends AbstractAnalysisServer {
     CrashReportingAttachmentsBuilder crashReportingAttachmentsBuilder,
     InstrumentationService instrumentationService, {
     http.Client? httpClient,
-    ProcessManager? processManager,
     DiagnosticServer? diagnosticServer,
     // Disable to avoid using this in unit tests.
     bool enableBazelWatcher = false,
@@ -139,7 +137,6 @@ class LspAnalysisServer extends AbstractAnalysisServer {
           baseResourceProvider,
           instrumentationService,
           httpClient,
-          processManager,
           LspNotificationManager(channel, baseResourceProvider.pathContext),
           enableBazelWatcher: enableBazelWatcher,
         ) {
@@ -187,10 +184,10 @@ class LspAnalysisServer extends AbstractAnalysisServer {
       RefactoringWorkspace(driverMap.values, searchEngine);
 
   void addPriorityFile(String filePath) {
-    // When pubspecs are opened, trigger pre-loading of pub package names and
-    // versions.
-    if (file_paths.isPubspecYaml(resourceProvider.pathContext, filePath)) {
-      pubPackageService.beginCachePreloads([filePath]);
+    // When a pubspec is opened, trigger package name caching for completion.
+    if (!pubPackageService.isRunning &&
+        file_paths.isPubspecYaml(resourceProvider.pathContext, filePath)) {
+      pubPackageService.beginPackageNamePreload();
     }
 
     final didAdd = priorityFiles.add(filePath);
@@ -854,18 +851,6 @@ class LspServerContextManagerCallbacks extends ContextManagerCallbacks {
     analysisDriver.priorityFiles = analysisServer.priorityFiles.toList();
   }
 
-  @override
-  void pubspecChanged(String pubspecPath) {
-    analysisServer.pubPackageService.fetchPackageVersionsViaPubOutdated(
-        pubspecPath,
-        pubspecWasModified: true);
-  }
-
-  @override
-  void pubspecRemoved(String pubspecPath) {
-    analysisServer.pubPackageService.flushPackageCaches(pubspecPath);
-  }
-
   @override
   void recordAnalysisErrors(String path, List<protocol.AnalysisError> errors) {
     final errorsToSend = errors.where(_shouldSendError).toList();

pkg/analysis_server/lib/src/lsp/mapping.dart

@@ -49,15 +49,6 @@ final diagnosticTagsForErrorCode = <String, List<lsp.DiagnosticTag>>{
   ],
 };
 
-/// Pattern for docComplete text on completion items that can be upgraded to
-/// the "detail" field so that it can be shown more prominently by clients.
-///
-/// This is typically used for labels like _latest compatible_ and _latest_ in
-/// the pubspec version items. These go into docComplete so that they appear
-/// reasonably for non-LSP clients where there is no equivalent of the detail
-/// field.
-final _upgradableDocCompletePattern = RegExp(r'^_([\w ]{0,20})_$');
-
 lsp.Either2<String, lsp.MarkupContent> asStringOrMarkupContent(
     Set<lsp.MarkupKind>? preferredFormats, String content) {
   return preferredFormats == null
@@ -965,21 +956,7 @@ lsp.CompletionItem toCompletionItem(
   final insertText = insertTextInfo.first;
   final insertTextFormat = insertTextInfo.last;
   final isMultilineCompletion = insertText.contains('\n');
-
-  var cleanedDoc = cleanDartdoc(suggestion.docComplete);
-  var detail = getCompletionDetail(suggestion, completionKind,
-      supportsCompletionDeprecatedFlag || supportsDeprecatedTag);
-
-  // To improve the display of some items (like pubspec version numbers),
-  // short labels in the format `_foo_` in docComplete are "upgraded" to the
-  // detail field.
-  final labelMatch = cleanedDoc != null
-      ? _upgradableDocCompletePattern.firstMatch(cleanedDoc)
-      : null;
-  if (labelMatch != null) {
-    cleanedDoc = null;
-    detail = labelMatch.group(1);
-  }
+  final cleanedDoc = cleanDartdoc(suggestion.docComplete);
 
   // Because we potentially send thousands of these items, we should minimise
   // the generated JSON as much as possible - for example using nulls in place
@@ -994,7 +971,8 @@ lsp.CompletionItem toCompletionItem(
     commitCharacters:
         includeCommitCharacters ? dartCompletionCommitCharacters : null,
     data: resolutionData,
-    detail: detail,
+    detail: getCompletionDetail(suggestion, completionKind,
+        supportsCompletionDeprecatedFlag || supportsDeprecatedTag),
     documentation: cleanedDoc != null
         ? asStringOrMarkupContent(formats, cleanedDoc)
         : null,

pkg/analysis_server/lib/src/services/completion/yaml/producer.dart

@@ -176,11 +176,9 @@ abstract class Producer {
   const Producer();
 
   /// A utility method used to create a suggestion for the [identifier].
-  CompletionSuggestion identifier(String identifier,
-          {int relevance = 1000, String? docComplete}) =>
+  CompletionSuggestion identifier(String identifier, {int relevance = 1000}) =>
       CompletionSuggestion(CompletionSuggestionKind.IDENTIFIER, relevance,
-          identifier, identifier.length, 0, false, false,
-          docComplete: docComplete);
+          identifier, identifier.length, 0, false, false);
 
   /// A utility method used to create a suggestion for the package [packageName].
   CompletionSuggestion packageName(String packageName,

pkg/analysis_server/lib/src/services/completion/yaml/pubspec_generator.dart

@@ -37,25 +37,18 @@ class PubPackageVersionProducer extends Producer {
   @override
   Iterable<CompletionSuggestion> suggestions(
       YamlCompletionRequest request) sync* {
-    final versions = request.pubPackageService
-        ?.cachedPubOutdatedVersions(request.filePath, package);
-    final resolvable = versions?.resolvableVersion;
-    var latest = versions?.latestVersion;
-
-    // If we didn't get a latest version from the "pub outdated" results, we can
-    // use the result from the Pub API if we've called it (this will usually
-    // only be the case for LSP where a resolve() call was sent).
+    // TOOD(dantup): Consider supporting async completion requests so this
+    // could call packageDetails() (with a short timeout, and pub retries
+    // disabled). A user that explicitly invokes completion in the location
+    // of a version may be prepared to wait a short period for a web request
+    // to get completion versions (this is also the only way for non-LSP
+    // clients to get them, since there are no resolve calls).
     //
-    // This allows us (in some cases) to still show version numbers even if the
-    // package was newly added to pubspec and not saved, so not yet in the
-    // "pub outdated" results.
-    latest ??= request.pubPackageService?.cachedPubApiLatestVersion(package);
-
-    if (resolvable != null && resolvable != latest) {
-      yield identifier('^$resolvable', docComplete: '_latest compatible_');
-    }
-    if (latest != null) {
-      yield identifier('^$latest', docComplete: '_latest_');
+    // Supporting this will require making the completion async further up.
+    final details = request.pubPackageService?.cachedPackageDetails(package);
+    final version = details?.latestVersion;
+    if (version != null) {
+      yield identifier('^$version');
     }
   }
 }