diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
index bf88a87d3e7..787a022140f 100644
--- a/src/compiler/parser.ts
+++ b/src/compiler/parser.ts
@@ -4017,7 +4017,7 @@ namespace ts {
                 setDecoratorContext(/*val*/ true);
             }
 
-            return finishNode(node);
+            return addJSDocComment(finishNode(node));
         }
 
         function parseOptionalIdentifier() {
@@ -4301,13 +4301,13 @@ namespace ts {
                 const labeledStatement = <LabeledStatement>createNode(SyntaxKind.LabeledStatement, fullStart);
                 labeledStatement.label = <Identifier>expression;
                 labeledStatement.statement = parseStatement();
-                return finishNode(labeledStatement);
+                return addJSDocComment(finishNode(labeledStatement));
             }
             else {
                 const expressionStatement = <ExpressionStatement>createNode(SyntaxKind.ExpressionStatement, fullStart);
                 expressionStatement.expression = expression;
                 parseSemicolon();
-                return finishNode(expressionStatement);
+                return addJSDocComment(finishNode(expressionStatement));
             }
         }
 
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index 05dc4be1d0a..33ad24d7f56 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -1205,7 +1205,19 @@ namespace ts {
                 node.parent.parent.parent.kind === SyntaxKind.VariableStatement;
 
             const variableStatementNode = isInitializerOfVariableDeclarationInStatement ? node.parent.parent.parent : undefined;
-            return variableStatementNode && variableStatementNode.jsDocComment;
+            if (variableStatementNode) {
+                return variableStatementNode.jsDocComment;
+            }
+
+            // Also recognize when the node is the RHS of an assignment expression
+            const isSourceOfAssignmentExpressionStatement =
+                node.parent && node.parent.parent &&
+                node.parent.kind === SyntaxKind.BinaryExpression &&
+                (node.parent as BinaryExpression).operatorToken.kind === SyntaxKind.EqualsToken &&
+                node.parent.parent.kind === SyntaxKind.ExpressionStatement;
+            if (isSourceOfAssignmentExpressionStatement) {
+                return node.parent.parent.jsDocComment;
+            }
         }
 
         return undefined;
diff --git a/tests/cases/fourslash/getJavaScriptCompletions18.ts b/tests/cases/fourslash/getJavaScriptCompletions18.ts
new file mode 100644
index 00000000000..a30d4943f4f
--- /dev/null
+++ b/tests/cases/fourslash/getJavaScriptCompletions18.ts
@@ -0,0 +1,21 @@
+/// <reference path="fourslash.ts" />
+
+// @allowNonTsExtensions: true
+// @Filename: file.js
+//// /**
+////   * @param {number} a
+////   * @param {string} b
+//// */
+//// exports.foo = function(a, b) {
+//// 	a/*a*/;
+//// 	b/*b*/
+//// };
+
+goTo.marker('a');
+edit.insert('.');
+verify.completionListContains('toFixed', undefined, undefined, 'method');
+
+
+goTo.marker('b');
+edit.insert('.');
+verify.completionListContains('substr', undefined, undefined, 'method');