microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-08 22:29:37 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Adds ThisType to SyntaxKind, to distinguish between a 'this' expression and a 'this' type. Needed for transforms

Browse Source
This commit is contained in:
Ron Buckton
2015-11-17 10:53:29 -08:00
parent 5ac4b782e0
commit 443abe6dea
9 changed files with 42 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/services/services.ts
View File

@@ -2314,7 +2314,7 @@ namespace ts {
return true;
}
return false;
}
@@ -2333,7 +2333,7 @@ namespace ts {
}
return false;
}
function tryConsumeDefine(): boolean {
let token = scanner.getToken();
if (token === SyntaxKind.Identifier && scanner.getTokenValue() === "define") {
@@ -2359,7 +2359,7 @@ namespace ts {
if (token !== SyntaxKind.OpenBracketToken) {
return true;
}
// skip open bracket
token = scanner.scan();
let i = 0;
@@ -2374,7 +2374,7 @@ namespace ts {
token = scanner.scan();
}
return true;
}
return false;
}
@@ -3976,7 +3976,7 @@ namespace ts {
let sourceFile = getValidSourceFile(fileName);
let entries: CompletionEntry[] = [];
if (isRightOfDot && isSourceFileJavaScript(sourceFile)) {
const uniqueNames = getCompletionEntriesFromSymbols(symbols, entries);
addRange(entries, getJavaScriptCompletionEntries(sourceFile, uniqueNames));
@@ -4595,6 +4595,7 @@ namespace ts {
case SyntaxKind.PropertyAccessExpression:
case SyntaxKind.QualifiedName:
case SyntaxKind.ThisKeyword:
case SyntaxKind.ThisType:
case SyntaxKind.SuperKeyword:
// For the identifiers/this/super etc get the type at position
let type = typeChecker.getTypeAtLocation(node);
@@ -4866,6 +4867,7 @@ namespace ts {
function getSemanticDocumentHighlights(node: Node): DocumentHighlights[] {
if (node.kind === SyntaxKind.Identifier ||
node.kind === SyntaxKind.ThisKeyword ||
node.kind === SyntaxKind.ThisType ||
node.kind === SyntaxKind.SuperKeyword ||
isLiteralNameOfPropertyDeclarationOrIndexAccess(node) ||
isNameOfExternalModuleImportOrDeclaration(node)) {
@@ -5561,7 +5563,7 @@ namespace ts {
}
}
if (node.kind === SyntaxKind.ThisKeyword) {
if (node.kind === SyntaxKind.ThisKeyword || node.kind === SyntaxKind.ThisType) {
return getReferencesForThisKeyword(node, sourceFiles);
}
@@ -6043,7 +6045,7 @@ namespace ts {
cancellationToken.throwIfCancellationRequested();
let node = getTouchingWord(sourceFile, position);
if (!node || node.kind !== SyntaxKind.ThisKeyword) {
if (!node || (node.kind !== SyntaxKind.ThisKeyword && node.kind !== SyntaxKind.ThisType)) {
return;
}
@@ -6405,7 +6407,8 @@ namespace ts {
return node.parent.kind === SyntaxKind.TypeReference ||
(node.parent.kind === SyntaxKind.ExpressionWithTypeArguments && !isExpressionWithTypeArgumentsInClassExtendsClause(<ExpressionWithTypeArguments>node.parent)) ||
node.kind === SyntaxKind.ThisKeyword && !isExpression(node);
(node.kind === SyntaxKind.ThisKeyword && !isExpression(node)) ||
node.kind === SyntaxKind.ThisType;
}
function isNamespaceReference(node: Node): boolean {
@@ -6525,6 +6528,7 @@ namespace ts {
case SyntaxKind.NullKeyword:
case SyntaxKind.SuperKeyword:
case SyntaxKind.ThisKeyword:
case SyntaxKind.ThisType:
case SyntaxKind.Identifier:
break;