Treat dash as a non-autocorrectable separator

Author: abb128

java/res/values-fr-rCA/donottranslate-config-spacing-and-punctuations.xml

@@ -25,7 +25,7 @@
     <string name="symbols_followed_by_space">.,;:!?)]}</string>
     <!-- Symbols that separate words -->
     <!-- Don't remove the enclosing double quotes, they protect whitespace (not just U+0020) -->
-    <string name="symbols_word_separators">"&#x0009;&#x0020;&#x000A;&#x00A0;"()[]{}*&amp;&lt;&gt;+=|.,;:!?/_\"</string>
+    <string name="symbols_word_separators">"&#x0009;&#x0020;&#x000A;&#x00A0;"()[]{}*&amp;&lt;&gt;+=|.,;:!?/_\"-</string>
     <!-- Word connectors -->
-    <string name="symbols_word_connectors">\'-</string>
+    <string name="symbols_word_connectors">\'</string>
 </resources>

java/res/values-fr/donottranslate-config-spacing-and-punctuations.xml

@@ -26,7 +26,7 @@
     <string name="symbols_clustering_together">!?</string>
     <!-- Symbols that separate words -->
     <!-- Don't remove the enclosing double quotes, they protect whitespace (not just U+0020) -->
-    <string name="symbols_word_separators">"&#x0009;&#x0020;&#x000A;&#x00A0;"()[]{}*&amp;&lt;&gt;+=|.,;:!?/_\"</string>
+    <string name="symbols_word_separators">"&#x0009;&#x0020;&#x000A;&#x00A0;"()[]{}*&amp;&lt;&gt;+=|.,;:!?/_\"-</string>
     <!-- Word connectors -->
-    <string name="symbols_word_connectors">\'-</string>
+    <string name="symbols_word_connectors">\'</string>
 </resources>

java/res/values-hy/donottranslate-config-spacing-and-punctuations.xml

@@ -25,7 +25,7 @@
     <string name="symbols_followed_by_space">.,;:!?)]}&#x0589;&#x055D;</string>
     <!-- Symbols that separate words. Adding armenian period and comma. -->
     <!-- Don't remove the enclosing double quotes, they protect whitespace (not just U+0020) -->
-    <string name="symbols_word_separators">"&#x0009;&#x0020;&#x000A;&#x00A0;"()[]{}*&amp;&lt;&gt;+=|.,;:!?/_\"&#x0589;&#x055D;</string>
+    <string name="symbols_word_separators">"&#x0009;&#x0020;&#x000A;&#x00A0;"()[]{}*&amp;&lt;&gt;+=|.,;:!?/_\"&#x0589;&#x055D;-</string>
     <!-- The sentence separator code point, for capitalization -->
     <!-- U+0589: "։" ARMENIAN FULL STOP   ; 589h = 1417d -->
     <integer name="sentence_separator">1417</integer>

java/res/values/donottranslate-config-spacing-and-punctuations.xml

@@ -34,9 +34,9 @@
     <string name="symbols_clustering_together"></string>
     <!-- Symbols that separate words -->
     <!-- Don't remove the enclosing double quotes, they protect whitespace (not just U+0020) -->
-    <string name="symbols_word_separators">"&#x0009;&#x0020;&#x000A;&#x00A0;"()[]{}*&amp;&lt;&gt;+=|.,;:!?/_\"</string>
+    <string name="symbols_word_separators">"&#x0009;&#x0020;&#x000A;&#x00A0;"()[]{}*&amp;&lt;&gt;+=|.,;:!?/_\"-</string>
     <!-- Word connectors -->
-    <string name="symbols_word_connectors">\'-</string>
+    <string name="symbols_word_connectors">\'</string>
     <!-- The sentence separator code point, for capitalization and auto-insertion -->
     <!-- U+002E: "." FULL STOP   ; 2Eh = 46d -->
     <integer name="sentence_separator">46</integer>

java/src/org/futo/inputmethod/latin/Suggest.java

@@ -306,6 +306,14 @@ public static SuggestedWords obtainNonBatchedInputSuggestedWords(
                 false /* isObsoleteSuggestions */, inputStyle, sequenceNumber);
     }
 
+    // Returns whether the provided codepoint should trigger an autocorrection
+    public static boolean shouldCodePointAutocorrect(final int codePoint) {
+        // Dash will never autocorrect because the autocorrect currently doesn't take the dash
+        // suffix into account, this leads to it miscorrecting prefixes like "un-" to "in-"
+        // because in most cases, "un" is a typo of "in"
+        return codePoint != '-';
+    }
+
 
     // Retrieves suggestions for non-batch input (typing, recorrection, predictions...)
     // and calls the callback function with the suggestions.

java/src/org/futo/inputmethod/latin/inputlogic/InputLogic.java

@@ -1037,7 +1037,8 @@ private void handleSeparatorEvent(final Event event, final InputTransaction inpu
         }
         // isComposingWord() may have changed since we stored wasComposing
         if (mWordComposer.isComposingWord()) {
-            if (settingsValues.mAutoCorrectionEnabledPerUserSettings) {
+            if (settingsValues.mAutoCorrectionEnabledPerUserSettings
+                    && Suggest.shouldCodePointAutocorrect(codePoint)) {
                 final String separator = shouldAvoidSendingCode ? LastComposedWord.NOT_A_SEPARATOR
                         : StringUtils.newSingleCodePointString(codePoint);
                 commitCurrentAutoCorrection(settingsValues, separator);