From 0af5bcab45b4c32e8f17030b69dc3aff7c72d73d Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Fri, 9 Mar 2018 10:40:43 -0500
Subject: [PATCH] refactor(autocomplete): remove 6.0.0 deletion targets
 (#10319)

Removes the deletion targets for 6.0.0 in the `material/autocomplete` module.

BREAKING CHANGES:
* The `defaults` parameter in the `MatAutocomplete` constructor is now required.
---
 src/lib/autocomplete/autocomplete-module.ts |  7 +++++--
 src/lib/autocomplete/autocomplete.ts        | 11 ++---------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/lib/autocomplete/autocomplete-module.ts b/src/lib/autocomplete/autocomplete-module.ts
index 7847f54f2311..ed7f1d037272 100644
--- a/src/lib/autocomplete/autocomplete-module.ts
+++ b/src/lib/autocomplete/autocomplete-module.ts
@@ -10,7 +10,7 @@ import {NgModule} from '@angular/core';
 import {CommonModule} from '@angular/common';
 import {OverlayModule} from '@angular/cdk/overlay';
 import {MatOptionModule, MatCommonModule} from '@angular/material/core';
-import {MatAutocomplete} from './autocomplete';
+import {MatAutocomplete, MAT_AUTOCOMPLETE_DEFAULT_OPTIONS} from './autocomplete';
 import {
   MatAutocompleteTrigger,
   MAT_AUTOCOMPLETE_SCROLL_STRATEGY_PROVIDER,
@@ -20,6 +20,9 @@ import {
   imports: [MatOptionModule, OverlayModule, MatCommonModule, CommonModule],
   exports: [MatAutocomplete, MatOptionModule, MatAutocompleteTrigger, MatCommonModule],
   declarations: [MatAutocomplete, MatAutocompleteTrigger],
-  providers: [MAT_AUTOCOMPLETE_SCROLL_STRATEGY_PROVIDER],
+  providers: [
+    MAT_AUTOCOMPLETE_SCROLL_STRATEGY_PROVIDER,
+    {provide: MAT_AUTOCOMPLETE_DEFAULT_OPTIONS, useValue: false}
+  ],
 })
 export class MatAutocompleteModule {}
diff --git a/src/lib/autocomplete/autocomplete.ts b/src/lib/autocomplete/autocomplete.ts
index c60a95ab9c17..620b5d798619 100644
--- a/src/lib/autocomplete/autocomplete.ts
+++ b/src/lib/autocomplete/autocomplete.ts
@@ -21,7 +21,6 @@ import {
   Output,
   InjectionToken,
   Inject,
-  Optional,
 } from '@angular/core';
 import {
   MatOption,
@@ -150,16 +149,10 @@ export class MatAutocomplete extends _MatAutocompleteMixinBase implements AfterC
   constructor(
     private _changeDetectorRef: ChangeDetectorRef,
     private _elementRef: ElementRef,
-
-    // @deletion-target Turn into required param in 6.0.0
-    @Optional() @Inject(MAT_AUTOCOMPLETE_DEFAULT_OPTIONS)
-        defaults?: MatAutocompleteDefaultOptions) {
+    @Inject(MAT_AUTOCOMPLETE_DEFAULT_OPTIONS) defaults: MatAutocompleteDefaultOptions) {
     super();
 
-    this._autoActiveFirstOption = defaults &&
-        typeof defaults.autoActiveFirstOption !== 'undefined' ?
-            defaults.autoActiveFirstOption :
-            false;
+    this._autoActiveFirstOption = !!defaults.autoActiveFirstOption;
   }
 
   ngAfterContentInit() {