microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-12 20:01:02 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Address CR feedback.

Browse Source
This commit is contained in:
Cyrus Najmabadi
2014-09-17 12:33:32 -07:00
parent 27805d6585
commit a1ca10d380
1 changed files with 3 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
src/services/services.ts
View File

@@ -3687,76 +3687,15 @@ module ts {
// Only allow a symbol to be renamed if it actually has at least one declaration.
if (symbol && symbol.getDeclarations() && symbol.getDeclarations().length > 0) {
var kind = getKind(symbol);
var kind = getSymbolKind(symbol);
if (kind) {
return RenameInfo.Create(symbol.name, typeInfoResolver.getFullyQualifiedName(symbol), kind, getKindModifiers(symbol),
return RenameInfo.Create(symbol.name, typeInfoResolver.getFullyQualifiedName(symbol), kind,
getNodeModifiers(symbol.getDeclarations()[0]),
new TypeScript.TextSpan(node.getStart(), node.getWidth()));
}
}
}
function getKindModifiers(symbol: Symbol): string {
var modifiers: string[] = [];
var decl = symbol.getDeclarations()[0];
if (decl.flags & NodeFlags.Ambient) {
modifiers.push(ScriptElementKindModifier.ambientModifier);
}
if (decl.flags & NodeFlags.Export) {
modifiers.push(ScriptElementKindModifier.exportedModifier);
}
if (decl.flags & NodeFlags.Private) {
modifiers.push(ScriptElementKindModifier.privateMemberModifier);
}
if (decl.flags & NodeFlags.Public) {
modifiers.push(ScriptElementKindModifier.publicMemberModifier);
}
if (decl.flags & NodeFlags.Static) {
modifiers.push(ScriptElementKindModifier.staticModifier);
}
return modifiers.length == 0 ? ScriptElementKindModifier.none : modifiers.join(',');
}
function getKind(symbol: Symbol): string {
if (symbol.flags & SymbolFlags.Module) {
return ScriptElementKind.moduleElement;
}
else if (symbol.flags & SymbolFlags.Class) {
return ScriptElementKind.classElement;
}
else if (symbol.flags & SymbolFlags.Interface) {
return ScriptElementKind.interfaceElement;
}
else if (symbol.flags & SymbolFlags.Enum) {
return ScriptElementKind.enumElement;
}
else if (symbol.flags & SymbolFlags.Variable) {
return ScriptElementKind.variableElement;
}
else if (symbol.flags & SymbolFlags.Function) {
return ScriptElementKind.functionElement;
}
else if (symbol.flags & SymbolFlags.Method) {
return ScriptElementKind.memberFunctionElement;
}
else if (symbol.flags & SymbolFlags.GetAccessor) {
return ScriptElementKind.memberGetAccessorElement;
}
else if (symbol.flags & SymbolFlags.SetAccessor) {
return ScriptElementKind.memberSetAccessorElement;
}
else if (symbol.flags & SymbolFlags.Property) {
return ScriptElementKind.memberVariableElement;
}
else if (symbol.flags & SymbolFlags.TypeParameter) {
return ScriptElementKind.typeParameterElement;
}
else if (symbol.flags & SymbolFlags.EnumMember) {
return ScriptElementKind.memberVariableElement;
}
}
return RenameInfo.CreateError(getLocaleSpecificMessage(Diagnostics.You_cannot_rename_this_element.key));
}