Commit 987dab9

committed

addressing CR comments

1 parent 953e568 commit 987dab9Copy full SHA for 987dab9

1 file changed

src/services
- services.ts

`‎src/services/services.ts‎`

-Original file line number
+Diff line change
                 if (symbol) {
                     var declarations = symbol.getDeclarations();
                     if (declarations && declarations.length > 0) {
+-
                         // Disallow rename for elements that are defined in the standard TypeScript library.
                         var defaultLibFile = getDefaultLibFileName(host.getCompilationSettings());
                         for (var i = 0; i < declarations.length; i++) {
                             var sourceFile = declarations[i].getSourceFile();
                             if (sourceFile && endsWith(sourceFile.fileName, defaultLibFile)) {
                                 return getRenameInfoError(getLocaleSpecificMessage(Diagnostics.You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library.key));
+                            }
 -            	        }
 +                        }
                         var kind = getSymbolKind(symbol, typeInfoResolver, node);
                         if (kind) {
 -                            return getRenameInfo(symbol.name, typeInfoResolver.getFullyQualifiedName(symbol), kind,
 -                                getSymbolModifiers(symbol),
 -                                createTextSpan(node.getStart(), node.getWidth()));
 +                            return {
 +                                canRename: true,
 +                                localizedErrorMessage: undefined,
 +                                displayName: symbol.name,
 +                                fullDisplayName: typeInfoResolver.getFullyQualifiedName(symbol),
 +                                kind: kind,
 +                                kindModifiers: getSymbolModifiers(symbol),
 +                                triggerSpan: createTextSpan(node.getStart(), node.getWidth())
 +                            };
+                        }
+                    }
+                }
             return getRenameInfoError(getLocaleSpecificMessage(Diagnostics.You_cannot_rename_this_element.key));
             function endsWith(string: string, value: string): boolean {
 -                return string.substring(string.length - value.length, string.length) === value;
 +                return string.lastIndexOf(value) + value.length === string.length;
+            }
             function getRenameInfoError(localizedErrorMessage: string): RenameInfo {
                     triggerSpan: undefined
                 };
+            }
+-
 -            function getRenameInfo(displayName: string, fullDisplayName: string, kind: string, kindModifiers: string, triggerSpan: TextSpan): RenameInfo {
 -                return {
 -                    canRename: true,
 -                    localizedErrorMessage: undefined,
 -                    displayName,
 -                    fullDisplayName,
 -                    kind,
 -                    kindModifiers,
 -                    triggerSpan
 -                };
 -            }
+        }
         return {

Comments

(0)

File tree

‎src/services/services.ts‎

0 commit comments

`‎src/services/services.ts‎`