fix: fix multibyte support

krzysztofzablocki · Dec 22, 2016 · d2fc38d · d2fc38d
1 parent 369c663
commit d2fc38d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Sourcery CHANGELOG
 
 ---
+## Master
+
+### Bug Fixes
+- Fix dealing with multibyte characters
+
 ## 0.4.7
 ### New Features
 - Added `contains`, `hasPrefix`, `hasPrefix` filters

diff --git a/Sourcery/Parsing/Parser.swift b/Sourcery/Parsing/Parser.swift
@@ -518,7 +518,7 @@ extension Parser {
 
     fileprivate func parseAnnotations(_ source: [String: SourceKitRepresentable]) -> Annotations {
         guard let range = SubstringIdentifier.key.range(for: source),
-        let lineInfo = contents.lineAndCharacter(forByteOffset: Int(range.offset)) else { return [:] }
+        let lineInfo = contents.lineAndCharacter(forCharacterOffset: Int(range.offset)) else { return [:] }
 
         var annotations = Annotations()
         for line in lines[0..<lineInfo.line-1].reversed() {

diff --git a/SourceryTests/ParserSpec.swift b/SourceryTests/ParserSpec.swift
@@ -392,6 +392,13 @@ class ParserSpec: QuickSpec {
                                 ]))
                     }
 
+                    it("extracts multi-byte cases properly") {
+                        expect(parse("enum JapaneseEnum {\ncase アイウエオ\n}"))
+                            .to(equal([
+                                Enum(name: "JapaneseEnum", cases: [Enum.Case(name: "アイウエオ")])
+                                ]))
+                    }
+
                     it("extracts cases with annotations properly") {
                         expect(parse("enum Foo {\n // sourcery: annotation\ncase optionA(Int)\n case optionB }"))
                                 .to(equal([