Pass UTF16-encoded string to CheckSpelling

Author: maxbrunsfeld

src/main.cc

@@ -57,9 +57,11 @@ class Spellchecker : public Nan::ObjectWrap {
     }
 
     Spellchecker* that = Nan::ObjectWrap::Unwrap<Spellchecker>(info.Holder());
-    String::Utf8Value text(info[0]);
+    Handle<String> string = Handle<String>::Cast(info[0]);
+    std::vector<uint16_t> text(string->Length());
+    string->Write(reinterpret_cast<uint16_t *>(text.data()));
 
-    std::vector<MisspelledRange> misspelled_ranges = that->impl->CheckSpelling(*text, text.length());
+    std::vector<MisspelledRange> misspelled_ranges = that->impl->CheckSpelling(text.data(), text.size());
 
     Local<Array> result = Nan::New<Array>();
     std::vector<MisspelledRange>::const_iterator iter = misspelled_ranges.begin();

src/spellchecker.h

@@ -3,6 +3,7 @@
 
 #include <string>
 #include <vector>
+#include <stdint.h>
 
 namespace spellchecker {
 
@@ -22,7 +23,7 @@ class SpellcheckerImplementation {
   // Returns true if the word is misspelled.
   virtual bool IsMisspelled(const std::string& word) = 0;
 
-  virtual std::vector<MisspelledRange> CheckSpelling(const char *text, size_t length) = 0;
+  virtual std::vector<MisspelledRange> CheckSpelling(const uint16_t *text, size_t length) = 0;
 
   // Adds a new word to the dictionary.
   // NB: When using Hunspell, this will not modify the .dic file; custom words must be added each

src/spellchecker_hunspell.cc

@@ -1,6 +1,8 @@
 #include <cstdio>
+#include <cwctype>
 #include <algorithm>
 #include "../vendor/hunspell/src/hunspell/hunspell.hxx"
+#include "../vendor/hunspell/src/hunspell/csutil.hxx"
 #include "spellchecker_hunspell.h"
 
 namespace spellchecker {
@@ -48,7 +50,7 @@ bool HunspellSpellchecker::IsMisspelled(const std::string& word) {
   return hunspell->spell(word.c_str()) == 0;
 }
 
-std::vector<MisspelledRange> HunspellSpellchecker::CheckSpelling(const char *text, size_t length) {
+std::vector<MisspelledRange> HunspellSpellchecker::CheckSpelling(const uint16_t *utf16_text, size_t utf16_length) {
   std::vector<MisspelledRange> result;
   return result;
 }

src/spellchecker_hunspell.h

@@ -16,7 +16,7 @@ class HunspellSpellchecker : public SpellcheckerImplementation {
   std::vector<std::string> GetAvailableDictionaries(const std::string& path);
   std::vector<std::string> GetCorrectionsForMisspelling(const std::string& word);
   bool IsMisspelled(const std::string& word);
-  std::vector<MisspelledRange> CheckSpelling(const char *text, size_t length);
+  std::vector<MisspelledRange> CheckSpelling(const uint16_t *text, size_t length);
   void Add(const std::string& word);
 
 private:

src/spellchecker_mac.h

@@ -17,7 +17,7 @@ class MacSpellchecker : public SpellcheckerImplementation {
   std::vector<std::string> GetAvailableDictionaries(const std::string& path);
   std::vector<std::string> GetCorrectionsForMisspelling(const std::string& word);
   bool IsMisspelled(const std::string& word);
-  std::vector<MisspelledRange> CheckSpelling(const char *text, size_t length);
+  std::vector<MisspelledRange> CheckSpelling(const uint16_t *text, size_t length);
   void Add(const std::string& word);
 
 private:

src/spellchecker_mac.mm

@@ -52,13 +52,14 @@
   return result;
 }
 
-std::vector<MisspelledRange> MacSpellchecker::CheckSpelling(const char *text, size_t length) {
+std::vector<MisspelledRange> MacSpellchecker::CheckSpelling(const uint16_t *text, size_t length) {
   std::vector<MisspelledRange> result;
 
   @autoreleasepool {
-    NSString* string = [NSString stringWithUTF8String:text];
+    NSData *data = [[NSData alloc] initWithBytesNoCopy:(void *)(text) length:(length * 2) freeWhenDone:NO];
+    NSString* string = [[NSString alloc] initWithData:data encoding:NSUTF16LittleEndianStringEncoding];
     NSArray *misspellings = [this->spellChecker checkString:string
-                                                      range:NSMakeRange(0, length)
+                                                      range:NSMakeRange(0, string.length)
                                                       types:NSTextCheckingTypeSpelling
                                                     options:nil
                                      inSpellDocumentWithTag:0

src/spellchecker_win.cc

@@ -187,15 +187,15 @@ bool WindowsSpellchecker::IsMisspelled(const std::string& word) {
   return ret;
 }
 
-std::vector<MisspelledRange> WindowsSpellchecker::CheckSpelling(const char *text, size_t length) {
+std::vector<MisspelledRange> WindowsSpellchecker::CheckSpelling(const uint16_t *text, size_t length) {
   std::vector<MisspelledRange> result;
 
   if (this->currentSpellchecker == NULL) {
     return result;
   }
 
   IEnumSpellingError* errors = NULL;
-  std::wstring wtext = ToWString(text);
+  std::wstring wtext(reinterpret_cast<const wchar_t *>(text), length);
   if (FAILED(this->currentSpellchecker->Check(wtext.c_str(), &errors))) {
     return result;
   }

src/spellchecker_win.h

@@ -18,7 +18,7 @@ class WindowsSpellchecker : public SpellcheckerImplementation {
 
   std::vector<std::string> GetCorrectionsForMisspelling(const std::string& word);
   bool IsMisspelled(const std::string& word);
-  std::vector<MisspelledRange> CheckSpelling(const char *text, size_t length);
+  std::vector<MisspelledRange> CheckSpelling(const uint16_t *text, size_t length);
   void Add(const std::string& word);
 
 private: