Skip to content

Commit 9229730

Browse files
committed
Fix some typing issue
1 parent bc445e3 commit 9229730

File tree

4 files changed

+29
-25
lines changed

4 files changed

+29
-25
lines changed

bamboo.xml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,22 +23,22 @@
2323
<description>Vietnamese input engine for IBus</description>
2424
<exec>/usr/lib/ibus-engine-bamboo --ibus</exec>
2525
<version>0.6.2</version>
26-
<author>Luong Thanh Lam &lt;ltlam93@gmail.com&gt;</author>
26+
<author>Luong Thanh Lam &lt;ltlam93@gmail.com&gt;</author>
2727
<license>GPLv3</license>
2828
<homepage>https://github.com/BambooEngine/ibus-bamboo/</homepage>
2929
<textdomain>ibus-bamboo</textdomain>
30-
<engines>
31-
<engine>
32-
<symbol>vi</symbol>
33-
<name>Bamboo</name>
34-
<language>vi</language>
35-
<license>GPLv3</license>
36-
<author>Luong Thanh Lam &lt;ltlam93@gmail.com&gt;</author>
37-
<icon>/usr/share/ibus-bamboo/viet-on.png</icon>
38-
<layout>us</layout>
39-
<longname>Bamboo</longname>
40-
<description>Vietnamese input method editor</description>
41-
<rank>1</rank>
42-
</engine>
43-
</engines>
30+
<engines>
31+
<engine>
32+
<symbol>vi</symbol>
33+
<name>Bamboo</name>
34+
<language>vi</language>
35+
<license>GPLv3</license>
36+
<author>Luong Thanh Lam &lt;ltlam93@gmail.com&gt;</author>
37+
<icon>/usr/share/ibus-bamboo/viet-on.png</icon>
38+
<layout>us</layout>
39+
<longname>Bamboo</longname>
40+
<description>Vietnamese input method editor</description>
41+
<rank>1</rank>
42+
</engine>
43+
</engines>
4444
</component>

src/github.com/BambooEngine/bamboo-core/bamboo_utils.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ func extractCvcTrans(composition []*Transformation) ([]*Transformation, []*Trans
243243

244244
func extractLastWord(composition []*Transformation, effectKeys []rune) ([]*Transformation, []*Transformation) {
245245
for i := len(composition) - 1; i >= 0; i-- {
246-
var canvas = getCanvas(composition[i:], VietnameseMode)
246+
var canvas = getCanvas(composition[i:], VietnameseMode|LowerCase)
247247
if len(canvas) == 0 {
248248
continue
249249
}
@@ -302,12 +302,12 @@ func findTarget(composition []*Transformation, applicableRules []Rule, flags uin
302302
if applicableRule.EffectType != ToneTransformation {
303303
continue
304304
}
305-
var target *Transformation
305+
var target *Transformation
306306
if flags&EfreeToneMarking != 0 {
307307
if hasValidTone(composition, Tone(applicableRule.Effect)) {
308308
target = findToneTarget(composition, flags&EstdToneStyle != 0)
309309
}
310-
} else if lastAppending := findLastAppendingTrans(composition); lastAppending != nil && IsVowel(lastAppending.Rule.EffectOn) {
310+
} else if lastAppending := findLastAppendingTrans(composition); lastAppending != nil && IsVowel(lastAppending.Rule.EffectOn) {
311311
target = lastAppending
312312
}
313313
if str == Flatten(append(composition, &Transformation{Target: target, Rule: applicableRule}), VietnameseMode) {
@@ -332,7 +332,7 @@ func generateUndoTransformations(composition []*Transformation, rules []Rule, fl
332332
if hasValidTone(composition, Tone(rule.Effect)) {
333333
target = findToneTarget(composition, flags&EstdToneStyle != 0)
334334
}
335-
} else if lastAppending := findLastAppendingTrans(composition); lastAppending != nil && IsVowel(lastAppending.Rule.EffectOn) {
335+
} else if lastAppending := findLastAppendingTrans(composition); lastAppending != nil && IsVowel(lastAppending.Rule.EffectOn) {
336336
target = lastAppending
337337
}
338338
if target == nil {

src/github.com/BambooEngine/bamboo-core/utils.go

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88

99
package bamboo
1010

11-
import "unicode"
11+
import (
12+
"unicode"
13+
)
1214

1315
var Vowels = []rune("aàáảãạăằắẳẵặâầấẩẫậeèéẻẽẹêềếểễệiìíỉĩịoòóỏõọôồốổỗộơờớởỡợuùúủũụưừứửữựyỳýỷỹỵ")
1416

@@ -150,13 +152,14 @@ func canProcessKey(lowerKey rune, effectKeys []rune) bool {
150152
if IsAlpha(lowerKey) || inKeyList(effectKeys, lowerKey) {
151153
return true
152154
}
153-
if IsWordBreakSymbol(lowerKey) {
154-
return false
155-
}
155+
if IsWordBreakSymbol(lowerKey) {
156+
return false
157+
}
156158
return IsVietnameseRune(lowerKey)
157159
}
158160

159161
func IsVietnameseRune(lowerKey rune) bool {
162+
// lowerKey = unicode.ToLower(lowerKey)
160163
if FindToneFromChar(lowerKey) != ToneNone {
161164
return true
162165
}

src/ibus-bamboo/engine_utils.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -324,13 +324,14 @@ func (e *IBusBambooEngine) isValidState(state uint32) bool {
324324
}
325325

326326
func (e *IBusBambooEngine) canProcessKey(keyVal uint32) bool {
327-
if keyVal == IBusSpace || keyVal == IBusBackSpace {
327+
var keyRune = rune(keyVal)
328+
if keyVal == IBusSpace || keyVal == IBusBackSpace || bamboo.IsWordBreakSymbol(keyRune) {
328329
return true
329330
}
330331
if e.config.IBflags&IBmacroEnabled != 0 && keyVal == IBusTab {
331332
return true
332333
}
333-
return e.preeditor.CanProcessKey(rune(keyVal))
334+
return e.preeditor.CanProcessKey(keyRune)
334335
}
335336

336337
func (e *IBusBambooEngine) inBackspaceWhiteList() bool {

0 commit comments

Comments
 (0)