Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Jenkins Build Server
authored and
ci
committed
Feb 2, 2013
1 parent
6dfa753
commit b83bda6
Showing
18 changed files
with
341 additions
and
71 deletions.
There are no files selected for viewing
5 changes: 5 additions & 0 deletions
5
Monticello.package/MCMethodDefinition.class/class/flushMethodCache.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| class initialization | ||
| flushMethodCache | ||
| "We do not named this method flushCache because it would override an important class methods." | ||
|
|
||
| Definitions := nil. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| class initialization | ||
| shutDown | ||
| "Free up all cached monticello method definitions" | ||
| Definitions := nil. | ||
| self flushMethodCache |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 3 additions & 0 deletions
3
MonticelloGUI.package/MCSnapshotBrowser.class/instance/hasExtensions.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| accessing | ||
| hasExtensions | ||
| ^self extensionClassNames notEmpty |
3 changes: 3 additions & 0 deletions
3
MonticelloGUI.package/MCSnapshotBrowser.class/instance/packageOrganizations.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| listing | ||
| packageOrganizations | ||
| ^ items select: [:ea | ea isOrganizationDefinition] |
6 changes: 4 additions & 2 deletions
6
MonticelloGUI.package/MCSnapshotBrowser.class/instance/visibleCategories.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,6 @@ | ||
| listing | ||
| visibleCategories | ||
| ^ (self packageClasses collect: [:ea | ea category]) | ||
| asSet asSortedCollection add: self extensionsCategory; yourself. | ||
| ^ ((self packageOrganizations gather: [:ea | ea categories]), | ||
| (self packageClasses collect: [:ea | ea category]), | ||
| (self hasExtensions ifTrue: [{self extensionsCategory}] ifFalse: [#()])) | ||
| asSet asSortedCollection |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
86 changes: 38 additions & 48 deletions
86
Morphic.package/Paragraph.class/instance/buildSelectionBlocksFrom.to..st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,63 +1,53 @@ | ||
| selection | ||
| buildSelectionBlocksFrom: topLeft to: bottomRight | ||
| buildSelectionBlocksFrom: topLeft to: bottomRight | ||
| | viewedString primary topLeftBlk bottomRightBlk findReplaceIntervals secondarySelectionIntervals startIdx stopIdx | | ||
| Display depth = 1 | ||
| ifTrue: [^ self]. | ||
| ifTrue: [ ^ self ]. | ||
| Display depth = 2 | ||
| ifTrue: [^ self]. | ||
| ifTrue: [ ^ self ]. | ||
| primary := selectionStart notNil | ||
| ifTrue: [selectionStart stringIndex to: selectionStop stringIndex - 1] | ||
| ifFalse: [0 to: -1]. | ||
| ifTrue: [ selectionStart stringIndex to: selectionStop stringIndex - 1 ] | ||
| ifFalse: [ 0 to: -1 ]. | ||
| topLeftBlk := self characterBlockAtPoint: topLeft. | ||
| bottomRightBlk := self characterBlockAtPoint: bottomRight. | ||
| startIdx := topLeftBlk stringIndex. | ||
| stopIdx := bottomRightBlk stringIndex. | ||
| viewedString := (self text copyFrom: startIdx to: stopIdx) asString. | ||
| self theme currentSettings haveSecondarySelectionTextColor | ||
| ifTrue: [self text removeAttribute: TextSelectionColor secondarySelection]. | ||
| self theme currentSettings haveFindReplaceSelectionTextColor | ||
| ifTrue: [self text removeAttribute: TextSelectionColor findReplaceSelection]. | ||
| ifTrue: [ self text removeAttribute: TextSelectionColor secondarySelection ]. | ||
| self theme currentSettings haveFindReplaceSelectionTextColor | ||
| ifTrue: [ self text removeAttribute: TextSelectionColor findReplaceSelection ]. | ||
| findReplaceIntervals := #(). | ||
| extraSelectionBlocks := Array | ||
| streamContents: [:strm | | ||
| findReplaceSelectionRegex | ||
| ifNotNil: [findReplaceIntervals := findReplaceSelectionRegex matchingRangesIn: viewedString. | ||
| findReplaceIntervals := (findReplaceIntervals | ||
| collect: [:r | r + topLeftBlk stringIndex - 1]) | ||
| reject: [:r | primary size > 0 | ||
| and: [(r includes: primary first) | ||
| or: [primary includes: r first]]]. | ||
| findReplaceIntervals | ||
| do: [:r | | ||
| self theme currentSettings haveFindReplaceSelectionTextColor | ||
| ifTrue: [ | ||
| self text | ||
| addAttribute: TextSelectionColor findReplaceSelection | ||
| from: r first | ||
| to: r last]. | ||
| strm | ||
| nextPut: (ParagraphSelectionBlock | ||
| first: (self characterBlockForIndex: r first) | ||
| last: (self characterBlockForIndex: r last + 1) | ||
| color: self findReplaceSelectionColor)]]. | ||
| secondarySelection | ||
| ifNotNil: [secondarySelectionIntervals := viewedString allRangesOfSubString: secondarySelection. | ||
| secondarySelectionIntervals := (secondarySelectionIntervals | ||
| collect: [:r | r + topLeftBlk stringIndex - 1]) | ||
| reject: [:i | (findReplaceIntervals includes: i) | ||
| or: [i = primary]]. | ||
| secondarySelectionIntervals | ||
| do: [:r | | ||
| self theme currentSettings haveSecondarySelectionTextColor | ||
| ifTrue: [ | ||
| self text | ||
| addAttribute: TextSelectionColor secondarySelection | ||
| from: r first | ||
| to: r last]. | ||
| strm | ||
| nextPut: (ParagraphSelectionBlock | ||
| first: (self characterBlockForIndex: r first) | ||
| last: (self characterBlockForIndex: r last + 1) | ||
| color: self secondarySelectionColor)]]]. | ||
| streamContents: [ :strm | | ||
| findReplaceSelectionRegex | ||
| ifNotNil: [ | ||
| findReplaceIntervals := findReplaceSelectionRegex matchingRangesIn: viewedString. | ||
| findReplaceIntervals := (findReplaceIntervals collect: [ :r | r + topLeftBlk stringIndex - 1 ]) | ||
| reject: [ :r | primary size > 0 and: [ (r includes: primary first) or: [ primary includes: r first ] ] ]. | ||
| findReplaceIntervals | ||
| do: [ :r | | ||
| self theme currentSettings haveFindReplaceSelectionTextColor | ||
| ifTrue: [ self text addAttribute: TextSelectionColor findReplaceSelection from: r first to: r last ]. | ||
| strm | ||
| nextPut: | ||
| (ParagraphSelectionBlock | ||
| first: (self characterBlockForIndex: r first) | ||
| last: (self characterBlockForIndex: r last + 1) | ||
| color: self findReplaceSelectionColor) ] ]. | ||
| secondarySelection | ||
| ifNotNil: [ | ||
| secondarySelectionIntervals := secondarySelection | ||
| reject: [ :i | (findReplaceIntervals includes: i) or: [ i = primary ] ]. | ||
| secondarySelectionIntervals | ||
| do: [ :r | | ||
| self theme currentSettings haveSecondarySelectionTextColor | ||
| ifTrue: [ self text addAttribute: TextSelectionColor secondarySelection from: r first to: r last ]. | ||
| strm | ||
| nextPut: | ||
| (ParagraphSelectionBlock | ||
| first: (self characterBlockForIndex: r first) | ||
| last: (self characterBlockForIndex: r last + 1) | ||
| color: self secondarySelectionColor) ] ] ]. | ||
| findReplaceSelectionRegex := nil. | ||
| secondarySelection := nil |
3 changes: 3 additions & 0 deletions
3
Morphic.package/Paragraph.class/instance/secondarySelection.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| access | ||
| secondarySelection | ||
| ^ secondarySelection |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 7 additions & 3 deletions
10
ScriptLoader20.package/ScriptLoader.class/instance/commentForCurrentUpdate.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,10 @@ | ||
| public | ||
| commentForCurrentUpdate | ||
| ^ 'Issue 7179: Fixed AsmJit extension methods | ||
| http://code.google.com/p/pharo/issues/detail?id=7179 | ||
| ^ '- Issue 7170: Open up the API for secondarySelection in editor/TextMorphForEditView. Thanks Thierry Goubier | ||
| http://code.google.com/p/pharo/issues/detail?id=7170 | ||
| ' | ||
| - Issue 7182: Extensions shown only when there are extensions | ||
| http://code.google.com/p/pharo/issues/detail?id=7182 | ||
| - improve the MCClassDefinition cache reseting protocol' |
Oops, something went wrong.