Update to use new preview with Extract Method refactoring

pharo-project · May 3, 2021 · bbca019 · bbca019
1 parent 1cdb400
commit bbca019
Show file tree

Hide file tree

Showing 10 changed files with 47 additions and 38 deletions.
diff --git a/src/NautilusRefactoring/NautilusRefactoring.class.st b/src/NautilusRefactoring/NautilusRefactoring.class.st
@@ -33,9 +33,13 @@ NautilusRefactoring >> chooseFrom: anArray title: aString lines: aCollection [
 ]
 
 { #category : #display }
-NautilusRefactoring >> handleMethodNameRequest: aMethodName in: ref [
+NautilusRefactoring >> handleMethodNameRequest: aMethodName [
 	|dialog|
-	dialog := SycMethodNameEditorPresenter openOn: aMethodName withRefactoring: ref.
+	dialog := SycMethodNameEditorPresenter 
+		openOn: aMethodName 
+		canRenameArgs: false 
+		canRemoveArgs: false 
+		canAddArgs: false.
 	dialog cancelled ifTrue: [  CmdCommandAborted signal ].
 	^ aMethodName
 ]
@@ -62,7 +66,7 @@ NautilusRefactoring >> refactoringOptions: aRefactoring [
 		setOption: #implementorToInline
 		toUse: [ :ref :imps | self requestImplementorToInline: imps ];
 		setOption: #methodName
-		toUse: [ :ref :name | self requestMethodNameFor: name in: ref ];
+		toUse: [ :name | self requestMethodNameFor: name ];
 		setOption: #selfArgumentName
 		toUse: [ :ref | self requestSelfArgumentName ];
 		setOption: #selectVariableToMoveTo
@@ -102,8 +106,8 @@ NautilusRefactoring >> requestImplementorToInline: imps [
 ]
 
 { #category : #option }
-NautilusRefactoring >> requestMethodNameFor: aMethodName in: ref [
-	^ self handleMethodNameRequest: aMethodName in: ref
+NautilusRefactoring >> requestMethodNameFor: aMethodName [
+	^ self handleMethodNameRequest: aMethodName
 ]
 
 { #category : #option }

diff --git a/src/Refactoring-Core/RBExtractMethodRefactoring.class.st b/src/Refactoring-Core/RBExtractMethodRefactoring.class.st
@@ -249,6 +249,7 @@ RBExtractMethodRefactoring >> getNewMethodName [
 	newSelector isNil] 
 			whileTrue: [].
 	parameters := newMethodName arguments asOrderedCollection.
+	newMethodName renameMap ifNotEmpty: [parameterMap := newMethodName renameMap].
 	^newSelector asSymbol
 ]
 
@@ -313,7 +314,9 @@ RBExtractMethodRefactoring >> nameNewMethod: aSymbol [
 						nextPut: $ ;
 						nextPutAll: arg asString;
 						nextPut: $  ] ].
-	modifiedParseTree := RBParseTreeRewriter replace: self methodDelimiter with: newSend in: modifiedParseTree
+	modifiedParseTree := RBParseTreeRewriter replace: self methodDelimiter with: newSend in: modifiedParseTree.
+	self parameterMap do: [ :e |
+	(self parseTreeRewriterClass rename: e newName to: e name) executeTree: modifiedParseTree ]
 ]
 
 { #category : #transforming }
@@ -323,7 +326,7 @@ RBExtractMethodRefactoring >> newExtractedSelector [
 
 { #category : #accessing }
 RBExtractMethodRefactoring >> parameterMap [
-	^ parameterMap
+	^ parameterMap ifNil: [ parameterMap := { } ]
 ]
 
 { #category : #accessing }
@@ -369,10 +372,8 @@ RBExtractMethodRefactoring >> remainingTemporaries [
 
 { #category : #transforming }
 RBExtractMethodRefactoring >> renameAllParameters [
-	parameterMap ifNotNil: [
-		parameterMap keysAndValuesDo: [ :key : value | 
-			key ~= value ifTrue: [ self renameParameterWith: key to: value ]]
-	]
+	self parameterMap do: [ :each | 
+			self renameParameterWith: each name to: each newName ]
 ]
 
 { #category : #renaming }
@@ -471,7 +472,7 @@ RBExtractMethodRefactoring >> validateRenameNode: aParseTree withOldName: oldNam
 			block
 				ifNotNil: [ self refactoringError: conditions errorString with: block ]
 				ifNil: [ self refactoringError: conditions errorString ] ].
-	(parameterMap values includes: newName) ifTrue: [
+	(self parameterMap values includes: newName) ifTrue: [
 		self refactoringError: newName asString , ' is already defined as parameter' ].
 	(aParseTree whoDefines: newName)
 		ifNotNil: [ self refactoringError: newName asString , ' is already defined' ].

diff --git a/src/Refactoring-Core/RBExtractMethodToComponentRefactoring.class.st b/src/Refactoring-Core/RBExtractMethodToComponentRefactoring.class.st
@@ -52,8 +52,8 @@ RBExtractMethodToComponentRefactoring >> extractMethod [
 				in: class.
 	refactoring setOption: #methodName
 		toUse: 
-			[:ref :methodName | 
-			extractedMethodSelector := ref 
+			[:methodName | 
+			extractedMethodSelector := self 
 						uniqueMethodNameFor: methodName arguments size.
 			methodName
 				selector: extractedMethodSelector;

diff --git a/src/Refactoring-Core/RBRefactoring.class.st b/src/Refactoring-Core/RBRefactoring.class.st
@@ -56,7 +56,7 @@ RBRefactoring class >> initializeRefactoringOptions [
 		put: [ :ref :imps | self error: #implementorToInline ];
 
 		at: #methodName
-		put: [ :ref :methodName | self error: #methodName ];
+		put: [ :methodName | self error: #methodName ];
 
 		at: #selfArgumentName
 		put: [ :ref | self error: #selfArgumentName ];
@@ -398,7 +398,7 @@ RBRefactoring >> requestImplementorToInline: implementorsCollection [
 
 { #category : #requests }
 RBRefactoring >> requestMethodNameFor: aMethodName [ 
-	^(self options at: #methodName) value: self value: aMethodName
+	^(self options at: #methodName) value: aMethodName
 ]
 
 { #category : #requests }

diff --git a/src/Refactoring-Tests-Core/RBExtractMethodTest.class.st b/src/Refactoring-Tests-Core/RBExtractMethodTest.class.st
@@ -162,9 +162,7 @@ RBExtractMethodTest >> testExtractWithRenamingOfParameters [
 	self setupMethodNameFor: refactoring toReturn: #foo:.
 	refactoring
 		parameterMap:
-			(Dictionary new
-				at: #nameStream put: #newParameter;
-				yourself).
+			(Array with: ((RBArgumentName name: #nameStream) newName: #newParameter)).
 	self executeRefactoring: refactoring.
 	class := refactoring model classNamed: #RBLintRuleTestData.
 

diff --git a/src/Refactoring-Tests-Core/RBRefactoringTest.class.st b/src/Refactoring-Tests-Core/RBRefactoringTest.class.st
@@ -478,7 +478,7 @@ RBRefactoringTest >> setupMethodNameFor: aRefactoring toReturn: aSelector [
 	options := aRefactoring options copy.
 	options at: #methodName
 		put: 
-			[:ref :aMethodName | 
+			[:aMethodName | 
 			aMethodName
 				selector: aSelector;
 				yourself].
@@ -491,7 +491,7 @@ RBRefactoringTest >> setupMethodNameFor: aRefactoring toReturn: aSelector withAr
 	options := aRefactoring options copy.
 	options at: #methodName
 		put: 
-			[:ref :aMethodName | 
+			[ :aMethodName | 
 			aMethodName
 				selector: aSelector;
 				arguments: stringCollection;

diff --git a/src/Refactoring2-Transformations/RBTransformation.class.st b/src/Refactoring2-Transformations/RBTransformation.class.st
@@ -46,7 +46,7 @@ RBTransformation class >> initializeRefactoringOptions [
 		put: [ :ref :imps | self error: #implementorToInline ];
 
 		at: #methodName
-		put: [ :ref :methodName | self error: #methodName ];
+		put: [ :methodName | self error: #methodName ];
 
 		at: #selfArgumentName
 		put: [ :ref | self error: #selfArgumentName ];

diff --git a/src/SystemCommands-MessageCommands/SycChangeMessageSignatureCommand.class.st b/src/SystemCommands-MessageCommands/SycChangeMessageSignatureCommand.class.st
@@ -62,17 +62,6 @@ SycChangeMessageSignatureCommand >> canRenameArgs [
 	^ true
 ]
 
-{ #category : #actions }
-SycChangeMessageSignatureCommand >> computeInvalidArgNames [ 
-	| invalidArgNames |
-	invalidArgNames := Set new.
-	(model allImplementorsOf: originalMessage selector) do: [ :e | | cm | 
-		cm:=(e realClass >> originalMessage selector).
-		invalidArgNames addAll: cm argumentNames;
-			addAll: cm origin instVarNames ].
-	^ invalidArgNames
-]
-
 { #category : #execution }
 SycChangeMessageSignatureCommand >> createRefactoring [
 	self subclassResponsibility
@@ -109,7 +98,7 @@ SycChangeMessageSignatureCommand >> prepareFullExecutionInContext: aToolContext
 { #category : #requesting }
 SycChangeMessageSignatureCommand >> requestNewMessageIn: aToolContext [
 	| methodName dialog invalidArgNames |
-	invalidArgNames := self computeInvalidArgNames.
+	invalidArgNames := self computeInvalidArgNamesForSelector: originalMessage selector.
 	methodName := RBMethodName selector: originalMessage selector arguments: originalMessage argumentNames.
 	dialog := SycMethodNameEditorPresenter openOn: methodName withInvalidArgs: invalidArgNames
 		canRenameArgs: self canRenameArgs

diff --git a/src/SystemCommands-RefactoringSupport/TRefactoringCommandSupport.trait.st b/src/SystemCommands-RefactoringSupport/TRefactoringCommandSupport.trait.st
@@ -6,6 +6,17 @@ Trait {
 	#category : #'SystemCommands-RefactoringSupport'
 }
 
+{ #category : #actions }
+TRefactoringCommandSupport >> computeInvalidArgNamesForSelector: aSymbol [
+	| invalidArgNames |
+	invalidArgNames := Set new.
+	(model allImplementorsOf: aSymbol) do: [ :e | | cm | 
+		cm:=(e realClass >> aSymbol).
+		invalidArgNames addAll: cm argumentNames;
+			addAll: cm origin instVarNames ].
+	^ invalidArgNames
+]
+
 { #category : #initialization }
 TRefactoringCommandSupport >> initializeDefaultOptionsOf: refactoring [
 

diff --git a/src/SystemCommands-SourceCodeCommands/SycExtractMethodCommand.class.st b/src/SystemCommands-SourceCodeCommands/SycExtractMethodCommand.class.st
@@ -4,6 +4,8 @@ I am a command to extract selected ast node into separate method
 Class {
 	#name : #SycExtractMethodCommand,
 	#superclass : #SycSourceCodeCommand,
+	#traits : 'TRefactoringCommandSupport',
+	#classTraits : 'TRefactoringCommandSupport classTrait',
 	#instVars : [
 		'selectedTextInterval'
 	],
@@ -55,7 +57,7 @@ SycExtractMethodCommand >> isComplexRefactoring [
 { #category : #execution }
 SycExtractMethodCommand >> readParametersFromContext: aSourceCodeContext [
 	super readParametersFromContext: aSourceCodeContext.
-
+	self setUpModelFromContext: aSourceCodeContext.
 	selectedTextInterval := aSourceCodeContext selectedTextInterval.
 ]
 
@@ -81,10 +83,14 @@ SycExtractMethodCommand >> setUpOptionToChangeExtractionClass: refactoring [
 SycExtractMethodCommand >> setUpOptionToChangeMethodNameDuring: refactoring [
 
 	| dialog |
-	refactoring setOption: #methodName toUse: [ :ref :methodName | 
+	refactoring setOption: #methodName toUse: [ :methodName | | invalidArgs |
+		invalidArgs := self computeInvalidArgNamesForSelector: method selector.
 		dialog := SycMethodNameEditorPresenter
-			          openOn: methodName
-			          withRefactoring: ref.
+			openOn: methodName
+			withInvalidArgs: invalidArgs
+			canRenameArgs: true
+			canRemoveArgs: false
+			canAddArgs: false.
 		dialog cancelled ifTrue: [ CmdCommandAborted signal ].
 		methodName ]
 ]