From 01f1b5fc2acf168db62b5006c323a953598c17f3 Mon Sep 17 00:00:00 2001 From: Janina Adamcic Date: Sat, 3 Jul 2021 19:31:14 +0200 Subject: [PATCH 01/17] refactored diffing and added diffing for classComments --- .../CRBrowser.class/instance/codeOfSelectedChange.st | 4 +--- .../instance/diffFromPriorSourceFor..st | 8 -------- .../CRBrowser.class/instance/priorSourceOrNil.st | 9 ++------- .../CRBrowser.class/methodProperties.json | 5 ++--- .../instance/classCommentPriorSource.st | 7 +++++++ .../instance/methodPriorSource.st | 12 ++++++++++++ .../instance/priorSourceOrNil.st | 8 ++++++++ .../CRChangeListItem.class/methodProperties.json | 3 +++ 8 files changed, 35 insertions(+), 21 deletions(-) delete mode 100644 packages/ChangesReloaded-Core.package/CRBrowser.class/instance/diffFromPriorSourceFor..st create mode 100644 packages/ChangesReloaded-Core.package/CRChangeListItem.class/instance/classCommentPriorSource.st create mode 100644 packages/ChangesReloaded-Core.package/CRChangeListItem.class/instance/methodPriorSource.st create mode 100644 packages/ChangesReloaded-Core.package/CRChangeListItem.class/instance/priorSourceOrNil.st diff --git a/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/codeOfSelectedChange.st b/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/codeOfSelectedChange.st index b077d6b5..9c139277 100644 --- a/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/codeOfSelectedChange.st +++ b/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/codeOfSelectedChange.st @@ -1,6 +1,4 @@ updating codeOfSelectedChange - ^ self hasSelectedMethodChangeListItem - ifTrue: [self diffFromPriorSourceFor: self selectedChangeListItem string] - ifFalse: [self selectedChangeListItem string] \ No newline at end of file + ^ self diffFromPriorSourceFor: self selectedChangeListItem string \ No newline at end of file diff --git a/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/diffFromPriorSourceFor..st b/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/diffFromPriorSourceFor..st deleted file mode 100644 index 8a2e1d37..00000000 --- a/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/diffFromPriorSourceFor..st +++ /dev/null @@ -1,8 +0,0 @@ -diffs -diffFromPriorSourceFor: sourceCode - - ^ TextDiffBuilder - buildDisplayPatchFrom: (self priorSourceOrNil ifNil: ['']) - to: sourceCode - inClass: self selectedClass - prettyDiffs: self showingPrettyDiffs \ No newline at end of file diff --git a/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/priorSourceOrNil.st b/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/priorSourceOrNil.st index 32afeaf6..0295d33f 100644 --- a/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/priorSourceOrNil.st +++ b/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/priorSourceOrNil.st @@ -1,9 +1,4 @@ misc priorSourceOrNil - | aClass aSelector changeRecords | - (aClass := self selectedClass) ifNil: [^ nil]. - (aSelector := self selectedMessageName) ifNil: [^ nil]. - changeRecords := aClass changeRecordsAt: aSelector. - changeRecords ifNil: [^ nil]. - changeRecords ifEmpty: [^ nil]. - ^ changeRecords first string \ No newline at end of file + + ^ self selectedChangeListItem priorSourceOrNil \ No newline at end of file diff --git a/packages/ChangesReloaded-Core.package/CRBrowser.class/methodProperties.json b/packages/ChangesReloaded-Core.package/CRBrowser.class/methodProperties.json index be14364c..aa62c561 100644 --- a/packages/ChangesReloaded-Core.package/CRBrowser.class/methodProperties.json +++ b/packages/ChangesReloaded-Core.package/CRBrowser.class/methodProperties.json @@ -33,11 +33,10 @@ "changeListItems:" : "gf 7/15/2020 10:40", "clipGroupIndex" : "JA 7/1/2021 11:12", "clipVersionIndex" : "JA 7/1/2021 11:14", - "codeOfSelectedChange" : "abd 7/3/2021 00:03", + "codeOfSelectedChange" : "JA 7/3/2021 18:40", "codePaneFraction" : "SV 6/21/2020 12:23", "codePaneFrame" : "mg 8/7/2020 22:25", "createNewGroupFor:" : "abd 6/20/2021 14:15", - "diffFromPriorSourceFor:" : "abd 7/3/2021 00:06", "fileInPickedChanges" : "7/2/2021 20:05:34", "getCorrespondingGroupOf:in:" : "JA 6/30/2021 22:34", "groupChangeListItems" : "abd 7/2/2021 18:53", @@ -60,7 +59,7 @@ "pickButtonFrame" : "mg 8/6/2020 12:29", "pickButtonLabel" : "abd 6/16/2021 11:38", "pickedChangeListItems" : "mg 8/6/2020 11:17", - "priorSourceOrNil" : "abd 7/3/2021 00:17", + "priorSourceOrNil" : "JA 7/3/2021 18:41", "removeAllChangeListItemsExcept:" : "SV 8/5/2020 22:13", "selectedChangeListItem" : "TS 6/18/2021 18:05", "selectedClass" : "JA 5/20/2021 22:50", diff --git a/packages/ChangesReloaded-Core.package/CRChangeListItem.class/instance/classCommentPriorSource.st b/packages/ChangesReloaded-Core.package/CRChangeListItem.class/instance/classCommentPriorSource.st new file mode 100644 index 00000000..09b6fa0e --- /dev/null +++ b/packages/ChangesReloaded-Core.package/CRChangeListItem.class/instance/classCommentPriorSource.st @@ -0,0 +1,7 @@ +misc +classCommentPriorSource + + | aClass | + (aClass := Smalltalk classNamed: (self attributes at: #class)) + ifNil: [^'']. + ^ aClass comment asString \ No newline at end of file diff --git a/packages/ChangesReloaded-Core.package/CRChangeListItem.class/instance/methodPriorSource.st b/packages/ChangesReloaded-Core.package/CRChangeListItem.class/instance/methodPriorSource.st new file mode 100644 index 00000000..111a5b13 --- /dev/null +++ b/packages/ChangesReloaded-Core.package/CRChangeListItem.class/instance/methodPriorSource.st @@ -0,0 +1,12 @@ +misc +methodPriorSource + + | aSelector aClass changeRecords | + + aSelector := (self attributes at: #method). + (aClass := Smalltalk classNamed: (self attributes at: #class)) + ifNil: [^ '']. + (changeRecords := aClass changeRecordsAt: aSelector) + ifNil: [^ '']; + ifEmpty: [^ '']. + ^ changeRecords first string \ No newline at end of file diff --git a/packages/ChangesReloaded-Core.package/CRChangeListItem.class/instance/priorSourceOrNil.st b/packages/ChangesReloaded-Core.package/CRChangeListItem.class/instance/priorSourceOrNil.st new file mode 100644 index 00000000..16b05f23 --- /dev/null +++ b/packages/ChangesReloaded-Core.package/CRChangeListItem.class/instance/priorSourceOrNil.st @@ -0,0 +1,8 @@ +misc +priorSourceOrNil + + ^ self category caseOf: { + [#method] -> [self methodPriorSource]. + [#classComment] -> [self classCommentPriorSource] + } + otherwise: [nil] \ No newline at end of file diff --git a/packages/ChangesReloaded-Core.package/CRChangeListItem.class/methodProperties.json b/packages/ChangesReloaded-Core.package/CRChangeListItem.class/methodProperties.json index 99f6cf1b..122d0ddc 100644 --- a/packages/ChangesReloaded-Core.package/CRChangeListItem.class/methodProperties.json +++ b/packages/ChangesReloaded-Core.package/CRChangeListItem.class/methodProperties.json @@ -16,6 +16,7 @@ "category:" : "abd 6/17/2021 12:57", "changeRecord" : "SV 5/29/2020 22:13", "changeRecord:" : "abd 6/17/2021 11:57", + "classCommentPriorSource" : "JA 7/3/2021 19:24", "description" : "abd 6/20/2021 13:46", "doesNotUnderstand:" : "gf 6/15/2020 23:22", "formatted:" : "TS 6/30/2021 21:20", @@ -25,7 +26,9 @@ "isMethod" : "abd 7/2/2021 19:02", "isPicked" : "SV 7/13/2020 16:05", "isPicked:" : "abd 6/20/2021 12:56", + "methodPriorSource" : "JA 7/3/2021 19:30", "pick" : "gf 7/15/2020 10:45", + "priorSourceOrNil" : "JA 7/3/2021 19:30", "separatesGroup:" : "abd 7/2/2021 19:08", "shouldBeGrouped" : "abd 7/2/2021 19:10", "toggleIsPicked" : "abd 6/17/2021 13:03", From 7a5bb079a1092460ae72ffbf56def39177f41dfc Mon Sep 17 00:00:00 2001 From: Janina Adamcic Date: Sat, 3 Jul 2021 19:50:21 +0200 Subject: [PATCH 02/17] test for correct classComment diffing --- .../CRBrowserTest.class/instance/firstClassCommentCode.st | 4 ++++ .../instance/firstClassCommentCodeInImage.st | 4 ++++ .../CRBrowserTest.class/instance/testContents.st | 5 +++++ .../CRBrowserTest.class/methodProperties.json | 4 +++- 4 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 packages/ChangesReloaded-Tests.package/CRBrowserTest.class/instance/firstClassCommentCode.st create mode 100644 packages/ChangesReloaded-Tests.package/CRBrowserTest.class/instance/firstClassCommentCodeInImage.st diff --git a/packages/ChangesReloaded-Tests.package/CRBrowserTest.class/instance/firstClassCommentCode.st b/packages/ChangesReloaded-Tests.package/CRBrowserTest.class/instance/firstClassCommentCode.st new file mode 100644 index 00000000..c68eada5 --- /dev/null +++ b/packages/ChangesReloaded-Tests.package/CRBrowserTest.class/instance/firstClassCommentCode.st @@ -0,0 +1,4 @@ +accessing +firstClassCommentCode + "This is a string that represents a class comment" + ^ 'This is another altered class comment for test purposes.' \ No newline at end of file diff --git a/packages/ChangesReloaded-Tests.package/CRBrowserTest.class/instance/firstClassCommentCodeInImage.st b/packages/ChangesReloaded-Tests.package/CRBrowserTest.class/instance/firstClassCommentCodeInImage.st new file mode 100644 index 00000000..0abc78ae --- /dev/null +++ b/packages/ChangesReloaded-Tests.package/CRBrowserTest.class/instance/firstClassCommentCodeInImage.st @@ -0,0 +1,4 @@ +accessing +firstClassCommentCodeInImage + "This is a string that represents a class comment" + ^ 'This is a class comment for test purposes.' \ No newline at end of file diff --git a/packages/ChangesReloaded-Tests.package/CRBrowserTest.class/instance/testContents.st b/packages/ChangesReloaded-Tests.package/CRBrowserTest.class/instance/testContents.st index 872f5efc..d9a4ab2c 100644 --- a/packages/ChangesReloaded-Tests.package/CRBrowserTest.class/instance/testContents.st +++ b/packages/ChangesReloaded-Tests.package/CRBrowserTest.class/instance/testContents.st @@ -4,4 +4,9 @@ testContents self selectFirstChangeListItem. self assert: (TextDiffBuilder buildDisplayPatchFrom: self firstMethodCodeInImage to: self firstMethodCode) + equals: self changesBrowser contents. + + self selectSecondChangeListItem. + self + assert: (TextDiffBuilder buildDisplayPatchFrom: self firstClassCommentCodeInImage to: self firstClassCommentCode) equals: self changesBrowser contents. \ No newline at end of file diff --git a/packages/ChangesReloaded-Tests.package/CRBrowserTest.class/methodProperties.json b/packages/ChangesReloaded-Tests.package/CRBrowserTest.class/methodProperties.json index ff0a28dd..6c177fce 100644 --- a/packages/ChangesReloaded-Tests.package/CRBrowserTest.class/methodProperties.json +++ b/packages/ChangesReloaded-Tests.package/CRBrowserTest.class/methodProperties.json @@ -10,6 +10,8 @@ "changesBrowser" : "mg 7/2/2020 14:00", "click:at:in:" : "abd 7/2/2021 19:52", "correctChangeGroupContentIndices" : "JA 7/1/2021 13:47", + "firstClassCommentCode" : "JA 7/3/2021 19:47", + "firstClassCommentCodeInImage" : "JA 7/3/2021 19:49", "firstMethodCode" : "abd 7/2/2021 16:43", "firstMethodCodeInImage" : "abd 7/2/2021 16:43", "mouse:does:at:in:" : "abd 7/2/2021 19:52", @@ -24,7 +26,7 @@ "testBuildingChangesBrowser" : "mg 7/2/2020 13:53", "testChangeListItems" : "abd 7/2/2021 19:56", "testClippingOfIndices" : "JA 7/1/2021 11:22", - "testContents" : "abd 7/3/2021 00:10", + "testContents" : "JA 7/3/2021 19:48", "testCorrectGroupIndexSelectedWhenClicked" : "JA 7/1/2021 11:26", "testCorrectSelectedIndicesOnInitialization" : "abd 7/2/2021 19:50", "testHasSelectedChangeListItem" : "JA 7/1/2021 11:38", From 2863259f003e97b45ddb2f0eae1938d7fc0a0724 Mon Sep 17 00:00:00 2001 From: Janina Adamcic Date: Sat, 3 Jul 2021 20:12:54 +0200 Subject: [PATCH 03/17] removed obsolete methods --- .../CRBrowser.class/instance/selectedClass.st | 6 ------ .../CRBrowser.class/instance/selectedMessageName.st | 6 ------ .../CRBrowser.class/methodProperties.json | 2 -- .../CRBrowserTest.class/instance/testSelectedClass.st | 7 ------- .../instance/testSelectedMessageName.st | 7 ------- .../CRBrowserTest.class/methodProperties.json | 2 -- 6 files changed, 30 deletions(-) delete mode 100644 packages/ChangesReloaded-Core.package/CRBrowser.class/instance/selectedClass.st delete mode 100644 packages/ChangesReloaded-Core.package/CRBrowser.class/instance/selectedMessageName.st delete mode 100644 packages/ChangesReloaded-Tests.package/CRBrowserTest.class/instance/testSelectedClass.st delete mode 100644 packages/ChangesReloaded-Tests.package/CRBrowserTest.class/instance/testSelectedMessageName.st diff --git a/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/selectedClass.st b/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/selectedClass.st deleted file mode 100644 index 43eeb7b9..00000000 --- a/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/selectedClass.st +++ /dev/null @@ -1,6 +0,0 @@ -accessing -selectedClass - - self hasSelectedMethodChangeListItem - ifTrue: [^ self selectedChangeListItem methodClass] - ifFalse: [^ nil] \ No newline at end of file diff --git a/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/selectedMessageName.st b/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/selectedMessageName.st deleted file mode 100644 index c8474b04..00000000 --- a/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/selectedMessageName.st +++ /dev/null @@ -1,6 +0,0 @@ -accessing -selectedMessageName - - self hasSelectedMethodChangeListItem - ifTrue: [^ self selectedChangeListItem methodSelector] - ifFalse: [^ nil] \ No newline at end of file diff --git a/packages/ChangesReloaded-Core.package/CRBrowser.class/methodProperties.json b/packages/ChangesReloaded-Core.package/CRBrowser.class/methodProperties.json index aa62c561..7e94dc0b 100644 --- a/packages/ChangesReloaded-Core.package/CRBrowser.class/methodProperties.json +++ b/packages/ChangesReloaded-Core.package/CRBrowser.class/methodProperties.json @@ -62,9 +62,7 @@ "priorSourceOrNil" : "JA 7/3/2021 18:41", "removeAllChangeListItemsExcept:" : "SV 8/5/2020 22:13", "selectedChangeListItem" : "TS 6/18/2021 18:05", - "selectedClass" : "JA 5/20/2021 22:50", "selectedGroup" : "TS 6/18/2021 18:02", - "selectedMessageName" : "JA 5/20/2021 22:50", "switchToDetailedView" : "mg 8/6/2020 11:24", "togglePickStatusOfSelectedChangeListItem" : "abd 6/17/2021 13:03", "updateAfterChangeListChange" : "TS 6/18/2021 18:32", diff --git a/packages/ChangesReloaded-Tests.package/CRBrowserTest.class/instance/testSelectedClass.st b/packages/ChangesReloaded-Tests.package/CRBrowserTest.class/instance/testSelectedClass.st deleted file mode 100644 index 959cc29d..00000000 --- a/packages/ChangesReloaded-Tests.package/CRBrowserTest.class/instance/testSelectedClass.st +++ /dev/null @@ -1,7 +0,0 @@ -testing-functionality -testSelectedClass - - self assert: (self changesBrowser selectedClass isNil). - - self selectMethodChangeListItem. - self assert: (self changesBrowser selectedClass == CRChangesDummyClass) \ No newline at end of file diff --git a/packages/ChangesReloaded-Tests.package/CRBrowserTest.class/instance/testSelectedMessageName.st b/packages/ChangesReloaded-Tests.package/CRBrowserTest.class/instance/testSelectedMessageName.st deleted file mode 100644 index e4b963dd..00000000 --- a/packages/ChangesReloaded-Tests.package/CRBrowserTest.class/instance/testSelectedMessageName.st +++ /dev/null @@ -1,7 +0,0 @@ -testing-functionality -testSelectedMessageName - - self assert: (self changesBrowser selectedMessageName isNil). - - self selectMethodChangeListItem. - self assert: (self changesBrowser selectedMessageName == #functionOrder5) \ No newline at end of file diff --git a/packages/ChangesReloaded-Tests.package/CRBrowserTest.class/methodProperties.json b/packages/ChangesReloaded-Tests.package/CRBrowserTest.class/methodProperties.json index 6c177fce..b4e41c79 100644 --- a/packages/ChangesReloaded-Tests.package/CRBrowserTest.class/methodProperties.json +++ b/packages/ChangesReloaded-Tests.package/CRBrowserTest.class/methodProperties.json @@ -40,8 +40,6 @@ "testPickedChangeListItems" : "JA 7/1/2021 11:52", "testRemoveAllChangeListItemsExcept" : "TS 6/19/2021 11:58", "testSelectedChangeListItemWhenNothingSelected" : "JA 7/1/2021 12:00", - "testSelectedClass" : "JA 7/1/2021 12:11", - "testSelectedMessageName" : "JA 7/1/2021 12:44", "testSwitchingBetweenViews" : "mg 7/15/2020 19:58", "testTogglePickStatus" : "JA 7/1/2021 12:14", "world" : "mg 7/2/2020 14:01" } } From 78cdce7825bd371456e82866fdc0a0a8607f709e Mon Sep 17 00:00:00 2001 From: Abdullatif Ghajar Date: Sun, 4 Jul 2021 10:45:51 +0200 Subject: [PATCH 04/17] Implement first draft of feature --- .../class/encapsulateMethodRenamedFrom..st | 25 +++++++++++++++++++ .../getChangeListItemsMissingInImageFrom..st | 2 +- .../instance/fileInPickedChanges.st | 2 +- .../CRBrowser.class/methodProperties.json | 5 ++-- .../class/categoryRegexAttributesList.st | 1 + .../instance/description.st | 3 ++- .../methodProperties.json | 6 ++--- .../CRComplexChangeListItem.class/README.md | 0 .../class/newMethodRenamedWith..st | 12 +++++++++ .../instance/changeListItems..st | 3 +++ .../instance/changeListItems.st | 3 +++ .../instance/fileIn.st | 4 +++ .../instance/string.st | 4 +++ .../methodProperties.json | 8 ++++++ .../properties.json | 14 +++++++++++ 15 files changed, 84 insertions(+), 8 deletions(-) create mode 100644 packages/ChangesReloaded-Core.package/CRBrowser.class/class/encapsulateMethodRenamedFrom..st create mode 100644 packages/ChangesReloaded-Core.package/CRComplexChangeListItem.class/README.md create mode 100644 packages/ChangesReloaded-Core.package/CRComplexChangeListItem.class/class/newMethodRenamedWith..st create mode 100644 packages/ChangesReloaded-Core.package/CRComplexChangeListItem.class/instance/changeListItems..st create mode 100644 packages/ChangesReloaded-Core.package/CRComplexChangeListItem.class/instance/changeListItems.st create mode 100644 packages/ChangesReloaded-Core.package/CRComplexChangeListItem.class/instance/fileIn.st create mode 100644 packages/ChangesReloaded-Core.package/CRComplexChangeListItem.class/instance/string.st create mode 100644 packages/ChangesReloaded-Core.package/CRComplexChangeListItem.class/methodProperties.json create mode 100644 packages/ChangesReloaded-Core.package/CRComplexChangeListItem.class/properties.json diff --git a/packages/ChangesReloaded-Core.package/CRBrowser.class/class/encapsulateMethodRenamedFrom..st b/packages/ChangesReloaded-Core.package/CRBrowser.class/class/encapsulateMethodRenamedFrom..st new file mode 100644 index 00000000..dcd6bdc5 --- /dev/null +++ b/packages/ChangesReloaded-Core.package/CRBrowser.class/class/encapsulateMethodRenamedFrom..st @@ -0,0 +1,25 @@ +utils +encapsulateMethodRenamedFrom: changeListItems + + | index newChangeListItems inseparableChangeListItems | + + newChangeListItems := OrderedCollection new. + index := changeListItems size. + + [index > 0] whileTrue: [ + (changeListItems at: index) category = #methodRenamed + ifTrue: [ + inseparableChangeListItems := OrderedCollection new. + index := index - 1. + [(changeListItems at: index) category = #methodRemoved] whileFalse: [ + inseparableChangeListItems add: (changeListItems at: index). + index := index - 1. + ]. + inseparableChangeListItems add: (changeListItems at: index). + newChangeListItems add: (CRComplexChangeListItem newMethodRenamedWith: inseparableChangeListItems). + ] + ifFalse: [newChangeListItems add: (changeListItems at: index)]. + index := index - 1. + ]. + + ^ newChangeListItems reverse \ No newline at end of file diff --git a/packages/ChangesReloaded-Core.package/CRBrowser.class/class/getChangeListItemsMissingInImageFrom..st b/packages/ChangesReloaded-Core.package/CRBrowser.class/class/getChangeListItemsMissingInImageFrom..st index 052e42a4..4df9dd6f 100644 --- a/packages/ChangesReloaded-Core.package/CRBrowser.class/class/getChangeListItemsMissingInImageFrom..st +++ b/packages/ChangesReloaded-Core.package/CRBrowser.class/class/getChangeListItemsMissingInImageFrom..st @@ -8,4 +8,4 @@ getChangeListItemsMissingInImageFrom: anOrderedCollectionOfChangeRecords changeListItems removeAllSuchThat: [:each | each category = #nonPersistentDoIt]. - ^ changeListItems \ No newline at end of file + ^ self encapsulateMethodRenamedFrom: changeListItems \ No newline at end of file diff --git a/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/fileInPickedChanges.st b/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/fileInPickedChanges.st index cdf3b106..836d6b98 100644 --- a/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/fileInPickedChanges.st +++ b/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/fileInPickedChanges.st @@ -7,5 +7,5 @@ fileInPickedChanges during: [:bar | self pickedChangeListItems reverse doWithIndex: [:each :index | bar value: index. - bar value: 'loading ', index printString , '/' , self numberOfPickedChangeListItems printString , ': ' , each description printString. + bar value: 'loading ', index printString , '/' , self numberOfPickedChangeListItems printString , ': ' , each description. each fileIn]] diff --git a/packages/ChangesReloaded-Core.package/CRBrowser.class/methodProperties.json b/packages/ChangesReloaded-Core.package/CRBrowser.class/methodProperties.json index be14364c..a6a7be14 100644 --- a/packages/ChangesReloaded-Core.package/CRBrowser.class/methodProperties.json +++ b/packages/ChangesReloaded-Core.package/CRBrowser.class/methodProperties.json @@ -3,8 +3,9 @@ "changeGroupListName" : "JA 7/1/2021 12:25", "defaultBrowserHeight" : "SV 8/7/2020 12:58", "defaultBrowserWidth" : "SV 8/7/2020 12:58", + "encapsulateMethodRenamedFrom:" : "abd 7/4/2021 10:44", "extent" : "SV 8/7/2020 15:37", - "getChangeListItemsMissingInImageFrom:" : "abd 6/27/2021 20:03", + "getChangeListItemsMissingInImageFrom:" : "abd 7/4/2021 10:44", "getChangeRecordsFromLastCrashFrom:" : "abd 6/20/2021 19:06", "newWith:" : "uh 6/21/2020 21:32", "numberOfBytesToLoadChangesFrom" : "gf 5/20/2020 10:43", @@ -38,7 +39,7 @@ "codePaneFrame" : "mg 8/7/2020 22:25", "createNewGroupFor:" : "abd 6/20/2021 14:15", "diffFromPriorSourceFor:" : "abd 7/3/2021 00:06", - "fileInPickedChanges" : "7/2/2021 20:05:34", + "fileInPickedChanges" : "abd 7/3/2021 11:16", "getCorrespondingGroupOf:in:" : "JA 6/30/2021 22:34", "groupChangeListItems" : "abd 7/2/2021 18:53", "groupIndex" : "TS 6/30/2021 21:53", diff --git a/packages/ChangesReloaded-Core.package/CRChangeListItem.class/class/categoryRegexAttributesList.st b/packages/ChangesReloaded-Core.package/CRChangeListItem.class/class/categoryRegexAttributesList.st index 3dbde4be..14eb9699 100644 --- a/packages/ChangesReloaded-Core.package/CRChangeListItem.class/class/categoryRegexAttributesList.st +++ b/packages/ChangesReloaded-Core.package/CRChangeListItem.class/class/categoryRegexAttributesList.st @@ -13,6 +13,7 @@ categoryRegexAttributesList {#methodRecategorized. '^([^ ]+) (class )?organization classify\: #(.+) under\: #(.+)$'. [:m | {#method -> (m subexpression: 4). #category -> (m subexpression: 5) } as: Dictionary]}. {#methodRemoved. '^([^ ]+) (class )?removeSelector\: #([^ ]+)$'. [:m | {#method -> (m subexpression: 4). #class -> (m subexpression: 2) } as: Dictionary]}. + {#methodRenamed. '^Rename Method$'. [:m | Dictionary new]}. {#packageCreated. '^SystemOrganization addCategory\: #(.+)$'. [:m | {#package -> (m subexpression: 2)} as: Dictionary]}. {#packageRemoved. '^SystemOrganization removeSystemCategory\: #(.+)$'. [:m | {#package -> (m subexpression: 2)} as: Dictionary]}. diff --git a/packages/ChangesReloaded-Core.package/CRChangeListItem.class/instance/description.st b/packages/ChangesReloaded-Core.package/CRChangeListItem.class/instance/description.st index 8a013bfa..1854f87b 100644 --- a/packages/ChangesReloaded-Core.package/CRChangeListItem.class/instance/description.st +++ b/packages/ChangesReloaded-Core.package/CRChangeListItem.class/instance/description.st @@ -16,8 +16,9 @@ description [#methodRecategorized] -> ['#', (self attributes at: #method), ' to #', (self attributes at: #category)]. [#methodRemoved] -> [(self attributes at: #method), ' from ', (self attributes at: #class)]. + [#methodRenamed] -> [(self attributes at: #oldMethod), ' -> ', (self attributes at: #newMethod), ' in #', (self attributes at: #class)]. [#packageCreated] -> ['#', (self attributes at: #package)]. [#packageRemoved] -> ['#', (self attributes at: #package)]. [#packageRenamed] -> ['#', (self attributes at: #oldPackage), ' -> #', (self attributes at: #newPackage)] - }) \ No newline at end of file + }) \ No newline at end of file diff --git a/packages/ChangesReloaded-Core.package/CRChangeListItem.class/methodProperties.json b/packages/ChangesReloaded-Core.package/CRChangeListItem.class/methodProperties.json index 99f6cf1b..41dcddf0 100644 --- a/packages/ChangesReloaded-Core.package/CRChangeListItem.class/methodProperties.json +++ b/packages/ChangesReloaded-Core.package/CRChangeListItem.class/methodProperties.json @@ -1,9 +1,9 @@ { "class" : { "categoryAndAttributesFor:" : "abd 6/27/2021 20:01", - "categoryRegexAttributesList" : "abd 7/2/2021 23:44", + "categoryRegexAttributesList" : "abd 7/3/2021 21:41", "classCommentCategoryAndAttributesFor:" : "abd 7/2/2021 23:45", - "doItCategoryAndAttributesFor:" : "abd 6/27/2021 20:01", + "doItCategoryAndAttributesFor:" : "abd 7/3/2021 21:40", "if:matches:do:" : "abd 6/27/2021 20:01", "methodCategoryAndAttributesFor:" : "abd 7/2/2021 23:45", "newWith:" : "abd 6/27/2021 20:00", @@ -16,7 +16,7 @@ "category:" : "abd 6/17/2021 12:57", "changeRecord" : "SV 5/29/2020 22:13", "changeRecord:" : "abd 6/17/2021 11:57", - "description" : "abd 6/20/2021 13:46", + "description" : "abd 7/3/2021 21:44", "doesNotUnderstand:" : "gf 6/15/2020 23:22", "formatted:" : "TS 6/30/2021 21:20", "groupDescription" : "abd 6/20/2021 13:53", diff --git a/packages/ChangesReloaded-Core.package/CRComplexChangeListItem.class/README.md b/packages/ChangesReloaded-Core.package/CRComplexChangeListItem.class/README.md new file mode 100644 index 00000000..e69de29b diff --git a/packages/ChangesReloaded-Core.package/CRComplexChangeListItem.class/class/newMethodRenamedWith..st b/packages/ChangesReloaded-Core.package/CRComplexChangeListItem.class/class/newMethodRenamedWith..st new file mode 100644 index 00000000..f7dc079e --- /dev/null +++ b/packages/ChangesReloaded-Core.package/CRComplexChangeListItem.class/class/newMethodRenamedWith..st @@ -0,0 +1,12 @@ +instance-creation +newMethodRenamedWith: changeListItems + + ^ self new + category: #methodRenamed; + attributes: ({ + #class -> (changeListItems first attributes at: #class). + #oldMethod -> (changeListItems last attributes at: #method). + #newMethod -> (changeListItems first attributes at: #method). + } as: Dictionary); + changeListItems: changeListItems; + yourself \ No newline at end of file diff --git a/packages/ChangesReloaded-Core.package/CRComplexChangeListItem.class/instance/changeListItems..st b/packages/ChangesReloaded-Core.package/CRComplexChangeListItem.class/instance/changeListItems..st new file mode 100644 index 00000000..50c04086 --- /dev/null +++ b/packages/ChangesReloaded-Core.package/CRComplexChangeListItem.class/instance/changeListItems..st @@ -0,0 +1,3 @@ +accessing +changeListItems: anObject + changeListItems := anObject \ No newline at end of file diff --git a/packages/ChangesReloaded-Core.package/CRComplexChangeListItem.class/instance/changeListItems.st b/packages/ChangesReloaded-Core.package/CRComplexChangeListItem.class/instance/changeListItems.st new file mode 100644 index 00000000..c3ddc5b0 --- /dev/null +++ b/packages/ChangesReloaded-Core.package/CRComplexChangeListItem.class/instance/changeListItems.st @@ -0,0 +1,3 @@ +accessing +changeListItems + ^ changeListItems \ No newline at end of file diff --git a/packages/ChangesReloaded-Core.package/CRComplexChangeListItem.class/instance/fileIn.st b/packages/ChangesReloaded-Core.package/CRComplexChangeListItem.class/instance/fileIn.st new file mode 100644 index 00000000..8fd59ca3 --- /dev/null +++ b/packages/ChangesReloaded-Core.package/CRComplexChangeListItem.class/instance/fileIn.st @@ -0,0 +1,4 @@ +initialization +fileIn + + self changeListItems do: [:each | each fileIn]. \ No newline at end of file diff --git a/packages/ChangesReloaded-Core.package/CRComplexChangeListItem.class/instance/string.st b/packages/ChangesReloaded-Core.package/CRComplexChangeListItem.class/instance/string.st new file mode 100644 index 00000000..c14ee521 --- /dev/null +++ b/packages/ChangesReloaded-Core.package/CRComplexChangeListItem.class/instance/string.st @@ -0,0 +1,4 @@ +accessing +string + + ^ self category asString \ No newline at end of file diff --git a/packages/ChangesReloaded-Core.package/CRComplexChangeListItem.class/methodProperties.json b/packages/ChangesReloaded-Core.package/CRComplexChangeListItem.class/methodProperties.json new file mode 100644 index 00000000..6cd6fec8 --- /dev/null +++ b/packages/ChangesReloaded-Core.package/CRComplexChangeListItem.class/methodProperties.json @@ -0,0 +1,8 @@ +{ + "class" : { + "newMethodRenamedWith:" : "abd 7/3/2021 21:34" }, + "instance" : { + "changeListItems" : "abd 7/3/2021 21:34", + "changeListItems:" : "abd 7/3/2021 21:34", + "fileIn" : "abd 7/3/2021 21:46", + "string" : "abd 7/3/2021 21:45" } } diff --git a/packages/ChangesReloaded-Core.package/CRComplexChangeListItem.class/properties.json b/packages/ChangesReloaded-Core.package/CRComplexChangeListItem.class/properties.json new file mode 100644 index 00000000..51a4bc71 --- /dev/null +++ b/packages/ChangesReloaded-Core.package/CRComplexChangeListItem.class/properties.json @@ -0,0 +1,14 @@ +{ + "category" : "ChangesReloaded-Core", + "classinstvars" : [ + ], + "classvars" : [ + ], + "commentStamp" : "", + "instvars" : [ + "changeListItems" ], + "name" : "CRComplexChangeListItem", + "pools" : [ + ], + "super" : "CRChangeListItem", + "type" : "normal" } From e6da36d16a47cdbc04f70a20275801a36491565c Mon Sep 17 00:00:00 2001 From: Abdullatif Ghajar Date: Sun, 4 Jul 2021 10:54:58 +0200 Subject: [PATCH 05/17] Improve mini things --- .../CRBrowser.class/instance/fileInPickedChanges.st | 2 +- .../instance/hasSelectedMethodChangeListItem.st | 4 ---- .../CRBrowser.class/methodProperties.json | 3 +-- 3 files changed, 2 insertions(+), 7 deletions(-) delete mode 100644 packages/ChangesReloaded-Core.package/CRBrowser.class/instance/hasSelectedMethodChangeListItem.st diff --git a/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/fileInPickedChanges.st b/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/fileInPickedChanges.st index cdf3b106..836d6b98 100644 --- a/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/fileInPickedChanges.st +++ b/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/fileInPickedChanges.st @@ -7,5 +7,5 @@ fileInPickedChanges during: [:bar | self pickedChangeListItems reverse doWithIndex: [:each :index | bar value: index. - bar value: 'loading ', index printString , '/' , self numberOfPickedChangeListItems printString , ': ' , each description printString. + bar value: 'loading ', index printString , '/' , self numberOfPickedChangeListItems printString , ': ' , each description. each fileIn]] diff --git a/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/hasSelectedMethodChangeListItem.st b/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/hasSelectedMethodChangeListItem.st deleted file mode 100644 index 8a6ac57b..00000000 --- a/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/hasSelectedMethodChangeListItem.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -hasSelectedMethodChangeListItem - - ^ self hasSelectedChangeListItem and: [self selectedChangeListItem isMethod] \ No newline at end of file diff --git a/packages/ChangesReloaded-Core.package/CRBrowser.class/methodProperties.json b/packages/ChangesReloaded-Core.package/CRBrowser.class/methodProperties.json index 7e94dc0b..8737ab88 100644 --- a/packages/ChangesReloaded-Core.package/CRBrowser.class/methodProperties.json +++ b/packages/ChangesReloaded-Core.package/CRBrowser.class/methodProperties.json @@ -37,14 +37,13 @@ "codePaneFraction" : "SV 6/21/2020 12:23", "codePaneFrame" : "mg 8/7/2020 22:25", "createNewGroupFor:" : "abd 6/20/2021 14:15", - "fileInPickedChanges" : "7/2/2021 20:05:34", + "fileInPickedChanges" : "abd 7/4/2021 10:54", "getCorrespondingGroupOf:in:" : "JA 6/30/2021 22:34", "groupChangeListItems" : "abd 7/2/2021 18:53", "groupIndex" : "TS 6/30/2021 21:53", "groupIndex:" : "FK 6/16/2021 14:09", "groupListFrame" : "abd 6/16/2021 10:25", "hasSelectedChangeListItem" : "TS 6/18/2021 18:43", - "hasSelectedMethodChangeListItem" : "TS 6/18/2021 18:44", "hasValidGroupIndex" : "TS 6/18/2021 18:47", "hasValidVersionIndex" : "TS 6/18/2021 18:47", "initializeChangeListItemsWith:" : "abd 7/2/2021 19:44", From 329a563398063c2fdfe4e42728a0a5d21c174e38 Mon Sep 17 00:00:00 2001 From: Abdullatif Ghajar Date: Sun, 4 Jul 2021 10:57:55 +0200 Subject: [PATCH 06/17] Return printString --- .../CRBrowser.class/instance/fileInPickedChanges.st | 2 +- .../CRBrowser.class/methodProperties.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/fileInPickedChanges.st b/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/fileInPickedChanges.st index 836d6b98..cdf3b106 100644 --- a/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/fileInPickedChanges.st +++ b/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/fileInPickedChanges.st @@ -7,5 +7,5 @@ fileInPickedChanges during: [:bar | self pickedChangeListItems reverse doWithIndex: [:each :index | bar value: index. - bar value: 'loading ', index printString , '/' , self numberOfPickedChangeListItems printString , ': ' , each description. + bar value: 'loading ', index printString , '/' , self numberOfPickedChangeListItems printString , ': ' , each description printString. each fileIn]] diff --git a/packages/ChangesReloaded-Core.package/CRBrowser.class/methodProperties.json b/packages/ChangesReloaded-Core.package/CRBrowser.class/methodProperties.json index 8737ab88..60f799e8 100644 --- a/packages/ChangesReloaded-Core.package/CRBrowser.class/methodProperties.json +++ b/packages/ChangesReloaded-Core.package/CRBrowser.class/methodProperties.json @@ -37,7 +37,7 @@ "codePaneFraction" : "SV 6/21/2020 12:23", "codePaneFrame" : "mg 8/7/2020 22:25", "createNewGroupFor:" : "abd 6/20/2021 14:15", - "fileInPickedChanges" : "abd 7/4/2021 10:54", + "fileInPickedChanges" : "abd 7/4/2021 10:57", "getCorrespondingGroupOf:in:" : "JA 6/30/2021 22:34", "groupChangeListItems" : "abd 7/2/2021 18:53", "groupIndex" : "TS 6/30/2021 21:53", From d4b5dc53183f5996af8c1e09e7ba91237fc43aca Mon Sep 17 00:00:00 2001 From: Abdullatif Ghajar Date: Mon, 5 Jul 2021 15:54:18 +0200 Subject: [PATCH 07/17] Change renameMethodRefactoring --- .../instance/renameMethodRefactoring.st | 19 +++++++++++++++++++ .../Browser.extension/methodProperties.json | 5 +++++ .../Browser.extension/properties.json | 2 ++ 3 files changed, 26 insertions(+) create mode 100644 packages/ChangesReloaded-Core.package/Browser.extension/instance/renameMethodRefactoring.st create mode 100644 packages/ChangesReloaded-Core.package/Browser.extension/methodProperties.json create mode 100644 packages/ChangesReloaded-Core.package/Browser.extension/properties.json diff --git a/packages/ChangesReloaded-Core.package/Browser.extension/instance/renameMethodRefactoring.st b/packages/ChangesReloaded-Core.package/Browser.extension/instance/renameMethodRefactoring.st new file mode 100644 index 00000000..c0bed379 --- /dev/null +++ b/packages/ChangesReloaded-Core.package/Browser.extension/instance/renameMethodRefactoring.st @@ -0,0 +1,19 @@ +*ChangesReloaded-Core +renameMethodRefactoring + | method class oldArguments oldMethodName newMethodName argumentPermutation| + method := self selectedMessageName. + class := self selectedClass. + + SystemChangeNotifier uniqueInstance trigger: (DoItEvent expression: 'Rename Method' context: ''). + + oldArguments := (RBParser parseMethod: (class methodHeaderFor: method)) argumentNames. + oldMethodName := RBMethodName + selector: method + arguments: oldArguments. + (newMethodName := self requestMethodNameFor: oldMethodName) ifNil: [ ^ nil ]. + argumentPermutation := newMethodName arguments collect: [ :each | oldArguments indexOf: each ]. + ^RBRenameMethodRefactoring + renameMethod: method + in: class + to: newMethodName selector + permutation: argumentPermutation \ No newline at end of file diff --git a/packages/ChangesReloaded-Core.package/Browser.extension/methodProperties.json b/packages/ChangesReloaded-Core.package/Browser.extension/methodProperties.json new file mode 100644 index 00000000..d39930cf --- /dev/null +++ b/packages/ChangesReloaded-Core.package/Browser.extension/methodProperties.json @@ -0,0 +1,5 @@ +{ + "class" : { + }, + "instance" : { + "renameMethodRefactoring" : "abd 7/3/2021 21:39" } } diff --git a/packages/ChangesReloaded-Core.package/Browser.extension/properties.json b/packages/ChangesReloaded-Core.package/Browser.extension/properties.json new file mode 100644 index 00000000..edd7909e --- /dev/null +++ b/packages/ChangesReloaded-Core.package/Browser.extension/properties.json @@ -0,0 +1,2 @@ +{ + "name" : "Browser" } From 8dd4325862c7ad9367eabfc6238a3dac83507050 Mon Sep 17 00:00:00 2001 From: Abdu Date: Mon, 5 Jul 2021 17:42:45 +0200 Subject: [PATCH 08/17] Finish implementing methodRenamed --- .../instance/registerMethodRenamedIn.from.to..st | 4 ++++ .../instance/renameMethodRefactoring.st | 6 +++--- .../Browser.extension/methodProperties.json | 3 ++- .../class/encapsulateMethodRenamedFrom..st | 4 ++-- .../CRBrowser.class/methodProperties.json | 2 +- .../class/categoryRegexAttributesList.st | 2 +- .../CRChangeListItem.class/methodProperties.json | 2 +- .../class/newMethodRenamedOf.with..st | 9 +++++++++ .../class/newMethodRenamedWith..st | 12 ------------ .../CRComplexChangeListItem.class/instance/string.st | 4 ---- .../methodProperties.json | 5 ++--- 11 files changed, 25 insertions(+), 28 deletions(-) create mode 100644 packages/ChangesReloaded-Core.package/Browser.extension/instance/registerMethodRenamedIn.from.to..st create mode 100644 packages/ChangesReloaded-Core.package/CRComplexChangeListItem.class/class/newMethodRenamedOf.with..st delete mode 100644 packages/ChangesReloaded-Core.package/CRComplexChangeListItem.class/class/newMethodRenamedWith..st delete mode 100644 packages/ChangesReloaded-Core.package/CRComplexChangeListItem.class/instance/string.st diff --git a/packages/ChangesReloaded-Core.package/Browser.extension/instance/registerMethodRenamedIn.from.to..st b/packages/ChangesReloaded-Core.package/Browser.extension/instance/registerMethodRenamedIn.from.to..st new file mode 100644 index 00000000..811c88ab --- /dev/null +++ b/packages/ChangesReloaded-Core.package/Browser.extension/instance/registerMethodRenamedIn.from.to..st @@ -0,0 +1,4 @@ +*ChangesReloaded-Core +registerMethodRenamedIn: aClass from: anOldMethodName to: aNewMethodName + + SystemChangeNotifier uniqueInstance trigger: (DoItEvent expression: ('"{1} methodRenamed: #{2} toBe: #{3}"' format: {aClass. anOldMethodName selector. aNewMethodName selector}) context: ''). \ No newline at end of file diff --git a/packages/ChangesReloaded-Core.package/Browser.extension/instance/renameMethodRefactoring.st b/packages/ChangesReloaded-Core.package/Browser.extension/instance/renameMethodRefactoring.st index c0bed379..44a6c66c 100644 --- a/packages/ChangesReloaded-Core.package/Browser.extension/instance/renameMethodRefactoring.st +++ b/packages/ChangesReloaded-Core.package/Browser.extension/instance/renameMethodRefactoring.st @@ -3,15 +3,15 @@ renameMethodRefactoring | method class oldArguments oldMethodName newMethodName argumentPermutation| method := self selectedMessageName. class := self selectedClass. - - SystemChangeNotifier uniqueInstance trigger: (DoItEvent expression: 'Rename Method' context: ''). - oldArguments := (RBParser parseMethod: (class methodHeaderFor: method)) argumentNames. oldMethodName := RBMethodName selector: method arguments: oldArguments. (newMethodName := self requestMethodNameFor: oldMethodName) ifNil: [ ^ nil ]. argumentPermutation := newMethodName arguments collect: [ :each | oldArguments indexOf: each ]. + + self registerMethodRenamedIn: class from: oldMethodName to: newMethodName. + ^RBRenameMethodRefactoring renameMethod: method in: class diff --git a/packages/ChangesReloaded-Core.package/Browser.extension/methodProperties.json b/packages/ChangesReloaded-Core.package/Browser.extension/methodProperties.json index d39930cf..4031d24f 100644 --- a/packages/ChangesReloaded-Core.package/Browser.extension/methodProperties.json +++ b/packages/ChangesReloaded-Core.package/Browser.extension/methodProperties.json @@ -2,4 +2,5 @@ "class" : { }, "instance" : { - "renameMethodRefactoring" : "abd 7/3/2021 21:39" } } + "registerMethodRenamedIn:from:to:" : "abd 7/5/2021 17:37", + "renameMethodRefactoring" : "abd 7/5/2021 17:13" } } diff --git a/packages/ChangesReloaded-Core.package/CRBrowser.class/class/encapsulateMethodRenamedFrom..st b/packages/ChangesReloaded-Core.package/CRBrowser.class/class/encapsulateMethodRenamedFrom..st index dcd6bdc5..380d84a8 100644 --- a/packages/ChangesReloaded-Core.package/CRBrowser.class/class/encapsulateMethodRenamedFrom..st +++ b/packages/ChangesReloaded-Core.package/CRBrowser.class/class/encapsulateMethodRenamedFrom..st @@ -9,14 +9,14 @@ encapsulateMethodRenamedFrom: changeListItems [index > 0] whileTrue: [ (changeListItems at: index) category = #methodRenamed ifTrue: [ - inseparableChangeListItems := OrderedCollection new. + inseparableChangeListItems := {changeListItems at: index} asOrderedCollection. index := index - 1. [(changeListItems at: index) category = #methodRemoved] whileFalse: [ inseparableChangeListItems add: (changeListItems at: index). index := index - 1. ]. inseparableChangeListItems add: (changeListItems at: index). - newChangeListItems add: (CRComplexChangeListItem newMethodRenamedWith: inseparableChangeListItems). + newChangeListItems add: (CRComplexChangeListItem newMethodRenamedOf: inseparableChangeListItems first with: inseparableChangeListItems copyWithoutFirst). ] ifFalse: [newChangeListItems add: (changeListItems at: index)]. index := index - 1. diff --git a/packages/ChangesReloaded-Core.package/CRBrowser.class/methodProperties.json b/packages/ChangesReloaded-Core.package/CRBrowser.class/methodProperties.json index a6a7be14..7394e260 100644 --- a/packages/ChangesReloaded-Core.package/CRBrowser.class/methodProperties.json +++ b/packages/ChangesReloaded-Core.package/CRBrowser.class/methodProperties.json @@ -3,7 +3,7 @@ "changeGroupListName" : "JA 7/1/2021 12:25", "defaultBrowserHeight" : "SV 8/7/2020 12:58", "defaultBrowserWidth" : "SV 8/7/2020 12:58", - "encapsulateMethodRenamedFrom:" : "abd 7/4/2021 10:44", + "encapsulateMethodRenamedFrom:" : "abd 7/5/2021 17:29", "extent" : "SV 8/7/2020 15:37", "getChangeListItemsMissingInImageFrom:" : "abd 7/4/2021 10:44", "getChangeRecordsFromLastCrashFrom:" : "abd 6/20/2021 19:06", diff --git a/packages/ChangesReloaded-Core.package/CRChangeListItem.class/class/categoryRegexAttributesList.st b/packages/ChangesReloaded-Core.package/CRChangeListItem.class/class/categoryRegexAttributesList.st index 14eb9699..02cb00ab 100644 --- a/packages/ChangesReloaded-Core.package/CRChangeListItem.class/class/categoryRegexAttributesList.st +++ b/packages/ChangesReloaded-Core.package/CRChangeListItem.class/class/categoryRegexAttributesList.st @@ -13,7 +13,7 @@ categoryRegexAttributesList {#methodRecategorized. '^([^ ]+) (class )?organization classify\: #(.+) under\: #(.+)$'. [:m | {#method -> (m subexpression: 4). #category -> (m subexpression: 5) } as: Dictionary]}. {#methodRemoved. '^([^ ]+) (class )?removeSelector\: #([^ ]+)$'. [:m | {#method -> (m subexpression: 4). #class -> (m subexpression: 2) } as: Dictionary]}. - {#methodRenamed. '^Rename Method$'. [:m | Dictionary new]}. + {#methodRenamed. '^"([^ ]+) methodRenamed\: #([^ ]+) toBe\: #([^ ]+)"$'. [:m | {#class -> (m subexpression: 2). #oldMethod -> (m subexpression: 3). #newMethod -> (m subexpression: 4)} as: Dictionary]}. {#packageCreated. '^SystemOrganization addCategory\: #(.+)$'. [:m | {#package -> (m subexpression: 2)} as: Dictionary]}. {#packageRemoved. '^SystemOrganization removeSystemCategory\: #(.+)$'. [:m | {#package -> (m subexpression: 2)} as: Dictionary]}. diff --git a/packages/ChangesReloaded-Core.package/CRChangeListItem.class/methodProperties.json b/packages/ChangesReloaded-Core.package/CRChangeListItem.class/methodProperties.json index 41dcddf0..24131095 100644 --- a/packages/ChangesReloaded-Core.package/CRChangeListItem.class/methodProperties.json +++ b/packages/ChangesReloaded-Core.package/CRChangeListItem.class/methodProperties.json @@ -1,7 +1,7 @@ { "class" : { "categoryAndAttributesFor:" : "abd 6/27/2021 20:01", - "categoryRegexAttributesList" : "abd 7/3/2021 21:41", + "categoryRegexAttributesList" : "abd 7/5/2021 17:37", "classCommentCategoryAndAttributesFor:" : "abd 7/2/2021 23:45", "doItCategoryAndAttributesFor:" : "abd 7/3/2021 21:40", "if:matches:do:" : "abd 6/27/2021 20:01", diff --git a/packages/ChangesReloaded-Core.package/CRComplexChangeListItem.class/class/newMethodRenamedOf.with..st b/packages/ChangesReloaded-Core.package/CRComplexChangeListItem.class/class/newMethodRenamedOf.with..st new file mode 100644 index 00000000..136f711a --- /dev/null +++ b/packages/ChangesReloaded-Core.package/CRComplexChangeListItem.class/class/newMethodRenamedOf.with..st @@ -0,0 +1,9 @@ +instance-creation +newMethodRenamedOf: aChangeListItem with: changeListItems + + ^ self new + changeRecord: (aChangeListItem changeRecord); + category: (aChangeListItem category); + attributes: (aChangeListItem attributes); + changeListItems: changeListItems; + yourself \ No newline at end of file diff --git a/packages/ChangesReloaded-Core.package/CRComplexChangeListItem.class/class/newMethodRenamedWith..st b/packages/ChangesReloaded-Core.package/CRComplexChangeListItem.class/class/newMethodRenamedWith..st deleted file mode 100644 index f7dc079e..00000000 --- a/packages/ChangesReloaded-Core.package/CRComplexChangeListItem.class/class/newMethodRenamedWith..st +++ /dev/null @@ -1,12 +0,0 @@ -instance-creation -newMethodRenamedWith: changeListItems - - ^ self new - category: #methodRenamed; - attributes: ({ - #class -> (changeListItems first attributes at: #class). - #oldMethod -> (changeListItems last attributes at: #method). - #newMethod -> (changeListItems first attributes at: #method). - } as: Dictionary); - changeListItems: changeListItems; - yourself \ No newline at end of file diff --git a/packages/ChangesReloaded-Core.package/CRComplexChangeListItem.class/instance/string.st b/packages/ChangesReloaded-Core.package/CRComplexChangeListItem.class/instance/string.st deleted file mode 100644 index c14ee521..00000000 --- a/packages/ChangesReloaded-Core.package/CRComplexChangeListItem.class/instance/string.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -string - - ^ self category asString \ No newline at end of file diff --git a/packages/ChangesReloaded-Core.package/CRComplexChangeListItem.class/methodProperties.json b/packages/ChangesReloaded-Core.package/CRComplexChangeListItem.class/methodProperties.json index 6cd6fec8..def3a675 100644 --- a/packages/ChangesReloaded-Core.package/CRComplexChangeListItem.class/methodProperties.json +++ b/packages/ChangesReloaded-Core.package/CRComplexChangeListItem.class/methodProperties.json @@ -1,8 +1,7 @@ { "class" : { - "newMethodRenamedWith:" : "abd 7/3/2021 21:34" }, + "newMethodRenamedOf:with:" : "abd 7/5/2021 17:25" }, "instance" : { "changeListItems" : "abd 7/3/2021 21:34", "changeListItems:" : "abd 7/3/2021 21:34", - "fileIn" : "abd 7/3/2021 21:46", - "string" : "abd 7/3/2021 21:45" } } + "fileIn" : "abd 7/3/2021 21:46" } } From 6010569fe9c42210321bcd339b1ae9750a944407 Mon Sep 17 00:00:00 2001 From: Abdu Date: Tue, 6 Jul 2021 19:55:34 +0200 Subject: [PATCH 09/17] Use own RenameEvent --- .../class/encapsulateMethodRenamedFrom..st | 25 ------------------- .../getChangeListItemsMissingInImageFrom..st | 2 +- .../CRBrowser.class/methodProperties.json | 3 +-- .../class/categoryRegexAttributesList.st | 2 +- .../methodProperties.json | 2 +- .../class/newMethodRenamedOf.with..st | 9 ------- .../instance/changeListItems..st | 3 --- .../instance/changeListItems.st | 3 --- .../instance/fileIn.st | 4 --- .../methodProperties.json | 7 ------ .../README.md | 0 .../class.oldName.newName.permutation..st | 7 ++++++ .../instance/logString.st | 5 ++++ .../instance/permutation..st | 3 +++ .../instance/permutation.st | 3 +++ .../instance/trigger..st | 4 +++ .../methodProperties.json | 8 ++++++ .../properties.json | 6 ++--- .../instance/execute.st | 6 +++++ .../methodProperties.json | 5 ++++ .../properties.json | 2 ++ ...ethodRenamedIn.from.to.withPermutation..st | 8 ++++++ .../methodProperties.json | 5 ++++ .../properties.json | 2 ++ 24 files changed, 65 insertions(+), 59 deletions(-) delete mode 100644 packages/ChangesReloaded-Core.package/CRBrowser.class/class/encapsulateMethodRenamedFrom..st delete mode 100644 packages/ChangesReloaded-Core.package/CRComplexChangeListItem.class/class/newMethodRenamedOf.with..st delete mode 100644 packages/ChangesReloaded-Core.package/CRComplexChangeListItem.class/instance/changeListItems..st delete mode 100644 packages/ChangesReloaded-Core.package/CRComplexChangeListItem.class/instance/changeListItems.st delete mode 100644 packages/ChangesReloaded-Core.package/CRComplexChangeListItem.class/instance/fileIn.st delete mode 100644 packages/ChangesReloaded-Core.package/CRComplexChangeListItem.class/methodProperties.json rename packages/ChangesReloaded-Core.package/{CRComplexChangeListItem.class => CRMethodRenamedEvent.class}/README.md (100%) create mode 100644 packages/ChangesReloaded-Core.package/CRMethodRenamedEvent.class/class/class.oldName.newName.permutation..st create mode 100644 packages/ChangesReloaded-Core.package/CRMethodRenamedEvent.class/instance/logString.st create mode 100644 packages/ChangesReloaded-Core.package/CRMethodRenamedEvent.class/instance/permutation..st create mode 100644 packages/ChangesReloaded-Core.package/CRMethodRenamedEvent.class/instance/permutation.st create mode 100644 packages/ChangesReloaded-Core.package/CRMethodRenamedEvent.class/instance/trigger..st create mode 100644 packages/ChangesReloaded-Core.package/CRMethodRenamedEvent.class/methodProperties.json rename packages/ChangesReloaded-Core.package/{CRComplexChangeListItem.class => CRMethodRenamedEvent.class}/properties.json (64%) create mode 100644 packages/ChangesReloaded-Core.package/RBRenameMethodRefactoring.extension/instance/execute.st create mode 100644 packages/ChangesReloaded-Core.package/RBRenameMethodRefactoring.extension/methodProperties.json create mode 100644 packages/ChangesReloaded-Core.package/RBRenameMethodRefactoring.extension/properties.json create mode 100644 packages/ChangesReloaded-Core.package/SystemChangeNotifier.extension/instance/methodRenamedIn.from.to.withPermutation..st create mode 100644 packages/ChangesReloaded-Core.package/SystemChangeNotifier.extension/methodProperties.json create mode 100644 packages/ChangesReloaded-Core.package/SystemChangeNotifier.extension/properties.json diff --git a/packages/ChangesReloaded-Core.package/CRBrowser.class/class/encapsulateMethodRenamedFrom..st b/packages/ChangesReloaded-Core.package/CRBrowser.class/class/encapsulateMethodRenamedFrom..st deleted file mode 100644 index 380d84a8..00000000 --- a/packages/ChangesReloaded-Core.package/CRBrowser.class/class/encapsulateMethodRenamedFrom..st +++ /dev/null @@ -1,25 +0,0 @@ -utils -encapsulateMethodRenamedFrom: changeListItems - - | index newChangeListItems inseparableChangeListItems | - - newChangeListItems := OrderedCollection new. - index := changeListItems size. - - [index > 0] whileTrue: [ - (changeListItems at: index) category = #methodRenamed - ifTrue: [ - inseparableChangeListItems := {changeListItems at: index} asOrderedCollection. - index := index - 1. - [(changeListItems at: index) category = #methodRemoved] whileFalse: [ - inseparableChangeListItems add: (changeListItems at: index). - index := index - 1. - ]. - inseparableChangeListItems add: (changeListItems at: index). - newChangeListItems add: (CRComplexChangeListItem newMethodRenamedOf: inseparableChangeListItems first with: inseparableChangeListItems copyWithoutFirst). - ] - ifFalse: [newChangeListItems add: (changeListItems at: index)]. - index := index - 1. - ]. - - ^ newChangeListItems reverse \ No newline at end of file diff --git a/packages/ChangesReloaded-Core.package/CRBrowser.class/class/getChangeListItemsMissingInImageFrom..st b/packages/ChangesReloaded-Core.package/CRBrowser.class/class/getChangeListItemsMissingInImageFrom..st index 4df9dd6f..a6148549 100644 --- a/packages/ChangesReloaded-Core.package/CRBrowser.class/class/getChangeListItemsMissingInImageFrom..st +++ b/packages/ChangesReloaded-Core.package/CRBrowser.class/class/getChangeListItemsMissingInImageFrom..st @@ -8,4 +8,4 @@ getChangeListItemsMissingInImageFrom: anOrderedCollectionOfChangeRecords changeListItems removeAllSuchThat: [:each | each category = #nonPersistentDoIt]. - ^ self encapsulateMethodRenamedFrom: changeListItems \ No newline at end of file + ^changeListItems \ No newline at end of file diff --git a/packages/ChangesReloaded-Core.package/CRBrowser.class/methodProperties.json b/packages/ChangesReloaded-Core.package/CRBrowser.class/methodProperties.json index 7394e260..a384c505 100644 --- a/packages/ChangesReloaded-Core.package/CRBrowser.class/methodProperties.json +++ b/packages/ChangesReloaded-Core.package/CRBrowser.class/methodProperties.json @@ -3,9 +3,8 @@ "changeGroupListName" : "JA 7/1/2021 12:25", "defaultBrowserHeight" : "SV 8/7/2020 12:58", "defaultBrowserWidth" : "SV 8/7/2020 12:58", - "encapsulateMethodRenamedFrom:" : "abd 7/5/2021 17:29", "extent" : "SV 8/7/2020 15:37", - "getChangeListItemsMissingInImageFrom:" : "abd 7/4/2021 10:44", + "getChangeListItemsMissingInImageFrom:" : "abd 7/5/2021 23:41", "getChangeRecordsFromLastCrashFrom:" : "abd 6/20/2021 19:06", "newWith:" : "uh 6/21/2020 21:32", "numberOfBytesToLoadChangesFrom" : "gf 5/20/2020 10:43", diff --git a/packages/ChangesReloaded-Core.package/CRChangeListItem.class/class/categoryRegexAttributesList.st b/packages/ChangesReloaded-Core.package/CRChangeListItem.class/class/categoryRegexAttributesList.st index 02cb00ab..a2b2c4fa 100644 --- a/packages/ChangesReloaded-Core.package/CRChangeListItem.class/class/categoryRegexAttributesList.st +++ b/packages/ChangesReloaded-Core.package/CRChangeListItem.class/class/categoryRegexAttributesList.st @@ -13,7 +13,7 @@ categoryRegexAttributesList {#methodRecategorized. '^([^ ]+) (class )?organization classify\: #(.+) under\: #(.+)$'. [:m | {#method -> (m subexpression: 4). #category -> (m subexpression: 5) } as: Dictionary]}. {#methodRemoved. '^([^ ]+) (class )?removeSelector\: #([^ ]+)$'. [:m | {#method -> (m subexpression: 4). #class -> (m subexpression: 2) } as: Dictionary]}. - {#methodRenamed. '^"([^ ]+) methodRenamed\: #([^ ]+) toBe\: #([^ ]+)"$'. [:m | {#class -> (m subexpression: 2). #oldMethod -> (m subexpression: 3). #newMethod -> (m subexpression: 4)} as: Dictionary]}. + {#methodRenamed. '^RBRenameMethodRefactoring renameMethod: #([^ ]+) in: ([^ ]+) to: #([^ ]+) permutation: #()!$'. [:m | {#class -> (m subexpression: 3). #oldMethod -> (m subexpression: 2). #newMethod -> (m subexpression: 4)} as: Dictionary]}. {#packageCreated. '^SystemOrganization addCategory\: #(.+)$'. [:m | {#package -> (m subexpression: 2)} as: Dictionary]}. {#packageRemoved. '^SystemOrganization removeSystemCategory\: #(.+)$'. [:m | {#package -> (m subexpression: 2)} as: Dictionary]}. diff --git a/packages/ChangesReloaded-Core.package/CRChangeListItem.class/methodProperties.json b/packages/ChangesReloaded-Core.package/CRChangeListItem.class/methodProperties.json index 24131095..171943e2 100644 --- a/packages/ChangesReloaded-Core.package/CRChangeListItem.class/methodProperties.json +++ b/packages/ChangesReloaded-Core.package/CRChangeListItem.class/methodProperties.json @@ -1,7 +1,7 @@ { "class" : { "categoryAndAttributesFor:" : "abd 6/27/2021 20:01", - "categoryRegexAttributesList" : "abd 7/5/2021 17:37", + "categoryRegexAttributesList" : "abd 7/6/2021 00:42", "classCommentCategoryAndAttributesFor:" : "abd 7/2/2021 23:45", "doItCategoryAndAttributesFor:" : "abd 7/3/2021 21:40", "if:matches:do:" : "abd 6/27/2021 20:01", diff --git a/packages/ChangesReloaded-Core.package/CRComplexChangeListItem.class/class/newMethodRenamedOf.with..st b/packages/ChangesReloaded-Core.package/CRComplexChangeListItem.class/class/newMethodRenamedOf.with..st deleted file mode 100644 index 136f711a..00000000 --- a/packages/ChangesReloaded-Core.package/CRComplexChangeListItem.class/class/newMethodRenamedOf.with..st +++ /dev/null @@ -1,9 +0,0 @@ -instance-creation -newMethodRenamedOf: aChangeListItem with: changeListItems - - ^ self new - changeRecord: (aChangeListItem changeRecord); - category: (aChangeListItem category); - attributes: (aChangeListItem attributes); - changeListItems: changeListItems; - yourself \ No newline at end of file diff --git a/packages/ChangesReloaded-Core.package/CRComplexChangeListItem.class/instance/changeListItems..st b/packages/ChangesReloaded-Core.package/CRComplexChangeListItem.class/instance/changeListItems..st deleted file mode 100644 index 50c04086..00000000 --- a/packages/ChangesReloaded-Core.package/CRComplexChangeListItem.class/instance/changeListItems..st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -changeListItems: anObject - changeListItems := anObject \ No newline at end of file diff --git a/packages/ChangesReloaded-Core.package/CRComplexChangeListItem.class/instance/changeListItems.st b/packages/ChangesReloaded-Core.package/CRComplexChangeListItem.class/instance/changeListItems.st deleted file mode 100644 index c3ddc5b0..00000000 --- a/packages/ChangesReloaded-Core.package/CRComplexChangeListItem.class/instance/changeListItems.st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -changeListItems - ^ changeListItems \ No newline at end of file diff --git a/packages/ChangesReloaded-Core.package/CRComplexChangeListItem.class/instance/fileIn.st b/packages/ChangesReloaded-Core.package/CRComplexChangeListItem.class/instance/fileIn.st deleted file mode 100644 index 8fd59ca3..00000000 --- a/packages/ChangesReloaded-Core.package/CRComplexChangeListItem.class/instance/fileIn.st +++ /dev/null @@ -1,4 +0,0 @@ -initialization -fileIn - - self changeListItems do: [:each | each fileIn]. \ No newline at end of file diff --git a/packages/ChangesReloaded-Core.package/CRComplexChangeListItem.class/methodProperties.json b/packages/ChangesReloaded-Core.package/CRComplexChangeListItem.class/methodProperties.json deleted file mode 100644 index def3a675..00000000 --- a/packages/ChangesReloaded-Core.package/CRComplexChangeListItem.class/methodProperties.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "class" : { - "newMethodRenamedOf:with:" : "abd 7/5/2021 17:25" }, - "instance" : { - "changeListItems" : "abd 7/3/2021 21:34", - "changeListItems:" : "abd 7/3/2021 21:34", - "fileIn" : "abd 7/3/2021 21:46" } } diff --git a/packages/ChangesReloaded-Core.package/CRComplexChangeListItem.class/README.md b/packages/ChangesReloaded-Core.package/CRMethodRenamedEvent.class/README.md similarity index 100% rename from packages/ChangesReloaded-Core.package/CRComplexChangeListItem.class/README.md rename to packages/ChangesReloaded-Core.package/CRMethodRenamedEvent.class/README.md diff --git a/packages/ChangesReloaded-Core.package/CRMethodRenamedEvent.class/class/class.oldName.newName.permutation..st b/packages/ChangesReloaded-Core.package/CRMethodRenamedEvent.class/class/class.oldName.newName.permutation..st new file mode 100644 index 00000000..2c67ab36 --- /dev/null +++ b/packages/ChangesReloaded-Core.package/CRMethodRenamedEvent.class/class/class.oldName.newName.permutation..st @@ -0,0 +1,7 @@ +instance creation +class: aClass oldName: anOldName newName: aNewName permutation: aPermutation + + ^ (self class: aClass) + oldName: anOldName; + newName: aNewName; + permutation: aPermutation \ No newline at end of file diff --git a/packages/ChangesReloaded-Core.package/CRMethodRenamedEvent.class/instance/logString.st b/packages/ChangesReloaded-Core.package/CRMethodRenamedEvent.class/instance/logString.st new file mode 100644 index 00000000..3668bad0 --- /dev/null +++ b/packages/ChangesReloaded-Core.package/CRMethodRenamedEvent.class/instance/logString.st @@ -0,0 +1,5 @@ +triggering +logString + + ^ '(RBRenameMethodRefactoring renameMethod: #{1} in: {2} to: #{3} permutation: {4}) execute' + format: {self oldName. self item. self newName. self permutation} \ No newline at end of file diff --git a/packages/ChangesReloaded-Core.package/CRMethodRenamedEvent.class/instance/permutation..st b/packages/ChangesReloaded-Core.package/CRMethodRenamedEvent.class/instance/permutation..st new file mode 100644 index 00000000..b51cb12d --- /dev/null +++ b/packages/ChangesReloaded-Core.package/CRMethodRenamedEvent.class/instance/permutation..st @@ -0,0 +1,3 @@ +accessing +permutation: t1 + permutation := t1 \ No newline at end of file diff --git a/packages/ChangesReloaded-Core.package/CRMethodRenamedEvent.class/instance/permutation.st b/packages/ChangesReloaded-Core.package/CRMethodRenamedEvent.class/instance/permutation.st new file mode 100644 index 00000000..849e1406 --- /dev/null +++ b/packages/ChangesReloaded-Core.package/CRMethodRenamedEvent.class/instance/permutation.st @@ -0,0 +1,3 @@ +accessing +permutation + ^ permutation \ No newline at end of file diff --git a/packages/ChangesReloaded-Core.package/CRMethodRenamedEvent.class/instance/trigger..st b/packages/ChangesReloaded-Core.package/CRMethodRenamedEvent.class/instance/trigger..st new file mode 100644 index 00000000..19c9f75c --- /dev/null +++ b/packages/ChangesReloaded-Core.package/CRMethodRenamedEvent.class/instance/trigger..st @@ -0,0 +1,4 @@ +triggering +trigger: anEventManager + + SystemChangeNotifier uniqueInstance evaluated: self logString \ No newline at end of file diff --git a/packages/ChangesReloaded-Core.package/CRMethodRenamedEvent.class/methodProperties.json b/packages/ChangesReloaded-Core.package/CRMethodRenamedEvent.class/methodProperties.json new file mode 100644 index 00000000..fc2cd28a --- /dev/null +++ b/packages/ChangesReloaded-Core.package/CRMethodRenamedEvent.class/methodProperties.json @@ -0,0 +1,8 @@ +{ + "class" : { + "class:oldName:newName:permutation:" : "abd 7/6/2021 00:34" }, + "instance" : { + "logString" : "abd 7/6/2021 19:41", + "permutation" : "", + "permutation:" : "", + "trigger:" : "abd 7/6/2021 00:38" } } diff --git a/packages/ChangesReloaded-Core.package/CRComplexChangeListItem.class/properties.json b/packages/ChangesReloaded-Core.package/CRMethodRenamedEvent.class/properties.json similarity index 64% rename from packages/ChangesReloaded-Core.package/CRComplexChangeListItem.class/properties.json rename to packages/ChangesReloaded-Core.package/CRMethodRenamedEvent.class/properties.json index 51a4bc71..64a7d74d 100644 --- a/packages/ChangesReloaded-Core.package/CRComplexChangeListItem.class/properties.json +++ b/packages/ChangesReloaded-Core.package/CRMethodRenamedEvent.class/properties.json @@ -6,9 +6,9 @@ ], "commentStamp" : "", "instvars" : [ - "changeListItems" ], - "name" : "CRComplexChangeListItem", + "permutation" ], + "name" : "CRMethodRenamedEvent", "pools" : [ ], - "super" : "CRChangeListItem", + "super" : "RenamedEvent", "type" : "normal" } diff --git a/packages/ChangesReloaded-Core.package/RBRenameMethodRefactoring.extension/instance/execute.st b/packages/ChangesReloaded-Core.package/RBRenameMethodRefactoring.extension/instance/execute.st new file mode 100644 index 00000000..2edb9472 --- /dev/null +++ b/packages/ChangesReloaded-Core.package/RBRenameMethodRefactoring.extension/instance/execute.st @@ -0,0 +1,6 @@ +*ChangesReloaded-Core +execute + + SystemChangeNotifier uniqueInstance + doSilently: [1 setHaltOnce. super execute]; + methodRenamedIn: class from: oldSelector to: newSelector withPermutation: permutation \ No newline at end of file diff --git a/packages/ChangesReloaded-Core.package/RBRenameMethodRefactoring.extension/methodProperties.json b/packages/ChangesReloaded-Core.package/RBRenameMethodRefactoring.extension/methodProperties.json new file mode 100644 index 00000000..91825df1 --- /dev/null +++ b/packages/ChangesReloaded-Core.package/RBRenameMethodRefactoring.extension/methodProperties.json @@ -0,0 +1,5 @@ +{ + "class" : { + }, + "instance" : { + "execute" : "abd 7/6/2021 19:31" } } diff --git a/packages/ChangesReloaded-Core.package/RBRenameMethodRefactoring.extension/properties.json b/packages/ChangesReloaded-Core.package/RBRenameMethodRefactoring.extension/properties.json new file mode 100644 index 00000000..40123cf0 --- /dev/null +++ b/packages/ChangesReloaded-Core.package/RBRenameMethodRefactoring.extension/properties.json @@ -0,0 +1,2 @@ +{ + "name" : "RBRenameMethodRefactoring" } diff --git a/packages/ChangesReloaded-Core.package/SystemChangeNotifier.extension/instance/methodRenamedIn.from.to.withPermutation..st b/packages/ChangesReloaded-Core.package/SystemChangeNotifier.extension/instance/methodRenamedIn.from.to.withPermutation..st new file mode 100644 index 00000000..07052893 --- /dev/null +++ b/packages/ChangesReloaded-Core.package/SystemChangeNotifier.extension/instance/methodRenamedIn.from.to.withPermutation..st @@ -0,0 +1,8 @@ +*ChangesReloaded-Core +methodRenamedIn: aClass from: anOldName to: aNewName withPermutation: aPermutation + + self trigger: (CRMethodRenamedEvent + class: aClass + oldName: anOldName + newName: aNewName + permutation: aPermutation) \ No newline at end of file diff --git a/packages/ChangesReloaded-Core.package/SystemChangeNotifier.extension/methodProperties.json b/packages/ChangesReloaded-Core.package/SystemChangeNotifier.extension/methodProperties.json new file mode 100644 index 00000000..cf4523be --- /dev/null +++ b/packages/ChangesReloaded-Core.package/SystemChangeNotifier.extension/methodProperties.json @@ -0,0 +1,5 @@ +{ + "class" : { + }, + "instance" : { + "methodRenamedIn:from:to:withPermutation:" : "abd 7/6/2021 00:35" } } diff --git a/packages/ChangesReloaded-Core.package/SystemChangeNotifier.extension/properties.json b/packages/ChangesReloaded-Core.package/SystemChangeNotifier.extension/properties.json new file mode 100644 index 00000000..699c4552 --- /dev/null +++ b/packages/ChangesReloaded-Core.package/SystemChangeNotifier.extension/properties.json @@ -0,0 +1,2 @@ +{ + "name" : "SystemChangeNotifier" } From e6286e0f7defebd026e60bef8b83c36bdd54aaf6 Mon Sep 17 00:00:00 2001 From: Abdu Date: Tue, 6 Jul 2021 20:08:13 +0200 Subject: [PATCH 10/17] Revert changes of Browser --- .../registerMethodRenamedIn.from.to..st | 4 ---- .../instance/renameMethodRefactoring.st | 19 ------------------- .../Browser.extension/methodProperties.json | 6 ------ .../Browser.extension/properties.json | 2 -- 4 files changed, 31 deletions(-) delete mode 100644 packages/ChangesReloaded-Core.package/Browser.extension/instance/registerMethodRenamedIn.from.to..st delete mode 100644 packages/ChangesReloaded-Core.package/Browser.extension/instance/renameMethodRefactoring.st delete mode 100644 packages/ChangesReloaded-Core.package/Browser.extension/methodProperties.json delete mode 100644 packages/ChangesReloaded-Core.package/Browser.extension/properties.json diff --git a/packages/ChangesReloaded-Core.package/Browser.extension/instance/registerMethodRenamedIn.from.to..st b/packages/ChangesReloaded-Core.package/Browser.extension/instance/registerMethodRenamedIn.from.to..st deleted file mode 100644 index 811c88ab..00000000 --- a/packages/ChangesReloaded-Core.package/Browser.extension/instance/registerMethodRenamedIn.from.to..st +++ /dev/null @@ -1,4 +0,0 @@ -*ChangesReloaded-Core -registerMethodRenamedIn: aClass from: anOldMethodName to: aNewMethodName - - SystemChangeNotifier uniqueInstance trigger: (DoItEvent expression: ('"{1} methodRenamed: #{2} toBe: #{3}"' format: {aClass. anOldMethodName selector. aNewMethodName selector}) context: ''). \ No newline at end of file diff --git a/packages/ChangesReloaded-Core.package/Browser.extension/instance/renameMethodRefactoring.st b/packages/ChangesReloaded-Core.package/Browser.extension/instance/renameMethodRefactoring.st deleted file mode 100644 index 44a6c66c..00000000 --- a/packages/ChangesReloaded-Core.package/Browser.extension/instance/renameMethodRefactoring.st +++ /dev/null @@ -1,19 +0,0 @@ -*ChangesReloaded-Core -renameMethodRefactoring - | method class oldArguments oldMethodName newMethodName argumentPermutation| - method := self selectedMessageName. - class := self selectedClass. - oldArguments := (RBParser parseMethod: (class methodHeaderFor: method)) argumentNames. - oldMethodName := RBMethodName - selector: method - arguments: oldArguments. - (newMethodName := self requestMethodNameFor: oldMethodName) ifNil: [ ^ nil ]. - argumentPermutation := newMethodName arguments collect: [ :each | oldArguments indexOf: each ]. - - self registerMethodRenamedIn: class from: oldMethodName to: newMethodName. - - ^RBRenameMethodRefactoring - renameMethod: method - in: class - to: newMethodName selector - permutation: argumentPermutation \ No newline at end of file diff --git a/packages/ChangesReloaded-Core.package/Browser.extension/methodProperties.json b/packages/ChangesReloaded-Core.package/Browser.extension/methodProperties.json deleted file mode 100644 index 4031d24f..00000000 --- a/packages/ChangesReloaded-Core.package/Browser.extension/methodProperties.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "class" : { - }, - "instance" : { - "registerMethodRenamedIn:from:to:" : "abd 7/5/2021 17:37", - "renameMethodRefactoring" : "abd 7/5/2021 17:13" } } diff --git a/packages/ChangesReloaded-Core.package/Browser.extension/properties.json b/packages/ChangesReloaded-Core.package/Browser.extension/properties.json deleted file mode 100644 index edd7909e..00000000 --- a/packages/ChangesReloaded-Core.package/Browser.extension/properties.json +++ /dev/null @@ -1,2 +0,0 @@ -{ - "name" : "Browser" } From bb6fdb90fb567dabc7a7acd3be6b03bd277eea38 Mon Sep 17 00:00:00 2001 From: Abdu Date: Tue, 6 Jul 2021 20:26:07 +0200 Subject: [PATCH 11/17] Correct regex of methodRenamed --- .../CRChangeListItem.class/class/categoryRegexAttributesList.st | 2 +- .../CRChangeListItem.class/methodProperties.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/ChangesReloaded-Core.package/CRChangeListItem.class/class/categoryRegexAttributesList.st b/packages/ChangesReloaded-Core.package/CRChangeListItem.class/class/categoryRegexAttributesList.st index a2b2c4fa..97955088 100644 --- a/packages/ChangesReloaded-Core.package/CRChangeListItem.class/class/categoryRegexAttributesList.st +++ b/packages/ChangesReloaded-Core.package/CRChangeListItem.class/class/categoryRegexAttributesList.st @@ -13,7 +13,7 @@ categoryRegexAttributesList {#methodRecategorized. '^([^ ]+) (class )?organization classify\: #(.+) under\: #(.+)$'. [:m | {#method -> (m subexpression: 4). #category -> (m subexpression: 5) } as: Dictionary]}. {#methodRemoved. '^([^ ]+) (class )?removeSelector\: #([^ ]+)$'. [:m | {#method -> (m subexpression: 4). #class -> (m subexpression: 2) } as: Dictionary]}. - {#methodRenamed. '^RBRenameMethodRefactoring renameMethod: #([^ ]+) in: ([^ ]+) to: #([^ ]+) permutation: #()!$'. [:m | {#class -> (m subexpression: 3). #oldMethod -> (m subexpression: 2). #newMethod -> (m subexpression: 4)} as: Dictionary]}. + {#methodRenamed. '^\(RBRenameMethodRefactoring renameMethod\: #([^ ]+) in\: ([^ ]+) to\: #([^ ]+) permutation\: #\(\)\) execute$'. [:m | {#class -> (m subexpression: 3). #oldMethod -> (m subexpression: 2). #newMethod -> (m subexpression: 4)} as: Dictionary]}. {#packageCreated. '^SystemOrganization addCategory\: #(.+)$'. [:m | {#package -> (m subexpression: 2)} as: Dictionary]}. {#packageRemoved. '^SystemOrganization removeSystemCategory\: #(.+)$'. [:m | {#package -> (m subexpression: 2)} as: Dictionary]}. diff --git a/packages/ChangesReloaded-Core.package/CRChangeListItem.class/methodProperties.json b/packages/ChangesReloaded-Core.package/CRChangeListItem.class/methodProperties.json index 171943e2..854013c6 100644 --- a/packages/ChangesReloaded-Core.package/CRChangeListItem.class/methodProperties.json +++ b/packages/ChangesReloaded-Core.package/CRChangeListItem.class/methodProperties.json @@ -1,7 +1,7 @@ { "class" : { "categoryAndAttributesFor:" : "abd 6/27/2021 20:01", - "categoryRegexAttributesList" : "abd 7/6/2021 00:42", + "categoryRegexAttributesList" : "abd 7/6/2021 20:17", "classCommentCategoryAndAttributesFor:" : "abd 7/2/2021 23:45", "doItCategoryAndAttributesFor:" : "abd 7/3/2021 21:40", "if:matches:do:" : "abd 6/27/2021 20:01", From af00d275bbc24e661370bc79a93c50b044af5e7c Mon Sep 17 00:00:00 2001 From: Abdu Date: Sat, 10 Jul 2021 12:15:23 +0200 Subject: [PATCH 12/17] Finish silently methods --- .../instance/executeSilently.st | 8 ++++++++ .../RBAddMethodChange.extension/methodProperties.json | 5 +++++ .../RBAddMethodChange.extension/properties.json | 2 ++ .../instance/executeSilently.st | 9 +++++++++ .../methodProperties.json | 5 +++++ .../RBCompositeRefactoryChange.extension/properties.json | 2 ++ .../instance/addRefactoringSilently..st | 4 ++++ .../RBRefactoringManager.extension/methodProperties.json | 5 +++++ .../RBRefactoringManager.extension/properties.json | 2 ++ .../instance/performChangeSilently..st | 3 +++ .../methodProperties.json | 5 +++++ .../RBRefactoryChangeManager.extension/properties.json | 2 ++ .../instance/execute.st | 3 ++- .../methodProperties.json | 2 +- 14 files changed, 55 insertions(+), 2 deletions(-) create mode 100644 packages/ChangesReloaded-Core.package/RBAddMethodChange.extension/instance/executeSilently.st create mode 100644 packages/ChangesReloaded-Core.package/RBAddMethodChange.extension/methodProperties.json create mode 100644 packages/ChangesReloaded-Core.package/RBAddMethodChange.extension/properties.json create mode 100644 packages/ChangesReloaded-Core.package/RBCompositeRefactoryChange.extension/instance/executeSilently.st create mode 100644 packages/ChangesReloaded-Core.package/RBCompositeRefactoryChange.extension/methodProperties.json create mode 100644 packages/ChangesReloaded-Core.package/RBCompositeRefactoryChange.extension/properties.json create mode 100644 packages/ChangesReloaded-Core.package/RBRefactoringManager.extension/instance/addRefactoringSilently..st create mode 100644 packages/ChangesReloaded-Core.package/RBRefactoringManager.extension/methodProperties.json create mode 100644 packages/ChangesReloaded-Core.package/RBRefactoringManager.extension/properties.json create mode 100644 packages/ChangesReloaded-Core.package/RBRefactoryChangeManager.extension/instance/performChangeSilently..st create mode 100644 packages/ChangesReloaded-Core.package/RBRefactoryChangeManager.extension/methodProperties.json create mode 100644 packages/ChangesReloaded-Core.package/RBRefactoryChangeManager.extension/properties.json diff --git a/packages/ChangesReloaded-Core.package/RBAddMethodChange.extension/instance/executeSilently.st b/packages/ChangesReloaded-Core.package/RBAddMethodChange.extension/instance/executeSilently.st new file mode 100644 index 00000000..9a34c2e7 --- /dev/null +++ b/packages/ChangesReloaded-Core.package/RBAddMethodChange.extension/instance/executeSilently.st @@ -0,0 +1,8 @@ +*ChangesReloaded-Core +executeSilently + + | undo | + undo := self asUndoOperation. + undo name: self name. + self primitiveExecute. + ^ undo \ No newline at end of file diff --git a/packages/ChangesReloaded-Core.package/RBAddMethodChange.extension/methodProperties.json b/packages/ChangesReloaded-Core.package/RBAddMethodChange.extension/methodProperties.json new file mode 100644 index 00000000..34f89e08 --- /dev/null +++ b/packages/ChangesReloaded-Core.package/RBAddMethodChange.extension/methodProperties.json @@ -0,0 +1,5 @@ +{ + "class" : { + }, + "instance" : { + "executeSilently" : "abd 7/10/2021 12:03" } } diff --git a/packages/ChangesReloaded-Core.package/RBAddMethodChange.extension/properties.json b/packages/ChangesReloaded-Core.package/RBAddMethodChange.extension/properties.json new file mode 100644 index 00000000..725ba20d --- /dev/null +++ b/packages/ChangesReloaded-Core.package/RBAddMethodChange.extension/properties.json @@ -0,0 +1,2 @@ +{ + "name" : "RBAddMethodChange" } diff --git a/packages/ChangesReloaded-Core.package/RBCompositeRefactoryChange.extension/instance/executeSilently.st b/packages/ChangesReloaded-Core.package/RBCompositeRefactoryChange.extension/instance/executeSilently.st new file mode 100644 index 00000000..eac366b9 --- /dev/null +++ b/packages/ChangesReloaded-Core.package/RBCompositeRefactoryChange.extension/instance/executeSilently.st @@ -0,0 +1,9 @@ +*ChangesReloaded-Core +executeSilently + | undos undo | + undos := changes collect: [ :each | each class = RBAddMethodChange + ifTrue: [each executeSilently] + ifFalse: [each execute]]. + undo := self copy. + undo changes: undos reversed. + ^ undo \ No newline at end of file diff --git a/packages/ChangesReloaded-Core.package/RBCompositeRefactoryChange.extension/methodProperties.json b/packages/ChangesReloaded-Core.package/RBCompositeRefactoryChange.extension/methodProperties.json new file mode 100644 index 00000000..3f99001e --- /dev/null +++ b/packages/ChangesReloaded-Core.package/RBCompositeRefactoryChange.extension/methodProperties.json @@ -0,0 +1,5 @@ +{ + "class" : { + }, + "instance" : { + "executeSilently" : "abd 7/10/2021 12:09" } } diff --git a/packages/ChangesReloaded-Core.package/RBCompositeRefactoryChange.extension/properties.json b/packages/ChangesReloaded-Core.package/RBCompositeRefactoryChange.extension/properties.json new file mode 100644 index 00000000..6976c2d0 --- /dev/null +++ b/packages/ChangesReloaded-Core.package/RBCompositeRefactoryChange.extension/properties.json @@ -0,0 +1,2 @@ +{ + "name" : "RBCompositeRefactoryChange" } diff --git a/packages/ChangesReloaded-Core.package/RBRefactoringManager.extension/instance/addRefactoringSilently..st b/packages/ChangesReloaded-Core.package/RBRefactoringManager.extension/instance/addRefactoringSilently..st new file mode 100644 index 00000000..d1aa7164 --- /dev/null +++ b/packages/ChangesReloaded-Core.package/RBRefactoringManager.extension/instance/addRefactoringSilently..st @@ -0,0 +1,4 @@ +*ChangesReloaded-Core +addRefactoringSilently: aRefactoring + RBRefactoryChangeManager instance performChangeSilently: aRefactoring changes. + refactorings add: aRefactoring class name \ No newline at end of file diff --git a/packages/ChangesReloaded-Core.package/RBRefactoringManager.extension/methodProperties.json b/packages/ChangesReloaded-Core.package/RBRefactoringManager.extension/methodProperties.json new file mode 100644 index 00000000..1c37033d --- /dev/null +++ b/packages/ChangesReloaded-Core.package/RBRefactoringManager.extension/methodProperties.json @@ -0,0 +1,5 @@ +{ + "class" : { + }, + "instance" : { + "addRefactoringSilently:" : "abd 7/10/2021 11:54" } } diff --git a/packages/ChangesReloaded-Core.package/RBRefactoringManager.extension/properties.json b/packages/ChangesReloaded-Core.package/RBRefactoringManager.extension/properties.json new file mode 100644 index 00000000..700a781e --- /dev/null +++ b/packages/ChangesReloaded-Core.package/RBRefactoringManager.extension/properties.json @@ -0,0 +1,2 @@ +{ + "name" : "RBRefactoringManager" } diff --git a/packages/ChangesReloaded-Core.package/RBRefactoryChangeManager.extension/instance/performChangeSilently..st b/packages/ChangesReloaded-Core.package/RBRefactoryChangeManager.extension/instance/performChangeSilently..st new file mode 100644 index 00000000..5677a322 --- /dev/null +++ b/packages/ChangesReloaded-Core.package/RBRefactoryChangeManager.extension/instance/performChangeSilently..st @@ -0,0 +1,3 @@ +*ChangesReloaded-Core +performChangeSilently: aRefactoringChange + self ignoreChangesWhile: [ self addUndo: aRefactoringChange executeSilently ] \ No newline at end of file diff --git a/packages/ChangesReloaded-Core.package/RBRefactoryChangeManager.extension/methodProperties.json b/packages/ChangesReloaded-Core.package/RBRefactoryChangeManager.extension/methodProperties.json new file mode 100644 index 00000000..96d4291f --- /dev/null +++ b/packages/ChangesReloaded-Core.package/RBRefactoryChangeManager.extension/methodProperties.json @@ -0,0 +1,5 @@ +{ + "class" : { + }, + "instance" : { + "performChangeSilently:" : "abd 7/10/2021 11:55" } } diff --git a/packages/ChangesReloaded-Core.package/RBRefactoryChangeManager.extension/properties.json b/packages/ChangesReloaded-Core.package/RBRefactoryChangeManager.extension/properties.json new file mode 100644 index 00000000..a78d7df8 --- /dev/null +++ b/packages/ChangesReloaded-Core.package/RBRefactoryChangeManager.extension/properties.json @@ -0,0 +1,2 @@ +{ + "name" : "RBRefactoryChangeManager" } diff --git a/packages/ChangesReloaded-Core.package/RBRenameMethodRefactoring.extension/instance/execute.st b/packages/ChangesReloaded-Core.package/RBRenameMethodRefactoring.extension/instance/execute.st index 2edb9472..9639dc8e 100644 --- a/packages/ChangesReloaded-Core.package/RBRenameMethodRefactoring.extension/instance/execute.st +++ b/packages/ChangesReloaded-Core.package/RBRenameMethodRefactoring.extension/instance/execute.st @@ -2,5 +2,6 @@ execute SystemChangeNotifier uniqueInstance - doSilently: [1 setHaltOnce. super execute]; + doSilently: [self primitiveExecute. + RBRefactoringManager instance addRefactoringSilently: self]; methodRenamedIn: class from: oldSelector to: newSelector withPermutation: permutation \ No newline at end of file diff --git a/packages/ChangesReloaded-Core.package/RBRenameMethodRefactoring.extension/methodProperties.json b/packages/ChangesReloaded-Core.package/RBRenameMethodRefactoring.extension/methodProperties.json index 91825df1..1925cc0e 100644 --- a/packages/ChangesReloaded-Core.package/RBRenameMethodRefactoring.extension/methodProperties.json +++ b/packages/ChangesReloaded-Core.package/RBRenameMethodRefactoring.extension/methodProperties.json @@ -2,4 +2,4 @@ "class" : { }, "instance" : { - "execute" : "abd 7/6/2021 19:31" } } + "execute" : "abd 7/10/2021 11:52" } } From d2d114394b993049f5ad1245d84e2bf10391f01d Mon Sep 17 00:00:00 2001 From: Abdu Date: Sat, 10 Jul 2021 13:52:22 +0200 Subject: [PATCH 13/17] Add tests --- .../instance/expectedAttributes.st | 1 + .../instance/expectedCategories.st | 1 + .../methodProperties.json | 4 ++-- .../instance/methodToRename.st | 3 +++ .../instance/methodWithRenamedMethod.st | 3 +++ .../methodProperties.json | 4 +++- .../mockChangesFileStreamWithAllTypesOfChanges.st | 2 ++ .../CRFakeFileStream.class/methodProperties.json | 2 +- .../CRMethodRenamedEventTest.class/README.md | 0 .../instance/newMethod.st | 4 ++++ .../instance/oldMethod.st | 4 ++++ .../instance/setUp.st | 8 ++++++++ .../instance/tearDown.st | 8 ++++++++ .../instance/testLoggingOfEvent.st | 15 +++++++++++++++ .../methodProperties.json | 9 +++++++++ .../properties.json | 14 ++++++++++++++ .../README.md | 0 .../instance/newMethod.st | 4 ++++ .../instance/oldMethod.st | 4 ++++ .../instance/setUp.st | 8 ++++++++ .../instance/tearDown.st | 8 ++++++++ .../instance/testMethodRenaming.st | 9 +++++++++ .../methodProperties.json | 9 +++++++++ .../properties.json | 14 ++++++++++++++ 24 files changed, 134 insertions(+), 4 deletions(-) create mode 100644 packages/ChangesReloaded-Tests.package/CRChangesDummyClass.class/instance/methodToRename.st create mode 100644 packages/ChangesReloaded-Tests.package/CRChangesDummyClass.class/instance/methodWithRenamedMethod.st create mode 100644 packages/ChangesReloaded-Tests.package/CRMethodRenamedEventTest.class/README.md create mode 100644 packages/ChangesReloaded-Tests.package/CRMethodRenamedEventTest.class/instance/newMethod.st create mode 100644 packages/ChangesReloaded-Tests.package/CRMethodRenamedEventTest.class/instance/oldMethod.st create mode 100644 packages/ChangesReloaded-Tests.package/CRMethodRenamedEventTest.class/instance/setUp.st create mode 100644 packages/ChangesReloaded-Tests.package/CRMethodRenamedEventTest.class/instance/tearDown.st create mode 100644 packages/ChangesReloaded-Tests.package/CRMethodRenamedEventTest.class/instance/testLoggingOfEvent.st create mode 100644 packages/ChangesReloaded-Tests.package/CRMethodRenamedEventTest.class/methodProperties.json create mode 100644 packages/ChangesReloaded-Tests.package/CRMethodRenamedEventTest.class/properties.json create mode 100644 packages/ChangesReloaded-Tests.package/ExtensioRBRenameMathodRefactoring.class/README.md create mode 100644 packages/ChangesReloaded-Tests.package/ExtensioRBRenameMathodRefactoring.class/instance/newMethod.st create mode 100644 packages/ChangesReloaded-Tests.package/ExtensioRBRenameMathodRefactoring.class/instance/oldMethod.st create mode 100644 packages/ChangesReloaded-Tests.package/ExtensioRBRenameMathodRefactoring.class/instance/setUp.st create mode 100644 packages/ChangesReloaded-Tests.package/ExtensioRBRenameMathodRefactoring.class/instance/tearDown.st create mode 100644 packages/ChangesReloaded-Tests.package/ExtensioRBRenameMathodRefactoring.class/instance/testMethodRenaming.st create mode 100644 packages/ChangesReloaded-Tests.package/ExtensioRBRenameMathodRefactoring.class/methodProperties.json create mode 100644 packages/ChangesReloaded-Tests.package/ExtensioRBRenameMathodRefactoring.class/properties.json diff --git a/packages/ChangesReloaded-Tests.package/CRChangeListItemTest.class/instance/expectedAttributes.st b/packages/ChangesReloaded-Tests.package/CRChangeListItemTest.class/instance/expectedAttributes.st index 15162a40..da6a3d59 100644 --- a/packages/ChangesReloaded-Tests.package/CRChangeListItemTest.class/instance/expectedAttributes.st +++ b/packages/ChangesReloaded-Tests.package/CRChangeListItemTest.class/instance/expectedAttributes.st @@ -13,6 +13,7 @@ expectedAttributes {#newClass->'CRChangesDummyNewClass'. #oldClass->'CRChangesDummyOldClass'} as: Dictionary. {#category->'category'. #method->'method'} as: Dictionary. {#class->'CRChangesDummyClass'. #method->'obsoleteMethod'} as: Dictionary. + {#class->'CRChangesDummyClass'. #oldMethod->'methodToRename'. #newMethod->'renamedMethod'} as: Dictionary. {#package->'ChangesReloadedDummyPackage1'} as: Dictionary. {#package->'ChangesReloadedDummyPackage1'} as: Dictionary. {#newPackage->'ChangesReloadedDummyPackage2'. #oldPackage->'ChangesReloadedDummyPackage1'} as: Dictionary diff --git a/packages/ChangesReloaded-Tests.package/CRChangeListItemTest.class/instance/expectedCategories.st b/packages/ChangesReloaded-Tests.package/CRChangeListItemTest.class/instance/expectedCategories.st index 893143a0..26c3a1de 100644 --- a/packages/ChangesReloaded-Tests.package/CRChangeListItemTest.class/instance/expectedCategories.st +++ b/packages/ChangesReloaded-Tests.package/CRChangeListItemTest.class/instance/expectedCategories.st @@ -13,6 +13,7 @@ expectedCategories #classRenamed. #methodRecategorized. #methodRemoved. + #methodRenamed. #packageCreated. #packageRemoved. #packageRenamed diff --git a/packages/ChangesReloaded-Tests.package/CRChangeListItemTest.class/methodProperties.json b/packages/ChangesReloaded-Tests.package/CRChangeListItemTest.class/methodProperties.json index e8974f30..a2d621aa 100644 --- a/packages/ChangesReloaded-Tests.package/CRChangeListItemTest.class/methodProperties.json +++ b/packages/ChangesReloaded-Tests.package/CRChangeListItemTest.class/methodProperties.json @@ -6,8 +6,8 @@ "assertCorrectUnpickedListItemDecriptionAttributes:" : "abd 6/17/2021 12:42", "changeListItems" : "TS 6/30/2021 18:51", "changeListItems:" : "TS 6/30/2021 18:51", - "expectedAttributes" : "abd 7/2/2021 23:44", - "expectedCategories" : "TS 6/30/2021 20:51", + "expectedAttributes" : "abd 7/10/2021 12:30", + "expectedCategories" : "abd 7/10/2021 12:27", "getMethodChangeListItemWithDifferentObjectIdentity" : "abd 6/27/2021 20:02", "setUp" : "TS 6/30/2021 19:06", "specificChangeListItem1" : "abd 7/2/2021 19:49", diff --git a/packages/ChangesReloaded-Tests.package/CRChangesDummyClass.class/instance/methodToRename.st b/packages/ChangesReloaded-Tests.package/CRChangesDummyClass.class/instance/methodToRename.st new file mode 100644 index 00000000..5b49a351 --- /dev/null +++ b/packages/ChangesReloaded-Tests.package/CRChangesDummyClass.class/instance/methodToRename.st @@ -0,0 +1,3 @@ +renaming +methodToRename + ^ 'hello world' \ No newline at end of file diff --git a/packages/ChangesReloaded-Tests.package/CRChangesDummyClass.class/instance/methodWithRenamedMethod.st b/packages/ChangesReloaded-Tests.package/CRChangesDummyClass.class/instance/methodWithRenamedMethod.st new file mode 100644 index 00000000..259fb144 --- /dev/null +++ b/packages/ChangesReloaded-Tests.package/CRChangesDummyClass.class/instance/methodWithRenamedMethod.st @@ -0,0 +1,3 @@ +renaming +methodWithRenamedMethod + self methodToRename \ No newline at end of file diff --git a/packages/ChangesReloaded-Tests.package/CRChangesDummyClass.class/methodProperties.json b/packages/ChangesReloaded-Tests.package/CRChangesDummyClass.class/methodProperties.json index bcd47063..6f4e0211 100644 --- a/packages/ChangesReloaded-Tests.package/CRChangesDummyClass.class/methodProperties.json +++ b/packages/ChangesReloaded-Tests.package/CRChangesDummyClass.class/methodProperties.json @@ -2,4 +2,6 @@ "class" : { }, "instance" : { - "functionOrder5" : "SV 7/26/2020 13:46" } } + "functionOrder5" : "SV 7/26/2020 13:46", + "methodToRename" : "", + "methodWithRenamedMethod" : "" } } diff --git a/packages/ChangesReloaded-Tests.package/CRFakeFileStream.class/class/mockChangesFileStreamWithAllTypesOfChanges.st b/packages/ChangesReloaded-Tests.package/CRFakeFileStream.class/class/mockChangesFileStreamWithAllTypesOfChanges.st index 97842a45..90f367bd 100644 --- a/packages/ChangesReloaded-Tests.package/CRFakeFileStream.class/class/mockChangesFileStreamWithAllTypesOfChanges.st +++ b/packages/ChangesReloaded-Tests.package/CRFakeFileStream.class/class/mockChangesFileStreamWithAllTypesOfChanges.st @@ -32,6 +32,8 @@ CRChangesDummyClass organization classify: #method under: #category! CRChangesDummyClass removeSelector: #obsoleteMethod! +(RBRenameMethodRefactoring renameMethod: #methodToRename in: CRChangesDummyClass to: #renamedMethod permutation: #()) execute! + SystemOrganization addCategory: #ChangesReloadedDummyPackage1! SystemOrganization removeSystemCategory: #ChangesReloadedDummyPackage1! diff --git a/packages/ChangesReloaded-Tests.package/CRFakeFileStream.class/methodProperties.json b/packages/ChangesReloaded-Tests.package/CRFakeFileStream.class/methodProperties.json index 85568e54..e4695391 100644 --- a/packages/ChangesReloaded-Tests.package/CRFakeFileStream.class/methodProperties.json +++ b/packages/ChangesReloaded-Tests.package/CRFakeFileStream.class/methodProperties.json @@ -1,7 +1,7 @@ { "class" : { "mockChangesFileStream" : "JA 7/1/2021 13:15", - "mockChangesFileStreamWithAllTypesOfChanges" : "TS 6/30/2021 20:26" }, + "mockChangesFileStreamWithAllTypesOfChanges" : "abd 7/10/2021 12:28" }, "instance" : { "atEnd" : "gf 6/24/2020 16:22", "basicNext" : "gf 6/24/2020 16:29", diff --git a/packages/ChangesReloaded-Tests.package/CRMethodRenamedEventTest.class/README.md b/packages/ChangesReloaded-Tests.package/CRMethodRenamedEventTest.class/README.md new file mode 100644 index 00000000..e69de29b diff --git a/packages/ChangesReloaded-Tests.package/CRMethodRenamedEventTest.class/instance/newMethod.st b/packages/ChangesReloaded-Tests.package/CRMethodRenamedEventTest.class/instance/newMethod.st new file mode 100644 index 00000000..ee179318 --- /dev/null +++ b/packages/ChangesReloaded-Tests.package/CRMethodRenamedEventTest.class/instance/newMethod.st @@ -0,0 +1,4 @@ +methods +newMethod + + ^ 'renamedMethod' asSymbol \ No newline at end of file diff --git a/packages/ChangesReloaded-Tests.package/CRMethodRenamedEventTest.class/instance/oldMethod.st b/packages/ChangesReloaded-Tests.package/CRMethodRenamedEventTest.class/instance/oldMethod.st new file mode 100644 index 00000000..4310cacb --- /dev/null +++ b/packages/ChangesReloaded-Tests.package/CRMethodRenamedEventTest.class/instance/oldMethod.st @@ -0,0 +1,4 @@ +methods +oldMethod + + ^ 'methodToRename' asSymbol \ No newline at end of file diff --git a/packages/ChangesReloaded-Tests.package/CRMethodRenamedEventTest.class/instance/setUp.st b/packages/ChangesReloaded-Tests.package/CRMethodRenamedEventTest.class/instance/setUp.st new file mode 100644 index 00000000..62c549c6 --- /dev/null +++ b/packages/ChangesReloaded-Tests.package/CRMethodRenamedEventTest.class/instance/setUp.st @@ -0,0 +1,8 @@ +running +setUp + + (RBRenameMethodRefactoring + renameMethod: self oldMethod + in: CRChangesDummyClass + to: self newMethod + permutation: #()) execute \ No newline at end of file diff --git a/packages/ChangesReloaded-Tests.package/CRMethodRenamedEventTest.class/instance/tearDown.st b/packages/ChangesReloaded-Tests.package/CRMethodRenamedEventTest.class/instance/tearDown.st new file mode 100644 index 00000000..35ecf6c7 --- /dev/null +++ b/packages/ChangesReloaded-Tests.package/CRMethodRenamedEventTest.class/instance/tearDown.st @@ -0,0 +1,8 @@ +running +tearDown + + SystemChangeNotifier uniqueInstance doSilently: [(RBRenameMethodRefactoring + renameMethod: self newMethod + in: CRChangesDummyClass + to: self oldMethod + permutation: #()) execute] \ No newline at end of file diff --git a/packages/ChangesReloaded-Tests.package/CRMethodRenamedEventTest.class/instance/testLoggingOfEvent.st b/packages/ChangesReloaded-Tests.package/CRMethodRenamedEventTest.class/instance/testLoggingOfEvent.st new file mode 100644 index 00000000..ff31b149 --- /dev/null +++ b/packages/ChangesReloaded-Tests.package/CRMethodRenamedEventTest.class/instance/testLoggingOfEvent.st @@ -0,0 +1,15 @@ +testing +testLoggingOfEvent + + | changesFileCopy end lastChangeRecord | + changesFileCopy := SourceFiles second readOnlyCopy. + changesFileCopy setConverterForCode. + end := changesFileCopy size. + + lastChangeRecord := (ChangeList new + scanFile: changesFileCopy from: end - 1000 to: end; + changeList) last. + + + self assert: '(RBRenameMethodRefactoring renameMethod: #methodToRename in: CRChangesDummyClass to: #renamedMethod permutation: #()) execute' + equals: lastChangeRecord string \ No newline at end of file diff --git a/packages/ChangesReloaded-Tests.package/CRMethodRenamedEventTest.class/methodProperties.json b/packages/ChangesReloaded-Tests.package/CRMethodRenamedEventTest.class/methodProperties.json new file mode 100644 index 00000000..79de4c36 --- /dev/null +++ b/packages/ChangesReloaded-Tests.package/CRMethodRenamedEventTest.class/methodProperties.json @@ -0,0 +1,9 @@ +{ + "class" : { + }, + "instance" : { + "newMethod" : "abd 7/10/2021 13:14", + "oldMethod" : "abd 7/10/2021 13:14", + "setUp" : "abd 7/10/2021 13:13", + "tearDown" : "abd 7/10/2021 13:33", + "testLoggingOfEvent" : "abd 7/10/2021 13:32" } } diff --git a/packages/ChangesReloaded-Tests.package/CRMethodRenamedEventTest.class/properties.json b/packages/ChangesReloaded-Tests.package/CRMethodRenamedEventTest.class/properties.json new file mode 100644 index 00000000..2edfe9c8 --- /dev/null +++ b/packages/ChangesReloaded-Tests.package/CRMethodRenamedEventTest.class/properties.json @@ -0,0 +1,14 @@ +{ + "category" : "ChangesReloaded-Tests", + "classinstvars" : [ + ], + "classvars" : [ + ], + "commentStamp" : "", + "instvars" : [ + ], + "name" : "CRMethodRenamedEventTest", + "pools" : [ + ], + "super" : "TestCase", + "type" : "normal" } diff --git a/packages/ChangesReloaded-Tests.package/ExtensioRBRenameMathodRefactoring.class/README.md b/packages/ChangesReloaded-Tests.package/ExtensioRBRenameMathodRefactoring.class/README.md new file mode 100644 index 00000000..e69de29b diff --git a/packages/ChangesReloaded-Tests.package/ExtensioRBRenameMathodRefactoring.class/instance/newMethod.st b/packages/ChangesReloaded-Tests.package/ExtensioRBRenameMathodRefactoring.class/instance/newMethod.st new file mode 100644 index 00000000..ee179318 --- /dev/null +++ b/packages/ChangesReloaded-Tests.package/ExtensioRBRenameMathodRefactoring.class/instance/newMethod.st @@ -0,0 +1,4 @@ +methods +newMethod + + ^ 'renamedMethod' asSymbol \ No newline at end of file diff --git a/packages/ChangesReloaded-Tests.package/ExtensioRBRenameMathodRefactoring.class/instance/oldMethod.st b/packages/ChangesReloaded-Tests.package/ExtensioRBRenameMathodRefactoring.class/instance/oldMethod.st new file mode 100644 index 00000000..4310cacb --- /dev/null +++ b/packages/ChangesReloaded-Tests.package/ExtensioRBRenameMathodRefactoring.class/instance/oldMethod.st @@ -0,0 +1,4 @@ +methods +oldMethod + + ^ 'methodToRename' asSymbol \ No newline at end of file diff --git a/packages/ChangesReloaded-Tests.package/ExtensioRBRenameMathodRefactoring.class/instance/setUp.st b/packages/ChangesReloaded-Tests.package/ExtensioRBRenameMathodRefactoring.class/instance/setUp.st new file mode 100644 index 00000000..40031623 --- /dev/null +++ b/packages/ChangesReloaded-Tests.package/ExtensioRBRenameMathodRefactoring.class/instance/setUp.st @@ -0,0 +1,8 @@ +running +setUp + + SystemChangeNotifier uniqueInstance doSilently: [(RBRenameMethodRefactoring + renameMethod: self oldMethod + in: CRChangesDummyClass + to: self newMethod + permutation: #()) execute] \ No newline at end of file diff --git a/packages/ChangesReloaded-Tests.package/ExtensioRBRenameMathodRefactoring.class/instance/tearDown.st b/packages/ChangesReloaded-Tests.package/ExtensioRBRenameMathodRefactoring.class/instance/tearDown.st new file mode 100644 index 00000000..35ecf6c7 --- /dev/null +++ b/packages/ChangesReloaded-Tests.package/ExtensioRBRenameMathodRefactoring.class/instance/tearDown.st @@ -0,0 +1,8 @@ +running +tearDown + + SystemChangeNotifier uniqueInstance doSilently: [(RBRenameMethodRefactoring + renameMethod: self newMethod + in: CRChangesDummyClass + to: self oldMethod + permutation: #()) execute] \ No newline at end of file diff --git a/packages/ChangesReloaded-Tests.package/ExtensioRBRenameMathodRefactoring.class/instance/testMethodRenaming.st b/packages/ChangesReloaded-Tests.package/ExtensioRBRenameMathodRefactoring.class/instance/testMethodRenaming.st new file mode 100644 index 00000000..86aff4c2 --- /dev/null +++ b/packages/ChangesReloaded-Tests.package/ExtensioRBRenameMathodRefactoring.class/instance/testMethodRenaming.st @@ -0,0 +1,9 @@ +testing +testMethodRenaming + + self assert: (CRChangesDummyClass includesSelector: self oldMethod) not. + self assert: (CRChangesDummyClass includesSelector: self newMethod). + + self assert: 'methodWithRenamedMethod + self renamedMethod' + equals: (CRChangesDummyClass sourceCodeAt: #methodWithRenamedMethod). \ No newline at end of file diff --git a/packages/ChangesReloaded-Tests.package/ExtensioRBRenameMathodRefactoring.class/methodProperties.json b/packages/ChangesReloaded-Tests.package/ExtensioRBRenameMathodRefactoring.class/methodProperties.json new file mode 100644 index 00000000..533214cc --- /dev/null +++ b/packages/ChangesReloaded-Tests.package/ExtensioRBRenameMathodRefactoring.class/methodProperties.json @@ -0,0 +1,9 @@ +{ + "class" : { + }, + "instance" : { + "newMethod" : "abd 7/10/2021 13:03", + "oldMethod" : "abd 7/10/2021 13:02", + "setUp" : "abd 7/10/2021 13:19", + "tearDown" : "abd 7/10/2021 13:19", + "testMethodRenaming" : "abd 7/10/2021 13:10" } } diff --git a/packages/ChangesReloaded-Tests.package/ExtensioRBRenameMathodRefactoring.class/properties.json b/packages/ChangesReloaded-Tests.package/ExtensioRBRenameMathodRefactoring.class/properties.json new file mode 100644 index 00000000..76bd10f2 --- /dev/null +++ b/packages/ChangesReloaded-Tests.package/ExtensioRBRenameMathodRefactoring.class/properties.json @@ -0,0 +1,14 @@ +{ + "category" : "ChangesReloaded-Tests", + "classinstvars" : [ + ], + "classvars" : [ + ], + "commentStamp" : "", + "instvars" : [ + ], + "name" : "ExtensioRBRenameMathodRefactoring", + "pools" : [ + ], + "super" : "TestCase", + "type" : "normal" } From ed50f89db72c88b0958ef574a1ff38afe5e7a8e3 Mon Sep 17 00:00:00 2001 From: Abdu Date: Sat, 10 Jul 2021 14:02:29 +0200 Subject: [PATCH 14/17] Fix CI --- .../instance/testMethodRenaming.st | 2 +- .../methodProperties.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/ChangesReloaded-Tests.package/ExtensioRBRenameMathodRefactoring.class/instance/testMethodRenaming.st b/packages/ChangesReloaded-Tests.package/ExtensioRBRenameMathodRefactoring.class/instance/testMethodRenaming.st index 86aff4c2..797ec944 100644 --- a/packages/ChangesReloaded-Tests.package/ExtensioRBRenameMathodRefactoring.class/instance/testMethodRenaming.st +++ b/packages/ChangesReloaded-Tests.package/ExtensioRBRenameMathodRefactoring.class/instance/testMethodRenaming.st @@ -6,4 +6,4 @@ testMethodRenaming self assert: 'methodWithRenamedMethod self renamedMethod' - equals: (CRChangesDummyClass sourceCodeAt: #methodWithRenamedMethod). \ No newline at end of file + equals: (CRChangesDummyClass sourceCodeAt: #methodWithRenamedMethod) string. \ No newline at end of file diff --git a/packages/ChangesReloaded-Tests.package/ExtensioRBRenameMathodRefactoring.class/methodProperties.json b/packages/ChangesReloaded-Tests.package/ExtensioRBRenameMathodRefactoring.class/methodProperties.json index 533214cc..711976d3 100644 --- a/packages/ChangesReloaded-Tests.package/ExtensioRBRenameMathodRefactoring.class/methodProperties.json +++ b/packages/ChangesReloaded-Tests.package/ExtensioRBRenameMathodRefactoring.class/methodProperties.json @@ -6,4 +6,4 @@ "oldMethod" : "abd 7/10/2021 13:02", "setUp" : "abd 7/10/2021 13:19", "tearDown" : "abd 7/10/2021 13:19", - "testMethodRenaming" : "abd 7/10/2021 13:10" } } + "testMethodRenaming" : "abd 7/10/2021 14:02" } } From 7e02a0dbb7e404eb1d5f47fd9233ac64c9650ba6 Mon Sep 17 00:00:00 2001 From: Janina Adamcic Date: Tue, 13 Jul 2021 18:35:04 +0200 Subject: [PATCH 15/17] added test for CRChangeListItem priorSourceOrNil --- .../instance/specificChangeListItem3.st | 4 ++++ .../instance/testPriorSourceOrNil.st | 6 ++++++ .../CRChangeListItemTest.class/methodProperties.json | 4 +++- 3 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 packages/ChangesReloaded-Tests.package/CRChangeListItemTest.class/instance/specificChangeListItem3.st create mode 100644 packages/ChangesReloaded-Tests.package/CRChangeListItemTest.class/instance/testPriorSourceOrNil.st diff --git a/packages/ChangesReloaded-Tests.package/CRChangeListItemTest.class/instance/specificChangeListItem3.st b/packages/ChangesReloaded-Tests.package/CRChangeListItemTest.class/instance/specificChangeListItem3.st new file mode 100644 index 00000000..44702ea4 --- /dev/null +++ b/packages/ChangesReloaded-Tests.package/CRChangeListItemTest.class/instance/specificChangeListItem3.st @@ -0,0 +1,4 @@ +accessing +specificChangeListItem3 + + ^ self changeListItems at: 3 \ No newline at end of file diff --git a/packages/ChangesReloaded-Tests.package/CRChangeListItemTest.class/instance/testPriorSourceOrNil.st b/packages/ChangesReloaded-Tests.package/CRChangeListItemTest.class/instance/testPriorSourceOrNil.st new file mode 100644 index 00000000..1cd18ab4 --- /dev/null +++ b/packages/ChangesReloaded-Tests.package/CRChangeListItemTest.class/instance/testPriorSourceOrNil.st @@ -0,0 +1,6 @@ +testing +testPriorSourceOrNil + + self assert: self specificChangeListItem1 priorSourceOrNil notNil. + self assert: self specificChangeListItem2 priorSourceOrNil notNil. + self assert: self specificChangeListItem3 priorSourceOrNil isNil. \ No newline at end of file diff --git a/packages/ChangesReloaded-Tests.package/CRChangeListItemTest.class/methodProperties.json b/packages/ChangesReloaded-Tests.package/CRChangeListItemTest.class/methodProperties.json index a2d621aa..9b76dec2 100644 --- a/packages/ChangesReloaded-Tests.package/CRChangeListItemTest.class/methodProperties.json +++ b/packages/ChangesReloaded-Tests.package/CRChangeListItemTest.class/methodProperties.json @@ -12,10 +12,12 @@ "setUp" : "TS 6/30/2021 19:06", "specificChangeListItem1" : "abd 7/2/2021 19:49", "specificChangeListItem2" : "TS 6/30/2021 20:40", + "specificChangeListItem3" : "JA 7/13/2021 18:33", "testAttributes" : "TS 6/30/2021 20:22", "testCategories" : "TS 6/30/2021 20:45", "testDescriptionTextAttributes" : "TS 6/30/2021 20:45", "testDoesNotUnderstand" : "TS 6/30/2021 20:51", "testEqualityComparator" : "TS 6/30/2021 20:41", "testHash" : "TS 6/30/2021 20:41", - "testIsMethod" : "abd 7/2/2021 19:05" } } + "testIsMethod" : "abd 7/2/2021 19:05", + "testPriorSourceOrNil" : "JA 7/13/2021 18:33" } } From 7b3560911baaa26899d0dec5df7c978f908e9b6c Mon Sep 17 00:00:00 2001 From: Janina Adamcic Date: Tue, 13 Jul 2021 18:48:08 +0200 Subject: [PATCH 16/17] added another minor test --- .../instance/testPriorSourceOrNil.st | 12 ++++++++++++ .../CRBrowserTest.class/methodProperties.json | 1 + 2 files changed, 13 insertions(+) create mode 100644 packages/ChangesReloaded-Tests.package/CRBrowserTest.class/instance/testPriorSourceOrNil.st diff --git a/packages/ChangesReloaded-Tests.package/CRBrowserTest.class/instance/testPriorSourceOrNil.st b/packages/ChangesReloaded-Tests.package/CRBrowserTest.class/instance/testPriorSourceOrNil.st new file mode 100644 index 00000000..5e2c1879 --- /dev/null +++ b/packages/ChangesReloaded-Tests.package/CRBrowserTest.class/instance/testPriorSourceOrNil.st @@ -0,0 +1,12 @@ +testing-functionality +testPriorSourceOrNil + + self selectFirstChangeListItem. + self + assert: self changesBrowser priorSourceOrNil + equals: self firstMethodCodeInImage. + + self selectSecondChangeListItem. + self + assert: self changesBrowser priorSourceOrNil + equals: self firstClassCommentCodeInImage. \ No newline at end of file diff --git a/packages/ChangesReloaded-Tests.package/CRBrowserTest.class/methodProperties.json b/packages/ChangesReloaded-Tests.package/CRBrowserTest.class/methodProperties.json index b4e41c79..89924d05 100644 --- a/packages/ChangesReloaded-Tests.package/CRBrowserTest.class/methodProperties.json +++ b/packages/ChangesReloaded-Tests.package/CRBrowserTest.class/methodProperties.json @@ -38,6 +38,7 @@ "testPickAllChangeListItemsWithPrepickedItem" : "JA 7/1/2021 11:44", "testPickButtonLabel" : "JA 7/1/2021 11:45", "testPickedChangeListItems" : "JA 7/1/2021 11:52", + "testPriorSourceOrNil" : "JA 7/13/2021 18:47", "testRemoveAllChangeListItemsExcept" : "TS 6/19/2021 11:58", "testSelectedChangeListItemWhenNothingSelected" : "JA 7/1/2021 12:00", "testSwitchingBetweenViews" : "mg 7/15/2020 19:58", From 37f94fc387d03c4af70e50cf39390d33c19b5e7e Mon Sep 17 00:00:00 2001 From: Abdu Date: Wed, 14 Jul 2021 11:51:30 +0200 Subject: [PATCH 17/17] Fix last thing (permutations) --- .../class/categoryRegexAttributesList.st | 2 +- .../CRChangeListItem.class/class/stringToIntArray..st | 4 ++++ .../CRChangeListItem.class/methodProperties.json | 5 +++-- .../CRMethodRenamedEvent.class/instance/logString.st | 4 ++-- .../CRMethodRenamedEvent.class/methodProperties.json | 2 +- .../instance/expectedAttributes.st | 2 +- .../CRChangeListItemTest.class/methodProperties.json | 2 +- .../CRFakeFileStream.class/methodProperties.json | 2 +- 8 files changed, 14 insertions(+), 9 deletions(-) create mode 100644 packages/ChangesReloaded-Core.package/CRChangeListItem.class/class/stringToIntArray..st diff --git a/packages/ChangesReloaded-Core.package/CRChangeListItem.class/class/categoryRegexAttributesList.st b/packages/ChangesReloaded-Core.package/CRChangeListItem.class/class/categoryRegexAttributesList.st index 97955088..0c1b66e7 100644 --- a/packages/ChangesReloaded-Core.package/CRChangeListItem.class/class/categoryRegexAttributesList.st +++ b/packages/ChangesReloaded-Core.package/CRChangeListItem.class/class/categoryRegexAttributesList.st @@ -13,7 +13,7 @@ categoryRegexAttributesList {#methodRecategorized. '^([^ ]+) (class )?organization classify\: #(.+) under\: #(.+)$'. [:m | {#method -> (m subexpression: 4). #category -> (m subexpression: 5) } as: Dictionary]}. {#methodRemoved. '^([^ ]+) (class )?removeSelector\: #([^ ]+)$'. [:m | {#method -> (m subexpression: 4). #class -> (m subexpression: 2) } as: Dictionary]}. - {#methodRenamed. '^\(RBRenameMethodRefactoring renameMethod\: #([^ ]+) in\: ([^ ]+) to\: #([^ ]+) permutation\: #\(\)\) execute$'. [:m | {#class -> (m subexpression: 3). #oldMethod -> (m subexpression: 2). #newMethod -> (m subexpression: 4)} as: Dictionary]}. + {#methodRenamed. '^\(RBRenameMethodRefactoring renameMethod\: #([^ ]+) in\: ([^ ]+) to\: #([^ ]+) permutation\: #\(([^\)]*)\)\) execute$'. [:m | {#class -> (m subexpression: 3). #oldMethod -> (m subexpression: 2). #newMethod -> (m subexpression: 4). #permutation -> (self stringToIntArray: (m subexpression: 5))} as: Dictionary]}. {#packageCreated. '^SystemOrganization addCategory\: #(.+)$'. [:m | {#package -> (m subexpression: 2)} as: Dictionary]}. {#packageRemoved. '^SystemOrganization removeSystemCategory\: #(.+)$'. [:m | {#package -> (m subexpression: 2)} as: Dictionary]}. diff --git a/packages/ChangesReloaded-Core.package/CRChangeListItem.class/class/stringToIntArray..st b/packages/ChangesReloaded-Core.package/CRChangeListItem.class/class/stringToIntArray..st new file mode 100644 index 00000000..7324a8a5 --- /dev/null +++ b/packages/ChangesReloaded-Core.package/CRChangeListItem.class/class/stringToIntArray..st @@ -0,0 +1,4 @@ +categories & attributes +stringToIntArray: aString + + ^ ((aString findBetweenSubStrs: ' ') collect: [:each | each asInteger]) asArray \ No newline at end of file diff --git a/packages/ChangesReloaded-Core.package/CRChangeListItem.class/methodProperties.json b/packages/ChangesReloaded-Core.package/CRChangeListItem.class/methodProperties.json index 854013c6..1bdf812d 100644 --- a/packages/ChangesReloaded-Core.package/CRChangeListItem.class/methodProperties.json +++ b/packages/ChangesReloaded-Core.package/CRChangeListItem.class/methodProperties.json @@ -1,13 +1,14 @@ { "class" : { "categoryAndAttributesFor:" : "abd 6/27/2021 20:01", - "categoryRegexAttributesList" : "abd 7/6/2021 20:17", + "categoryRegexAttributesList" : "abd 7/14/2021 11:43", "classCommentCategoryAndAttributesFor:" : "abd 7/2/2021 23:45", "doItCategoryAndAttributesFor:" : "abd 7/3/2021 21:40", "if:matches:do:" : "abd 6/27/2021 20:01", "methodCategoryAndAttributesFor:" : "abd 7/2/2021 23:45", "newWith:" : "abd 6/27/2021 20:00", - "setCategoryAndAttributesOf:" : "abd 6/27/2021 20:00" }, + "setCategoryAndAttributesOf:" : "abd 6/27/2021 20:00", + "stringToIntArray:" : "abd 7/14/2021 11:47" }, "instance" : { "=" : "abd 7/2/2021 19:32", "attributes" : "abd 6/20/2021 12:57", diff --git a/packages/ChangesReloaded-Core.package/CRMethodRenamedEvent.class/instance/logString.st b/packages/ChangesReloaded-Core.package/CRMethodRenamedEvent.class/instance/logString.st index 3668bad0..cc766a1d 100644 --- a/packages/ChangesReloaded-Core.package/CRMethodRenamedEvent.class/instance/logString.st +++ b/packages/ChangesReloaded-Core.package/CRMethodRenamedEvent.class/instance/logString.st @@ -1,5 +1,5 @@ triggering logString - ^ '(RBRenameMethodRefactoring renameMethod: #{1} in: {2} to: #{3} permutation: {4}) execute' - format: {self oldName. self item. self newName. self permutation} \ No newline at end of file + ^ '(RBRenameMethodRefactoring renameMethod: #{1} in: {2} to: #{3} permutation: #({4})) execute' + format: {self oldName. self item. self newName. self permutation joinSeparatedBy: ' '} \ No newline at end of file diff --git a/packages/ChangesReloaded-Core.package/CRMethodRenamedEvent.class/methodProperties.json b/packages/ChangesReloaded-Core.package/CRMethodRenamedEvent.class/methodProperties.json index fc2cd28a..0eb01586 100644 --- a/packages/ChangesReloaded-Core.package/CRMethodRenamedEvent.class/methodProperties.json +++ b/packages/ChangesReloaded-Core.package/CRMethodRenamedEvent.class/methodProperties.json @@ -2,7 +2,7 @@ "class" : { "class:oldName:newName:permutation:" : "abd 7/6/2021 00:34" }, "instance" : { - "logString" : "abd 7/6/2021 19:41", + "logString" : "abd 7/14/2021 11:23", "permutation" : "", "permutation:" : "", "trigger:" : "abd 7/6/2021 00:38" } } diff --git a/packages/ChangesReloaded-Tests.package/CRChangeListItemTest.class/instance/expectedAttributes.st b/packages/ChangesReloaded-Tests.package/CRChangeListItemTest.class/instance/expectedAttributes.st index da6a3d59..d028a5cd 100644 --- a/packages/ChangesReloaded-Tests.package/CRChangeListItemTest.class/instance/expectedAttributes.st +++ b/packages/ChangesReloaded-Tests.package/CRChangeListItemTest.class/instance/expectedAttributes.st @@ -13,7 +13,7 @@ expectedAttributes {#newClass->'CRChangesDummyNewClass'. #oldClass->'CRChangesDummyOldClass'} as: Dictionary. {#category->'category'. #method->'method'} as: Dictionary. {#class->'CRChangesDummyClass'. #method->'obsoleteMethod'} as: Dictionary. - {#class->'CRChangesDummyClass'. #oldMethod->'methodToRename'. #newMethod->'renamedMethod'} as: Dictionary. + {#class->'CRChangesDummyClass'. #oldMethod->'methodToRename'. #newMethod->'renamedMethod'. #permutation->#()} as: Dictionary. {#package->'ChangesReloadedDummyPackage1'} as: Dictionary. {#package->'ChangesReloadedDummyPackage1'} as: Dictionary. {#newPackage->'ChangesReloadedDummyPackage2'. #oldPackage->'ChangesReloadedDummyPackage1'} as: Dictionary diff --git a/packages/ChangesReloaded-Tests.package/CRChangeListItemTest.class/methodProperties.json b/packages/ChangesReloaded-Tests.package/CRChangeListItemTest.class/methodProperties.json index a2d621aa..6a0ce945 100644 --- a/packages/ChangesReloaded-Tests.package/CRChangeListItemTest.class/methodProperties.json +++ b/packages/ChangesReloaded-Tests.package/CRChangeListItemTest.class/methodProperties.json @@ -6,7 +6,7 @@ "assertCorrectUnpickedListItemDecriptionAttributes:" : "abd 6/17/2021 12:42", "changeListItems" : "TS 6/30/2021 18:51", "changeListItems:" : "TS 6/30/2021 18:51", - "expectedAttributes" : "abd 7/10/2021 12:30", + "expectedAttributes" : "abd 7/14/2021 11:46", "expectedCategories" : "abd 7/10/2021 12:27", "getMethodChangeListItemWithDifferentObjectIdentity" : "abd 6/27/2021 20:02", "setUp" : "TS 6/30/2021 19:06", diff --git a/packages/ChangesReloaded-Tests.package/CRFakeFileStream.class/methodProperties.json b/packages/ChangesReloaded-Tests.package/CRFakeFileStream.class/methodProperties.json index e4695391..26729e3b 100644 --- a/packages/ChangesReloaded-Tests.package/CRFakeFileStream.class/methodProperties.json +++ b/packages/ChangesReloaded-Tests.package/CRFakeFileStream.class/methodProperties.json @@ -1,7 +1,7 @@ { "class" : { "mockChangesFileStream" : "JA 7/1/2021 13:15", - "mockChangesFileStreamWithAllTypesOfChanges" : "abd 7/10/2021 12:28" }, + "mockChangesFileStreamWithAllTypesOfChanges" : "abd 7/14/2021 11:45" }, "instance" : { "atEnd" : "gf 6/24/2020 16:22", "basicNext" : "gf 6/24/2020 16:29",