maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Enable intellisense in jsDoc tag @type brackets

Browse source
This commit is contained in:
zhengbli 2015-08-11 21:40:37 -07:00
parent 0b6aeeca9d
commit 5e9186b9ed
2 changed files with 48 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
src/services/services.ts
View file

@ -2928,8 +2928,22 @@ namespace ts {
log("getCompletionData: Is inside comment: " + (new Date().getTime() - start));
if (insideComment) {
log("Returning an empty list because completion was inside a comment.");
return undefined;
// Completion should work inside certain JsDoc tags. For example:
// /** @type {number | string} */
// Completion should work in the brackets
let insideJsDocTagExpression = false;
let tag = getJsDocTagAtPosition(sourceFile, position);
if (tag) {
switch (tag.kind) {
case SyntaxKind.JSDocTypeTag:
let typeTag = <JSDocTypeTag>tag;
insideJsDocTagExpression = position > typeTag.typeExpression.pos && position < typeTag.typeExpression.end;
}
}
if (!insideJsDocTagExpression) {
log("Returning an empty list because completion was inside a comment.");
return undefined;
}
}
start = new Date().getTime();
@ -3716,33 +3730,12 @@ namespace ts {
return undefined;
}
// If the current position is right after an At sign
if (sourceFile.text.charCodeAt(position - 1) === CharacterCodes.at) {
return getAllJsDocCompletionEntries();
}
// The current position is right after an At sign
// Or if the current position is in a tag name
let jsDocCommentNode: JSDocComment;
let node = ts.getTokenAtPosition(sourceFile, position);
while (true) {
if (node === sourceFile ||
node.kind === SyntaxKind.VariableStatement ||
node.kind === SyntaxKind.FunctionDeclaration ||
node.kind === SyntaxKind.Parameter ||
node.jsDocComment) {
jsDocCommentNode = node.jsDocComment;
break;
}
node = node.parent;
}
if (jsDocCommentNode) {
for (let tag of jsDocCommentNode.tags) {
if (position >= tag.atToken.pos && position <= tag.tagName.end) {
return getAllJsDocCompletionEntries();
}
}
return undefined;
}
if (sourceFile.text.charCodeAt(position - 1) === CharacterCodes.at ||
getJsDocTagAtPosition(sourceFile, position)) {
return getAllJsDocCompletionEntries();
}
}
function getAllJsDocCompletionEntries(): CompletionEntry[] {

27
src/services/utilities.ts
View file

@ -469,6 +469,33 @@ namespace ts {
}
}
/**
* Get the corresponding JSDocTag node if the position is in a jsDoc commet
*/
export function getJsDocTagAtPosition(sourceFile: SourceFile, position: number): JSDocTag {
let node = ts.getTokenAtPosition(sourceFile, position);
let jsDocComment: JSDocComment;
while (true) {
if (node === sourceFile ||
node.kind === SyntaxKind.VariableStatement ||
node.kind === SyntaxKind.FunctionDeclaration ||
node.kind === SyntaxKind.Parameter ||
node.jsDocComment) {
jsDocComment = node.jsDocComment;
break;
}
node = node.parent;
}
if (jsDocComment) {
for (let tag of jsDocComment.tags) {
if (position >= tag.pos && position <= tag.end) {
return tag;
}
}
}
return undefined;
}
function nodeHasTokens(n: Node): boolean {
// If we have a token or node that has a non-zero width, it must have tokens.
// Note, that getWidth() does not take trivia into account.