diff --git a/FileSystem-Smalltalk.package/extension/ClassOrganization/instance/fileEntriesDo_.st b/FileSystem-Smalltalk.package/extension/ClassOrganization/instance/fileEntriesDo_.st index 32e05ef502..cf1f88cfef 100644 --- a/FileSystem-Smalltalk.package/extension/ClassOrganization/instance/fileEntriesDo_.st +++ b/FileSystem-Smalltalk.package/extension/ClassOrganization/instance/fileEntriesDo_.st @@ -1,6 +1,6 @@ fileEntriesDo: aBlock self flag: 'Hardcoded extension packages :/'. - self realCategories + self categories reject: [ :name | name == Protocol nullCategory or: [ name first = $* ]] thenDo: [ :name | aBlock value: (ProtocolEntry class: self subject protocol: name)] \ No newline at end of file diff --git a/Kernel.package/ClassOrganization.class/instance/accessing/allCategories.st b/Kernel.package/ClassOrganization.class/instance/accessing/allCategories.st new file mode 100644 index 0000000000..f2235f18fe --- /dev/null +++ b/Kernel.package/ClassOrganization.class/instance/accessing/allCategories.st @@ -0,0 +1,2 @@ +allCategories + ^ self protocolOrganizer allProtocolsNames \ No newline at end of file diff --git a/Kernel.package/ClassOrganization.class/instance/accessing/allProtocols.st b/Kernel.package/ClassOrganization.class/instance/accessing/allProtocols.st new file mode 100644 index 0000000000..40d4bd83ef --- /dev/null +++ b/Kernel.package/ClassOrganization.class/instance/accessing/allProtocols.st @@ -0,0 +1,2 @@ +allProtocols + ^ self protocolOrganizer allProtocols \ No newline at end of file diff --git a/Kernel.package/ClassOrganization.class/instance/accessing/allProtocolsNames.st b/Kernel.package/ClassOrganization.class/instance/accessing/allProtocolsNames.st new file mode 100644 index 0000000000..b3f8e190f0 --- /dev/null +++ b/Kernel.package/ClassOrganization.class/instance/accessing/allProtocolsNames.st @@ -0,0 +1,2 @@ +allProtocolsNames + ^ self allProtocols collect: #name \ No newline at end of file diff --git a/Kernel.package/ClassOrganization.class/instance/accessing/categories.st b/Kernel.package/ClassOrganization.class/instance/accessing/categories.st index 5a7f092060..e0e8cffd50 100644 --- a/Kernel.package/ClassOrganization.class/instance/accessing/categories.st +++ b/Kernel.package/ClassOrganization.class/instance/accessing/categories.st @@ -1,3 +1,2 @@ categories - - ^ self protocolOrganizer allProtocolsNames \ No newline at end of file + ^ self protocolOrganizer protocolsNames \ No newline at end of file diff --git a/Kernel.package/ClassOrganization.class/instance/accessing/realCategories.st b/Kernel.package/ClassOrganization.class/instance/accessing/realCategories.st deleted file mode 100644 index 2274244071..0000000000 --- a/Kernel.package/ClassOrganization.class/instance/accessing/realCategories.st +++ /dev/null @@ -1,2 +0,0 @@ -realCategories - ^ self protocolOrganizer protocolsNames \ No newline at end of file diff --git a/KernelTests.package/ClassOrganizationTest.class/instance/tests/testRemoveCategory.st b/KernelTests.package/ClassOrganizationTest.class/instance/tests/testRemoveCategory.st index b2e1af3eb9..4d84aadbc7 100644 --- a/KernelTests.package/ClassOrganizationTest.class/instance/tests/testRemoveCategory.st +++ b/KernelTests.package/ClassOrganizationTest.class/instance/tests/testRemoveCategory.st @@ -1,7 +1,6 @@ testRemoveCategory - self assert: self organization categories size = 3. + self assert: self organization categories size = 2. self should: [ self organization removeCategory: 'one' ] raise: Error. self organization removeCategory: 'empty'. - self assert: self organization categories size = 2. - self assert: self organization categories first = AllProtocol defaultName. - self assert: self organization categories second = 'one' \ No newline at end of file + self assert: self organization categories size = 1. + self assert: self organization categories first = 'one' \ No newline at end of file diff --git a/Monticello-Tests.package/MCSnapshotBrowserTest.class/instance/private/protocolsForClass_.st b/Monticello-Tests.package/MCSnapshotBrowserTest.class/instance/private/protocolsForClass_.st index 5259feadcb..c78f0545b6 100644 --- a/Monticello-Tests.package/MCSnapshotBrowserTest.class/instance/private/protocolsForClass_.st +++ b/Monticello-Tests.package/MCSnapshotBrowserTest.class/instance/private/protocolsForClass_.st @@ -1,2 +1,2 @@ protocolsForClass: aClass - ^ aClass organization categories + ^ aClass organization allCategories diff --git a/Nautilus.package/CategoryWidget.class/instance/private/loadPackagesCategoriesInSystemEnvironmentFor_.st b/Nautilus.package/CategoryWidget.class/instance/private/loadPackagesCategoriesInSystemEnvironmentFor_.st index 6649b5b2be..69e0a488df 100644 --- a/Nautilus.package/CategoryWidget.class/instance/private/loadPackagesCategoriesInSystemEnvironmentFor_.st +++ b/Nautilus.package/CategoryWidget.class/instance/private/loadPackagesCategoriesInSystemEnvironmentFor_.st @@ -1,3 +1,5 @@ loadPackagesCategoriesInSystemEnvironmentFor: class - ^ self sortCategories: class protocols forClass: class \ No newline at end of file + ^ self + sortCategories: class organization allProtocolsNames + forClass: class \ No newline at end of file diff --git a/RPackage-Core.package/RPackage.class/instance/accessing/removeClass_.st b/RPackage-Core.package/RPackage.class/instance/accessing/removeClass_.st index cddd481222..1c10954eff 100644 --- a/RPackage-Core.package/RPackage.class/instance/accessing/removeClass_.st +++ b/RPackage-Core.package/RPackage.class/instance/accessing/removeClass_.st @@ -1,7 +1,7 @@ removeClass: aClass "Remove the class and all its methods from the receiver. If we have a protocol which looks like an extension of us, rename it to 'as yet unclassified' to avoid breaking things afterwards." - aClass organization realCategories + aClass organization categories do: [ :each | (self isYourClassExtension: each) ifTrue: [ aClass organization renameCategory: each toBe: Protocol defaultName ] ]. diff --git a/RPackage-Core.package/RPackage.class/instance/private/basicImportClass_.st b/RPackage-Core.package/RPackage.class/instance/private/basicImportClass_.st index d47cc75f70..77c90af1d0 100644 --- a/RPackage-Core.package/RPackage.class/instance/private/basicImportClass_.st +++ b/RPackage-Core.package/RPackage.class/instance/private/basicImportClass_.st @@ -7,9 +7,9 @@ basicImportClass: aClass | protocols | self addClassDefinition: aClass. - aClass organization realCategories + aClass organization categories do: [ :each | (self isYourClassExtension: each) ifTrue: [ aClass organization renameCategory: each toBe: Protocol defaultName ] ]. - protocols := aClass organization realCategories reject: [ :each | each first = $* ]. + protocols := aClass organization categories reject: [ :each | each first = $* ]. protocols do: [ :each | self importProtocol: each forClass: aClass ] \ No newline at end of file diff --git a/RPackage-Core.package/RPackage.class/instance/system compatibility/coreCategoriesForClass_.st b/RPackage-Core.package/RPackage.class/instance/system compatibility/coreCategoriesForClass_.st index e0f42f40be..4f38655a31 100644 --- a/RPackage-Core.package/RPackage.class/instance/system compatibility/coreCategoriesForClass_.st +++ b/RPackage-Core.package/RPackage.class/instance/system compatibility/coreCategoriesForClass_.st @@ -1,4 +1,5 @@ coreCategoriesForClass: aClass self flag: #stef. "only used by goferCleanUp" - ^ aClass organization realCategories reject: [ :cat | self isForeignClassExtension: cat ] \ No newline at end of file + ^ aClass organization categories + reject: [ :cat | self isForeignClassExtension: cat ] \ No newline at end of file diff --git a/RPackage-Core.package/RPackage.class/instance/system compatibility/extensionCategoriesForClass_.st b/RPackage-Core.package/RPackage.class/instance/system compatibility/extensionCategoriesForClass_.st index ff1e8f365e..7b89896450 100644 --- a/RPackage-Core.package/RPackage.class/instance/system compatibility/extensionCategoriesForClass_.st +++ b/RPackage-Core.package/RPackage.class/instance/system compatibility/extensionCategoriesForClass_.st @@ -1,3 +1,4 @@ extensionCategoriesForClass: aClass self flag: #stef. "only used by goferCleanUp and PackageEnvironment of RB" - ^ aClass organization realCategories select: [:cat | self isYourClassExtension: cat] \ No newline at end of file + ^ aClass organization categories + select: [ :cat | self isYourClassExtension: cat ] \ No newline at end of file diff --git a/Refactoring-Environment.package/RBBrowserEnvironment.class/instance/accessing/protocolsFor_.st b/Refactoring-Environment.package/RBBrowserEnvironment.class/instance/accessing/protocolsFor_.st index 60f6e47719..da3ab86dcb 100644 --- a/Refactoring-Environment.package/RBBrowserEnvironment.class/instance/accessing/protocolsFor_.st +++ b/Refactoring-Environment.package/RBBrowserEnvironment.class/instance/accessing/protocolsFor_.st @@ -1,2 +1,3 @@ protocolsFor: aClass - ^aClass organization realCategories select: [:each | self includesProtocol: each in: aClass] \ No newline at end of file + ^aClass organization categories + select: [ :each | self includesProtocol: each in: aClass ] \ No newline at end of file diff --git a/ScriptLoader50.package/ScriptLoader.class/instance/pharo - scripts/script50053.st b/ScriptLoader50.package/ScriptLoader.class/instance/pharo - scripts/script50054.st similarity index 97% rename from ScriptLoader50.package/ScriptLoader.class/instance/pharo - scripts/script50053.st rename to ScriptLoader50.package/ScriptLoader.class/instance/pharo - scripts/script50054.st index dad67a065b..c92b85a235 100644 --- a/ScriptLoader50.package/ScriptLoader.class/instance/pharo - scripts/script50053.st +++ b/ScriptLoader50.package/ScriptLoader.class/instance/pharo - scripts/script50054.st @@ -1,4 +1,4 @@ -script50053 +script50054 ^ 'AST-Core-TheIntegrator.294.mcz AST-Tests-Core-TheIntegrator.68.mcz @@ -114,8 +114,8 @@ HudsonBuildTools20-TheIntegrator.65.mcz IssueTracking-TheIntegrator.6.mcz IssueTracking-Tests-TheIntegrator.3.mcz Jobs-EstebanLorenzano.4.mcz -Kernel-TheIntegrator.2030.mcz -KernelTests-TheIntegrator.774.mcz +Kernel-TheIntegrator.2031.mcz +KernelTests-TheIntegrator.776.mcz Keymapping-Core-EstebanLorenzano.195.mcz Keymapping-KeyCombinations-TheIntegrator.48.mcz Keymapping-Pragmas-TheIntegrator.50.mcz @@ -148,7 +148,7 @@ Metacello-TestsPlatform.squeakCommon-MarcusDenker.19.mcz Metacello-ToolBox-MarcusDenker.141.mcz Metacello-Tutorial-EstebanLorenzano.27.mcz Monticello-StephaneDucasse.1018.mcz -Monticello-Tests-TheIntegrator.6.mcz +Monticello-Tests-TheIntegrator.8.mcz MonticelloConfigurations-MarcusDenker.70.mcz MonticelloFileTree-Core-TheIntegrator.182.mcz MonticelloFileTree-FileSystem-Utilities-MarcusDenker.32.mcz @@ -184,7 +184,7 @@ NativeBoost-Pools-CamilloBruni.13.mcz NativeBoost-Tests-TheIntegrator.92.mcz NativeBoost-Unix-MarcusDenker.17.mcz NativeBoost-Win32-TheIntegrator.57.mcz -Nautilus-StephaneDucasse.920.mcz +Nautilus-TheIntegrator.922.mcz Nautilus-Tests-StephaneDucasse.14.mcz NautilusCommon-TheIntegrator.260.mcz NautilusRefactoring-TheIntegrator.216.mcz @@ -212,14 +212,14 @@ PragmaCollector-TheIntegrator.3.mcz ProfStef-Core-TheIntegrator.57.mcz ProfStef-Help-SvenVanCaekenberghe.14.mcz ProfStef-Tests-TheIntegrator.25.mcz -RPackage-Core-TheIntegrator.385.mcz +RPackage-Core-TheIntegrator.387.mcz RPackage-SystemIntegration-TheIntegrator.234.mcz RPackage-Tests-StephaneDucasse.169.mcz RecentSubmissions-StephaneDucasse.233.mcz Refactoring-Changes-TheIntegrator.65.mcz Refactoring-Core-TheIntegrator.270.mcz Refactoring-Critics-TheIntegrator.173.mcz -Refactoring-Environment-TheIntegrator.52.mcz +Refactoring-Environment-TheIntegrator.54.mcz Refactoring-Tests-Changes-MarcusDenker.38.mcz Refactoring-Tests-Core-TheIntegrator.123.mcz Refactoring-Tests-Critics-TheIntegrator.31.mcz @@ -296,7 +296,7 @@ Text-Edition-TheIntegrator.83.mcz Text-Edition-Tests-EstebanLorenzano.3.mcz Text-Scanning-TheIntegrator.26.mcz Text-Tests-EstebanLorenzano.7.mcz -Tool-Base-TheIntegrator.72.mcz +Tool-Base-TheIntegrator.74.mcz Tool-Browser-Old-TheIntegrator.37.mcz Tool-Changes-TheIntegrator.22.mcz Tool-ConfigurationBrowser-TheIntegrator.17.mcz @@ -314,7 +314,7 @@ Tool-TxWorkspace-TorstenBergmann.5.mcz Tool-Workspace-TheIntegrator.24.mcz Tools-TheIntegrator.1503.mcz ToolsTest-MarcusDenker.denker.71.mcz -Traits-StephaneDucasse.763.mcz +Traits-TheIntegrator.765.mcz Transcript-StephaneDucasse.32.mcz TxText-Athens-SeanDeNigris.49.mcz TxText-AthensTests-SeanDeNigris.10.mcz diff --git a/ScriptLoader50.package/ScriptLoader.class/instance/pharo - updates/update50053.st b/ScriptLoader50.package/ScriptLoader.class/instance/pharo - updates/update50053.st deleted file mode 100644 index f7f5a3075d..0000000000 --- a/ScriptLoader50.package/ScriptLoader.class/instance/pharo - updates/update50053.st +++ /dev/null @@ -1,15 +0,0 @@ -update50053 - "self new update50053" - self withUpdateLog: '15564 Association key:value: - https://pharo.fogbugz.com/f/cases/15564 - -15549 "References an abstract class" should check method - https://pharo.fogbugz.com/f/cases/15549 - -15566 Direct dependency from CompiledMethod to the bytecode set - https://pharo.fogbugz.com/f/cases/15566 - -15523 Code Cruft Rule Only Matches One-Liners - https://pharo.fogbugz.com/f/cases/15523'. - self loadTogether: self script50053 merge: false. - self flushCaches. diff --git a/ScriptLoader50.package/ScriptLoader.class/instance/pharo - updates/update50054.st b/ScriptLoader50.package/ScriptLoader.class/instance/pharo - updates/update50054.st new file mode 100644 index 0000000000..75ea38aabb --- /dev/null +++ b/ScriptLoader50.package/ScriptLoader.class/instance/pharo - updates/update50054.st @@ -0,0 +1,11 @@ +update50054 + "self new update50054" + self withUpdateLog: '15425 Make AST based syntax coloring the default + https://pharo.fogbugz.com/f/cases/15425 + +15563 ClassOrganization>>#categories should not answer "all" category + https://pharo.fogbugz.com/f/cases/15563'. + self loadTogether: self script50054 merge: false. + +SHRBTextStyler useAstColoring: true. + self flushCaches. diff --git a/ScriptLoader50.package/ScriptLoader.class/instance/public/commentForCurrentUpdate.st b/ScriptLoader50.package/ScriptLoader.class/instance/public/commentForCurrentUpdate.st index ad825c47c2..a20d3e1d4f 100644 --- a/ScriptLoader50.package/ScriptLoader.class/instance/public/commentForCurrentUpdate.st +++ b/ScriptLoader50.package/ScriptLoader.class/instance/public/commentForCurrentUpdate.st @@ -1,12 +1,6 @@ commentForCurrentUpdate - ^ '15564 Association key:value: - https://pharo.fogbugz.com/f/cases/15564 + ^ '15425 Make AST based syntax coloring the default + https://pharo.fogbugz.com/f/cases/15425 -15549 "References an abstract class" should check method - https://pharo.fogbugz.com/f/cases/15549 - -15566 Direct dependency from CompiledMethod to the bytecode set - https://pharo.fogbugz.com/f/cases/15566 - -15523 Code Cruft Rule Only Matches One-Liners - https://pharo.fogbugz.com/f/cases/15523' \ No newline at end of file +15563 ClassOrganization>>#categories should not answer "all" category + https://pharo.fogbugz.com/f/cases/15563' \ No newline at end of file diff --git a/Tool-Base.package/AbstractTool.class/class/private/protocolSuggestionsFor_.st b/Tool-Base.package/AbstractTool.class/class/private/protocolSuggestionsFor_.st index 09836029af..ed7e558ca9 100644 --- a/Tool-Base.package/AbstractTool.class/class/private/protocolSuggestionsFor_.st +++ b/Tool-Base.package/AbstractTool.class/class/private/protocolSuggestionsFor_.st @@ -3,7 +3,7 @@ protocolSuggestionsFor: aClass | allExistingProtocols interestingProtocols reject | reject := Set new. reject - addAll: aClass organization categories; + addAll: aClass organization allCategories; add: AllProtocol defaultName; add: Protocol nullCategory; add: Protocol unclassified. diff --git a/Tool-Base.package/AbstractTool.class/instance/method/categorizeMethods_of_from_.st b/Tool-Base.package/AbstractTool.class/instance/method/categorizeMethods_of_from_.st index f4b63ca61e..5ace9971d5 100644 --- a/Tool-Base.package/AbstractTool.class/instance/method/categorizeMethods_of_from_.st +++ b/Tool-Base.package/AbstractTool.class/instance/method/categorizeMethods_of_from_.st @@ -6,7 +6,7 @@ categorizeMethods: aCollection of: aClass from: aCategory aClass ifNil: [^self]. labels := OrderedCollection new. labels - addAll: aClass organization categories copy sort; + addAll: aClass organization allCategories copy sort; add: Protocol unclassified. lines := OrderedCollection new. lines add: labels size -1. diff --git a/Traits.package/TClassDescription.class/instance/filein%2Fout/fileOutChangedMessages_on_moveSource_toFile_.st b/Traits.package/TClassDescription.class/instance/filein%2Fout/fileOutChangedMessages_on_moveSource_toFile_.st index f4dc86b448..924a904695 100644 --- a/Traits.package/TClassDescription.class/instance/filein%2Fout/fileOutChangedMessages_on_moveSource_toFile_.st +++ b/Traits.package/TClassDescription.class/instance/filein%2Fout/fileOutChangedMessages_on_moveSource_toFile_.st @@ -5,7 +5,7 @@ fileOutChangedMessages: aSet on: aFileStream moveSource: moveSource toFile: file Note when this method is called with moveSource=true, it is condensing the .changes file, and should only write a preamble for every method." | org | - (org := self organization) realCategories do: + (org := self organization) categories do: [:cat | | sels | sels := (org listAtCategoryNamed: cat) select: [:sel | aSet includes: sel]. sels do: diff --git a/Traits.package/TClassDescription.class/instance/filein%2Fout/fileOutOn_moveSource_toFile_.st b/Traits.package/TClassDescription.class/instance/filein%2Fout/fileOutOn_moveSource_toFile_.st index 025287e3d6..147bb327a0 100644 --- a/Traits.package/TClassDescription.class/instance/filein%2Fout/fileOutOn_moveSource_toFile_.st +++ b/Traits.package/TClassDescription.class/instance/filein%2Fout/fileOutOn_moveSource_toFile_.st @@ -11,7 +11,7 @@ fileOutOn: aFileStream moveSource: moveSource toFile: fileIndex numbered: fileIndex moveSource: moveSource forClass: self. - self organization realCategories do: + self organization categories do: [:heading | self fileOutCategory: heading on: aFileStream