Version 2.14.0-47.0.dev

Merge commit '11c2c4aaccb5b09c4b4f954cd82f1fce30bcb98a' into 'dev'

Author: Dart CI

pkg/analysis_server/lib/src/lsp/handlers/handler_completion.dart

@@ -357,11 +357,15 @@ class CompletionHandler
               final key = _createImportedSymbolKey(nameKey, declaringUri);
               final importingUris = alreadyImportedSymbols[key];
 
-              // Keep it only if there are either:
-              // - no URIs importing it
-              // - the URIs importing it include this one
+              // Keep it only if:
+              // - no existing imports include it
+              //     (in which case all libraries will be offered as
+              //     auto-imports)
+              // - this is the first imported URI that includes it
+              //     (we don't want to repeat it for each imported library that
+              //     includes it)
               return importingUris == null ||
-                  importingUris.contains('${library.uri}');
+                  importingUris.first == '${library.uri}';
             }).map((item) => declarationToCompletionItem(
                       capabilities,
                       unit.path!,

pkg/analysis_server/test/lsp/completion_dart_test.dart

@@ -1192,6 +1192,95 @@ main() {
     '''));
   }
 
+  Future<void>
+      test_suggestionSets_doesNotDuplicate_importedViaMultipleLibraries() async {
+    // An item that's already imported through multiple libraries that
+    // export it should not result in multiple entries.
+    newFile(
+      join(projectFolderPath, 'lib/source_file.dart'),
+      content: '''
+      class MyExportedClass {}
+      ''',
+    );
+    newFile(
+      join(projectFolderPath, 'lib/reexport1.dart'),
+      content: '''
+      export 'source_file.dart';
+      ''',
+    );
+    newFile(
+      join(projectFolderPath, 'lib/reexport2.dart'),
+      content: '''
+      export 'source_file.dart';
+      ''',
+    );
+
+    final content = '''
+import 'reexport1.dart';
+import 'reexport2.dart';
+
+main() {
+  MyExported^
+}
+    ''';
+
+    final initialAnalysis = waitForAnalysisComplete();
+    await initialize(
+        workspaceCapabilities:
+            withApplyEditSupport(emptyWorkspaceClientCapabilities));
+    await openFile(mainFileUri, withoutMarkers(content));
+    await initialAnalysis;
+
+    final res = await getCompletion(mainFileUri, positionFromMarker(content));
+
+    final completions = res.where((c) => c.label == 'MyExportedClass').toList();
+    expect(completions, hasLength(1));
+  }
+
+  Future<void>
+      test_suggestionSets_doesNotDuplicate_importedViaSingleLibrary() async {
+    // An item that's already imported through a library that exports it
+    // should not result in multiple entries.
+    newFile(
+      join(projectFolderPath, 'lib/source_file.dart'),
+      content: '''
+      class MyExportedClass {}
+      ''',
+    );
+    newFile(
+      join(projectFolderPath, 'lib/reexport1.dart'),
+      content: '''
+      export 'source_file.dart';
+      ''',
+    );
+    newFile(
+      join(projectFolderPath, 'lib/reexport2.dart'),
+      content: '''
+      export 'source_file.dart';
+      ''',
+    );
+
+    final content = '''
+import 'reexport1.dart';
+
+main() {
+  MyExported^
+}
+    ''';
+
+    final initialAnalysis = waitForAnalysisComplete();
+    await initialize(
+        workspaceCapabilities:
+            withApplyEditSupport(emptyWorkspaceClientCapabilities));
+    await openFile(mainFileUri, withoutMarkers(content));
+    await initialAnalysis;
+
+    final res = await getCompletion(mainFileUri, positionFromMarker(content));
+
+    final completions = res.where((c) => c.label == 'MyExportedClass').toList();
+    expect(completions, hasLength(1));
+  }
+
   Future<void> test_suggestionSets_doesNotFilterSymbolsWithSameName() async {
     // Classes here are not re-exports, so should not be filtered out.
     newFile(

pkg/compiler/lib/src/commandline_options.dart

@@ -27,8 +27,6 @@ class Flags {
   static const String enableDiagnosticColors = '--enable-diagnostic-colors';
   static const String experimentalTrackAllocations =
       '--experimental-track-allocations';
-  static const String experimentalAllocationsPath =
-      '--experimental-allocations-path';
 
   static const String experimentalWrapped = '--experimental-wrapped';
   static const String experimentalPowersets = '--experimental-powersets';

pkg/compiler/lib/src/dart2js.dart

@@ -592,7 +592,6 @@ Future<api.CompilationResult> compile(List<String> argv,
     // TODO(29574): provide a warning/hint/error, when profile-based data is
     // used without `--fast-startup`.
     new OptionHandler(Flags.experimentalTrackAllocations, passThrough),
-    new OptionHandler("${Flags.experimentalAllocationsPath}=.+", passThrough),
 
     new OptionHandler(Flags.experimentLocalNames, ignoreOption),
     new OptionHandler(Flags.experimentStartupFunctions, passThrough),

pkg/compiler/lib/src/js_emitter/code_emitter_task.dart

@@ -125,7 +125,6 @@ class CodeEmitterTask extends CompilerTask {
       });
       ProgramBuilder programBuilder = ProgramBuilder(
           _compiler.options,
-          _compiler.reporter,
           closedWorld.elementEnvironment,
           closedWorld.commonElements,
           closedWorld.outputUnitData,

pkg/compiler/lib/src/js_emitter/model.dart

@@ -19,7 +19,6 @@ class Program {
   final List<Holder> holders;
   final bool outputContainsConstantList;
   final bool needsNativeSupport;
-  final bool hasSoftDeferredClasses;
 
   // If this field is not `null` then its value must be emitted in the embedded
   // global `TYPE_TO_INTERCEPTOR_MAP`. The map references constants and classes.
@@ -32,9 +31,7 @@ class Program {
 
   Program(this.fragments, this.holders, this.typeToInterceptorMap,
       this._metadataCollector, this.finalizers,
-      {this.needsNativeSupport,
-      this.outputContainsConstantList,
-      this.hasSoftDeferredClasses}) {
+      {this.needsNativeSupport, this.outputContainsConstantList}) {
     assert(needsNativeSupport != null);
     assert(outputContainsConstantList != null);
   }
@@ -289,11 +286,6 @@ class Class implements FieldContainer {
   final bool isNative;
   final bool isClosureBaseClass; // Common base class for closures.
 
-  /// Whether this class should be soft deferred.
-  ///
-  /// A soft-deferred class is only fully initialized at first instantiation.
-  final bool isSoftDeferred;
-
   final bool isMixinApplicationWithMembers;
 
   // If the class implements a function type, and the type is encoded in the
@@ -331,7 +323,6 @@ class Class implements FieldContainer {
       this.isDirectlyInstantiated,
       this.isNative,
       this.isClosureBaseClass,
-      this.isSoftDeferred = false,
       this.isMixinApplicationWithMembers}) {
     assert(onlyForRti != null);
     assert(onlyForConstructor != null);

pkg/compiler/lib/src/js_emitter/program_builder/program_builder.dart

@@ -4,9 +4,6 @@
 
 library dart2js.js_emitter.program_builder;
 
-import 'dart:io';
-import 'dart:convert' show jsonDecode;
-
 import '../../common.dart';
 import '../../common/names.dart' show Names, Selectors;
 import '../../constants/values.dart'
@@ -64,7 +61,6 @@ part 'registry.dart';
 /// emitted more easily by the individual emitters.
 class ProgramBuilder {
   final CompilerOptions _options;
-  final DiagnosticReporter _reporter;
   final JElementEnvironment _elementEnvironment;
   final JCommonElements _commonElements;
   final OutputUnitData _outputUnitData;
@@ -111,7 +107,6 @@ class ProgramBuilder {
 
   ProgramBuilder(
       this._options,
-      this._reporter,
       this._elementEnvironment,
       this._commonElements,
       this._outputUnitData,
@@ -173,17 +168,8 @@ class ProgramBuilder {
   List<StubMethod> _jsInteropIsChecks = [];
   final Set<TypeCheck> _jsInteropTypeChecks = {};
 
-  /// Classes that have been allocated during a profile run.
-  ///
-  /// These classes should not be soft-deferred.
-  ///
-  /// Also contains classes that are not tracked by the profile run (like
-  /// interceptors, ...).
-  Set<ClassEntity> _notSoftDeferred;
-
   Program buildProgram({bool storeFunctionTypesInMetadata: false}) {
     collector.collect();
-    _initializeSoftDeferredMap();
 
     this._storeFunctionTypesInMetadata = storeFunctionTypesInMetadata;
     // Note: In rare cases (mostly tests) output units can be empty. This
@@ -279,78 +265,13 @@ class ProgramBuilder {
     return new Program(fragments, holders, _buildTypeToInterceptorMap(),
         _task.metadataCollector, finalizers,
         needsNativeSupport: needsNativeSupport,
-        outputContainsConstantList: collector.outputContainsConstantList,
-        hasSoftDeferredClasses: _notSoftDeferred != null);
+        outputContainsConstantList: collector.outputContainsConstantList);
   }
 
   void _markEagerClasses() {
     _markEagerInterceptorClasses();
   }
 
-  void _initializeSoftDeferredMap() {
-    var allocatedClassesPath = _options.experimentalAllocationsPath;
-    if (allocatedClassesPath != null) {
-      // TODO(29574): the following denylist is ad-hoc and potentially
-      // incomplete. We need to mark all classes as black listed, that are
-      // used without code going through the class' constructor.
-      var denylist = [
-        'dart:_interceptors',
-        'dart:html',
-        'dart:typed_data_implementation',
-        'dart:_native_typed_data'
-      ].toSet();
-
-      // TODO(29574): the compiler should not just use dart:io to get the
-      // contents of a file.
-      File file = new File(allocatedClassesPath);
-
-      // TODO(29574): are the following checks necessary?
-      // To make compilation in build-systems easier, we ignore non-existing
-      // or empty profiles.
-      if (!file.existsSync()) {
-        _reporter.log("Profile file does not exist: $allocatedClassesPath");
-        return;
-      }
-      if (file.lengthSync() == 0) {
-        _reporter.log("Profile information (allocated classes) is empty.");
-        return;
-      }
-
-      String data = new File(allocatedClassesPath).readAsStringSync();
-      Set<String> allocatedClassesKeys = jsonDecode(data).keys.toSet();
-      Set<ClassEntity> allocatedClasses = new Set<ClassEntity>();
-
-      // Collects all super and mixin classes of a class.
-      void collect(ClassEntity element) {
-        allocatedClasses.add(element);
-        if (_elementEnvironment.isMixinApplication(element)) {
-          collect(_elementEnvironment.getEffectiveMixinClass(element));
-        }
-        ClassEntity superclass = _elementEnvironment.getSuperClass(element);
-        if (superclass != null) {
-          collect(superclass);
-        }
-      }
-
-      // For every known class, see if it was allocated in the profile. If yes,
-      // collect its dependencies (supers and mixins) and mark them as
-      // not-soft-deferrable.
-      collector.outputClassLists.forEach((_, List<ClassEntity> elements) {
-        for (ClassEntity element in elements) {
-          // TODO(29574): share the encoding of the element with the code
-          // that emits the profile-run.
-          var key = "${element.library.canonicalUri}:${element.name}";
-          if (allocatedClassesKeys.contains(key) ||
-              _nativeData.isJsInteropClass(element) ||
-              denylist.contains(element.library.canonicalUri.toString())) {
-            collect(element);
-          }
-        }
-      });
-      _notSoftDeferred = allocatedClasses;
-    }
-  }
-
   js.Expression _buildTypeToInterceptorMap() {
     InterceptorStubGenerator stubGenerator = new InterceptorStubGenerator(
         _commonElements,
@@ -641,10 +562,6 @@ class ProgramBuilder {
         staticFieldsForReflection);
   }
 
-  bool _isSoftDeferred(ClassEntity element) {
-    return _notSoftDeferred != null && !_notSoftDeferred.contains(element);
-  }
-
   Class _buildClass(ClassEntity cls) {
     ClassTypeData typeData = _buildClassTypeData(cls);
 
@@ -850,7 +767,6 @@ class ProgramBuilder {
           onlyForConstructor: onlyForConstructor,
           isNative: _nativeData.isNativeClass(cls),
           isClosureBaseClass: isClosureBaseClass,
-          isSoftDeferred: _isSoftDeferred(cls),
           isMixinApplicationWithMembers: isMixinApplicationWithMembers);
     }
     _classes[cls] = result;