Macro. Remove most of the implementation.

Change-Id: Icd5966b91fb594a618dde38bb8b4c217ede75d9a
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/406724
Commit-Queue: Konstantin Shcheglov <[email protected]>
Reviewed-by: Phil Quitslund <[email protected]>

Author: scheglov

pkg/analysis_server/lib/src/handler/legacy/edit_get_fixes.dart

@@ -163,7 +163,6 @@ class EditGetFixesHandler extends LegacyHandler
           uri: optionsFile.toUri(),
           lineInfo: lineInfo,
           isLibrary: true,
-          isMacroPart: false,
           isPart: false,
           errors: errors,
           analysisOptions: analysisOptions,
@@ -299,7 +298,6 @@ error.errorCode: ${error.errorCode}
           uri: pubspecFile.toUri(),
           lineInfo: lineInfo,
           isLibrary: true,
-          isMacroPart: false,
           isPart: false,
           errors: errors,
           analysisOptions: analysisOptions,

pkg/analysis_server/lib/src/lsp/handlers/code_actions/abstract_code_actions_producer.dart

@@ -163,7 +163,6 @@ abstract class AbstractCodeActionsProducer
       uri: server.uriConverter.toClientUri(path),
       lineInfo: lineInfo,
       isLibrary: true,
-      isMacroPart: false,
       isPart: false,
       errors: errors,
       analysisOptions: analysisOptions,

pkg/analyzer/lib/src/clients/build_resolvers/build_resolvers.dart

@@ -17,7 +17,6 @@ import 'package:analyzer/src/dart/analysis/performance_logger.dart';
 import 'package:analyzer/src/generated/source.dart';
 import 'package:analyzer/src/summary/package_bundle_reader.dart';
 import 'package:analyzer/src/summary/summary_sdk.dart';
-import 'package:analyzer/src/summary2/macro.dart';
 import 'package:analyzer/src/summary2/package_bundle_format.dart';
 
 export 'package:analyzer/dart/analysis/analysis_options.dart'
