summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2015-10-29 19:25:24 (GMT)
committerKevin Smith <kevin.smith@isode.com>2015-10-30 12:51:40 (GMT)
commit826041be3ee406c90b34401ab4510d7c50dbd4a6 (patch)
tree902f0dfed8ff1e67ed7f36e469136ffabd3a6802
parentefb98f5c83fc5e0fb598a88e04c8bf6f642b5e2a (diff)
downloadswift-826041be3ee406c90b34401ab4510d7c50dbd4a6.zip
swift-826041be3ee406c90b34401ab4510d7c50dbd4a6.tar.bz2
Change OS X spell checker to non-deprecated API
Test-Information: Verified that there are still suggestions by comparing misspelled test phrases in Swift without this change and Swift with this change. Change-Id: Ice11af65028a96c86b1b5cc57ddad8eeda1ccf76
-rw-r--r--SwifTools/MacOSXChecker.mm10
1 files changed, 9 insertions, 1 deletions
diff --git a/SwifTools/MacOSXChecker.mm b/SwifTools/MacOSXChecker.mm
index 3e687d1..0c73427 100644
--- a/SwifTools/MacOSXChecker.mm
+++ b/SwifTools/MacOSXChecker.mm
@@ -4,6 +4,12 @@
* See Documentation/Licenses/BSD-simplified.txt for more information.
*/
+/*
+ * Copyright (c) 2015 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
#include <SwifTools/MacOSXChecker.h>
#include <algorithm>
@@ -14,6 +20,8 @@
namespace Swift {
MacOSXChecker::MacOSXChecker() {
+ NSSpellChecker* spellChecker = [NSSpellChecker sharedSpellChecker];
+ [spellChecker setAutomaticallyIdentifiesLanguages:YES];
}
MacOSXChecker::~MacOSXChecker() {
@@ -27,7 +35,7 @@ bool MacOSXChecker::isCorrect(const std::string& /*word*/) {
void MacOSXChecker::getSuggestions(const std::string& word, std::vector<std::string>& list) {
NSSpellChecker* spellChecker = [NSSpellChecker sharedSpellChecker];
NSString* wordString = [[NSString alloc] initWithUTF8String: word.c_str()];
- NSArray* suggestions = [spellChecker guessesForWord: wordString];
+ NSArray* suggestions = [spellChecker guessesForWordRange:NSMakeRange(0, [wordString length]) inString:wordString language:nil inSpellDocumentWithTag:0];
for(unsigned int i = 0; i < [suggestions count]; ++i) {
list.push_back(std::string([[suggestions objectAtIndex:i] UTF8String]));
}