Fix PseudoType (#1815)

* Fix for added member element3. Try to make the hack PseudoType more robust by implementing noSuchMethod to always throw. * Fix ejson_lint after LintCode from analyser has become public * Update CHANGELOG * Update CHANGELOG.ejson.md
realm · Jan 2, 2025 · d9746f5 · d9746f5
1 parent 4e23227
commit d9746f5
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 48 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 
 ### Fixed
 * For the Android platform, changed compileSdkVersion into 31 from 28 to fix the fatal `android:attr/lStar not found` error when using Flutter 3.24.
+* Fix breakage of `PseudoType` after Flutter 3.27.1. (Issue [#1813](https://github.com/realm/realm-dart/issues/1813))
 
 ### Compatibility
 * Realm Studio: 15.0.0 or later.

diff --git a/packages/CHANGELOG.ejson.md b/packages/CHANGELOG.ejson.md
@@ -1,3 +1,7 @@
+## 0.4.1
+
+- Avoid name conflict on `LinkCode`. 
+
 ## 0.4.0
 
 - `fromEJson<T>` now accepts a `defaultValue` argument that is returned if  

diff --git a/packages/ejson_lint/lib/src/lints/mismatched_getter_type.dart b/packages/ejson_lint/lib/src/lints/mismatched_getter_type.dart
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import 'package:analyzer/dart/element/element.dart';
-import 'package:analyzer/error/error.dart';
+import 'package:analyzer/error/error.dart' as error;
 import 'package:analyzer/error/listener.dart';
 import 'package:custom_lint_builder/custom_lint_builder.dart';
 import 'package:ejson_analyzer/ejson_analyzer.dart';
@@ -13,7 +13,7 @@ class MismatchedGetterType extends DartLintRule {
           code: const LintCode(
             name: 'mismatched_getter_type',
             problemMessage: 'Type of getter does not match type of constructor parameter',
-            errorSeverity: ErrorSeverity.ERROR,
+            errorSeverity: error.ErrorSeverity.ERROR,
           ),
         );
 

diff --git a/packages/ejson_lint/lib/src/lints/missing_getter.dart b/packages/ejson_lint/lib/src/lints/missing_getter.dart
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import 'package:analyzer/dart/element/element.dart';
-import 'package:analyzer/error/error.dart';
+import 'package:analyzer/error/error.dart' as error;
 import 'package:analyzer/error/listener.dart';
 import 'package:custom_lint_builder/custom_lint_builder.dart';
 import 'package:ejson_analyzer/ejson_analyzer.dart';
@@ -13,7 +13,7 @@ class MissingGetter extends DartLintRule {
           code: const LintCode(
             name: 'missing_getter',
             problemMessage: 'Missing getter for constructor parameter',
-            errorSeverity: ErrorSeverity.ERROR,
+            errorSeverity: error.ErrorSeverity.ERROR,
           ),
         );
 

diff --git a/packages/ejson_lint/lib/src/lints/too_many_annotated_constructors.dart b/packages/ejson_lint/lib/src/lints/too_many_annotated_constructors.dart
@@ -1,7 +1,7 @@
 // Copyright 2024 MongoDB, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-import 'package:analyzer/error/error.dart';
+import 'package:analyzer/error/error.dart' as error;
 import 'package:analyzer/error/listener.dart';
 import 'package:custom_lint_builder/custom_lint_builder.dart';
 import 'package:ejson_analyzer/ejson_analyzer.dart';
@@ -21,7 +21,7 @@ class TooManyAnnotatedConstructors extends DartLintRule {
           code: const LintCode(
             name: 'too_many_annotated_constructors',
             problemMessage: 'Only one constructor can be annotated',
-            errorSeverity: ErrorSeverity.ERROR,
+            errorSeverity: error.ErrorSeverity.ERROR,
           ),
         );
 

diff --git a/packages/realm_dart/lib/src/cli/metrics/metrics.g.dart b/packages/realm_dart/lib/src/cli/metrics/metrics.g.dart
diff --git a/packages/realm_generator/lib/src/expanded_context_span.dart b/packages/realm_generator/lib/src/expanded_context_span.dart
@@ -3,7 +3,7 @@
 
 import 'package:source_span/source_span.dart';
 
-class ExpandedContextSpan with SourceSpanMixin implements FileSpan {
+class ExpandedContextSpan extends SourceSpanMixin implements FileSpan {
   final FileSpan _span, _contextSpan;
 
   ExpandedContextSpan(this._span, Iterable<FileSpan> contextSpans) : _contextSpan = contextSpans.fold<FileSpan>(_span, (acc, c) => acc.expand(c));

diff --git a/packages/realm_generator/lib/src/pseudo_type.dart b/packages/realm_generator/lib/src/pseudo_type.dart
@@ -20,13 +20,8 @@ class PseudoType extends TypeImpl {
 
   PseudoType(this._name, {this.nullabilitySuffix = NullabilitySuffix.none});
 
-  Never get _never => throw UnimplementedError();
-
-  @override
-  R accept<R>(TypeVisitor<R> visitor) => _never;
-
   @override
-  R acceptWithArgument<R, A>(TypeVisitorWithArgument<R, A> visitor, A argument) => _never;
+  R acceptWithArgument<R, A>(TypeVisitorWithArgument<R, A> visitor, A argument) => throw UnimplementedError();
 
   @override
   void appendTo(ElementDisplayStringBuilder builder) {
@@ -46,17 +41,14 @@ class PseudoType extends TypeImpl {
     im.invoke(writeNullability, <dynamic>[nullabilitySuffix]); // #_writeNullability won't work
   }
 
-  @override
-  String? get name => _never;
-
   @override
   PseudoType withNullability(NullabilitySuffix nullabilitySuffix) {
     return PseudoType(_name, nullabilitySuffix: nullabilitySuffix);
   }
 
   @override
-  Element? get element2 => _never;
+  Element? get element => null;
 
   @override
-  Element? get element => null;
+  Never noSuchMethod(Invocation invocation) => throw UnimplementedError();
 }