Squeak-dev November 2015

squeak-dev@lists.squeakfoundation.org

40 participants
251 discussions

Input event monitor?
by David T. Lewis 21 Nov '15

21 Nov '15

I think that we have (or had?) a utility in the image for displaying input events as they are delivered to the image. I cannot find it in the image, can someone please remind me what it was? Thanks, Dave

2 2

The Trunk: Morphic-cmm.1052.mcz
by commits＠source.squeak.org 21 Nov '15

21 Nov '15

Chris Muller uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-cmm.1052.mcz ==================== Summary ==================== Name: Morphic-cmm.1052 Author: cmm Time: 21 November 2015, 11:23:10.034 am UUID: 984e80fd-459b-467b-b350-bff00bb77b60 Ancestors: Morphic-mt.1051 - Restore the use-case "Replace Expression With A New Expression" (e.g., fix autoEnclose). "Connect Existing Expression To A New Expression" is already present via the Command key. We need to support both of those use cases. =============== Diff against Morphic-mt.1051 =============== Item was changed: ----- Method: TextEditor>>autoEncloseFor: (in category 'typing support') ----- autoEncloseFor: typedChar "Answer whether typeChar was handled by auto-enclosure. Caller should call normalCharacter if not." | openers closers | openers := '([{'. closers := ')]}'. (closers includes: typedChar) ifTrue: [ | pos | self blinkPrevParen: typedChar. ((pos := self indexOfNextNonwhitespaceCharacter) notNil and: [ (paragraph string at: pos) = typedChar ]) ifTrue: [ self moveCursor: [ : position | position + pos - pointBlock stringIndex + 1 ] forward: true select: false. ^ true ] ifFalse: [ ^ false ] ]. + (self class autoEnclose and: [ openers includes: typedChar ]) ifTrue: + [ self + addString: (closers at: (openers indexOf: typedChar)) asString ; + insertTypeAhead ; - (openers includes: typedChar) ifTrue: [ - self - openTypeIn; - addString: typedChar asString; - addString: (closers at: (openers indexOf: typedChar)) asString ; - insertAndCloseTypeIn ; moveCursor: [ : position | position - 1 ] forward: false select: false. + ^ false ]. - ^ true ]. ^ false! Item was changed: ----- Method: TextEditor>>dispatchOnKeyboardEvent: (in category 'typing support') ----- dispatchOnKeyboardEvent: aKeyboardEvent "Carry out the action associated with this character, if any. Type-ahead is passed so some routines can flush or use it." | honorCommandKeys typedChar | typedChar := aKeyboardEvent keyCharacter. "Create a new command for separating characters. Do not create separate commands for consecutive separators." ((Character separators includes: typedChar) and: [(Character separators includes: previousKeyCharacter) not]) ifTrue: [self closeTypeIn]. previousKeyCharacter := typedChar. "Handle one-line input fields." (typedChar == Character cr and: [morph acceptOnCR]) ifTrue: [^ true]. "Clear highlight for last opened parenthesis." self clearParens. "Handle line breaks and auto indent." typedChar == Character cr ifTrue: [ aKeyboardEvent controlKeyPressed ifTrue: [^ self normalCharacter: aKeyboardEvent]. aKeyboardEvent shiftPressed ifTrue: [^ self lf: aKeyboardEvent]. aKeyboardEvent commandKeyPressed ifTrue: [^ self crlf: aKeyboardEvent]. ^ self crWithIndent: aKeyboardEvent]. "Handle indent/outdent with selected text block." typedChar == Character tab ifTrue: [ aKeyboardEvent shiftPressed ifTrue: [self outdent: aKeyboardEvent. ^ true] ifFalse: [self hasMultipleLinesSelected ifTrue: [self indent: aKeyboardEvent. ^ true]]]. honorCommandKeys := Preferences cmdKeysInText. (honorCommandKeys and: [typedChar == Character enter]) ifTrue: [^ self dispatchOnEnterWith: aKeyboardEvent]. "Special keys overwrite crtl+key combinations - at least on Windows. To resolve this conflict, assume that keys other than cursor keys aren't used together with Crtl." ((self class specialShiftCmdKeys includes: aKeyboardEvent keyValue) and: [aKeyboardEvent keyValue < 27]) ifTrue: [^ aKeyboardEvent controlKeyPressed ifTrue: [self perform: (self class shiftCmdActions at: aKeyboardEvent keyValue + 1) with: aKeyboardEvent] ifFalse: [self perform: (self class cmdActions at: aKeyboardEvent keyValue + 1) with: aKeyboardEvent]]. "backspace, and escape keys (ascii 8 and 27) are command keys" ((honorCommandKeys and: [aKeyboardEvent commandKeyPressed]) or: [self class specialShiftCmdKeys includes: aKeyboardEvent keyValue]) ifTrue: [ ^ aKeyboardEvent shiftPressed ifTrue: [self perform: (self class shiftCmdActions at: aKeyboardEvent keyValue + 1) with: aKeyboardEvent] ifFalse: [self perform: (self class cmdActions at: aKeyboardEvent keyValue + 1) with: aKeyboardEvent]]. "the control key can be used to invoke shift-cmd shortcuts" (honorCommandKeys and: [ aKeyboardEvent controlKeyPressed ]) ifTrue: [^ self perform: (self class shiftCmdActions at: aKeyboardEvent keyValue + 1) with: aKeyboardEvent]. - "Automatically enclose paired characters such as brackets." self class autoEnclose + ifTrue: + [ (self autoEncloseFor: typedChar) ifFalse: [ self normalCharacter: aKeyboardEvent ] ] + ifFalse: [ self normalCharacter: aKeyboardEvent ]. + - ifTrue: [((self hasSelection and: [self enclose: aKeyboardEvent]) - or: [self autoEncloseFor: typedChar]) - ifTrue: [^ true]]. - - self normalCharacter: aKeyboardEvent. ^ false!

