Fix support for iconv when checking spelling

Closes GH-13. Closes GH-14.
wooorm · Mar 8, 2019 · a55923e · a55923e
1 parent 180b384
commit a55923e
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 2 deletions.
diff --git a/lib/util/form.js b/lib/util/form.js
@@ -1,5 +1,6 @@
 'use strict'
 
+var normalize = require('./normalize.js')
 var trim = require('./trim.js')
 var exact = require('./exact.js')
 var flag = require('./flag.js')
@@ -18,6 +19,8 @@ function form(context, value, all) {
     return null
   }
 
+  value = normalize(value, context.conversion.in)
+
   if (exact(context, value)) {
     if (!all && flag(flags, 'FORBIDDENWORD', dict[value])) {
       return null

diff --git a/test/index.js b/test/index.js
@@ -502,9 +502,38 @@ test('broken dictionaries', function(t) {
 })
 
 test('parse dictionaries', function(t) {
-  t.plan(1)
+  t.plan(2)
+
+  t.test('iconv and oconv', function(st) {
+    var dic = ['2', 'ĳdel', 'ĳdeltuit'].join('\n')
+    var aff = [
+      'SET UTF-8',
+      '',
+      'ICONV 1',
+      'ICONV ij ĳ',
+      '',
+      'OCONV 1',
+      'OCONV ĳ ij'
+    ].join('\n')
+    var spell = nspell(aff + '\n', dic + '\n')
 
-  t.test('nspell#spell(value)', function(st) {
+    st.equal(spell.correct('ijdel'), true, 'should support iconv (#1)')
+    st.equal(spell.correct('ĳdel'), true, 'should support iconv (#2)')
+    st.deepEqual(
+      spell.suggest('ijde'),
+      ['ijdel', 'Ĳdel'],
+      'should support oconv (#1)'
+    )
+    st.deepEqual(
+      spell.suggest('ĳde'),
+      ['ijdel', 'Ĳdel'],
+      'should support oconv (#2)'
+    )
+
+    st.end()
+  })
+
+  t.test('slashes and comments', function(st) {
     var dic = [
       '5',
       'aaa\\//A',