Merge branch 'master' into stringLiteralCompletions

src/services/breakpoints.ts

@@ -387,7 +387,7 @@ namespace ts.BreakpointResolver {
                     return spanInNode(variableDeclaration.parent.parent);
                 }
 
-                // If this is a destructuring pattern set breakpoint in binding pattern
+                // If this is a destructuring pattern, set breakpoint in binding pattern
                 if (isBindingPattern(variableDeclaration.name)) {
                     return spanInBindingPattern(<BindingPattern>variableDeclaration.name);
                 }
@@ -723,4 +723,4 @@ namespace ts.BreakpointResolver {
             }
         }
     }
-}
+}

src/services/signatureHelp.ts

@@ -161,7 +161,8 @@ namespace ts.SignatureHelp {
 
     //    // Did not find matching token
     //    return null;
-    //}
+    // }
+
     const emptyArray: any[] = [];
 
     const enum ArgumentListKind {
@@ -189,6 +190,7 @@ namespace ts.SignatureHelp {
         }
 
         const argumentInfo = getContainingArgumentInfo(startingToken, position, sourceFile);
+
         cancellationToken.throwIfCancellationRequested();
 
         // Semantic filtering of signature help
@@ -316,6 +318,7 @@ namespace ts.SignatureHelp {
                     argumentCount: argumentCount
                 };
             }
+            return undefined;
         }
         else if (node.kind === SyntaxKind.NoSubstitutionTemplateLiteral && node.parent.kind === SyntaxKind.TaggedTemplateExpression) {
             // Check if we're actually inside the template;
@@ -542,7 +545,7 @@ namespace ts.SignatureHelp {
         const isTypeParameterList = argumentListInfo.kind === ArgumentListKind.TypeArguments;
 
         const invocation = argumentListInfo.invocation;
-        const callTarget = getInvokedExpression(invocation)
+        const callTarget = getInvokedExpression(invocation);
         const callTargetSymbol = typeChecker.getSymbolAtLocation(callTarget);
         const callTargetDisplayParts = callTargetSymbol && symbolToDisplayParts(typeChecker, callTargetSymbol, /*enclosingDeclaration*/ undefined, /*meaning*/ undefined);
         const items: SignatureHelpItem[] = map(candidates, candidateSignature => {