cleanup

Author: jeffy-g

src/services/completions.ts

@@ -868,43 +868,26 @@ namespace ts.Completions {
                 //   /**
                 //    *         |c|
                 //    */
-                /* https://coderwall.com/p/zbc2zw/the-comment-toggle-trick
-                if (sourceFile.text.charCodeAt(position - 1) === CharacterCodes.at) {
-                    // The current position is next to the '@' sign, when no tag name being provided yet.
-                    // Provide a full list of tag names
-                    return { kind: CompletionDataKind.JsDocTagName };
-                }
-                else {
-                    const lineStart = getLineStartPositionForPosition(position, sourceFile);
-                    // or !/[^/\s\*]/.test(sourceFile.text.substring(lineStart, position))
-                    if (!(sourceFile.text.substring(lineStart, position).match(/[^\*|\s|(/\*\*)]/))) {
-                        return { kind: CompletionDataKind.JsDocTag };
-                    }
-                }
-                /*/
                 const lineStart = getLineStartPositionForPosition(position, sourceFile);
                 const jsdocFragment = sourceFile.text.substring(lineStart, position);
                 const reJSDocFragment = /^(?:\s*\/\*\*\s+|\s+\*?\s+)(@(?:\w+)?)?/g;
                 const match = reJSDocFragment.exec(jsdocFragment);
                 if (match && reJSDocFragment.lastIndex === jsdocFragment.length) {
                     return {
-                        kind: match[1] ? CompletionDataKind.JsDocTagName: CompletionDataKind.JsDocTag
+                        kind: match[1]
+                        // The current position is next to the '@' sign, when no tag name being provided yet.
+                        // Provide a full list of tag names
+                        ? CompletionDataKind.JsDocTagName:
+                          CompletionDataKind.JsDocTag
                     };
                 }
-                //*/
             }
 
             // Completion should work inside certain JsDoc tags. For example:
             //     /** @type {number | string} */
             // Completion should work in the brackets
             const tag = getJsDocTagAtPosition(currentToken, position);
             if (tag) {
-                /* https://coderwall.com/p/zbc2zw/the-comment-toggle-trick
-                if (tag.tagName.pos <= position && position <= tag.tagName.end) {
-                    return { kind: CompletionDataKind.JsDocTagName };
-                }
-                /*/
-                //*/
                 if (isTagWithTypeExpression(tag) && tag.typeExpression && tag.typeExpression.kind === SyntaxKind.JSDocTypeExpression) {
                     currentToken = getTokenAtPosition(sourceFile, position);
                     if (!currentToken ||

tests/cases/fourslash/completionsJsdocTag.ts

@@ -92,16 +92,6 @@
 //// */
 ////
 
-// also, can support the inline jsdoc tags
-/////**
-//// * link to {/*70*/
-//// */
-////
-/////**
-//// * link to {@/*71*/
-//// */
-////
-
 verify.completions({ marker: "", includes: { name: "@property", text: "@property", kind: "keyword" } });
 
 
@@ -113,72 +103,17 @@ test.markerNames().forEach(marker => {
         let completionOpt: FourSlashInterface.CompletionsOptions;
         const n = +marker;
         switch (n) {
-            /* https://coderwall.com/p/zbc2zw/the-comment-toggle-trick
-
-            // - - - - - -
-            // before fix
-            // - - - - - -
-
             // jsdoc tags will be listed when there is more than one whitespace after "*"
             case 10: case 11:
             // Also, if there are two or more blanks at the beginning of the line
             case 20: case 21:
-
-            // 5x - jsdoc tag completions should not occur
-            // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-            //  jsdoc tags will be listed but this does not the expected behavior
-            // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-            case 50: case 51: case 52:
-                completionOpt = { marker, includes: ["@abstract", "@access"] };
-                break;
-
-            // 3x - jsdoc tag names will be listed
-            case 30: case 31: case 32: case 33: case 34: case 35: case 36:
-
-            // 4x - jsdoc tag name completions should not occur
-            // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-            //  jsdoc tag names will be listed but this does not the expected behavior
-            // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-            case 40: case 41: case 42: case 43: case 44: case 45: case 46:
-
-            // does not the expected behavior... because ts.JsDoc@jsDocTagNames is missing inline jsdoc tag name
-            // In other words, inline jsdoc tag is interpreted as not intending to support
-            case 71:
-                completionOpt = {
-                    marker,
-                    triggerCharacter: "@",
-                    includes: ["package", "param"]
-                };
-                break;
-            /*/
-
-            // - - - - - -
-            // after fix
-            // - - - - - -
-
-            // jsdoc tags will be listed when there is more than one whitespace after "*"
-            case 10: case 11:
-            // Also, if there are two or more blanks at the beginning of the line
-            case 20: case 21:
-
-            // // also, can support the inline jsdoc tags
-            // case 70:
                 completionOpt = { marker, includes: [
                     "@abstract", "@access",
                 ]};
                 break;
 
             // 3x - jsdoc tag names will be listed
             case 30: case 31: case 32: case 33: case 34: case 35: case 36:
-
-            // // 4x - jsdoc tag name completions should not occur
-            // // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-            // //  this behavior does not by getCompletionData.insideComment.hasDocComment clause
-            // // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-            // case 40: case 41: case 42:
-
-            // // also, can support the inline jsdoc tags
-            // case 71:
                 completionOpt = {
                     marker,
                     triggerCharacter: "@",
@@ -205,19 +140,12 @@ test.markerNames().forEach(marker => {
             case 50: case 51: case 52:
                 completionOpt = { marker, exact: [] };
                 break;
-            //*/
 
             default:
                 break;
         }
         if (completionOpt) {
-            // verify.completions(completionOpt);
-            try {
-                verify.completions(completionOpt);
-            } catch (e) {
-                console.log(e.message);
-                console.log("please switch the code of src/services/completions.ts#getCompletionData");
-            }
+            verify.completions(completionOpt);
         }
     }
 });