From 18348bbef705eaede55c8bec9a76099c4c3f42fa Mon Sep 17 00:00:00 2001
From: Vladimir Matveev <vladima@microsoft.com>
Date: Tue, 8 Nov 2016 15:30:32 -0800
Subject: [PATCH] (signature help) type parameter lists are never variadic

---
 src/harness/fourslash.ts                               | 10 +++++++++-
 src/services/signatureHelp.ts                          |  5 ++++-
 tests/cases/fourslash/fourslash.ts                     |  1 +
 .../signatureHelpTypeParametersNotVariadic.ts          |  8 ++++++++
 4 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 tests/cases/fourslash/signatureHelpTypeParametersNotVariadic.ts

diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts
index ae32fe3db1631..6ff4dccdee30e 100644
--- a/src/harness/fourslash.ts
+++ b/src/harness/fourslash.ts
@@ -1026,7 +1026,7 @@ namespace FourSlash {
                 ts.displayPartsToString(help.suffixDisplayParts), expected);
         }
 
-        public verifyCurrentParameterIsletiable(isVariable: boolean) {
+        public verifyCurrentParameterIsVariable(isVariable: boolean) {
             const signature = this.getActiveSignatureHelpItem();
             assert.isOk(signature);
             assert.equal(isVariable, signature.isVariadic);
@@ -1053,6 +1053,10 @@ namespace FourSlash {
             assert.equal(this.getActiveSignatureHelpItem().parameters.length, expectedCount);
         }
 
+        public verifyCurrentSignatureHelpIsVariadic(expected: boolean) {
+            assert.equal(this.getActiveSignatureHelpItem().isVariadic, expected);
+        }
+
         public verifyCurrentSignatureHelpDocComment(docComment: string) {
             const actualDocComment = this.getActiveSignatureHelpItem().documentation;
             assert.equal(ts.displayPartsToString(actualDocComment), docComment, this.assertionMessageAtLastKnownMarker("current signature help doc comment"));
@@ -3231,6 +3235,10 @@ namespace FourSlashInterface {
             this.state.verifySignatureHelpCount(expected);
         }
 
+        public signatureHelpCurrentArgumentListIsVariadic(expected: boolean) {
+            this.state.verifyCurrentSignatureHelpIsVariadic(expected);
+        }
+
         public signatureHelpArgumentCountIs(expected: number) {
             this.state.verifySignatureHelpArgumentCount(expected);
         }
diff --git a/src/services/signatureHelp.ts b/src/services/signatureHelp.ts
index 211e55b23ba5e..44c2ede9fbb52 100644
--- a/src/services/signatureHelp.ts
+++ b/src/services/signatureHelp.ts
@@ -557,7 +557,9 @@ namespace ts.SignatureHelp {
                 addRange(prefixDisplayParts, callTargetDisplayParts);
             }
 
+            let isVariadic: boolean;
             if (isTypeParameterList) {
+                isVariadic = false; // type parameter lists are not variadic
                 prefixDisplayParts.push(punctuationPart(SyntaxKind.LessThanToken));
                 const typeParameters = candidateSignature.typeParameters;
                 signatureHelpParameters = typeParameters && typeParameters.length > 0 ? map(typeParameters, createSignatureHelpParameterForTypeParameter) : emptyArray;
@@ -567,6 +569,7 @@ namespace ts.SignatureHelp {
                 addRange(suffixDisplayParts, parameterParts);
             }
             else {
+                isVariadic = candidateSignature.hasRestParameter;
                 const typeParameterParts = mapToDisplayParts(writer =>
                     typeChecker.getSymbolDisplayBuilder().buildDisplayForTypeParametersAndDelimiters(candidateSignature.typeParameters, writer, invocation));
                 addRange(prefixDisplayParts, typeParameterParts);
@@ -582,7 +585,7 @@ namespace ts.SignatureHelp {
             addRange(suffixDisplayParts, returnTypeParts);
 
             return {
-                isVariadic: candidateSignature.hasRestParameter,
+                isVariadic,
                 prefixDisplayParts,
                 suffixDisplayParts,
                 separatorDisplayParts: [punctuationPart(SyntaxKind.CommaToken), spacePart()],
diff --git a/tests/cases/fourslash/fourslash.ts b/tests/cases/fourslash/fourslash.ts
index 0a72d29529586..295b8e422b9ba 100644
--- a/tests/cases/fourslash/fourslash.ts
+++ b/tests/cases/fourslash/fourslash.ts
@@ -194,6 +194,7 @@ declare namespace FourSlashInterface {
         currentSignatureHelpDocCommentIs(docComment: string): void;
         signatureHelpCountIs(expected: number): void;
         signatureHelpArgumentCountIs(expected: number): void;
+        signatureHelpCurrentArgumentListIsVariadic(expected: boolean);
         currentSignatureParameterCountIs(expected: number): void;
         currentSignatureTypeParameterCountIs(expected: number): void;
         currentSignatureHelpIs(expected: string): void;
diff --git a/tests/cases/fourslash/signatureHelpTypeParametersNotVariadic.ts b/tests/cases/fourslash/signatureHelpTypeParametersNotVariadic.ts
new file mode 100644
index 0000000000000..30b0bac7e7117
--- /dev/null
+++ b/tests/cases/fourslash/signatureHelpTypeParametersNotVariadic.ts
@@ -0,0 +1,8 @@
+/// <reference path="fourslash.ts" />
+
+//// declare function f(a: any, ...b: any[]): any;
+//// f</*1*/>(1, 2);
+
+goTo.marker("1");
+verify.signatureHelpArgumentCountIs(0);
+verify.signatureHelpCurrentArgumentListIsVariadic(false);
\ No newline at end of file