Version 2.12.0-265.0.dev

Merge commit '934980be801c8007189500ee6980fd81b9eca079' into 'dev'

Author: Dart CI

pkg/analysis_server/lib/src/context_manager.dart

@@ -1324,9 +1324,6 @@ class ContextManagerImpl implements ContextManager {
     if (info.excludes(path)) {
       return;
     }
-    if (info.ignored(path)) {
-      return;
-    }
     // handle the change
     switch (type) {
       case ChangeType.ADD:

pkg/analysis_server/lib/src/services/completion/dart/library_member_contributor.dart

@@ -62,7 +62,7 @@ class LibraryMemberContributor extends DartCompletionContributor {
             } else {
               if (element is ClassElement ||
                   element is ExtensionElement ||
-                  element is FunctionTypeAliasElement) {
+                  element is TypeAliasElement) {
                 builder.suggestElement(element,
                     kind: CompletionSuggestionKind.INVOCATION);
               } else if (!typesOnly &&

pkg/analysis_server/lib/src/services/completion/dart/local_library_contributor.dart

@@ -96,7 +96,7 @@ class LibraryElementSuggestionBuilder extends GeneralizingElementVisitor {
   @override
   void visitFunctionTypeAliasElement(FunctionTypeAliasElement element) {
     if (opType.includeTypeNameSuggestions) {
-      builder.suggestFunctionTypeAlias(element, prefix: prefix);
+      builder.suggestTypeAlias(element, prefix: prefix);
     }
   }
 
@@ -126,6 +126,13 @@ class LibraryElementSuggestionBuilder extends GeneralizingElementVisitor {
     }
   }
 
+  @override
+  void visitTypeAliasElement(TypeAliasElement element) {
+    if (opType.includeTypeNameSuggestions) {
+      builder.suggestTypeAlias(element, prefix: prefix);
+    }
+  }
+
   /// Add constructor suggestions for the given class.
   void _addConstructorSuggestions(ClassElement classElem) {
     for (var constructor in classElem.constructors) {

pkg/analysis_server/lib/src/services/completion/dart/local_reference_contributor.dart

@@ -310,16 +310,14 @@ class _LocalVisitor extends LocalDeclarationVisitor {
   @override
   void declaredFunctionTypeAlias(FunctionTypeAlias declaration) {
     if (opType.includeTypeNameSuggestions) {
-      builder.suggestFunctionTypeAlias(declaration.declaredElement,
-          kind: _defaultKind);
+      builder.suggestTypeAlias(declaration.declaredElement, kind: _defaultKind);
     }
   }
 
   @override
   void declaredGenericTypeAlias(GenericTypeAlias declaration) {
     if (opType.includeTypeNameSuggestions) {
-      builder.suggestFunctionTypeAlias(declaration.declaredElement,
-          kind: _defaultKind);
+      builder.suggestTypeAlias(declaration.declaredElement, kind: _defaultKind);
     }
   }
 

pkg/analysis_server/lib/src/services/completion/dart/suggestion_builder.dart

@@ -382,11 +382,11 @@ class SuggestionBuilder {
     } else if (element is FunctionElement &&
         element.enclosingElement is CompilationUnitElement) {
       suggestTopLevelFunction(element, kind: kind);
-    } else if (element is FunctionTypeAliasElement) {
-      suggestFunctionTypeAlias(element, kind: kind);
     } else if (element is PropertyAccessorElement &&
         element.enclosingElement is CompilationUnitElement) {
       suggestTopLevelPropertyAccessor(element, kind: kind);
+    } else if (element is TypeAliasElement) {
+      suggestTypeAlias(element, kind: kind);
     } else {
       throw ArgumentError('Cannot suggest a ${element.runtimeType}');
     }
@@ -487,19 +487,6 @@ class SuggestionBuilder {
     ));
   }
 
-  /// Add a suggestion for a [functionTypeAlias]. If a [kind] is provided it
-  /// will be used as the kind for the suggestion. If the alias can only be
-  /// referenced using a prefix, then the [prefix] should be provided.
-  void suggestFunctionTypeAlias(FunctionTypeAliasElement functionTypeAlias,
-      {CompletionSuggestionKind kind = CompletionSuggestionKind.INVOCATION,
-      String prefix}) {
-    var relevance = _computeTopLevelRelevance(functionTypeAlias,
-        defaultRelevance: 750,
-        elementType: _instantiateFunctionTypeAlias(functionTypeAlias));
-    _add(_createSuggestion(functionTypeAlias,
-        kind: kind, prefix: prefix, relevance: relevance));
-  }
-
   /// Add a suggestion for a [keyword]. The [offset] is the offset from the
   /// beginning of the keyword where the cursor will be left.
   void suggestKeyword(String keyword, {int offset}) {
@@ -863,6 +850,18 @@ class SuggestionBuilder {
         kind: kind, prefix: prefix, relevance: relevance));
   }
 
+  /// Add a suggestion for a [typeAlias]. If a [kind] is provided it
+  /// will be used as the kind for the suggestion. If the alias can only be
+  /// referenced using a prefix, then the [prefix] should be provided.
+  void suggestTypeAlias(TypeAliasElement typeAlias,
+      {CompletionSuggestionKind kind = CompletionSuggestionKind.INVOCATION,
+      String prefix}) {
+    var relevance = _computeTopLevelRelevance(typeAlias,
+        defaultRelevance: 750, elementType: _instantiateTypeAlias(typeAlias));
+    _add(_createSuggestion(typeAlias,
+        kind: kind, prefix: prefix, relevance: relevance));
+  }
+
   /// Add a suggestion for a type [parameter].
   void suggestTypeParameter(TypeParameterElement parameter) {
     var elementKind = _computeElementKind(parameter);
@@ -1083,7 +1082,7 @@ class SuggestionBuilder {
     );
   }
 
-  FunctionType _instantiateFunctionTypeAlias(FunctionTypeAliasElement element) {
+  DartType _instantiateTypeAlias(TypeAliasElement element) {
     var typeParameters = element.typeParameters;
     var typeArguments = const <DartType>[];
     if (typeParameters.isNotEmpty) {

pkg/analysis_server/lib/src/services/refactoring/naming_conventions.dart

@@ -42,14 +42,6 @@ RefactoringStatus validateFunctionName(String name) {
   return _validateLowerCamelCase(name, 'Function', allowBuiltIn: true);
 }
 
-/// Returns the [RefactoringStatus] with severity:
-/// - OK if the name is valid;
-/// - WARNING if the name is discouraged;
-/// - FATAL if the name is illegal.
-RefactoringStatus validateFunctionTypeAliasName(String name) {
-  return _validateUpperCamelCase(name, 'Function type alias');
-}
-
 /// Returns the [RefactoringStatus] with severity:
 /// - OK if the name is valid;
 /// - WARNING if the name is discouraged;
@@ -120,6 +112,14 @@ RefactoringStatus validateParameterName(String name) {
   return _validateLowerCamelCase(name, 'Parameter', allowBuiltIn: true);
 }
 
+/// Returns the [RefactoringStatus] with severity:
+/// - OK if the name is valid;
+/// - WARNING if the name is discouraged;
+/// - FATAL if the name is illegal.
+RefactoringStatus validateTypeAliasName(String name) {
+  return _validateUpperCamelCase(name, 'Type alias');
+}
+
 /// Returns the [RefactoringStatus] with severity:
 /// - OK if the name is valid;
 /// - WARNING if the name is discouraged;

pkg/analysis_server/lib/src/services/refactoring/rename_unit_member.dart

@@ -54,12 +54,12 @@ class RenameUnitMemberRefactoringImpl extends RenameRefactoringImpl {
     if (element is FunctionElement) {
       return 'Rename Top-Level Function';
     }
-    if (element is FunctionTypeAliasElement) {
-      return 'Rename Function Type Alias';
-    }
     if (element is TopLevelVariableElement) {
       return 'Rename Top-Level Variable';
     }
+    if (element is TypeAliasElement) {
+      return 'Rename Type Alias';
+    }
     return 'Rename Class';
   }
 
@@ -94,8 +94,8 @@ class RenameUnitMemberRefactoringImpl extends RenameRefactoringImpl {
     if (element is FunctionElement) {
       result.addStatus(validateFunctionName(newName));
     }
-    if (element is FunctionTypeAliasElement) {
-      result.addStatus(validateFunctionTypeAliasName(newName));
+    if (element is TypeAliasElement) {
+      result.addStatus(validateTypeAliasName(newName));
     }
     if (element is ClassElement) {
       result.addStatus(validateClassName(newName));

pkg/analysis_server/test/abstract_context.dart

@@ -282,7 +282,6 @@ mixin WithNonFunctionTypeAliasesMixin on AbstractContextTest {
   @override
   String get testPackageLanguageVersion => null;
 
-  @nonVirtual
   @override
   void setUp() {
     super.setUp();

pkg/analysis_server/test/context_manager_test.dart

@@ -227,32 +227,6 @@ sky_engine:lib/''');
     });
   }
 
-  Future<void> test_path_filter() async {
-    // Setup context.
-    var root = newFolder(projPath);
-    manager.setRoots(<String>[projPath], <String>[]);
-    expect(callbacks.currentFilePaths, isEmpty);
-    // Set ignore patterns for context.
-    var rootInfo = manager.getContextInfoFor(root);
-    manager.setIgnorePatternsForContext(
-        rootInfo, ['sdk_ext/**', 'lib/ignoreme.dart']);
-    // Start creating files.
-    newFile('$projPath/${ContextManagerImpl.PUBSPEC_NAME}');
-    var libPath = '$projPath/${ContextManagerTest.LIB_NAME}';
-    newFile('$libPath/main.dart');
-    newFile('$libPath/ignoreme.dart');
-    var sdkExtPath = '$projPath/sdk_ext';
-    newFile('$sdkExtPath/entry.dart');
-    var sdkExtSrcPath = '$projPath/sdk_ext/src';
-    newFile('$sdkExtSrcPath/part.dart');
-    // Pump event loop so new files are discovered and added to context.
-    await pumpEventQueue();
-    // Verify that ignored files were ignored.
-    var filePaths = callbacks.currentFilePaths;
-    expect(filePaths, hasLength(1));
-    expect(filePaths, contains(convertPath('/my/proj/lib/main.dart')));
-  }
-
   Future<void> test_refresh_folder_with_packagespec() {
     // create a context with a .packages file
     var packagespecFile = join(projPath, '.packages');

pkg/analysis_server/test/domain_analysis_test.dart

@@ -305,6 +305,18 @@ class AnalysisDomainHandlerTest extends AbstractAnalysisTest {
 class AnalysisDomainTest extends AbstractAnalysisTest {
   Map<String, List<AnalysisError>> filesErrors = {};
 
+  void assertHasErrors(String path) {
+    expect(filesErrors[path], isNotEmpty);
+  }
+
+  void assertNoErrors(String path) {
+    expect(filesErrors[path], isEmpty);
+  }
+
+  void assertNoErrorsNotification(String path) {
+    expect(filesErrors[path], isNull);
+  }
+
   @override
   void processNotification(Notification notification) {
     if (notification.event == ANALYSIS_NOTIFICATION_ERRORS) {
@@ -313,6 +325,117 @@ class AnalysisDomainTest extends AbstractAnalysisTest {
     }
   }
 
+  Future<void> test_fileSystem_addFile_excluded() async {
+    var a_path = convertPath('$projectPath/lib/a.dart');
+    var b_path = convertPath('$projectPath/lib/b.dart');
+
+    newFile('$projectPath/analysis_options.yaml', content: r'''
+analyzer:
+  exclude:
+    - "**/a.dart"
+''');
+
+    newFile(b_path, content: r'''
+import '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;
+
+    // We excluded 'a.dart' from analysis, no errors notification for it.
+    assertNoErrorsNotification(a_path);
+
+    // We added a.dart with `A`, so no errors.
+    assertNoErrors(b_path);
+  }
+
+  Future<void> test_fileSystem_changeFile_excluded() async {
+    var a_path = convertPath('$projectPath/lib/a.dart');
+    var b_path = convertPath('$projectPath/lib/b.dart');
+
+    newFile('$projectPath/analysis_options.yaml', content: r'''
+analyzer:
+  exclude:
+    - "**/a.dart"
+''');
+
+    newFile(a_path, content: r'''
+class B {}
+''');
+
+    newFile(b_path, content: r'''
+import 'a.dart';
+void f(A a) {}
+''');
+
+    createProject();
+    await pumpEventQueue();
+    await server.onAnalysisComplete;
+
+    // We excluded 'a.dart' from analysis, no errors notification for it.
+    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;
+
+    // We changed a.dart, to have `A`, so no errors.
+    assertNoErrors(b_path);
+  }
+
+  Future<void> test_fileSystem_deleteFile_excluded() async {
+    var a_path = convertPath('$projectPath/lib/a.dart');
+    var b_path = convertPath('$projectPath/lib/b.dart');
+
+    newFile('$projectPath/analysis_options.yaml', content: r'''
+analyzer:
+  exclude:
+    - "**/a.dart"
+''');
+
+    newFile(a_path, content: r'''
+class A {}
+''');
+
+    newFile(b_path, content: r'''
+import 'a.dart';
+void f(A a) {}
+''');
+
+    createProject();
+    await pumpEventQueue();
+    await server.onAnalysisComplete;
+
+    // We excluded 'a.dart' from analysis, no errors notification for it.
+    assertNoErrorsNotification(a_path);
+
+    // We have `A` in a.dart, so no errors.
+    assertNoErrors(b_path);
+
+    deleteFile(a_path);
+    await pumpEventQueue();
+    await server.onAnalysisComplete;
+
+    // We deleted a.dart, so `A` cannot be resolved.
+    assertHasErrors(b_path);
+  }
+
   Future<void> test_setRoots_packages() {
     // prepare package
     var pkgFile = newFile('/packages/pkgA/libA.dart', content: '''