hg/stx-goodies-smallsense: comparison SmallSense_

equal deleted inserted replaced

-:dddd3409f0a0
+:de41bf2025c0
-"{ Encoding: utf8 }"
 "
 stx:goodies/smallsense - A productivity plugin for Smalltalk/X IDE
 Copyright (C) 2013-2015 Jan Vrany
 This library is free software; you can redistribute it and/or
 key == #Return ifTrue:[
 ^ self keyPressReturn.
 ].
+UserPreferences current smallSenseElectricEditSupportEnabled ifFalse:[ ^ false ].
 key == ${ ifTrue:[
 ^ self keyPressOpenCurly
 ].
 key == Character space ifTrue:[
 ].
 ^ false
 "Created: / 07-03-2010 / 09:36:44 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-"Modified: / 13-08-2014 / 15:30:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+"Modified: / 04-05-2015 / 00:09:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 keyPressOpenCurly
 | line tokens i |
 "/ First, check if the cursor is at the end of line, i.e., if
 "/ there's no text after the cursor...
 lineNr := textView cursorLine.
 line := textView listAt: lineNr.
 i := line size.
-[ i > 0 and:[ (c := line at:i) isSeparator ] ] whileTrue:[ i := i - 1 ].
+i >= textView cursorCol ifTrue:[
-i <= textView cursorCol ifFalse:[
+[ i > 0 and:[ (c := line at:i) isSeparator ] ] whileTrue:[ i := i - 1 ].
-"/ If not, do not indent...
+i <= textView cursorCol ifFalse:[
-^ false
+"/ If not, do not indent...
+^ false
+].
 ].
 "/ Search for closest non-empty line above
 lineNr := textView cursorLine.
-line := textView listAt: lineNr.
+[ lineNr > 0 and:[ (line := textView list at: lineNr ifAbsent:[nil]) isEmptyOrNil ] ] whileTrue:[ lineNr := lineNr - 1 ].
-[ line isEmptyOrNil and:[lineNr > 0 ] ] whileTrue:[ lineNr := lineNr - 1 ].
 lineNr == 0 ifTrue:[
 "/ No such line found, givin up
 ^ false.
 ].
 indent := line indexOfNonSeparator.
 textView cursorCol: indent.
 ].
 ^ true
 "Created: / 13-08-2014 / 15:30:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-"Modified: / 31-03-2015 / 13:30:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+"Modified: / 04-05-2015 / 00:17:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 !JavaEditSupport methodsFor:'initialization'!
 initializeForService: anEditService

changeset 458	de41bf2025c0
parent 451	ef7e8e25df63
child 1072	a44c741ee5ef