Version 2.18.0-34.0.dev

Merge commit '20b560226e654f8885acd607b94f23b63bd9806b' into 'dev'

Author: Dart CI

pkg/analysis_server/test/abstract_context.dart

@@ -81,7 +81,7 @@ class AbstractContextTest with ResourceProviderMixin {
   String get workspaceRootPath => '/home';
 
   void addSource(String path, String content) {
-    newFile2(path, content);
+    newFile(path, content);
   }
 
   Future<void> analyzeTestPackageFiles() async {
@@ -134,7 +134,7 @@ class AbstractContextTest with ResourceProviderMixin {
       }
     }
 
-    newFile2(analysisOptionsPath, buffer.toString());
+    newFile(analysisOptionsPath, buffer.toString());
   }
 
   AnalysisDriver driverFor(String path) {
@@ -158,14 +158,14 @@ class AbstractContextTest with ResourceProviderMixin {
   }
 
   @override
-  File newFile2(String path, String content) {
+  File newFile(String path, String content) {
     if (_analysisContextCollection != null && !path.endsWith('.dart')) {
       throw StateError('Only dart files can be changed after analysis.');
     }
 
     path = convertPath(path);
     _addAnalyzedFileToDrivers(path);
-    return super.newFile2(path, content);
+    return super.newFile(path, content);
   }
 
   Future<ResolvedUnitResult> resolveFile(String path) async {
@@ -209,13 +209,13 @@ class AbstractContextTest with ResourceProviderMixin {
 
   /// Update `pubspec.yaml` and create the driver.
   void updateTestPubspecFile(String content) {
-    newFile2(testPubspecPath, content);
+    newFile(testPubspecPath, content);
   }
 
   void verifyCreatedCollection() {}
 
   void writePackageConfig(String path, PackageConfigFileBuilder config) {
-    newFile2(path, config.toContent(toUriStr: toUriStr));
+    newFile(path, config.toContent(toUriStr: toUriStr));
   }
 
   void writeTestPackageConfig({

pkg/analysis_server/test/abstract_single_unit.dart

@@ -57,11 +57,11 @@ class AbstractSingleUnitTest extends AbstractContextTest {
   }
 
   @override
-  File newFile2(String path, String content) {
+  File newFile(String path, String content) {
     if (useLineEndingsForPlatform) {
       content = normalizeNewlinesForPlatform(content);
     }
-    return super.newFile2(path, content);
+    return super.newFile(path, content);
   }
 
   Future<void> resolveFile2(String path) async {

pkg/analysis_server/test/analysis/get_errors_test.dart

@@ -27,7 +27,7 @@ class GetErrorsTest extends PubPackageAnalysisServerTest {
   }
 
   Future<void> test_afterAnalysisComplete() async {
-    newFile2(testFilePath, '''
+    newFile(testFilePath, '''
 main() {
   print(42)
 }
@@ -40,12 +40,12 @@ main() {
   }
 
   Future<void> test_errorInPart() async {
-    var libraryFile = newFile2('$testPackageLibPath/a.dart', r'''
+    var libraryFile = newFile('$testPackageLibPath/a.dart', r'''
 part 'b.dart';
 class A {}
 ''');
 
-    var partFile = newFile2('$testPackageLibPath/b.dart', r'''
+    var partFile = newFile('$testPackageLibPath/b.dart', r'''
 part of 'a.dart';
 class A {}
 ''');
@@ -73,7 +73,7 @@ class A {}
   }
 
   Future<void> test_hasErrors() async {
-    newFile2(testFilePath, '''
+    newFile(testFilePath, '''
 main() {
   print(42)
 }
@@ -111,7 +111,7 @@ main() {
   }
 
   Future<void> test_noErrors() async {
-    newFile2(testFilePath, '''
+    newFile(testFilePath, '''
 main() {
   print(42);
 }