Skip to content

Commit 4eb12f8

Browse files
committed
switch RenameInfo to interface
1 parent 5048a33 commit 4eb12f8

File tree

1 file changed

+35
-26
lines changed

1 file changed

+35
-26
lines changed

src/services/services.ts

Lines changed: 35 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -811,29 +811,14 @@ module ts {
811811
textSpan: TypeScript.TextSpan;
812812
}
813813

814-
export class RenameInfo {
815-
constructor(public canRename: boolean,
816-
public localizedErrorMessage: string,
817-
public displayName: string,
818-
public fullDisplayName: string,
819-
public kind: string,
820-
public kindModifiers: string,
821-
public triggerSpan: TypeScript.TextSpan) {
822-
}
823-
824-
public static CreateError(localizedErrorMessage: string) {
825-
return new RenameInfo(/*canRename:*/ false, localizedErrorMessage,
826-
/*displayName:*/ null, /*fullDisplayName:*/ null,
827-
/*kind:*/ null, /*kindModifiers:*/ null, /*triggerSpan:*/ null);
828-
}
829-
830-
public static Create(displayName: string,
831-
fullDisplayName: string,
832-
kind: string,
833-
kindModifiers: string,
834-
triggerSpan: TypeScript.TextSpan) {
835-
return new RenameInfo(/*canRename:*/ true, /*localizedErrorMessage:*/ null, displayName, fullDisplayName, kind, kindModifiers, triggerSpan);
836-
}
814+
export interface RenameInfo {
815+
canRename: boolean;
816+
localizedErrorMessage: string;
817+
displayName: string;
818+
fullDisplayName: string;
819+
kind: string;
820+
kindModifiers: string;
821+
triggerSpan: TypeScript.TextSpan;
837822
}
838823

839824
export interface SignatureHelpParameter {
@@ -4319,7 +4304,7 @@ module ts {
43194304
(char >= TypeScript.CharacterCodes._0 && char <= TypeScript.CharacterCodes._9);
43204305
}
43214306
}
4322-
4307+
43234308

43244309
function getRenameInfo(fileName: string, position: number): RenameInfo {
43254310
synchronizeHostData();
@@ -4337,14 +4322,38 @@ module ts {
43374322
if (symbol && symbol.getDeclarations() && symbol.getDeclarations().length > 0) {
43384323
var kind = getSymbolKind(symbol);
43394324
if (kind) {
4340-
return RenameInfo.Create(symbol.name, typeInfoResolver.getFullyQualifiedName(symbol), kind,
4325+
return getRenameInfo(symbol.name, typeInfoResolver.getFullyQualifiedName(symbol), kind,
43414326
getSymbolModifiers(symbol),
43424327
new TypeScript.TextSpan(node.getStart(), node.getWidth()));
43434328
}
43444329
}
43454330
}
43464331

4347-
return RenameInfo.CreateError(getLocaleSpecificMessage(Diagnostics.You_cannot_rename_this_element.key));
4332+
return getRenameInfoError(getLocaleSpecificMessage(Diagnostics.You_cannot_rename_this_element.key));
4333+
4334+
function getRenameInfoError(localizedErrorMessage: string): RenameInfo {
4335+
return {
4336+
canRename: false,
4337+
localizedErrorMessage: getLocaleSpecificMessage(Diagnostics.You_cannot_rename_this_element.key),
4338+
displayName: undefined,
4339+
fullDisplayName: undefined,
4340+
kind: undefined,
4341+
kindModifiers: undefined,
4342+
triggerSpan: undefined
4343+
};
4344+
}
4345+
4346+
function getRenameInfo(displayName: string, fullDisplayName: string, kind: string, kindModifiers: string, triggerSpan: TypeScript.TextSpan): RenameInfo {
4347+
return {
4348+
canRename: true,
4349+
localizedErrorMessage: undefined,
4350+
displayName: displayName,
4351+
fullDisplayName: fullDisplayName,
4352+
kind: kind,
4353+
kindModifiers: kindModifiers,
4354+
triggerSpan: triggerSpan
4355+
};
4356+
}
43484357
}
43494358

43504359
return {

0 commit comments

Comments
 (0)