@@ -68,7 +68,8 @@ function getInputNamesFromMetadata(
   // where inputs could be declared. This is an edge case because there
   // always needs to be an object literal, but in case there isn't we just
   // want to skip the invalid decorator and return null.
-  if (!ts.isObjectLiteralExpression(decoratorCall.arguments[0])) {
+  if (decoratorCall.arguments.length !== 1 ||
+      !ts.isObjectLiteralExpression(decoratorCall.arguments[0])) {
     return null;
   }
 
 
@@ -240,6 +240,17 @@ export class DeclarationUsageVisitor {
       callArgs: ts.NodeArray<ts.Expression>, parameters: ts.NodeArray<ts.ParameterDeclaration>) {
     parameters.forEach((parameter, index) => {
       let argumentNode: ts.Node = callArgs[index];
+
+      if (!argumentNode) {
+        if (!parameter.initializer) {
+          return;
+        }
+
+        // Argument can be undefined in case the function parameter has a default
+        // value. In that case we want to store the parameter default value in the context.
+        argumentNode = parameter.initializer;
+      }
+
       if (ts.isIdentifier(argumentNode)) {
         this.context.set(parameter, this._resolveIdentifier(argumentNode));
       } else {
@@ -285,7 +296,7 @@ export class DeclarationUsageVisitor {
   private _getPropertyAccessSymbol(node: ts.PropertyAccessExpression): ts.Symbol|null {
     let propertySymbol = this._getDeclarationSymbolOfNode(node.name);
 
-    if (!propertySymbol) {
+    if (!propertySymbol || !propertySymbol.valueDeclaration) {
       return null;
     }
 
 
@@ -1384,5 +1384,29 @@ describe('static-queries migration with usage strategy', () => {
 
       expect(testModule.promptForMigrationStrategy).toHaveBeenCalledTimes(0);
     });
+
+    it('should support function call with default parameter value', async() => {
+      writeFile('/index.ts', `
+        import {Component, ${queryType}} from '@angular/core';
+
+        @Component({template: '<span>Test</span>'})
+        export class MyComponent {
+          @${queryType}('test') query: any;
+          
+          ngOnInit() {
+            this.myFunction();
+          }
+          
+          myFunction(unused?: string, cb = () => this.query.doSomething) {
+            cb();
+          }
+        }
+      `);
+
+      await runMigration();
+
+      expect(tree.readContent('/index.ts'))
+          .toContain(`@${queryType}('test', { static: true }) query: any;`);
+    });
   }
 });
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,8 @@ function getInputNamesFromMetadata(`
`68`	`68`	`// where inputs could be declared. This is an edge case because there`
`69`	`69`	`// always needs to be an object literal, but in case there isn't we just`
`70`	`70`	`// want to skip the invalid decorator and return null.`
`71`		`- if (!ts.isObjectLiteralExpression(decoratorCall.arguments[0])) {`
	`71`	`+ if (decoratorCall.arguments.length !== 1 \|\|`
	`72`	`+ !ts.isObjectLiteralExpression(decoratorCall.arguments[0])) {`
`72`	`73`	`return null;`
`73`	`74`	`}`
`74`	`75`