FIx minor stuffs

Yui T · Yui T · commit da51f396955f · 2017-03-01T21:11:34.000-08:00
diff --git a/src/services/completions.ts b/src/services/completions.ts
@@ -59,7 +59,7 @@ namespace ts.Completions {
         }
 
         // Add keywords if this is not a member completion list
-        if (!isMemberCompletion && !(requestJsDocTag  && requestJsDocTagName)) {
+        if (!isMemberCompletion && !requestJsDocTag && !requestJsDocTagName) {
             addRange(entries, keywordCompletions);
         }
 
@@ -858,7 +858,7 @@ namespace ts.Completions {
                     //    *         |c|
                     //    */
                     const lineStart = getLineStartPositionForPosition(position, sourceFile);
-                    requestJsDocTag = !(sourceFile.text.substr(lineStart, position).match(/[^\*|\s|(/\*\*)]/));
+                    requestJsDocTag = !(sourceFile.text.substring(lineStart, position).match(/[^\*|\s|(/\*\*)]/));
                 }
             }
 
diff --git a/tests/cases/fourslash/completionInJsDoc.ts b/tests/cases/fourslash/completionInJsDoc.ts
@@ -35,22 +35,24 @@
 //// /**
 ////  * /*11*/
 ////  */
-
+////
 //// /**
 ////           /*12*/
 ////  */
-
+////
 //// /**
 ////   *       /*13*/
 ////   */
-
+////
 //// /**
 ////   * some comment /*14*/
 ////   */
-
+////
 //// /**
 ////   * @param /*15*/
 ////   */
+////
+//// /** @param /*16*/ */
 
 goTo.marker('1');
 verify.completionListContains("constructor");
@@ -105,4 +107,7 @@ goTo.marker('14');
 verify.completionListIsEmpty();
 
 goTo.marker('15');
+verify.completionListIsEmpty();
+
+goTo.marker('16');
 verify.completionListIsEmpty();

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ namespace ts.Completions {`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`// Add keywords if this is not a member completion list`
`62`		`- if (!isMemberCompletion && !(requestJsDocTag && requestJsDocTagName)) {`
	`62`	`+ if (!isMemberCompletion && !requestJsDocTag && !requestJsDocTagName) {`
`63`	`63`	`addRange(entries, keywordCompletions);`
`64`	`64`	`}`
`65`	`65`
`@@ -858,7 +858,7 @@ namespace ts.Completions {`
`858`	`858`	`// * \|c\|`
`859`	`859`	`// */`
`860`	`860`	`const lineStart = getLineStartPositionForPosition(position, sourceFile);`
`861`		`- requestJsDocTag = !(sourceFile.text.substr(lineStart, position).match(/[^\\|\s\|(/\\*)]/));`
	`861`	`+ requestJsDocTag = !(sourceFile.text.substring(lineStart, position).match(/[^\\|\s\|(/\\*)]/));`
`862`	`862`	`}`
`863`	`863`	`}`
`864`	`864`