1 0

The Trunk: WebClient-HTTP-cmm.4.mcz
by commits＠source.squeak.org 21 Nov '15

21 Nov '15

Chris Muller uploaded a new version of WebClient-HTTP to project The Trunk: http://source.squeak.org/trunk/WebClient-HTTP-cmm.4.mcz ==================== Summary ==================== Name: WebClient-HTTP-cmm.4 Author: cmm Time: 20 November 2015, 5:30:31.892 pm UUID: 8f2d17a2-99b0-4216-8808-5d3276f15ae0 Ancestors: WebClient-HTTP-cmm.3 Support the 'args' variable in HTTPSocket class>>#httpGet:args:user:passwd:. This fixes the in-image 'mc history' and origin functions for methods and classes. =============== Diff against WebClient-HTTP-cmm.3 =============== Item was changed: ----- Method: HTTPSocket class>>httpGet:args:user:passwd: (in category '*webclient-http') ----- httpGet: url args: args user: user passwd: passwd "Upload the contents of the stream to a file on the server. WARNING: This method will send a basic auth header proactively. This is necessary to avoid breaking MC and SqueakSource since SS does not return a 401 when accessing a private (global no access) repository." | urlString xhdrs client resp progress | + "Normalize the url and append args" - "Normalize the url" urlString := (Url absoluteFromText: url) asString. + args ifNotNil: [ + urlString := urlString, (self argString: args) + ]. "Some raw extra headers which historically have been added" xhdrs := HTTPProxyCredentials, HTTPBlabEmail. "may be empty" client := WebClient new. client username: user; password: passwd. ^[resp := client httpGet: urlString do:[:req| "HACK: Proactively send a basic auth header. See comment above." req headerAt: 'Authorization' put: 'Basic ', (user, ':', passwd) base64Encoded. "Accept anything" req addHeader: 'Accept' value: '*/*'. "Add the additional headers" (WebUtils readHeadersFrom: xhdrs readStream) do:[:assoc| req addHeader: assoc key value: assoc value]]. progress := [:total :amount| (HTTPProgress new) total: total; amount: amount; signal: 'Downloading...' ]. "Simulate old HTTPSocket return behavior" (resp code between: 200 and: 299) ifTrue:[^(RWBinaryOrTextStream with: (resp contentWithProgress: progress)) reset] ifFalse:[resp asString, resp content]. ] ensure:[client destroy]. !

1 0

Daily Commit Log
by commits＠source.squeak.org 20 Nov '15

20 Nov '15