@@ -70,7 +69,6 @@ AnalysisDriverForPackageBuild createAnalysisDriver({
     analysisOptionsMap: optionsMap,
     externalSummaries: dataStore,
     packages: packages,
-    macroSupport: KernelMacroSupport(),
     shouldReportInconsistentAnalysisException: false,
   );
 

pkg/analyzer/lib/src/dart/analysis/analysis_context_collection.dart

@@ -18,18 +18,13 @@ import 'package:analyzer/src/dart/analysis/info_declaration_store.dart';
 import 'package:analyzer/src/dart/analysis/performance_logger.dart';
 import 'package:analyzer/src/dart/analysis/unlinked_unit_store.dart';
 import 'package:analyzer/src/generated/sdk.dart';
-import 'package:analyzer/src/summary2/kernel_compilation_service.dart';
-import 'package:analyzer/src/summary2/macro.dart';
 import 'package:analyzer/src/util/sdk.dart';
 
 /// An implementation of [AnalysisContextCollection].
 class AnalysisContextCollectionImpl implements AnalysisContextCollection {
   /// The resource provider used to access the file system.
   final ResourceProvider resourceProvider;
 
-  /// The support for executing macros.
-  late final MacroSupportFactory macroSupportFactory;
-
   /// The shared container into which drivers record files ownership.
   final OwnedFiles ownedFiles = OwnedFiles();
 
@@ -65,7 +60,6 @@ class AnalysisContextCollectionImpl implements AnalysisContextCollection {
       required ContextRoot contextRoot,
       required DartSdk sdk,
     })? updateAnalysisOptions2,
-    MacroSupportFactory? macroSupportFactory,
     bool enableLintRuleTiming = false,
   }) : resourceProvider =
             resourceProvider ?? PhysicalResourceProvider.INSTANCE {
@@ -87,11 +81,6 @@ class AnalysisContextCollectionImpl implements AnalysisContextCollection {
     _throwIfAnyNotAbsoluteNormalizedPath(includedPaths);
     _throwIfNotAbsoluteNormalizedPath(sdkPath);
 
-    macroSupportFactory ??= KernelMacroSupportFactory();
-    // TODO(scheglov): https://github.com/dart-lang/linter/issues/3134
-    // ignore: prefer_initializing_formals
-    this.macroSupportFactory = macroSupportFactory;
-
     var contextLocator = ContextLocatorImpl(
       resourceProvider: this.resourceProvider,
     );
@@ -105,7 +94,6 @@ class AnalysisContextCollectionImpl implements AnalysisContextCollection {
       resourceProvider: this.resourceProvider,
     );
     for (var root in roots) {
-      var macroSupport = macroSupportFactory.newInstance();
       var context = contextBuilder.createContext(
         byteStore: byteStore,
         contextRoot: root,
@@ -123,7 +111,6 @@ class AnalysisContextCollectionImpl implements AnalysisContextCollection {
         fileContentCache: fileContentCache,
         unlinkedUnitStore: unlinkedUnitStore ?? UnlinkedUnitStoreImpl(),
         infoDeclarationStore: infoDeclarationStore,
-        macroSupport: macroSupport,
         ownedFiles: ownedFiles,
         enableLintRuleTiming: enableLintRuleTiming,
       );
@@ -165,11 +152,6 @@ class AnalysisContextCollectionImpl implements AnalysisContextCollection {
     for (var analysisContext in contexts) {
       await analysisContext.driver.dispose2();
     }
-    await macroSupportFactory.dispose();
-    // If there are other collections, they will have to start it again.
-    if (!forTesting) {
-      await KernelCompilationService.dispose();
-    }
   }
 
   /// Check every element with [_throwIfNotAbsoluteNormalizedPath].

pkg/analyzer/lib/src/dart/analysis/context_builder.dart

@@ -31,7 +31,6 @@ import 'package:analyzer/src/generated/sdk.dart' show DartSdk;
 import 'package:analyzer/src/generated/source.dart';
 import 'package:analyzer/src/summary/package_bundle_reader.dart';
 import 'package:analyzer/src/summary/summary_sdk.dart';
-import 'package:analyzer/src/summary2/macro.dart';
 import 'package:analyzer/src/summary2/package_bundle_format.dart';
 import 'package:analyzer/src/workspace/workspace.dart';
 
@@ -88,7 +87,6 @@ class ContextBuilderImpl {
     FileContentCache? fileContentCache,
     UnlinkedUnitStore? unlinkedUnitStore,
     InfoDeclarationStore? infoDeclarationStore,
-    MacroSupport? macroSupport,
     OwnedFiles? ownedFiles,
     bool enableLintRuleTiming = false,
   }) {
@@ -159,7 +157,6 @@ class ContextBuilderImpl {
       fileContentCache: fileContentCache,
       unlinkedUnitStore: unlinkedUnitStore,
       infoDeclarationStore: infoDeclarationStore,
-      macroSupport: macroSupport,
       declaredVariables: declaredVariables,
       testView: retainDataForTesting ? AnalysisDriverTestView() : null,
       ownedFiles: ownedFiles,

pkg/analyzer/lib/src/dart/analysis/driver.dart

@@ -51,13 +51,11 @@ import 'package:analyzer/src/summary/idl.dart';
 import 'package:analyzer/src/summary/package_bundle_reader.dart';
 import 'package:analyzer/src/summary2/ast_binary_flags.dart';
 import 'package:analyzer/src/summary2/bundle_writer.dart';
-import 'package:analyzer/src/summary2/macro.dart';
 import 'package:analyzer/src/summary2/package_bundle_format.dart';
 import 'package:analyzer/src/util/file_paths.dart' as file_paths;
 import 'package:analyzer/src/util/performance/operation_performance.dart';
 import 'package:analyzer/src/utilities/extensions/async.dart';
 import 'package:analyzer/src/utilities/extensions/collection.dart';
-import 'package:analyzer/src/utilities/extensions/string.dart';
 import 'package:analyzer/src/utilities/uri_cache.dart';
 import 'package:analyzer/src/workspace/pub.dart';
 import 'package:collection/collection.dart';
@@ -99,7 +97,7 @@ import 'package:meta/meta.dart';
 // TODO(scheglov): Clean up the list of implicitly analyzed files.
 class AnalysisDriver {
   /// The version of data format, should be incremented on every format change.
-  static const int DATA_VERSION = 427;
+  static const int DATA_VERSION = 428;
 
   /// The number of exception contexts allowed to write. Once this field is
   /// zero, we stop writing any new exception contexts in this process.
@@ -147,9 +145,6 @@ class AnalysisDriver {
   /// from file paths.
   final SourceFactory _sourceFactory;
 
-  /// The support for executing macros.
-  final MacroSupport? macroSupport;
-
   /// The container, shared with other drivers within the same collection,
   /// into which all drivers record files ownership.
   final OwnedFiles? ownedFiles;
@@ -281,7 +276,6 @@ class AnalysisDriver {
     required ByteStore byteStore,
     required SourceFactory sourceFactory,
     required Packages packages,
-    this.macroSupport,
     this.ownedFiles,
     this.analysisContext,
     @Deprecated("Use 'analysisOptionsMap' instead")
@@ -394,7 +388,6 @@ class AnalysisDriver {
       analysisOptionsMap: analysisOptionsMap,
       declaredVariables: declaredVariables,
       sourceFactory: _sourceFactory,
-      macroSupport: macroSupport,
       packagesFile: analysisContext?.contextRoot.packagesFile,
       externalSummaries: _externalSummaries,
       fileSystemState: _fsState,
@@ -803,12 +796,6 @@ class AnalysisDriver {
       );
     }
 
-    // If a macro generated file, request its library instead.
-    var file = resourceProvider.getFile(path);
-    if (file.libraryForMacro case var library?) {
-      _errorsRequestedFiles.addKey(library.path);
-    }
-
     // Schedule analysis.
     var completer = Completer<SomeErrorsResult>();
     _errorsRequestedFiles.add(path, completer);
@@ -866,12 +853,6 @@ class AnalysisDriver {
       return Future.value();
     }
 
-    // If a macro generated file, request its library instead.
-    var file = resourceProvider.getFile(path);
-    if (file.libraryForMacro case var library?) {
-      _indexRequestedFiles.addKey(library.path);
-    }
-
     // Schedule analysis.
     var completer = Completer<AnalysisDriverUnitIndex?>();
     _indexRequestedFiles.add(path, completer);
@@ -1096,12 +1077,6 @@ class AnalysisDriver {
       );
     }
 
-    // If a macro generated file, request its library instead.
-    var file = resourceProvider.getFile(path);
-    if (file.libraryForMacro case var library?) {
-      _requestedFiles.addKey(library.path);
-    }
-
     // Schedule analysis.
     var completer = Completer<SomeResolvedUnitResult>();
     _requestedFiles.add(path, completer);
@@ -1139,13 +1114,6 @@ class AnalysisDriver {
       );
     }
 
-    // If a macro generated file, request its library.
-    // Once the library is ready, we can return the requested result.
-    var file = resourceProvider.getFile(path);
-    if (file.libraryForMacro case var library?) {
-      _unitElementRequestedFiles.addKey(library.path);
-    }
-
     // Schedule analysis.
     var completer = Completer<SomeUnitElementResult>();
     _unitElementRequestedFiles.add(path, completer);
@@ -1585,7 +1553,6 @@ class AnalysisDriver {
       lineInfo: file.lineInfo,
       uri: file.uri,
       isLibrary: file.kind is LibraryFileKind,
-      isMacroPart: file.isMacroPart,
       isPart: file.kind is PartFileKind,
       errors: errors,
       analysisOptions: file.analysisOptions,
@@ -1673,24 +1640,6 @@ class AnalysisDriver {
     }
   }
 
-  Future<void> _ensureMacroGeneratedFiles() async {
-    for (var file in knownFiles.toList()) {
-      if (file.kind case LibraryFileKind libraryKind) {
-        var libraryCycle = libraryKind.libraryCycle;
-        if (libraryCycle.importsMacroClass) {
-          if (!libraryCycle.hasMacroFilesCreated) {
-            libraryCycle.hasMacroFilesCreated = true;
-            // We create macro-generated FileState(s) when load bundles.
-            await libraryContext.load(
-              targetLibrary: libraryKind,
-              performance: OperationPerformanceImpl('<root>'),
-            );
-          }
-        }
-      }
-    }
-  }
-
   Future<void> _getErrors(String path) async {
     var file = _fsState.getFileForPath(path);
 
@@ -1728,8 +1677,6 @@ class AnalysisDriver {
   Future<void> _getFilesDefiningClassMemberName(
     _GetFilesDefiningClassMemberNameRequest request,
   ) async {
-    await _ensureMacroGeneratedFiles();
-
     var result = <FileState>[];
     for (var file in knownFiles) {
       if (file.definedClassMemberNames.contains(request.name)) {
@@ -1742,8 +1689,6 @@ class AnalysisDriver {
   Future<void> _getFilesReferencingName(
     _GetFilesReferencingNameRequest request,
   ) async {
-    await _ensureMacroGeneratedFiles();
-
     var result = <FileState>[];
     for (var file in knownFiles) {
       if (file.referencedNames.contains(request.name)) {
@@ -1899,7 +1844,6 @@ class AnalysisDriver {
       lineInfo: file.lineInfo,
       uri: file.uri,
       isLibrary: file.kind is LibraryFileKind,
-      isMacroPart: file.isMacroPart,
       isPart: file.kind is PartFileKind,
       errors: [
         AnalysisError.tmp(
@@ -2673,21 +2617,3 @@ extension<K, V> on Map<K, List<Completer<V>>> {
     remove(key)?.completeAll(value);
   }
 }
-
-extension FileExtension on File {
-  File? get libraryForMacro {
-    if (path.removeSuffix('.macro.dart') case var noExtPath?) {
-      var libraryPath = '$noExtPath.dart';
-      return provider.getFile(libraryPath);
-    }
-    return null;
-  }
-
-  File? get macroForLibrary {
-    if (path.removeSuffix('.dart') case var noExtPath?) {
-      var libraryPath = '$noExtPath.macro.dart';
-      return provider.getFile(libraryPath);
-    }
-    return null;
-  }
-}