Remove WithNonFunctionTypeAliasesMixin from analysis_server/.

Change-Id: I3b25bf726d977984552ab361baf11eed28cafd7f
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/210651
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
Reviewed-by: Samuel Rawlins <srawlins@google.com>
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
This commit is contained in:
Konstantin Shcheglov 2021-08-19 22:08:24 +00:00 committed by commit-bot@chromium.org
parent d24708d4a0
commit 643d68793a
7 changed files with 6 additions and 28 deletions

View file

@ -300,20 +300,6 @@ class AbstractContextTest with ResourceProviderMixin {
} }
} }
mixin WithNonFunctionTypeAliasesMixin on AbstractContextTest {
@override
String? get testPackageLanguageVersion => null;
@override
void setUp() {
super.setUp();
createAnalysisOptionsFile(
experiments: [EnableString.nonfunction_type_aliases],
);
}
}
mixin WithNullSafetyMixin on AbstractContextTest { mixin WithNullSafetyMixin on AbstractContextTest {
@override @override
String get testPackageLanguageVersion => '2.12'; String get testPackageLanguageVersion => '2.12';

View file

@ -9,7 +9,6 @@ import 'package:analyzer_plugin/protocol/protocol_common.dart';
import 'package:test/test.dart'; import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart';
import '../abstract_context.dart';
import '../abstract_single_unit.dart'; import '../abstract_single_unit.dart';
void main() { void main() {
@ -74,8 +73,7 @@ class A {
} }
@reflectiveTest @reflectiveTest
class ConvertElementTest extends AbstractSingleUnitTest class ConvertElementTest extends AbstractSingleUnitTest {
with WithNonFunctionTypeAliasesMixin {
Future<void> test_CLASS() async { Future<void> test_CLASS() async {
await resolveTestCode(''' await resolveTestCode('''
@deprecated @deprecated

View file

@ -63,8 +63,7 @@ abstract class DartCompletionContributorTest
} }
} }
abstract class _BaseDartCompletionContributorTest extends AbstractContextTest abstract class _BaseDartCompletionContributorTest extends AbstractContextTest {
with WithNonFunctionTypeAliasesMixin {
static const String _UNCHECKED = '__UNCHECKED__'; static const String _UNCHECKED = '__UNCHECKED__';
late String testFile; late String testFile;
int _completionOffset = -1; int _completionOffset = -1;

View file

@ -12,7 +12,6 @@ import 'package:analyzer_plugin/protocol/protocol_common.dart'
show RefactoringProblemSeverity, SourceChange, SourceEdit; show RefactoringProblemSeverity, SourceChange, SourceEdit;
import 'package:test/test.dart'; import 'package:test/test.dart';
import '../../abstract_context.dart';
import '../../abstract_single_unit.dart'; import '../../abstract_single_unit.dart';
int findIdentifierLength(String search) { int findIdentifierLength(String search) {
@ -30,8 +29,7 @@ int findIdentifierLength(String search) {
} }
/// The base class for all [Refactoring] tests. /// The base class for all [Refactoring] tests.
abstract class RefactoringTest extends AbstractSingleUnitTest abstract class RefactoringTest extends AbstractSingleUnitTest {
with WithNonFunctionTypeAliasesMixin {
late SearchEngine searchEngine; late SearchEngine searchEngine;
late SourceChange refactoringChange; late SourceChange refactoringChange;

View file

@ -441,7 +441,7 @@ class B extends A {}
@reflectiveTest @reflectiveTest
class SearchEngineImplWithNonFunctionTypeAliasesTest class SearchEngineImplWithNonFunctionTypeAliasesTest
extends SearchEngineImplTest with WithNonFunctionTypeAliasesMixin { extends SearchEngineImplTest {
Future<void> test_searchReferences_typeAlias_interfaceType() async { Future<void> test_searchReferences_typeAlias_interfaceType() async {
await resolveTestCode(''' await resolveTestCode('''
typedef A<T> = Map<T, String>; typedef A<T> = Map<T, String>;

View file

@ -17,8 +17,7 @@ void main() {
}); });
} }
class AbstractOutlineComputerTest extends AbstractContextTest class AbstractOutlineComputerTest extends AbstractContextTest {
with WithNonFunctionTypeAliasesMixin {
late String testPath; late String testPath;
late String testCode; late String testCode;

View file

@ -7,7 +7,6 @@ import 'package:analysis_server/src/services/correction/fix.dart';
import 'package:analyzer_plugin/utilities/fixes/fixes.dart'; import 'package:analyzer_plugin/utilities/fixes/fixes.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart';
import '../../../../abstract_context.dart';
import 'fix_processor.dart'; import 'fix_processor.dart';
void main() { void main() {
@ -17,8 +16,7 @@ void main() {
} }
@reflectiveTest @reflectiveTest
class CreateFunctionTest extends FixProcessorTest class CreateFunctionTest extends FixProcessorTest {
with WithNonFunctionTypeAliasesMixin {
@override @override
FixKind get kind => DartFixKind.CREATE_FUNCTION; FixKind get kind => DartFixKind.CREATE_FUNCTION;