@@ -811,29 +811,14 @@ module ts {
811
811
textSpan : TypeScript . TextSpan ;
812
812
}
813
813
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 ;
837
822
}
838
823
839
824
export interface SignatureHelpParameter {
@@ -4319,7 +4304,7 @@ module ts {
4319
4304
( char >= TypeScript . CharacterCodes . _0 && char <= TypeScript . CharacterCodes . _9 ) ;
4320
4305
}
4321
4306
}
4322
-
4307
+
4323
4308
4324
4309
function getRenameInfo ( fileName : string , position : number ) : RenameInfo {
4325
4310
synchronizeHostData ( ) ;
@@ -4337,14 +4322,38 @@ module ts {
4337
4322
if ( symbol && symbol . getDeclarations ( ) && symbol . getDeclarations ( ) . length > 0 ) {
4338
4323
var kind = getSymbolKind ( symbol ) ;
4339
4324
if ( kind ) {
4340
- return RenameInfo . Create ( symbol . name , typeInfoResolver . getFullyQualifiedName ( symbol ) , kind ,
4325
+ return getRenameInfo ( symbol . name , typeInfoResolver . getFullyQualifiedName ( symbol ) , kind ,
4341
4326
getSymbolModifiers ( symbol ) ,
4342
4327
new TypeScript . TextSpan ( node . getStart ( ) , node . getWidth ( ) ) ) ;
4343
4328
}
4344
4329
}
4345
4330
}
4346
4331
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
+ }
4348
4357
}
4349
4358
4350
4359
return {
0 commit comments