Merge pull request #740 from midnightSuyama/enhance_SpaceBetweenAlpha…

…beticalWordValidator Enhance SpaceBetweenAlphabeticalWordValidator
redpen-cc · Jan 15, 2017 · ad3371a · ad3371a
2 parents 8f17124 + dcf1165
commit ad3371a
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 3 deletions.
diff --git a/redpen-core/src/main/java/cc/redpen/validator/Validator.java b/redpen-core/src/main/java/cc/redpen/validator/Validator.java
@@ -213,7 +213,11 @@ protected float getFloat(String name) {
     }
 
     protected String getString(String name) {
-        return config.getProperties().getOrDefault(name, (String) defaultProps.get(name));
+        if(config != null){
+            return config.getProperties().getOrDefault(name, (String) defaultProps.get(name));
+        }else{
+            return (String) defaultProps.get(name);
+        }
     }
 
     protected boolean getBoolean(String name) {

diff --git a/...ore/src/main/java/cc/redpen/validator/sentence/SpaceBetweenAlphabeticalWordValidator.java b/...ore/src/main/java/cc/redpen/validator/sentence/SpaceBetweenAlphabeticalWordValidator.java
@@ -40,7 +40,9 @@ public class SpaceBetweenAlphabeticalWordValidator extends Validator {
     private final Pattern pat = Pattern.compile(shard + "\\s+(" + word + ")\\s+" + shard);
 
     public SpaceBetweenAlphabeticalWordValidator() {
-        super("forbidden", false); // Spaces are enforced (false) or forbidden (true)
+        super("forbidden", false, // Spaces are enforced (false) or forbidden (true)
+              "skip_before", "",
+              "skip_after", "");
     }
 
     @Override public List<String> getSupportedLanguages() {
@@ -76,15 +78,17 @@ public void validate(Sentence sentence) {
     // TODO: need refactoring...
     private boolean notHasWhiteSpaceBeforeLeftParenthesis(char prevCharacter, char character) {
         return !StringUtils.isBasicLatin(prevCharacter)
+                && getString("skip_before").indexOf(prevCharacter) == -1
                 && prevCharacter != leftParenthesis
                 && prevCharacter != comma
-                && (prevCharacter != rightParenthesis && rightParenthesis != '（') // For handling multi-byte Parenthesis
+                && (prevCharacter != rightParenthesis && rightParenthesis != '）') // For handling multi-byte Parenthesis
                 && StringUtils.isBasicLatin(character)
                 && Character.isLetter(character);
     }
 
     private boolean notHasWhiteSpaceAfterRightParenthesis(char prevCharacter, char character) {
         return !StringUtils.isBasicLatin(character)
+                && getString("skip_after").indexOf(character) == -1
                 && character != rightParenthesis
                 && (character != leftParenthesis && leftParenthesis != '（')  // For handling multi-byte Parenthesis
                 && character != comma

diff --git a/...src/test/java/cc/redpen/validator/sentence/SpaceBetweenAlphabeticalWordValidatorTest.java b/...src/test/java/cc/redpen/validator/sentence/SpaceBetweenAlphabeticalWordValidatorTest.java
@@ -206,6 +206,36 @@ public void testNeedNoBeforeAndAfterSpace() throws RedPenException {
         assertEquals(1, errors.size());
     }
 
+    @Test
+    public void testSkipBefore() throws RedPenException {
+        SpaceBetweenAlphabeticalWordValidator validator = new SpaceBetweenAlphabeticalWordValidator();
+        validator.preInit(new ValidatorConfiguration("SpaceBetweenAlphabeticalWord").addProperty("skip_before", "「"), Configuration.builder().build());
+        List<ValidationError> errors = new ArrayList<>();
+        validator.setErrorList(errors);
+        validator.validate(new Sentence("きょうは「Coke 」を飲みたい。", 0));
+        assertEquals(0, errors.size());
+    }
+
+    @Test
+    public void testSkipAfter() throws RedPenException {
+        SpaceBetweenAlphabeticalWordValidator validator = new SpaceBetweenAlphabeticalWordValidator();
+        validator.preInit(new ValidatorConfiguration("SpaceBetweenAlphabeticalWord").addProperty("skip_after", "」"), Configuration.builder().build());
+        List<ValidationError> errors = new ArrayList<>();
+        validator.setErrorList(errors);
+        validator.validate(new Sentence("きょうは「 Coke」を飲みたい。", 0));
+        assertEquals(0, errors.size());
+    }
+
+    @Test
+    public void testSkipBeforeAndAfter() throws RedPenException {
+        SpaceBetweenAlphabeticalWordValidator validator = new SpaceBetweenAlphabeticalWordValidator();
+        validator.preInit(new ValidatorConfiguration("SpaceBetweenAlphabeticalWord").addProperty("skip_before", "・「").addProperty("skip_after", "・」"), Configuration.builder().build());
+        List<ValidationError> errors = new ArrayList<>();
+        validator.setErrorList(errors);
+        validator.validate(new Sentence("きょうは「Coke・Pepsi」を飲みたい。", 0));
+        assertEquals(0, errors.size());
+    }
+
 
     @Test
     public void testSupportedLanguages() {