microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-22 16:52:14 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

A few touch-ups to the code.

Browse Source
This commit is contained in:
Daniel Rosenwasser 2014-11-07 18:10:38 -08:00
parent 1934193213
commit c7acb6c2c4
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/services/services.ts
View File

@ -3858,33 +3858,31 @@ module ts {
}
}
function getModifierOccurrences(modifier: SyntaxKind, exportedDeclaration: Declaration) {
var container = exportedDeclaration.parent;
function getModifierOccurrences(modifier: SyntaxKind, declaration: Declaration) {
var container = declaration.parent;
// Make sure we only highlight the keyword when it makes sense to do so.
if (exportedDeclaration.flags & NodeFlags.AccessibilityModifier) {
if (!(hasKind(container, SyntaxKind.ClassDeclaration) ||
(exportedDeclaration.kind === SyntaxKind.Parameter && hasKind(container, SyntaxKind.Constructor)))) {
if (declaration.flags & NodeFlags.AccessibilityModifier) {
if (!(container.kind === SyntaxKind.ClassDeclaration ||
(declaration.kind === SyntaxKind.Parameter && hasKind(container, SyntaxKind.Constructor)))) {
return undefined;
}
}
else if (exportedDeclaration.flags & NodeFlags.Static) {
if (!(hasKind(container, SyntaxKind.ClassDeclaration))) {
else if (declaration.flags & NodeFlags.Static) {
if (container.kind !== SyntaxKind.ClassDeclaration) {
return undefined;
}
}
else if (exportedDeclaration.flags & (NodeFlags.Export | NodeFlags.Ambient)) {
if (!(hasKind(container, SyntaxKind.ModuleBlock) || hasKind(container, SyntaxKind.SourceFile))) {
else if (declaration.flags & (NodeFlags.Export | NodeFlags.Ambient)) {
if (!(container.kind === SyntaxKind.ModuleBlock || container.kind === SyntaxKind.SourceFile)) {
return undefined;
}
}
var keywords: Node[] = [];
var modifierFlag: NodeFlags = getFlagFromModifier(modifier);
var nodes: Node[];
if (container.kind === SyntaxKind.ModuleBlock) {
nodes = (<Block>container).statements;
}