Stop expecting 'inlineKeyword' during class parsing.

Inline classes will be replaced with extension types.

Change-Id: I9472dfbb92f7f50a4649e6f1953481a9ac237fe3
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/313284
Commit-Queue: Konstantin Shcheglov <[email protected]>
Auto-Submit: Konstantin Shcheglov <[email protected]>
Reviewed-by: Brian Wilkerson <[email protected]>

Author: scheglov

pkg/analysis_server/lib/src/computer/computer_highlights.dart

@@ -685,7 +685,6 @@ class _DartUnitHighlightsComputerVisitor extends RecursiveAstVisitor<void> {
 
   @override
   void visitClassDeclaration(ClassDeclaration node) {
-    computer._addRegion_token(node.inlineKeyword, HighlightRegionType.KEYWORD);
     computer._addRegion_token(
         node.abstractKeyword, HighlightRegionType.BUILT_IN);
     computer._addRegion_token(node.sealedKeyword, HighlightRegionType.BUILT_IN);

pkg/analysis_server/test/analysis/notification_highlights2_test.dart

@@ -1418,14 +1418,6 @@ f(a, b) {
     assertHasRegion(HighlightRegionType.KEYWORD, 'else');
   }
 
-  Future<void> test_KEYWORD_inline() async {
-    addTestFile('''
-inline class A {}
-''');
-    await prepareHighlights();
-    assertHasRegion(HighlightRegionType.KEYWORD, 'inline');
-  }
-
   Future<void> test_KEYWORD_late() async {
     addTestFile('''
 class C {

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

@@ -87,7 +87,7 @@ import 'package:analyzer/src/utilities/uri_cache.dart';
 /// TODO(scheglov) Clean up the list of implicitly analyzed files.
 class AnalysisDriver implements AnalysisDriverGeneric {
   /// The version of data format, should be incremented on every format change.
-  static const int DATA_VERSION = 290;
+  static const int DATA_VERSION = 291;
 
   /// The number of exception contexts allowed to write. Once this field is
   /// zero, we stop writing any new exception contexts in this process.

pkg/analyzer/lib/src/dart/ast/ast.dart

@@ -2720,6 +2720,7 @@ abstract final class ClassDeclaration implements NamedCompilationUnitMember {
   ImplementsClause? get implementsClause;
 
   /// Return the 'inline' keyword, or `null` if the keyword was absent.
+  @Deprecated('Replaced with extension types')
   @experimental
   Token? get inlineKeyword;
 
@@ -2780,9 +2781,6 @@ final class ClassDeclarationImpl extends NamedCompilationUnitMemberImpl
   @override
   final Token? mixinKeyword;
 
-  @override
-  final Token? inlineKeyword;
-
   @override
   final Token classKeyword;
 
@@ -2824,7 +2822,6 @@ final class ClassDeclarationImpl extends NamedCompilationUnitMemberImpl
     required this.interfaceKeyword,
     required this.finalKeyword,
     required this.mixinKeyword,
-    required this.inlineKeyword,
     required this.classKeyword,
     required super.name,
     required this.typeParameters,
@@ -2860,11 +2857,16 @@ final class ClassDeclarationImpl extends NamedCompilationUnitMemberImpl
         classKeyword;
   }
 
+  @Deprecated('Replaced with extension types')
+  @override
+  Token? get inlineKeyword {
+    return null;
+  }
+
   @override
   ChildEntities get _childEntities => super._childEntities
     ..addToken('abstractKeyword', abstractKeyword)
     ..addToken('macroKeyword', macroKeyword)
-    ..addToken('inlineKeyword', inlineKeyword)
     ..addToken('sealedKeyword', sealedKeyword)
     ..addToken('baseKeyword', baseKeyword)
     ..addToken('interfaceKeyword', interfaceKeyword)

pkg/analyzer/lib/src/dart/element/element.dart

@@ -448,12 +448,6 @@ abstract class ClassElement implements InterfaceElement {
   /// or mixed in.
   bool get isFinal;
 
-  /// Whether the class is an inline class.
-  ///
-  /// A class is an inline class if it has an explicit `inline` modifier.
-  @experimental
-  bool get isInline;
-
   /// Whether the class is an interface class.
   ///
   /// A class is an interface class if it has an explicit `interface` modifier,
@@ -709,15 +703,6 @@ class ClassElementImpl extends ClassOrMixinElementImpl
     setModifier(Modifier.FINAL, isFinal);
   }
 
-  @override
-  bool get isInline {
-    return hasModifier(Modifier.INLINE);
-  }
-
-  set isInline(bool isInline) {
-    setModifier(Modifier.INLINE, isInline);
-  }
-
   @override
   bool get isInterface {
     return hasModifier(Modifier.INTERFACE);
@@ -6824,56 +6809,53 @@ class Modifier implements Comparable<Modifier> {
   /// type being referred to is the return type.
   static const Modifier IMPLICIT_TYPE = Modifier('IMPLICIT_TYPE', 19);
 
-  /// Indicates that the modifier 'inline' was applied to the element.
-  static const Modifier INLINE = Modifier('INLINE', 20);
-
   /// Indicates that the modifier 'interface' was applied to the element.
-  static const Modifier INTERFACE = Modifier('INTERFACE', 21);
+  static const Modifier INTERFACE = Modifier('INTERFACE', 20);
 
   /// Indicates that the method invokes the super method with the same name.
-  static const Modifier INVOKES_SUPER_SELF = Modifier('INVOKES_SUPER_SELF', 22);
+  static const Modifier INVOKES_SUPER_SELF = Modifier('INVOKES_SUPER_SELF', 21);
 
   /// Indicates that modifier 'lazy' was applied to the element.
-  static const Modifier LATE = Modifier('LATE', 23);
+  static const Modifier LATE = Modifier('LATE', 22);
 
   /// Indicates that a class is a macro builder.
-  static const Modifier MACRO = Modifier('MACRO', 24);
+  static const Modifier MACRO = Modifier('MACRO', 23);
 
   /// Indicates that a class is a mixin application.
-  static const Modifier MIXIN_APPLICATION = Modifier('MIXIN_APPLICATION', 25);
+  static const Modifier MIXIN_APPLICATION = Modifier('MIXIN_APPLICATION', 24);
 
   /// Indicates that a class is a mixin class.
-  static const Modifier MIXIN_CLASS = Modifier('MIXIN_CLASS', 26);
+  static const Modifier MIXIN_CLASS = Modifier('MIXIN_CLASS', 25);
 
-  static const Modifier PROMOTABLE = Modifier('IS_PROMOTABLE', 27);
+  static const Modifier PROMOTABLE = Modifier('IS_PROMOTABLE', 26);
 
   /// Indicates whether the type of a [PropertyInducingElementImpl] should be
   /// used to infer the initializer. We set it to `false` if the type was
   /// inferred from the initializer itself.
   static const Modifier SHOULD_USE_TYPE_FOR_INITIALIZER_INFERENCE =
-      Modifier('SHOULD_USE_TYPE_FOR_INITIALIZER_INFERENCE', 28);
+      Modifier('SHOULD_USE_TYPE_FOR_INITIALIZER_INFERENCE', 27);
 
   /// Indicates that the modifier 'sealed' was applied to the element.
-  static const Modifier SEALED = Modifier('SEALED', 29);
+  static const Modifier SEALED = Modifier('SEALED', 28);
 
   /// Indicates that the pseudo-modifier 'set' was applied to the element.
-  static const Modifier SETTER = Modifier('SETTER', 30);
+  static const Modifier SETTER = Modifier('SETTER', 29);
 
   /// See [TypeParameterizedElement.isSimplyBounded].
-  static const Modifier SIMPLY_BOUNDED = Modifier('SIMPLY_BOUNDED', 31);
+  static const Modifier SIMPLY_BOUNDED = Modifier('SIMPLY_BOUNDED', 30);
 
   /// Indicates that the modifier 'static' was applied to the element.
-  static const Modifier STATIC = Modifier('STATIC', 32);
+  static const Modifier STATIC = Modifier('STATIC', 31);
 
   /// Indicates that the element does not appear in the source code but was
   /// implicitly created. For example, if a class does not define any
   /// constructors, an implicit zero-argument constructor will be created and it
   /// will be marked as being synthetic.
-  static const Modifier SYNTHETIC = Modifier('SYNTHETIC', 33);
+  static const Modifier SYNTHETIC = Modifier('SYNTHETIC', 32);
 
   /// Indicates that the element was appended to this enclosing element to
   /// simulate temporary the effect of applying augmentation.
-  static const Modifier TEMP_AUGMENTATION = Modifier('TEMP_AUGMENTATION', 34);
+  static const Modifier TEMP_AUGMENTATION = Modifier('TEMP_AUGMENTATION', 33);
 
   static const List<Modifier> values = [
     ABSTRACT,
@@ -6895,7 +6877,6 @@ class Modifier implements Comparable<Modifier> {
     HAS_SINCE_SDK_VERSION_COMPUTED,
     HAS_SINCE_SDK_VERSION_VALUE,
     IMPLICIT_TYPE,
-    INLINE,
     INTERFACE,
     INVOKES_SUPER_SELF,
     LATE,

pkg/analyzer/lib/src/fasta/ast_builder.dart

@@ -302,7 +302,6 @@ class AstBuilder extends StackListener {
       }
     }
     push(macroToken ?? NullValues.Token);
-    push(inlineToken ?? NullValues.Token);
     push(sealedToken ?? NullValues.Token);
     push(baseToken ?? NullValues.Token);
     push(interfaceToken ?? NullValues.Token);
@@ -754,7 +753,6 @@ class AstBuilder extends StackListener {
       metadata: null,
       abstractKeyword: null,
       macroKeyword: null,
-      inlineKeyword: null,
       sealedKeyword: null,
       baseKeyword: null,
       interfaceKeyword: null,
@@ -3678,7 +3676,6 @@ class AstBuilder extends StackListener {
     var interfaceKeyword = pop(NullValues.Token) as Token?;
     var baseKeyword = pop(NullValues.Token) as Token?;
     var sealedKeyword = pop(NullValues.Token) as Token?;
-    var inlineKeyword = pop(NullValues.Token) as Token?;
     var macroKeyword = pop(NullValues.Token) as Token?;
     var modifiers = pop() as _Modifiers?;
     var typeParameters = pop() as TypeParameterListImpl?;
@@ -3693,7 +3690,6 @@ class AstBuilder extends StackListener {
       metadata: metadata,
       abstractKeyword: abstractKeyword,
       macroKeyword: macroKeyword,
-      inlineKeyword: inlineKeyword,
       sealedKeyword: sealedKeyword,
       baseKeyword: baseKeyword,
       interfaceKeyword: interfaceKeyword,
@@ -6094,7 +6090,6 @@ class _ClassDeclarationBuilder extends _ClassLikeDeclarationBuilder {
   final Token? augmentKeyword;
   final Token? abstractKeyword;
   final Token? macroKeyword;
-  final Token? inlineKeyword;
   final Token? sealedKeyword;
   final Token? baseKeyword;
   final Token? interfaceKeyword;
@@ -6116,7 +6111,6 @@ class _ClassDeclarationBuilder extends _ClassLikeDeclarationBuilder {
     required this.augmentKeyword,
     required this.abstractKeyword,
     required this.macroKeyword,
-    required this.inlineKeyword,
     required this.sealedKeyword,
     required this.baseKeyword,
     required this.interfaceKeyword,
@@ -6137,7 +6131,6 @@ class _ClassDeclarationBuilder extends _ClassLikeDeclarationBuilder {
       augmentKeyword: augmentKeyword,
       abstractKeyword: abstractKeyword,
       macroKeyword: macroKeyword,
-      inlineKeyword: inlineKeyword,
       sealedKeyword: sealedKeyword,
       baseKeyword: baseKeyword,
       interfaceKeyword: interfaceKeyword,

pkg/analyzer/lib/src/summary2/element_builder.dart

@@ -91,7 +91,6 @@ class ElementBuilder extends ThrowingAstVisitor<void> {
     element.isAugmentation = node.augmentKeyword != null;
     element.isBase = node.baseKeyword != null;
     element.isFinal = node.finalKeyword != null;
-    element.isInline = node.inlineKeyword != null;
     element.isInterface = node.interfaceKeyword != null;
     element.isMacro = node.macroKeyword != null;
     element.isMixinClass = node.mixinKeyword != null;

pkg/analyzer/lib/src/summary2/element_flags.dart

@@ -11,13 +11,12 @@ class ClassElementFlags {
   static const int _isAugmentation = 1 << 1;
   static const int _isBase = 1 << 2;
   static const int _isFinal = 1 << 3;
-  static const int _isInline = 1 << 4;
-  static const int _isInterface = 1 << 5;
-  static const int _isMacro = 1 << 6;
-  static const int _isMixinApplication = 1 << 7;
-  static const int _isMixinClass = 1 << 8;
-  static const int _isSealed = 1 << 9;
-  static const int _isSimplyBounded = 1 << 10;
+  static const int _isInterface = 1 << 4;
+  static const int _isMacro = 1 << 5;
+  static const int _isMixinApplication = 1 << 6;
+  static const int _isMixinClass = 1 << 7;
+  static const int _isSealed = 1 << 8;
+  static const int _isSimplyBounded = 1 << 9;
 
   static void read(
     SummaryDataReader reader,
@@ -28,7 +27,6 @@ class ClassElementFlags {
     element.isAugmentation = (byte & _isAugmentation) != 0;
     element.isBase = (byte & _isBase) != 0;
     element.isFinal = (byte & _isFinal) != 0;
-    element.isInline = (byte & _isInline) != 0;
     element.isInterface = (byte & _isInterface) != 0;
     element.isMacro = (byte & _isMacro) != 0;
     element.isMixinApplication = (byte & _isMixinApplication) != 0;
@@ -46,7 +44,6 @@ class ClassElementFlags {
     result |= element.isAugmentation ? _isAugmentation : 0;
     result |= element.isBase ? _isBase : 0;
     result |= element.isFinal ? _isFinal : 0;
-    result |= element.isInline ? _isInline : 0;
     result |= element.isInterface ? _isInterface : 0;
     result |= element.isMacro ? _isMacro : 0;
     result |= element.isMixinApplication ? _isMixinApplication : 0;

pkg/analyzer/test/src/fasta/ast_builder_test.dart

@@ -329,27 +329,6 @@ ClassDeclaration
         withOffsets: true);
   }
 
-  void test_class_inline() {
-    var parseResult = parseStringWithErrors(r'''
-/// text
-inline class A {}
-''');
-    parseResult.assertNoErrors();
-
-    var node = parseResult.findNode.classDeclaration('class A {}');
-    assertParsedNodeText(node, r'''
-ClassDeclaration
-  documentationComment: Comment
-    tokens
-      /// text
-  inlineKeyword: inline
-  classKeyword: class
-  name: A
-  leftBracket: {
-  rightBracket: }
-''');
-  }
-
   void test_class_interface() {
     var parseResult = parseStringWithErrors(r'''
 /// text

pkg/analyzer/test/src/summary/element_text.dart

@@ -567,7 +567,6 @@ class _ElementWriter {
           _sink.writeIf(e.isBase, 'base ');
           _sink.writeIf(e.isInterface, 'interface ');
           _sink.writeIf(e.isFinal, 'final ');
-          _sink.writeIf(e.isInline, 'inline ');
           _sink.writeIf(!e.isSimplyBounded, 'notSimplyBounded ');
           _sink.writeIf(e.isMixinClass, 'mixin ');
           _sink.write('class ');