From a4e7bff759b7d23cca787ff205b4119b950e7fe5 Mon Sep 17 00:00:00 2001
From: Bill Ticehurst <billti@hotmail.com>
Date: Tue, 11 Oct 2016 17:51:53 -0700
Subject: [PATCH] Fixed errors with overloaded method exports

---
 src/compiler/checker.ts                       |  3 ++-
 .../completionListInImportClause04.ts         | 20 +++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 tests/cases/fourslash/completionListInImportClause04.ts

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index b5fe19b0a80..273b5e06134 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -17893,7 +17893,8 @@ namespace ts {
             }
 
             function isNotOverload(declaration: Declaration): boolean {
-                return declaration.kind !== SyntaxKind.FunctionDeclaration || !!(declaration as FunctionDeclaration).body;
+                return (declaration.kind !== SyntaxKind.FunctionDeclaration && declaration.kind !== SyntaxKind.MethodDeclaration) || 
+                        !!(declaration as FunctionDeclaration).body;
             }
         }
 
diff --git a/tests/cases/fourslash/completionListInImportClause04.ts b/tests/cases/fourslash/completionListInImportClause04.ts
new file mode 100644
index 00000000000..672c754e807
--- /dev/null
+++ b/tests/cases/fourslash/completionListInImportClause04.ts
@@ -0,0 +1,20 @@
+/// <reference path='fourslash.ts' />
+
+// @Filename: foo.d.ts
+//// declare class Foo {
+////     static prop1(x: number): number;
+////     static prop1(x: string): string;
+////     static prop2(x: boolean): boolean;
+//// }
+//// export = Foo; /*2*/
+
+// @Filename: app.ts
+////import {/*1*/} from './foo';
+
+goTo.marker('1');
+verify.completionListContains('prop1');
+verify.completionListContains('prop2');
+verify.not.completionListContains('Foo');
+verify.numberOfErrorsInCurrentFile(0);
+goTo.marker('2');
+verify.numberOfErrorsInCurrentFile(0);