The Trunk: Morphic-nice.1132.mcz

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

The Trunk: Morphic-nice.1132.mcz

commits-2
Nicolas Cellier uploaded a new version of Morphic to project The Trunk:
http://source.squeak.org/trunk/Morphic-nice.1132.mcz

==================== Summary ====================

Name: Morphic-nice.1132
Author: nice
Time: 3 May 2016, 8:51:04.345853 am
UUID: 5ea5430b-d2cf-4f37-9270-0348c08d54a9
Ancestors: Morphic-mt.1131

Avoid dead code following a returning if (case when both branches return).

=============== Diff against Morphic-mt.1131 ===============

Item was changed:
  ----- Method: TextEditor>>enclose: (in category 'editing keys') -----
  enclose: aKeyboardEvent
  "Insert or remove bracket characters around the current selection."
 
  | character left right startIndex stopIndex oldSelection which t |
  character := aKeyboardEvent shiftPressed
  ifTrue: ['{}|"<>' at: ('[]\'',.' indexOf: aKeyboardEvent keyCharacter) ifAbsent: [aKeyboardEvent keyCharacter]]
  ifFalse: [aKeyboardEvent keyCharacter].
  self closeTypeIn.
  startIndex := self startIndex.
  stopIndex := self stopIndex.
  oldSelection := self selection.
  which := '([<{|"''9' indexOf: character ifAbsent: [ ^ false ].
  "Allow Control key in lieu of Alt+Shift for (, {, and double-quote."
  left := ((Preferences cmdKeysInText and: [ aKeyboardEvent controlKeyPressed ])
  ifTrue: [ '({<{|""(' ]
  ifFalse: ['([<{|"''(']) at: which.
  right := ((Preferences cmdKeysInText and: [ aKeyboardEvent controlKeyPressed ])
  ifTrue: [ ')}>}|"")' ]
  ifFalse: [')]>}|"'')']) at: which.
  t := self text.
  ((startIndex > 1 and: [stopIndex <= t size])
  and: [ (t at: startIndex-1) = left and: [(t at: stopIndex) = right]])
+ ifTrue:
+ ["already enclosed; strip off brackets"
- ifTrue: [
- "already enclosed; strip off brackets"
  self selectFrom: startIndex-1 to: stopIndex.
+ self replaceSelectionWith: oldSelection]
+ ifFalse:
+ ["not enclosed; enclose by matching brackets"
- self replaceSelectionWith: oldSelection.
- ^ true]
- ifFalse: [
- "not enclosed; enclose by matching brackets"
  self replaceSelectionWith:
  (Text string: (String with: left), oldSelection string, (String with: right) attributes: emphasisHere).
+ self selectFrom: startIndex+1 to: stopIndex].
+ ^true!
- self selectFrom: startIndex+1 to: stopIndex.
- ^ true].
- ^ false!