Changes to Trunk (http://source.squeak.org/trunk.html) in the last 24 hours: http://lists.squeakfoundation.org/pipermail/packages/2015-November/009181.h… Name: Morphic-mt.1049 Ancestors: Morphic-kfr.1048 Fixes a bug with text selection and scrolling text boxes that have no soft line breaks. ============================================= http://lists.squeakfoundation.org/pipermail/packages/2015-November/009182.h… Name: Morphic-mt.1050 Ancestors: Morphic-mt.1049 Another update for indent/outdent after the suggestion from Levente and Chris. Indent only with TAB if multiple lines are selected. ============================================= http://lists.squeakfoundation.org/pipermail/packages/2015-November/009183.h… Name: Morphic-mt.1051 Ancestors: Morphic-mt.1050 Minor fix in text editor history. Do not create separate commands for consecutively typed separators. Allows for search/replace tabs with spaces (or vice versa) in-place. =============================================

1 0

Mantis Questionable Issues
by Patrick R. 20 Nov '15

20 Nov '15

Hi everyone, I have started looking at some of the open Mantis issues and commented on some which might be closed or need changes. Maybe someone could take a look at the following ones: - http://bugs.squeak.org/view.php?id=7768 - http://bugs.squeak.org/view.php?id=7796 - http://bugs.squeak.org/view.php?id=7770 - http://bugs.squeak.org/view.php?id=7774 Thanks :) Patrick -- View this message in context: http://forum.world.st/Mantis-Questionable-Issues-tp4862173.html Sent from the Squeak - Dev mailing list archive at Nabble.com.

3 2

The Inbox: TraitsTests-pre.15.mcz
by commits＠source.squeak.org 20 Nov '15

20 Nov '15

A new version of TraitsTests was added to project The Inbox: http://source.squeak.org/inbox/TraitsTests-pre.15.mcz ==================== Summary ==================== Name: TraitsTests-pre.15 Author: pre Time: 20 November 2015, 3:00:52.59 pm UUID: 3faad7d5-71f7-48d2-9ccb-4162d332c62a Ancestors: TraitsTests-nice.14 Updates the Traits tests to reflect the changes to the trait composition operator evaluation order =============== Diff against TraitsTests-nice.14 =============== Item was changed: ----- Method: ClassTraitTest>>testConflictsAliasesAndExclusions (in category 'testing') ----- testConflictsAliasesAndExclusions "conflict" self t1 classTrait compile: 'm2ClassSide: x ^99' classified: 'mycategory'. self assert: (self t1 classTrait includesLocalSelector: #m2ClassSide:). self assert: (self t5 classTrait >> #m2ClassSide:) isConflict. self assert: (self c2 class >> #m2ClassSide:) isConflict. "exclusion and alias" self assert: self t5 classSide traitComposition asString = 'T1 classTrait + T2 classTrait'. self t5 classSide uses: (self t1 classTrait @ { (#m2ClassSideAlias1: -> #m2ClassSide:) } + + (self t2 classTrait @ { (#m2ClassSideAlias2: -> #m2ClassSide:) } - { #m2ClassSide: })). - + self t2 classTrait) @ { (#m2ClassSideAlias2: -> #m2ClassSide:) } - - { #m2ClassSide: }. self deny: (self t5 classTrait >> #m2ClassSide:) isConflict. self deny: (self c2 class >> #m2ClassSide:) isConflict. self assert: (self c2 m2ClassSideAlias1: 13) = 99. self assert: (self c2 m2ClassSideAlias2: 13) = 13! Item was changed: ----- Method: PureBehaviorTest>>testChangeSuperclass (in category 'testing-applying trait composition') ----- testChangeSuperclass "self run: #testChangeSuperclass" "Test that when the superclass of a class is changed the non-local methods of the class sending super are recompiled to correctly store the new superclass." | aC2 newSuperclass | aC2 := self c2 new. "C1 is current superclass of C2" self assert: aC2 m51. self assert: self c2 superclass == self c1. self deny: (self c2 localSelectors includes: #m51). self deny: (self c2 >> #m52) == (self t5 >> #m52). "no sharing!!" + self assert: self c2 traitCompositionString = '(T5 - {#m11})'. - self assert: self c2 traitCompositionString = 'T5 - {#m11}'. self assert: self c2 selectors sort = #(bar foo m12 m13 m21 m22 m51 m52 m53). self assert: self c2 localSelectors sort = #(bar foo). "change superclass of C2 from C1 to X" newSuperclass := self createClassNamed: #X superclass: Object uses: {}. newSuperclass subclass: self c2 name uses: self c2 traitComposition instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' category: self c2 category. self assert: self c2 superclass == newSuperclass. newSuperclass compile: 'foo ^17'. self assert: aC2 m51 = 17. self deny: (self c2 localSelectors includes: #m51). self c2 compile: 'm51 ^19'. self assert: aC2 m51 = 19. self deny: (self c2 >> #m52) == (self t5 >> #m52). "no sharing!!" + self assert: self c2 traitCompositionString = '(T5 - {#m11})'. - self assert: self c2 traitCompositionString = 'T5 - {#m11}'. self assert: self c2 selectors sort = #(bar foo m12 m13 m21 m22 m51 m52 m53). self assert: self c2 localSelectors sort = #(bar foo m51). "change superclass of C2 back to C1" self c1 subclass: self c2 name uses: self c2 traitComposition instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' category: self c2 category. self assert: (aC2 m51 = 19). self assert: self c2 superclass == self c1. self assert: (self c2 localSelectors includes: #m51). self deny: (self c2 >> #m52) == (self t5 >> #m52). "no sharing!!" + self assert: self c2 traitCompositionString = '(T5 - {#m11})'. - self assert: self c2 traitCompositionString = 'T5 - {#m11}'. self assert: self c2 selectors sort = #(bar foo m12 m13 m21 m22 m51 m52 m53). self assert: self c2 localSelectors sort = #(bar foo m51). ! Item was changed: ----- Method: PureBehaviorTest>>testPropagationWhenTraitCompositionModifications (in category 'testing-applying trait composition') ----- testPropagationWhenTraitCompositionModifications "Test that the propagation mechanism works when setting new traitCompositions." self assert: self c2 methodDict size = 9. "2 + (3+(3+2))-1" "removing methods" self createTraitNamed: #T5 + uses: self t1 + (self t2 - { #m21. #m22 }). - uses: self t1 + self t2 - { #m21. #m22 }. self assert: self c2 methodDict size = 7. "adding methods" self createTraitNamed: #T2 uses: self t3. self assert: self c2 methodDict size = 10. self assert: (self c2 methodDict keys includesAllOf: #(#m31 #m32 #m33 ))! Item was changed: ----- Method: PureBehaviorTest>>testReshapeClass (in category 'testing-applying trait composition') ----- testReshapeClass "self run: #testReshapeClass" "Ensure that reshaping a class has no impact on its traits" + self assert: self c2 traitCompositionString = '(T5 - {#m11})'. - self assert: self c2 traitCompositionString = 'T5 - {#m11}'. self assert: self c2 selectors sort = #(bar foo m12 m13 m21 m22 m51 m52 m53). self assert: self c2 localSelectors sort = #(bar foo). self c2 addInstVarName: 'foobar'. + self assert: self c2 traitCompositionString = '(T5 - {#m11})'. - self assert: self c2 traitCompositionString = 'T5 - {#m11}'. self assert: self c2 selectors sort = #(bar foo m12 m13 m21 m22 m51 m52 m53). self assert: self c2 localSelectors sort = #(bar foo). self c2 removeInstVarName: 'foobar'. + self assert: self c2 traitCompositionString = '(T5 - {#m11})'. - self assert: self c2 traitCompositionString = 'T5 - {#m11}'. self assert: self c2 selectors sort = #(bar foo m12 m13 m21 m22 m51 m52 m53). self assert: self c2 localSelectors sort = #(bar foo). ! Item was changed: ----- Method: TraitCompositionTest>>testInvalidComposition (in category 'testing-basic') ----- testInvalidComposition self shouldnt: [self t1 @ { (#a -> #b) } @ { (#x -> #y) }] raise: TraitCompositionException. self shouldnt: [(self t1 + self t2) @ { (#a -> #b) } @ { (#x -> #y) }] raise: TraitCompositionException. self shouldnt: [self t1 - { #a } - { #b }] raise: TraitCompositionException. self shouldnt: [self t1 + self t2 - { #a } - { #b }] raise: TraitCompositionException. self should: [(self t1 - { #x }) @ { (#a -> #b) }] raise: TraitCompositionException. + self should: [(self t1 + (self t2 - { #x } @ { (#a -> #b) }))] - self should: [(self t1 + self t2 - { #x }) @ { (#a -> #b) }] raise: TraitCompositionException. self should: [self t1 + self t1] raise: TraitCompositionException. self should: [(self t1 + self t2) @ { (#a -> #b) } + self t1] raise: TraitCompositionException. self should: [self t1 @ { (#a -> #m11). (#a -> #m12) }] raise: TraitCompositionException. self should: [self t1 @ { (#a -> #m11). (#b -> #a) }] raise: TraitCompositionException! Item was changed: ----- Method: TraitCompositionTest>>testPrinting (in category 'testing-basic') ----- testPrinting | composition1 composition2 | + composition1 := ((self t1 - { #a } + (self t2 @ { (#z -> #c) } - { #b. #c })) + + (self t3 - { #d. #e }) + + (self t4 @ { (#x -> #a). (#y -> #b) })). + composition2 := (self t4 @ { (#x -> #a). (#y -> #b) }) + (self t1 - { #a }) + + (self t3 - { #d. #e }) + + (self t2 - { #b. #c }). - composition1 := ((self t1 - { #a } + self t2) @ { (#z -> #c) } - { #b. #c } - + self t3 - { #d. #e } - + self t4) @ { (#x -> #a). (#y -> #b) }. - composition2 := self t4 @ { (#x -> #a). (#y -> #b) } + self t1 - { #a } - + self t3 - { #d. #e } - + self t2 - { #b. #c }. self assertPrints: composition1 printString + like: '(T1 - {#a}) + ((T2 @ {#z->#c}) - {#b. #c}) + (T3 - {#d. #e}) + (T4 @ {#x->#a. #y->#b})'. - like: 'T1 - {#a} + T2 @ {#z->#c} - {#b. #c} + T3 - {#d. #e} + T4 @ {#x->#a. #y->#b}'. self assertPrints: composition2 printString + like: '(T4 @ {#x->#a. #y->#b}) + (T1 - {#a}) + (T3 - {#d. #e}) + (T2 - {#b. #c})'! - like: 'T4 @ {#x->#a. #y->#b} + T1 - {#a} + T3 - {#d. #e} + T2 - {#b. #c}'! Item was changed: ----- Method: TraitFileOutTest>>setUp (in category 'running') ----- setUp super setUp. SystemOrganization addCategory: self categoryName. td := self createTraitNamed: #TD uses: {}. td compile: 'd' classified: #cat1. tc := self createTraitNamed: #TC uses: td. tc compile: 'c' classified: #cat1. tb := self createTraitNamed: #TB uses: td. tb compile: 'b' classified: #cat1. + ta := self createTraitNamed: #TA uses: tb + ((tc @ {#cc->#c}) - {#c}). - ta := self createTraitNamed: #TA uses: tb + tc @ {#cc->#c} - {#c}. ta compile: 'a' classified: #cat1. ca := self createClassNamed: #CA superclass: Object uses: {}. ca compile: 'ca' classified: #cat1. cb := self createClassNamed: #CB superclass: ca uses: ta. cb compile: 'cb' classified: #cat1. "make the class of cb also use tc:" cb class uses: ta classTrait + tc instanceVariableNames: ''.! Item was changed: ----- Method: TraitFileOutTest>>testFileOutCategory (in category 'testing') ----- testFileOutCategory "File out whole system category, delete all classes and traits and then file them in again." "self run: #testFileOutCategory" SystemOrganization fileOutCategory: self categoryName. SystemOrganization removeSystemCategory: self categoryName. self deny: (Smalltalk globals keys includesAnyOf: #(CA CB TA TB TC TD)). self fileIn: self categoryName , '.st'.. self assert: (Smalltalk globals keys includesAllOf: #(CA CB TA TB TC TD)). ta := Smalltalk at: #TA. self assert: (ta isKindOf: Trait). + self assert: 'TB + ((TC @ {#cc->#c}) - {#c})' equals: ta traitComposition asString. - self assert: 'TB + TC @ {#cc->#c} - {#c}' equals: ta traitComposition asString. self assert: (ta methodDict keys includesAllOf: #(a b cc)). cb := Smalltalk at: #CB. self assert: (cb isKindOf: Class). self assert: 'TA' equals: cb traitComposition asString. self assert: (cb methodDict keys includesAllOf: #(cb a b cc)). "test classSide traitComposition of CB" self assert: 'TA classTrait + TC' equals: cb classSide traitComposition asString. self assert: (cb classSide methodDict keys includesAllOf: #(d c)) ! Item was changed: ----- Method: TraitFileOutTest>>testFileOutTrait (in category 'testing') ----- testFileOutTrait "fileOut trait T6, remove it from system and then file it in again" "self run: #testFileOutTrait" | fileName | self t6 compile: 'localMethod: argument ^argument'. self t6 classSide compile: 'localClassSideMethod: argument ^argument'. self t6 fileOut. fileName := self t6 asString , '.st'. self resourceClassesAndTraits remove: self t6. self t6 removeFromSystem. self fileIn: fileName. self assert: (Smalltalk includesKey: #T6). TraitsResource current t6: (Smalltalk at: #T6). self resourceClassesAndTraits add: self t6. self assert: (self t6 isKindOf: Trait). + self assert: 'T1 + (T2 @ {#m22Alias->#m22})' equals: self t6 traitComposition asString. - self assert: 'T1 + T2 @ {#m22Alias->#m22}' equals: self t6 traitComposition asString. self assert: (self t6 methodDict keys includesAllOf: #( #localMethod: #m11 #m12 #m13 #m21 #m22 #m22Alias )). self assert: 2 equals: self t6 classSide methodDict size. self assert: (self t6 classSide methodDict keys includes: #localClassSideMethod:) description: 'Missing selector #localClassSideMethod:'. self assert: (self t6 classSide methodDict keys includes: #m2ClassSide:) description: 'Missing selector #m2ClassSide:'.! Item was changed: ----- Method: TraitTest>>testPrinting (in category 'testing') ----- testPrinting self assertPrints: self t6 definition like: 'Trait named: #T6 + uses: T1 + (T2 @ {#m22Alias->#m22}) - uses: T1 + T2 @ {#m22Alias->#m22} category: ''TraitsTests-Kernel'''! Item was changed: ----- Method: TraitsResource>>setUp (in category 'as yet unclassified') ----- setUp "Please note, that most tests rely on this setup of traits and classes - and that especially the order of the definitions matters." "SetUpCount := SetUpCount + 1." dirty := false. SystemChangeNotifier uniqueInstance doSilently: [self t1: (self createTraitNamed: #T1 uses: { }). self t1 comment: 'I am the trait T1'. self t2: (self createTraitNamed: #T2 uses: { }). self t2 compile: 'm21 ^21' classified: #cat1. self t2 compile: 'm22 ^22' classified: #cat2. self t2 classSide compile: 'm2ClassSide: a ^a'. self t3: (self createTraitNamed: #T3 uses: { }). self t3 compile: 'm31 ^31' classified: #cat1. self t3 compile: 'm32 ^32' classified: #cat2. self t3 compile: 'm33 ^33' classified: #cat3. self t4: (self createTraitNamed: #T4 uses: { (self t1). (self t2) }). self t4 compile: 'm11 ^41' classified: #catX. "overrides T1>>m11" self t4 compile: 'm42 ^42' classified: #cat2. self t5: (self createTraitNamed: #T5 uses: self t1 + self t2). self t5 compile: 'm51 ^super foo' classified: #cat1. self t5 compile: 'm52 ^ self class bar' classified: #cat1. self t5 compile: 'm53 ^ self class bar' classified: #cat1. self t6: (self createTraitNamed: #T6 + uses: (self t1 + (self t2 @ { (#m22Alias -> #m22) }))). - uses: (self t1 + self t2) @ { (#m22Alias -> #m22) }). self c1: (self createClassNamed: #C1 superclass: Object uses: { }). self c1 compile: 'foo ^true' classified: #accessing. self t1 compile: 'm11 ^11' classified: #cat1. self t1 compile: 'm12 ^12' classified: #cat2. self t1 compile: 'm13 ^self m12' classified: #cat3. self c2: (self createClassNamed: #C2 superclass: self c1 uses: self t5 - { #m11 }). self c2 compile: 'foo ^false' classified: #private. self c2 compile: 'bar ^self foo' classified: #private. self setUpTrivialRequiresFixture. self setUpTwoLevelRequiresFixture. self setUpTranslatingRequiresFixture]. SystemChangeNotifier uniqueInstance notify: self ofAllSystemChangesUsing: #codeChangedEvent:!

1 0

The Inbox: Traits-pre.307.mcz
by commits＠source.squeak.org 20 Nov '15

20 Nov '15

A new version of Traits was added to project The Inbox: http://source.squeak.org/inbox/Traits-pre.307.mcz ==================== Summary ==================== Name: Traits-pre.307 Author: pre Time: 20 November 2015, 2:58:26.562 pm UUID: f0955b2d-775c-4862-85b9-5d6e616cd2e4 Ancestors: Traits-eem.306 This fixes http://bugs.squeak.org/view.php?id=7767 which is about the - and @ operator of Trait compositions ignoring brackets. This implementation uses the normal left to right evaluation order of Smalltalk to avoid confusions about the way trait composition expressions are evaluated. =============== Diff against Traits-eem.306 =============== Item was changed: ----- Method: TraitAlias>>printOn: (in category 'operations') ----- printOn: s "Answer the trait composition string (used for class definitions)" + s nextPutAll: '('. s nextPutAll: subject asString. s nextPutAll: ' @ {'. aliases do:[:assoc| s print: assoc] separatedBy:[s nextPutAll:'. ']. s nextPutAll: '}'. + s nextPutAll: ')'.! - ! Item was changed: ----- Method: TraitComposition>>- (in category 'converting') ----- - anArray - "the modifier operators #@ and #- bind stronger than +. - Thus, #@ or #- sent to a sum will only affect the most right summand" + self updateTraits: (self traitsCollect: [:aTrait | aTrait - anArray ])! - self addLast: (self removeLast - anArray)! Item was changed: ----- Method: TraitComposition>>@ (in category 'converting') ----- @ anArrayOfAssociations + + self updateTraits: (self traitsCollect: [:aTrait | aTrait @ anArrayOfAssociations ])! - "the modifier operators #@ and #- bind stronger than +. - Thus, #@ or #- sent to a sum will only affect the most right summand" - - self addLast: (self removeLast @ anArrayOfAssociations)! Item was added: + ----- Method: TraitComposition>>traitsCollect: (in category 'accessing') ----- + traitsCollect: aBlock + ^self collect: [:each| each traitsDo: aBlock]! Item was changed: ----- Method: TraitComposition>>traitsDo: (in category 'accessing') ----- traitsDo: aBlock + ^self do: [:each| each traitsDo: aBlock]! - ^self do:[:each| each traitsDo: aBlock]! Item was added: + ----- Method: TraitComposition>>updateTraits: (in category 'converting') ----- + updateTraits: aCollection + + self + removeAll; + addAll: aCollection! Item was changed: ----- Method: TraitExclusion>>printOn: (in category 'composition') ----- printOn: aStream "Answer the trait composition string (used for class definitions)" + aStream nextPutAll: '('. aStream nextPutAll: subject asString. aStream nextPutAll: ' - {'. exclusions asArray sort do:[:exc| aStream store: exc] separatedBy:[aStream nextPutAll: '. ']. + aStream nextPutAll: '}'. + aStream nextPutAll: ')'.! - aStream nextPutAll: '}'.!

1 0

The Trunk: Morphic-mt.1051.mcz
by commits＠source.squeak.org 20 Nov '15

20 Nov '15

Marcel Taeumel uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-mt.1051.mcz ==================== Summary ==================== Name: Morphic-mt.1051 Author: mt Time: 20 November 2015, 2:29:13.339 pm UUID: ccdb7ba4-414d-4c5b-ac18-6b858c14b3ea Ancestors: Morphic-mt.1050 Minor fix in text editor history. Do not create separate commands for consecutively typed separators. Allows for search/replace tabs with spaces (or vice versa) in-place. =============== Diff against Morphic-mt.1050 =============== Item was changed: Editor subclass: #TextEditor + instanceVariableNames: 'model paragraph markBlock pointBlock beginTypeInIndex emphasisHere lastParenLocation otherInterval oldInterval typeAhead history previousKeyCharacter' - instanceVariableNames: 'model paragraph markBlock pointBlock beginTypeInIndex emphasisHere lastParenLocation otherInterval oldInterval typeAhead history' classVariableNames: 'AutoEnclose AutoIndent ChangeText FindText' poolDictionaries: '' category: 'Morphic-Text Support'! TextEditor class instanceVariableNames: 'cmdActions shiftCmdActions yellowButtonMenu shiftedYellowButtonMenu'! !TextEditor commentStamp: '<historical>' prior: 0! See comment in Editor. My instances edit Text, this is, they support multiple lines and TextAttributes. They have no specific facilities for editing Smalltalk code. Those are found in SmalltalkEditor.! TextEditor class instanceVariableNames: 'cmdActions shiftCmdActions yellowButtonMenu shiftedYellowButtonMenu'! Item was changed: ----- Method: TextEditor>>dispatchOnKeyboardEvent: (in category 'typing support') ----- dispatchOnKeyboardEvent: aKeyboardEvent "Carry out the action associated with this character, if any. Type-ahead is passed so some routines can flush or use it." | honorCommandKeys typedChar | typedChar := aKeyboardEvent keyCharacter. + "Create a new command for separating characters. Do not create separate commands for consecutive separators." + ((Character separators includes: typedChar) + and: [(Character separators includes: previousKeyCharacter) not]) + ifTrue: [self closeTypeIn]. + previousKeyCharacter := typedChar. - "Create a new command for separating characters." - (Character separators includes: typedChar) - ifTrue: [self closeTypeIn]. "Handle one-line input fields." (typedChar == Character cr and: [morph acceptOnCR]) ifTrue: [^ true]. "Clear highlight for last opened parenthesis." self clearParens. "Handle line breaks and auto indent." typedChar == Character cr ifTrue: [ aKeyboardEvent controlKeyPressed ifTrue: [^ self normalCharacter: aKeyboardEvent]. aKeyboardEvent shiftPressed ifTrue: [^ self lf: aKeyboardEvent]. aKeyboardEvent commandKeyPressed ifTrue: [^ self crlf: aKeyboardEvent]. ^ self crWithIndent: aKeyboardEvent]. "Handle indent/outdent with selected text block." typedChar == Character tab ifTrue: [ aKeyboardEvent shiftPressed ifTrue: [self outdent: aKeyboardEvent. ^ true] ifFalse: [self hasMultipleLinesSelected ifTrue: [self indent: aKeyboardEvent. ^ true]]]. honorCommandKeys := Preferences cmdKeysInText. (honorCommandKeys and: [typedChar == Character enter]) ifTrue: [^ self dispatchOnEnterWith: aKeyboardEvent]. "Special keys overwrite crtl+key combinations - at least on Windows. To resolve this conflict, assume that keys other than cursor keys aren't used together with Crtl." ((self class specialShiftCmdKeys includes: aKeyboardEvent keyValue) and: [aKeyboardEvent keyValue < 27]) ifTrue: [^ aKeyboardEvent controlKeyPressed ifTrue: [self perform: (self class shiftCmdActions at: aKeyboardEvent keyValue + 1) with: aKeyboardEvent] ifFalse: [self perform: (self class cmdActions at: aKeyboardEvent keyValue + 1) with: aKeyboardEvent]]. "backspace, and escape keys (ascii 8 and 27) are command keys" ((honorCommandKeys and: [aKeyboardEvent commandKeyPressed]) or: [self class specialShiftCmdKeys includes: aKeyboardEvent keyValue]) ifTrue: [ ^ aKeyboardEvent shiftPressed ifTrue: [self perform: (self class shiftCmdActions at: aKeyboardEvent keyValue + 1) with: aKeyboardEvent] ifFalse: [self perform: (self class cmdActions at: aKeyboardEvent keyValue + 1) with: aKeyboardEvent]]. "the control key can be used to invoke shift-cmd shortcuts" (honorCommandKeys and: [ aKeyboardEvent controlKeyPressed ]) ifTrue: [^ self perform: (self class shiftCmdActions at: aKeyboardEvent keyValue + 1) with: aKeyboardEvent]. "Automatically enclose paired characters such as brackets." self class autoEnclose ifTrue: [((self hasSelection and: [self enclose: aKeyboardEvent]) or: [self autoEncloseFor: typedChar]) ifTrue: [^ true]]. self normalCharacter: aKeyboardEvent. ^ false!

1 0

The Trunk: Morphic-mt.1050.mcz
by commits＠source.squeak.org 20 Nov '15

20 Nov '15

Marcel Taeumel uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-mt.1050.mcz ==================== Summary ==================== Name: Morphic-mt.1050 Author: mt Time: 20 November 2015, 2:16:41.426 pm UUID: 188b4bcf-d1d3-4d41-a0dd-927519e120fb Ancestors: Morphic-mt.1049 Another update for indent/outdent after the suggestion from Levente and Chris. Indent only with TAB if multiple lines are selected. =============== Diff against Morphic-mt.1049 =============== Item was changed: ----- Method: TextEditor>>dispatchOnKeyboardEvent: (in category 'typing support') ----- dispatchOnKeyboardEvent: aKeyboardEvent "Carry out the action associated with this character, if any. Type-ahead is passed so some routines can flush or use it." | honorCommandKeys typedChar | typedChar := aKeyboardEvent keyCharacter. "Create a new command for separating characters." (Character separators includes: typedChar) ifTrue: [self closeTypeIn]. "Handle one-line input fields." (typedChar == Character cr and: [morph acceptOnCR]) ifTrue: [^ true]. "Clear highlight for last opened parenthesis." self clearParens. "Handle line breaks and auto indent." typedChar == Character cr ifTrue: [ aKeyboardEvent controlKeyPressed ifTrue: [^ self normalCharacter: aKeyboardEvent]. aKeyboardEvent shiftPressed ifTrue: [^ self lf: aKeyboardEvent]. aKeyboardEvent commandKeyPressed ifTrue: [^ self crlf: aKeyboardEvent]. ^ self crWithIndent: aKeyboardEvent]. "Handle indent/outdent with selected text block." + typedChar == Character tab ifTrue: [ + aKeyboardEvent shiftPressed + ifTrue: [self outdent: aKeyboardEvent. ^ true] + ifFalse: [self hasMultipleLinesSelected + ifTrue: [self indent: aKeyboardEvent. ^ true]]]. - ((typedChar == Character tab - and: [self hasSelection]) - and: [self isInWhitespaceAtStartOfLine]) ifTrue: [ - aKeyboardEvent shiftPressed - ifTrue: [self outdent: aKeyboardEvent] - ifFalse: [self indent: aKeyboardEvent]. - ^ true]. honorCommandKeys := Preferences cmdKeysInText. (honorCommandKeys and: [typedChar == Character enter]) ifTrue: [^ self dispatchOnEnterWith: aKeyboardEvent]. "Special keys overwrite crtl+key combinations - at least on Windows. To resolve this conflict, assume that keys other than cursor keys aren't used together with Crtl." ((self class specialShiftCmdKeys includes: aKeyboardEvent keyValue) and: [aKeyboardEvent keyValue < 27]) ifTrue: [^ aKeyboardEvent controlKeyPressed ifTrue: [self perform: (self class shiftCmdActions at: aKeyboardEvent keyValue + 1) with: aKeyboardEvent] ifFalse: [self perform: (self class cmdActions at: aKeyboardEvent keyValue + 1) with: aKeyboardEvent]]. "backspace, and escape keys (ascii 8 and 27) are command keys" ((honorCommandKeys and: [aKeyboardEvent commandKeyPressed]) or: [self class specialShiftCmdKeys includes: aKeyboardEvent keyValue]) ifTrue: [ ^ aKeyboardEvent shiftPressed ifTrue: [self perform: (self class shiftCmdActions at: aKeyboardEvent keyValue + 1) with: aKeyboardEvent] ifFalse: [self perform: (self class cmdActions at: aKeyboardEvent keyValue + 1) with: aKeyboardEvent]]. "the control key can be used to invoke shift-cmd shortcuts" (honorCommandKeys and: [ aKeyboardEvent controlKeyPressed ]) ifTrue: [^ self perform: (self class shiftCmdActions at: aKeyboardEvent keyValue + 1) with: aKeyboardEvent]. "Automatically enclose paired characters such as brackets." self class autoEnclose ifTrue: [((self hasSelection and: [self enclose: aKeyboardEvent]) or: [self autoEncloseFor: typedChar]) ifTrue: [^ true]]. self normalCharacter: aKeyboardEvent. ^ false! Item was added: + ----- Method: TextEditor>>hasMultipleLinesSelected (in category 'typing support') ----- + hasMultipleLinesSelected + + ^ self hasSelection and: [self startBlock top < self stopBlock top]! Item was removed: - ----- Method: TextEditor>>isInWhitespaceAtStartOfLine (in category 'typing support') ----- - isInWhitespaceAtStartOfLine - - ^ (self selectionStringFromBeginningOfLine allSatisfy: [:c| c isSeparator]) - and: [self selection anySatisfy: [:c | c isSeparator not] "Ignore whitespace-only selections."]! Item was removed: - ----- Method: TextEditor>>selectionStringFromBeginningOfLine (in category 'accessing-selection') ----- - selectionStringFromBeginningOfLine - - ^ self paragraph string - copyFrom: (self beginningOfLine: self startIndex) to: self startIndex - 1!

1 0

The Trunk: Morphic-mt.1049.mcz
by commits＠source.squeak.org 20 Nov '15

20 Nov '15

Marcel Taeumel uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-mt.1049.mcz ==================== Summary ==================== Name: Morphic-mt.1049 Author: mt Time: 20 November 2015, 12:03:39.524 pm UUID: 5e8ed364-933c-4412-a21c-f9de5a0eead2 Ancestors: Morphic-kfr.1048 Fixes a bug with text selection and scrolling text boxes that have no soft line breaks. =============== Diff against Morphic-kfr.1048 =============== Item was changed: ----- Method: PluggableTextMorph>>scrollSelectionIntoView: (in category 'editor access') ----- scrollSelectionIntoView: event + "Scroll my text into view. Due to line composition mechanism, we must never use the right of a character block because the lines last character block right value always comes from a global container and is *not* line specific." + - "Scroll my text into view if necessary and return true, else return false" - | selRects rectToTest transform cpHere | selectionInterval := textMorph editor selectionInterval. + + textMorph editor hasSelection + ifFalse: [self scrollToShow: (textMorph editor startBlock withWidth: 1)] + ifTrue: [ + self scrollToShow: (textMorph editor startBlock topLeft corner: textMorph editor stopBlock bottomLeft). + self scrollToShow: (textMorph editor pointBlock withWidth: 1). "Ensure text cursor visibility."]. + - selRects := textMorph paragraph selectionRects. - selRects isEmpty ifTrue: [^ false]. - rectToTest := selRects reduce: [:r1 :r2 | r1 quickMerge: r2]. - transform := scroller transformFrom: self. - (event notNil and: [event anyButtonPressed]) ifTrue: "Check for autoscroll" - [cpHere := transform localPointToGlobal: event cursorPoint. - cpHere y <= self top - ifTrue: [rectToTest := selRects first topLeft extent: 2@2] - ifFalse: [cpHere y >= self bottom - ifTrue: [rectToTest := selRects last bottomRight extent: 2@2] - ifFalse: [^ false]]]. - self scrollToShow: rectToTest. - self scrollToShow: textMorph editor pointBlock. "Ensure text cursor visibility." ^ true! Item was changed: ----- Method: PluggableTextMorph>>setSelection: (in category 'model access') ----- setSelection: sel selectionInterval := sel. textMorph editor selectFrom: sel first to: sel last. + self scrollSelectionIntoView.! - self scrollSelectionIntoView ifFalse: [scroller changed].! Item was changed: ----- Method: TextMorph>>container (in category 'geometry') ----- container "Return the container for composing this text. There are four cases: 1. container is specified as, eg, an arbitrary shape, 2. container is specified as the bound rectangle, because this morph is linked to others, 3. container is nil, and wrap is true -- grow downward as necessary, + 4. container is nil, and wrap is false -- grow in 2D as necessary." - 4. container is nil, and wrap is false -- grow in 2D as nexessary." container ifNil: [successor ifNotNil: [^ self compositionRectangle]. + wrapFlag ifTrue: [^ self compositionRectangle withHeight: self maximumContainerExtent y]. + ^ self compositionRectangle topLeft extent: self maximumContainerExtent]. - wrapFlag ifTrue: [^ self compositionRectangle withHeight: 9999999]. - ^ self compositionRectangle topLeft extent: 9999999@9999999]. ^ container! Item was added: + ----- Method: TextMorph>>maximumContainerExtent (in category 'geometry') ----- + maximumContainerExtent + "For text composition. Returns the maximum area for text to be composed." + + ^ 9999999@9999999!

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
26
Older →

Jump to page: