Version 2.13.0-82.0.dev

Merge commit '8833cbed7d7021420e6a969eba48f006bb7050f4' into 'dev'

Author: Dart CI

pkg/analysis_server/lib/src/analysis_server.dart

@@ -429,16 +429,6 @@ class AnalysisServer extends AbstractAnalysisServer {
     });
   }
 
-  /// Returns `true` if errors should be reported for [file] with the given
-  /// absolute path.
-  bool shouldSendErrorsNotificationFor(String file) {
-    // Errors should not be reported for things that are explicitly skipped
-    // during normal analysis (for example dot folders are skipped over in
-    // _handleWatchEventImpl).
-    return contextManager.isInAnalysisRoot(file) &&
-        !contextManager.isContainedInDotFolder(file);
-  }
-
   Future<void> shutdown() {
     if (options.analytics != null) {
       options.analytics
@@ -674,7 +664,7 @@ class ServerContextManagerCallbacks extends ContextManagerCallbacks {
     analysisDriver.results.listen((result) {
       var path = result.path;
       filesToFlush.add(path);
-      if (analysisServer.shouldSendErrorsNotificationFor(path)) {
+      if (analysisServer.isAnalyzed(path)) {
         _notificationManager.recordAnalysisErrors(NotificationManager.serverId,
             path, server.doAnalysisError_listFromEngine(result));
       }

pkg/analysis_server/lib/src/analysis_server_abstract.dart

@@ -348,6 +348,12 @@ abstract class AbstractAnalysisServer {
     });
   }
 
+  /// Return `true` if the file or directory with the given [path] will be
+  /// analyzed in one of the analysis contexts.
+  bool isAnalyzed(String path) {
+    return contextManager.isAnalyzed(path);
+  }
+
   void logExceptionResult(nd.ExceptionResult result) {
     var message = 'Analysis failed: ${result.filePath}';
     if (result.contextKey != null) {

pkg/analysis_server/lib/src/context_manager.dart

@@ -87,15 +87,9 @@ abstract class ContextManager {
   /// If no driver contains the given path, `null` is returned.
   AnalysisDriver getDriverFor(String path);
 
-  /// Determine whether the given [path], when interpreted relative to innermost
-  /// context root, contains a folder whose name starts with '.'.
-  ///
-  /// TODO(scheglov) Remove it, just [isInAnalysisRoot] should be enough.
-  bool isContainedInDotFolder(String path);
-
-  /// Return `true` if the given absolute [path] is in one of the current
-  /// root folders and is not excluded.
-  bool isInAnalysisRoot(String path);
+  /// Return `true` if the file or directory with the given [path] will be
+  /// analyzed in one of the analysis contexts.
+  bool isAnalyzed(String path);
 
   /// Rebuild the set of contexts from scratch based on the data last sent to
   /// [setRoots].
@@ -221,21 +215,8 @@ class ContextManagerImpl implements ContextManager {
     return getContextFor(path)?.driver;
   }
 
-  /// Determine whether the given [path], when interpreted relative to innermost
-  /// context root, contains a folder whose name starts with '.'.
-  @override
-  bool isContainedInDotFolder(String path) {
-    for (var analysisContext in _collection.contexts) {
-      var contextImpl = analysisContext as DriverBasedAnalysisContext;
-      if (_isContainedInDotFolder(contextImpl.contextRoot.root.path, path)) {
-        return true;
-      }
-    }
-    return false;
-  }
-
   @override
-  bool isInAnalysisRoot(String path) {
+  bool isAnalyzed(String path) {
     var collection = _collection;
     if (collection == null) {
       return false;
@@ -431,9 +412,6 @@ class ContextManagerImpl implements ContextManager {
       _watchBazelFilesIfNeeded(rootFolder, driver);
 
       for (var file in contextImpl.contextRoot.analyzedFiles()) {
-        if (_isContainedInDotFolder(contextImpl.contextRoot.root.path, file)) {
-          continue;
-        }
         if (file_paths.isAndroidManifestXml(pathContext, file)) {
           _analyzeAndroidManifestXml(driver, file);
         } else if (file_paths.isDart(pathContext, file)) {
@@ -554,12 +532,11 @@ class ContextManagerImpl implements ContextManager {
         var analysisContext = analysisContext_ as DriverBasedAnalysisContext;
         switch (type) {
           case ChangeType.ADD:
-            // TODO(scheglov) Why not `isInAnalysisRoot()`?
-            if (_isContainedInDotFolder(
-                analysisContext.contextRoot.root.path, path)) {
-              return;
+            if (analysisContext.contextRoot.isAnalyzed(path)) {
+              analysisContext.driver.addFile(path);
+            } else {
+              analysisContext.driver.changeFile(path);
             }
-            analysisContext.driver.addFile(path);
             break;
           case ChangeType.MODIFY:
             analysisContext.driver.changeFile(path);
@@ -592,25 +569,6 @@ class ContextManagerImpl implements ContextManager {
     refresh();
   }
 
-  /// Determine whether the given [path], when interpreted relative to the
-  /// context root [root], contains a folder whose name starts with '.' but is
-  /// not included in [exclude].
-  bool _isContainedInDotFolder(String root, String path,
-      {Set<String> exclude}) {
-    var pathDir = pathContext.dirname(path);
-    var rootPrefix = root + pathContext.separator;
-    if (pathDir.startsWith(rootPrefix)) {
-      var suffixPath = pathDir.substring(rootPrefix.length);
-      for (var pathComponent in pathContext.split(suffixPath)) {
-        if (pathComponent.startsWith('.') &&
-            !(exclude?.contains(pathComponent) ?? false)) {
-          return true;
-        }
-      }
-    }
-    return false;
-  }
-
   /// Read the contents of the file at the given [path], or throw an exception
   /// if the contents cannot be read.
   String _readFile(String path) {

pkg/analysis_server/lib/src/edit/edit_dartfix.dart

@@ -175,7 +175,7 @@ class EditDartFix
       if (res is Folder) {
         for (var child in res.getChildren()) {
           if (!child.shortName.startsWith('.') &&
-              contextManager.isInAnalysisRoot(child.path)) {
+              server.isAnalyzed(child.path)) {
             resources.add(child);
           }
         }

pkg/analysis_server/lib/src/edit/edit_domain.dart

@@ -261,7 +261,7 @@ class EditDomainHandler extends AbstractRequestHandler {
       return;
     }
 
-    if (!server.contextManager.isInAnalysisRoot(file)) {
+    if (!server.isAnalyzed(file)) {
       server.sendResponse(Response.getFixesInvalidFile(request));
       return;
     }

pkg/analysis_server/lib/src/lsp/handlers/handler_code_actions.dart

@@ -46,7 +46,7 @@ class CodeActionHandler extends MessageHandler<CodeActionParams,
     }
 
     final path = pathOfDoc(params.textDocument);
-    if (!path.isError && !server.isAnalyzedFile(path.result)) {
+    if (!path.isError && !server.isAnalyzed(path.result)) {
       return success(const []);
     }
 

pkg/analysis_server/lib/src/lsp/lsp_analysis_server.dart

@@ -338,14 +338,6 @@ class LspAnalysisServer extends AbstractAnalysisServer {
     }, socketError);
   }
 
-  /// Returns `true` if the [file] with the given absolute path is included
-  /// in an analysis root and not excluded.
-  bool isAnalyzedFile(String file) {
-    return contextManager.isInAnalysisRoot(file) &&
-        // Dot folders are not analyzed (skipped over in _handleWatchEventImpl)
-        !contextManager.isContainedInDotFolder(file);
-  }
-
   /// Logs the error on the client using window/logMessage.
   void logErrorToClient(String message) {
     channel.sendNotification(NotificationMessage(
@@ -584,13 +576,7 @@ class LspAnalysisServer extends AbstractAnalysisServer {
     // workspace.
     return initializationOptions.closingLabels &&
         priorityFiles.contains(file) &&
-        contextManager.isInAnalysisRoot(file);
-  }
-
-  /// Returns `true` if errors should be reported for [file] with the given
-  /// absolute path.
-  bool shouldSendErrorsNotificationFor(String file) {
-    return isAnalyzedFile(file);
+        isAnalyzed(file);
   }
 
   /// Returns `true` if Flutter outlines should be sent for [file] with the
@@ -817,7 +803,7 @@ class LspServerContextManagerCallbacks extends ContextManagerCallbacks {
     analysisDriver.results.listen((result) {
       var path = result.path;
       filesToFlush.add(path);
-      if (analysisServer.shouldSendErrorsNotificationFor(path)) {
+      if (analysisServer.isAnalyzed(path)) {
         final serverErrors = protocol.mapEngineErrors(
             result,
             result.errors.where(_shouldSendDiagnostic).toList(),

pkg/analysis_server/test/domain_analysis_test.dart

@@ -454,6 +454,35 @@ analyzer:
     assertHasErrors(a_path);
   }
 
+  Future<void> test_fileSystem_addFile_dart_dotFolder() async {
+    var a_path = '$projectPath/lib/.foo/a.dart';
+    var b_path = '$projectPath/lib/b.dart';
+
+    newFile(b_path, content: r'''
+import '.foo/a.dart';
+void f(A a) {}
+''');
+
+    createProject();
+    await pumpEventQueue();
+    await server.onAnalysisComplete;
+
+    // We don't have a.dart, so the import cannot be resolved.
+    assertHasErrors(b_path);
+
+    newFile(a_path, content: r'''
+class A {}
+''');
+    await pumpEventQueue();
+    await server.onAnalysisComplete;
+
+    // 'a.dart' is in a dot-folder, so excluded from analysis.
+    assertNoErrorsNotification(a_path);
+
+    // We added a.dart with `A`, so no errors.
+    assertNoErrors(b_path);
+  }
+
   Future<void> test_fileSystem_addFile_dart_excluded() async {
     var a_path = '$projectPath/lib/a.dart';
     var b_path = '$projectPath/lib/b.dart';
@@ -747,6 +776,42 @@ void f(A a) {}
     assertNoErrors(b_path);
   }
 
+  Future<void> test_fileSystem_changeFile_dart_dotFolder() async {
+    var a_path = '$testPackageLibPath/.foo/a.dart';
+    var b_path = '$testPackageLibPath/b.dart';
+
+    newFile(a_path, content: r'''
+class B {}
+''');
+
+    newFile(b_path, content: r'''
+import '.foo/a.dart';
+void f(A a) {}
+''');
+
+    setRoots(included: [workspaceRootPath], excluded: []);
+    await pumpEventQueue();
+    await server.onAnalysisComplete;
+
+    // 'a.dart' is in a dot-folder, so excluded from analysis.
+    assertNoErrorsNotification(a_path);
+
+    // We have `B`, not `A`, in a.dart, so has errors.
+    assertHasErrors(b_path);
+
+    newFile(a_path, content: r'''
+class A {}
+''');
+    await pumpEventQueue();
+    await server.onAnalysisComplete;
+
+    // 'a.dart' is in a dot-folder, so excluded from analysis.
+    assertNoErrorsNotification(a_path);
+
+    // We changed a.dart, to have `A`, so no errors.
+    assertNoErrors(b_path);
+  }
+
   Future<void> test_fileSystem_changeFile_dart_excluded() async {
     var a_path = '$testPackageLibPath/a.dart';
     var b_path = '$testPackageLibPath/b.dart';

pkg/analysis_server/test/src/cider/fixes_test.dart

@@ -37,6 +37,20 @@ class CiderFixesComputerTest extends CiderServiceTest {
     expect(resultContent, expected);
   }
 
+  Future<void> test_cachedResolvedFiles() async {
+    await _compute(r'''
+var a = 0^ var b = 1
+''');
+
+    // Only the first fix is applied.
+    assertHasFix(DartFixKind.INSERT_SEMICOLON, r'''
+var a = 0; var b = 1
+''');
+
+    // The file was resolved only once, even though we have 2 errors.
+    expect(fileResolver.testView.resolvedFiles, [testPath]);
+  }
+
   Future<void> test_createMethod() async {
     await _compute(r'''
 class A {

pkg/analyzer/lib/src/context/packages.dart

@@ -99,11 +99,6 @@ Packages parsePackageConfigJsonFile(ResourceProvider provider, File file) {
         jsonLanguageVersion.minor,
         0,
       );
-      // New features were added in `2.2.2` over `2.2.0`.
-      // But `2.2.2` is not representable, so we special case it.
-      if (languageVersion.major == 2 && languageVersion.minor == 2) {
-        languageVersion = Version(2, 2, 2);
-      }
     }
 
     map[name] = Package(