--- a/EditTextView.st Wed Jun 26 22:58:28 2019 +0200
+++ b/EditTextView.st Wed Jun 26 23:07:20 2019 +0200
@@ -6102,7 +6102,9 @@
] ifFalse:[
(false "(left endsWith:']')" or:[(startsWithClosingBracket value:rightPart)]) ifTrue:[
newIndent := (self prevTabBefore:i)-1.
- ].
+ ] ifFalse:[
+ newIndent := i. "/ leftIndentForLine returns the previous line's indent
+ ]
].
] ifFalse:[
(endsWithOpeningBracket value:leftPart) ifTrue:[
@@ -6132,6 +6134,7 @@
].
"Created: / 26-06-2019 / 21:57:50 / Claus Gittinger"
+ "Modified: / 26-06-2019 / 23:01:52 / Claus Gittinger"
!
keyPress:key x:x y:y
@@ -6493,17 +6496,17 @@
endsWithOpeningBracket endsWithClosingBracket bracketStrings language|
endsWithOpeningBracket := endsWithClosingBracket := [:line | false].
- (language := self editedLanguage) notNil ifTrue:[
- bracketStrings := language bracketStrings ? #().
- endsWithOpeningBracket :=
- [:line |
- bracketStrings contains:[:pair | line endsWith:(pair first)].
- ].
- endsWithClosingBracket :=
- [:line |
- bracketStrings contains:[:pair | line endsWith:(pair second)].
- ].
- ].
+ language := self editedLanguage ? SmalltalkLanguage instance.
+
+ bracketStrings := language bracketStrings ? #().
+ endsWithOpeningBracket :=
+ [:line |
+ bracketStrings contains:[:pair | line endsWith:(pair first)].
+ ].
+ endsWithClosingBracket :=
+ [:line |
+ bracketStrings contains:[:pair | line endsWith:(pair second)].
+ ].
lnr := lineNr.
[lnr > 1] whileTrue:[
@@ -6513,16 +6516,15 @@
line notEmptyOrNil ifTrue:[
indent := (line indexOfNonSeparatorStartingAt:1) - 1.
indent >= 0 ifTrue:[
- (self editedLanguage isNil or:[self editedLanguage isSmalltalk]) ifTrue:[
- (endsWithOpeningBracket value:line) ifTrue:[
- "/ ^ indent + 4
- ^ (self nextTabAfter:indent+1)-1
- ].
- (endsWithClosingBracket value:line) ifTrue:[
- "/ ^ indent - 4
- ^ (self prevTabBefore:indent)-1
- ].
+ (endsWithOpeningBracket value:line) ifTrue:[
+ "/ ^ indent + 4
+ ^ (self nextTabAfter:indent+1)-1
].
+ "/ no, not with kr indentation style
+ "/ (endsWithClosingBracket value:line) ifTrue:[
+ "/ "/ ^ indent - 4
+ "/ ^ (self prevTabBefore:indent)-1
+ "/ ].
^ indent
]
]
@@ -6531,7 +6533,7 @@
"Created: / 05-03-1996 / 14:58:53 / cg"
"Modified (format): / 25-04-2017 / 12:57:44 / cg"
- "Modified: / 26-06-2019 / 22:48:34 / Claus Gittinger"
+ "Modified: / 26-06-2019 / 23:05:47 / Claus Gittinger"
!
undentBy4