diff --git a/ConfigurationOfTxText.package/ConfigurationOfTxText.class/instance/versions/version2122_.st b/ConfigurationOfTxText.package/ConfigurationOfTxText.class/instance/versions/version2122_.st new file mode 100644 index 0000000000..effc8d45df --- /dev/null +++ b/ConfigurationOfTxText.package/ConfigurationOfTxText.class/instance/versions/version2122_.st @@ -0,0 +1,16 @@ +version2122: spec + + + spec for: #'common' do: [ + spec blessing: #'stable'. + spec description: '16122 TextLink positions are wrong +16121 TxTextStyler can not process RBSelfNode'. + spec author: 'MarcusDenker'. + spec timestamp: '10/8/2015 15:03'. + spec + package: 'TxText-Model' with: 'TxText-Model-SeanDeNigris.61'; + package: 'TxTextTests-Model' with: 'TxTextTests-Model-SeanDeNigris.29'; + package: 'TxText-Athens' with: 'TxText-Athens-GuillermoPolito.53'; + package: 'TxText-AthensTests' with: 'TxText-AthensTests-SeanDeNigris.10'; + package: 'TxText-Styler' with: 'TxText-Styler-MarcusDenker.17'; + package: 'Tool-TxWorkspace' with: 'Tool-TxWorkspace-NicolaiHess.7'. ]. diff --git a/NautilusRefactoring.package/NautilusRefactoring.class/instance/private/performRefactoringFor_withArguments_.st b/NautilusRefactoring.package/NautilusRefactoring.class/instance/private/performRefactoringFor_withArguments_.st new file mode 100644 index 0000000000..8ad88017e4 --- /dev/null +++ b/NautilusRefactoring.package/NautilusRefactoring.class/instance/private/performRefactoringFor_withArguments_.st @@ -0,0 +1,4 @@ +performRefactoringFor: aSymbol withArguments: anArray + [ self performRefactoring: (self perform: aSymbol withArguments: anArray) ] + on: RefactoringAborted + do: [ :ex | self inform: 'Refactoring aborted' ] \ No newline at end of file diff --git a/NautilusRefactoring.package/NautilusRefactoring.class/instance/source/renameTemporaryNamed_Between_from_.st b/NautilusRefactoring.package/NautilusRefactoring.class/instance/source/renameTemporaryNamed_Between_from_.st index 5fa0f2eee4..28ba1b1e49 100644 --- a/NautilusRefactoring.package/NautilusRefactoring.class/instance/source/renameTemporaryNamed_Between_from_.st +++ b/NautilusRefactoring.package/NautilusRefactoring.class/instance/source/renameTemporaryNamed_Between_from_.st @@ -1,5 +1,3 @@ renameTemporaryNamed: oldname Between: anInterval from: aMethod - | refactoring | aMethod ifNil: [ ^ self ]. - refactoring := self privateRenameTemporaryNamed: oldname Between: anInterval from: aMethod. - self performRefactoring: refactoring \ No newline at end of file + self performRefactoringFor: #privateRenameTemporaryNamed:Between:from: withArguments: {oldname. anInterval. aMethod}. \ No newline at end of file diff --git a/NautilusRefactoring.package/NautilusRefactoring.class/instance/source/renameTextSelectionForMethod.st b/NautilusRefactoring.package/NautilusRefactoring.class/instance/source/renameTextSelectionForMethod.st index 8d498f70d9..1c96f7ed6e 100644 --- a/NautilusRefactoring.package/NautilusRefactoring.class/instance/source/renameTextSelectionForMethod.st +++ b/NautilusRefactoring.package/NautilusRefactoring.class/instance/source/renameTextSelectionForMethod.st @@ -1,7 +1,8 @@ renameTextSelectionForMethod - | selectedInterval method | + | selectedInterval method tempNode | method := self model selectedMethod. selectedInterval := self model selectionInterval. selectedInterval first = 1 ifTrue: [ ^ self renameMethodFor: method ]. - self renameTemporaryNamed: self model contentSelection Between: selectedInterval from: method \ No newline at end of file + tempNode := (method ast bestNodeFor: selectedInterval). + self renameTemporaryNamed: tempNode name Between: (tempNode start to: tempNode stop) from: method \ No newline at end of file diff --git a/ReleaseTests.package/ObsoleteTest.class/instance/tests/testClassObsolete.st b/ReleaseTests.package/ObsoleteTest.class/instance/tests/testClassObsolete.st index 06b306346b..a24e09c6fc 100644 --- a/ReleaseTests.package/ObsoleteTest.class/instance/tests/testClassObsolete.st +++ b/ReleaseTests.package/ObsoleteTest.class/instance/tests/testClassObsolete.st @@ -1,8 +1,7 @@ testClassObsolete | aClass obj | - self skip. Smalltalk globals at: #ClassForObsoleteTest ifPresent: [ :cls | cls removeFromSystem ]. - aClass := Object subclass: #ClassForObsoleteTest. + aClass := classFactory newClass. obj := aClass new. self deny: aClass isObsolete. self deny: aClass class isObsolete. diff --git a/ReleaseTests.package/ObsoleteTest.class/instance/tests/testFixObsoleteSharedPools.st b/ReleaseTests.package/ObsoleteTest.class/instance/tests/testFixObsoleteSharedPools.st index a70fda49fc..efbf3a07f9 100644 --- a/ReleaseTests.package/ObsoleteTest.class/instance/tests/testFixObsoleteSharedPools.st +++ b/ReleaseTests.package/ObsoleteTest.class/instance/tests/testFixObsoleteSharedPools.st @@ -1,6 +1,5 @@ testFixObsoleteSharedPools | poolClass obsoletePoolName testClass preFixObsoleteClassNames postFixObsoleteClassNames | - self skip. poolClass := classFactory newClass. "provides unique name over time via class variable counter" testClass := classFactory newSubclassOf: classFactory defaultSuperclass diff --git a/ReleaseTests.package/ObsoleteTest.class/instance/tests/testTraitObsolete.st b/ReleaseTests.package/ObsoleteTest.class/instance/tests/testTraitObsolete.st index 424efc631a..4e6f4d5952 100644 --- a/ReleaseTests.package/ObsoleteTest.class/instance/tests/testTraitObsolete.st +++ b/ReleaseTests.package/ObsoleteTest.class/instance/tests/testTraitObsolete.st @@ -1,17 +1,13 @@ testTraitObsolete | aClass obj aTrait | - self skip. Smalltalk globals at: #ClassForObsoleteTest ifPresent: [ :cls | cls removeFromSystem ]. Smalltalk globals at: #TraitForObsoleteTest ifPresent: [ :tr | tr removeFromSystem ]. - aTrait := Trait named: #TraitForObsoleteTest. - aClass := Object subclass: #ClassForObsoleteTest uses: {aTrait}. + aTrait := classFactory newTrait. + aClass := classFactory newClassUsing: aTrait. obj := aClass new. self deny: aTrait isObsolete. aTrait removeFromSystem. self assert: aTrait isObsolete. - self deny: aClass isObsolete. - - Smalltalk globals at: #ClassForObsoleteTest ifPresent: [ :cls | cls removeFromSystem ]. - Smalltalk globals at: #TraitForObsoleteTest ifPresent: [ :tr | tr removeFromSystem ]. + self deny: aClass isObsolete diff --git a/ScriptLoader50.package/ScriptLoader.class/instance/pharo - scripts/script50580.st b/ScriptLoader50.package/ScriptLoader.class/instance/pharo - scripts/script50581.st similarity index 98% rename from ScriptLoader50.package/ScriptLoader.class/instance/pharo - scripts/script50580.st rename to ScriptLoader50.package/ScriptLoader.class/instance/pharo - scripts/script50581.st index 7dd03260b0..15e3127b0e 100644 --- a/ScriptLoader50.package/ScriptLoader.class/instance/pharo - scripts/script50580.st +++ b/ScriptLoader50.package/ScriptLoader.class/instance/pharo - scripts/script50581.st @@ -1,4 +1,4 @@ -script50580 +script50581 ^ 'AST-Core-TheIntegrator.399.mcz AST-FFI-Pharo50Compatibility-EstebanLorenzano.1.mcz @@ -223,7 +223,7 @@ Nautilus-GroupManagerUI-TheIntegrator.30.mcz Nautilus-Tests-TheIntegrator.31.mcz NautilusCommon-TheIntegrator.304.mcz NautilusGroupAutoBuilder-TheIntegrator.8.mcz -NautilusRefactoring-TheIntegrator.264.mcz +NautilusRefactoring-TheIntegrator.266.mcz Network-Kernel-TheIntegrator.123.mcz Network-MIME-MarcusDenker.69.mcz Network-Mail-TheIntegrator.45.mcz @@ -271,7 +271,7 @@ Reflectivity-Tools-Tests-TheIntegrator.8.mcz Regex-Core-TheIntegrator.38.mcz Regex-Help-MarcusDenker.5.mcz Regex-Tests-Core-MarcusDenker.9.mcz -ReleaseTests-TheIntegrator.23.mcz +ReleaseTests-TheIntegrator.25.mcz Renraku-YuriyTymchuk.103.mcz Renraku-Test-YuriyTymchuk.19.mcz Ring-Core-Containers-TheIntegrator.43.mcz @@ -281,7 +281,7 @@ Ring-Tests-Containers-MarcusDenker.18.mcz Ring-Tests-Kernel-TheIntegrator.90.mcz Ring-Tests-Monticello-MarcusDenker.19.mcz RingChunkImporter-TheIntegrator.4.mcz -Rubric-TheIntegrator.333.mcz +Rubric-NicolaiHess.335.mcz STON-Core-SvenVanCaekenberghe.58.mcz STON-Tests-SvenVanCaekenberghe.53.mcz SUnit-Core-TheIntegrator.163.mcz @@ -311,7 +311,7 @@ Spec-Layout-TheIntegrator.69.mcz Spec-MorphicAdapters-TheIntegrator.254.mcz Spec-PolyWidgets-TheIntegrator.64.mcz Spec-Tests-TheIntegrator.58.mcz -Spec-Tools-TheIntegrator.317.mcz +Spec-Tools-TheIntegrator.320.mcz StartupPreferences-EstebanLorenzano.147.mcz System-Announcements-TheIntegrator.108.mcz System-BasicCommandLineHandler-EstebanLorenzano.13.mcz diff --git a/ScriptLoader50.package/ScriptLoader.class/instance/pharo - updates/update50580.st b/ScriptLoader50.package/ScriptLoader.class/instance/pharo - updates/update50580.st deleted file mode 100644 index b602808fcb..0000000000 --- a/ScriptLoader50.package/ScriptLoader.class/instance/pharo - updates/update50580.st +++ /dev/null @@ -1,12 +0,0 @@ -update50580 - "self new update50580" - self withUpdateLog: '17113 Context menu in SyntaxErrorDebugger broken - https://pharo.fogbugz.com/f/cases/17113 - -17558 Update Rubric: In Linux some shortcuts use alt, some others ctrl - https://pharo.fogbugz.com/f/cases/17558 - -17561 Add a release test to test the presence of critical classes in startup list - https://pharo.fogbugz.com/f/cases/17561'. - self loadTogether: self script50580 merge: false. - self loadConfiguration: 'Rubric' version: '2.7'.self flushCaches. diff --git a/ScriptLoader50.package/ScriptLoader.class/instance/pharo - updates/update50581.st b/ScriptLoader50.package/ScriptLoader.class/instance/pharo - updates/update50581.st new file mode 100644 index 0000000000..fce856d3a8 --- /dev/null +++ b/ScriptLoader50.package/ScriptLoader.class/instance/pharo - updates/update50581.st @@ -0,0 +1,15 @@ +update50581 + "self new update50581" + self withUpdateLog: '14165 ObsoleteTest>>#testFixObsoleteSharedPools + https://pharo.fogbugz.com/f/cases/14165 + +16428 cmd+r (rename temporary) does not works all the time + https://pharo.fogbugz.com/f/cases/16428 + +17556 Update TxText: In Linux some shortcuts use alt, some others ctrl + https://pharo.fogbugz.com/f/cases/17556 + +17330 Push up method refactoring triggers debuggers + https://pharo.fogbugz.com/f/cases/17330'. + self loadTogether: self script50581 merge: false. + self loadConfiguration: 'TxText' version: '2.12.2'.self flushCaches. diff --git a/ScriptLoader50.package/ScriptLoader.class/instance/public/commentForCurrentUpdate.st b/ScriptLoader50.package/ScriptLoader.class/instance/public/commentForCurrentUpdate.st index e1f31ab753..a70c5e5bba 100644 --- a/ScriptLoader50.package/ScriptLoader.class/instance/public/commentForCurrentUpdate.st +++ b/ScriptLoader50.package/ScriptLoader.class/instance/public/commentForCurrentUpdate.st @@ -1,9 +1,12 @@ commentForCurrentUpdate - ^ '17113 Context menu in SyntaxErrorDebugger broken - https://pharo.fogbugz.com/f/cases/17113 + ^ '14165 ObsoleteTest>>#testFixObsoleteSharedPools + https://pharo.fogbugz.com/f/cases/14165 -17558 Update Rubric: In Linux some shortcuts use alt, some others ctrl - https://pharo.fogbugz.com/f/cases/17558 +16428 cmd+r (rename temporary) does not works all the time + https://pharo.fogbugz.com/f/cases/16428 -17561 Add a release test to test the presence of critical classes in startup list - https://pharo.fogbugz.com/f/cases/17561' \ No newline at end of file +17556 Update TxText: In Linux some shortcuts use alt, some others ctrl + https://pharo.fogbugz.com/f/cases/17556 + +17330 Push up method refactoring triggers debuggers + https://pharo.fogbugz.com/f/cases/17330' \ No newline at end of file diff --git a/Spec-Tools.package/MessageBrowser.class/instance/private/intervalOf_inCode_of_.st b/Spec-Tools.package/MessageBrowser.class/instance/private/intervalOf_inCode_of_.st index 31040d73c2..368f5e097d 100644 --- a/Spec-Tools.package/MessageBrowser.class/instance/private/intervalOf_inCode_of_.st +++ b/Spec-Tools.package/MessageBrowser.class/instance/private/intervalOf_inCode_of_.st @@ -1,2 +1,3 @@ intervalOf: aSelector inCode: aText of: aMethod + aMethod compiledMethod ifNil: [ ^ 0 to: 0 ]. ^ (self sourceIntervalOf: aSelector in: aMethod ast) ifEmpty: [ self searchedString: aSelector asString in: aText ] \ No newline at end of file diff --git a/TxText-Athens.package/TxTextEditorMorph.class/class/keybindings/buildTextEditorKeymapsOn_.st b/TxText-Athens.package/TxTextEditorMorph.class/class/keybindings/buildTextEditorKeymapsOn_.st index cab71bd354..4d8c7a096e 100644 --- a/TxText-Athens.package/TxTextEditorMorph.class/class/keybindings/buildTextEditorKeymapsOn_.st +++ b/TxText-Athens.package/TxTextEditorMorph.class/class/keybindings/buildTextEditorKeymapsOn_.st @@ -16,15 +16,15 @@ buildTextEditorKeymapsOn: aBuilder Character backspace. #handleBackspaceKey. Character pageDown. #movePageDown. Character pageUp. #movePageUp. - $z command. #undo. + $z meta. #undo. Character arrowRight shift. #extendSelectionRight. Character arrowLeft shift. #extendSelectionLeft. Character arrowUp shift. #extendSelectionUp. Character arrowDown shift. #extendSelectionDown. - $v command. #pasteClipboard. - $c command. #copyToClipboard. - $x command. #cutToClipboard. - $a command. #selectAll. + $v meta. #pasteClipboard. + $c meta. #copyToClipboard. + $x meta. #cutToClipboard. + $a meta. #selectAll. } pairsDo: [ :key :action | (aBuilder shortcut: action )