From 49cfdcf8ba8d9c15afdff758cd01328e48183365 Mon Sep 17 00:00:00 2001 From: lin777 Date: Fri, 5 Feb 2021 11:44:30 -0400 Subject: [PATCH] Update to fix undo refactoring for rename package, and add command to rename package from refactoring --- src/Refactoring-Changes/RBRefactoryChangeFactory.class.st | 5 +++++ src/Refactoring-Changes/RBRenamePackageChange.class.st | 2 +- .../SycRenamePackageCommand.class.st | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/Refactoring-Changes/RBRefactoryChangeFactory.class.st b/src/Refactoring-Changes/RBRefactoryChangeFactory.class.st index c8f77793bf3..68029fcd120 100644 --- a/src/Refactoring-Changes/RBRefactoryChangeFactory.class.st +++ b/src/Refactoring-Changes/RBRefactoryChangeFactory.class.st @@ -132,3 +132,8 @@ RBRefactoryChangeFactory >> renameInstanceVariable: oldName to: newName in: aCla RBRefactoryChangeFactory >> renamePackage: aRBPackage to: newName [ ^ RBRenamePackageChange rename: aRBPackage name to: newName ] + +{ #category : #'refactory-changes-packages' } +RBRefactoryChangeFactory >> renamePackageNamed: aRBPackage to: newName [ + ^ RBRenamePackageChange rename: aRBPackage to: newName +] diff --git a/src/Refactoring-Changes/RBRenamePackageChange.class.st b/src/Refactoring-Changes/RBRenamePackageChange.class.st index 496478bbc53..35b911d6aca 100644 --- a/src/Refactoring-Changes/RBRenamePackageChange.class.st +++ b/src/Refactoring-Changes/RBRenamePackageChange.class.st @@ -17,7 +17,7 @@ RBRenamePackageChange class >> rename: oldString to: newString [ { #category : #converting } RBRenamePackageChange >> asUndoOperation [ - ^ changeFactory renamePackage: self changePackage to: oldName + ^ changeFactory renamePackageNamed: newName to: oldName ] { #category : #accessing } diff --git a/src/SystemCommands-PackageCommands/SycRenamePackageCommand.class.st b/src/SystemCommands-PackageCommands/SycRenamePackageCommand.class.st index b99b32e6bff..301e5c8acef 100644 --- a/src/SystemCommands-PackageCommands/SycRenamePackageCommand.class.st +++ b/src/SystemCommands-PackageCommands/SycRenamePackageCommand.class.st @@ -30,7 +30,7 @@ SycRenamePackageCommand >> defaultMenuItemName [ { #category : #execution } SycRenamePackageCommand >> execute [ - package renameTo: newName + (RBRenamePackageRefactoring rename: package to: newName) execute ] { #category : #accessing }