Accept numeric values in JSHint options

Values with illegal syntax are silently ignored.
Fixes #25

Author: ralfstx

bundles/com.eclipsesource.jshint.ui/META-INF/MANIFEST.MF

@@ -10,7 +10,8 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.resources;bundle-version="3.6.0"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
-Import-Package: com.eclipsesource.jshint;version="[0.9.5,1.0.0)"
+Import-Package: com.eclipsesource.jshint;version="[0.9.5,1.0.0)",
+ com.eclipsesource.json;version="0.9.0"
 Export-Package: com.eclipsesource.jshint.ui.internal;version="0.9.5";x-internal:=true,
  com.eclipsesource.jshint.ui.internal.builder;version="0.9.5";x-internal:=true,
  com.eclipsesource.jshint.ui.internal.preferences;version="0.9.5";x-internal:=true,

bundles/com.eclipsesource.jshint.ui/src/com/eclipsesource/jshint/ui/internal/preferences/OptionParserUtil.java

@@ -14,6 +14,8 @@
 import java.util.List;
 
 import com.eclipsesource.jshint.Configuration;
+import com.eclipsesource.json.JsonValue;
+import com.eclipsesource.json.ParseException;
 
 
 public class OptionParserUtil {
@@ -25,7 +27,7 @@ private OptionParserUtil() {
   public static Configuration createConfiguration( String options, String globals ) {
     Configuration configuration = new Configuration();
     for( Entry entry : parseOptionString( globals ) ) {
-      configuration.addPredefined( entry.name, entry.value );
+      configuration.addPredefined( entry.name, entry.value == JsonValue.TRUE );
     }
     for( Entry entry : parseOptionString( options ) ) {
       configuration.addOption( entry.name, entry.value );
@@ -37,23 +39,35 @@ static List<Entry> parseOptionString( String input ) {
     List<Entry> result = new ArrayList<Entry>();
     String[] elements = input.split( "," );
     for( String element : elements ) {
-      element = element.trim();
-      if( element.length() > 0 ) {
-        String[] parts = element.split( ":", 2 );
-        String key = parts[ 0 ].trim();
-        if( key.length() > 0 ) {
-          boolean value = parts.length > 1 ? Boolean.parseBoolean( parts[ 1 ].trim() ) : false;
-          result.add( new Entry( key, value ) );
+      element = parseOptionElement( result, element.trim() );
+    }
+    return result;
+  }
+
+  private static String parseOptionElement( List<Entry> result, String element ) {
+    if( element.length() > 0 ) {
+      String[] parts = element.split( ":", 2 );
+      String key = parts[ 0 ].trim();
+      if( key.length() > 0 ) {
+        if( parts.length != 2 ) {
+          // TODO handle error
+        } else {
+          try {
+            JsonValue value = JsonValue.readFrom( parts[ 1 ].trim() );
+            result.add( new Entry( key, value ) );
+          } catch( ParseException exception ) {
+            // TODO handle error
+          }
         }
       }
     }
-    return result;
+    return element;
   }
 
   static class Entry {
     public final String name;
-    public final boolean value;
-    public Entry( String name, boolean value ) {
+    public final JsonValue value;
+    public Entry( String name, JsonValue value ) {
       this.name = name;
       this.value = value;
     }

tests/com.eclipsesource.jshint.ui.test/src/com/eclipsesource/jshint/ui/internal/preferences/OptionParserUtil_Test.java

@@ -16,8 +16,10 @@
 
 import com.eclipsesource.jshint.Configuration;
 import com.eclipsesource.jshint.ui.internal.preferences.OptionParserUtil.Entry;
+import com.eclipsesource.json.JsonValue;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 
 public class OptionParserUtil_Test {
@@ -26,7 +28,7 @@ public class OptionParserUtil_Test {
   public void createConfiguration() {
     Configuration result = OptionParserUtil.createConfiguration( "opt1: true", "predef1: false" );
 
-    assertEquals( "{\"predef\": {\"predef1\": false}, \"opt1\": true}", result.toJson() );
+    assertEquals( "{\"opt1\":true,\"predef\":{\"predef1\":false}}",result.toJson() );
   }
 
   @Test
@@ -64,7 +66,7 @@ public void parseSingle() {
 
     assertEquals( 1, result.size() );
     assertEquals( "foo", result.get( 0 ).name );
-    assertTrue( result.get( 0 ).value );
+    assertEquals( JsonValue.TRUE, result.get( 0 ).value );
   }
 
   @Test
@@ -73,9 +75,9 @@ public void parseTwoOptions() {
 
     assertEquals( 2, result.size() );
     assertEquals( "foo", result.get( 0 ).name );
-    assertTrue( result.get( 0 ).value );
+    assertEquals( JsonValue.TRUE, result.get( 0 ).value );
     assertEquals( "bar", result.get( 1 ).name );
-    assertFalse( result.get( 1 ).value );
+    assertEquals( JsonValue.FALSE, result.get( 1 ).value );
   }
 
   @Test
@@ -84,9 +86,9 @@ public void parseAdditionalWhitespace() {
 
     assertEquals( 2, result.size() );
     assertEquals( "foo", result.get( 0 ).name );
-    assertTrue( result.get( 0 ).value );
+    assertEquals( JsonValue.TRUE, result.get( 0 ).value );
     assertEquals( "bar", result.get( 1 ).name );
-    assertFalse( result.get( 1 ).value );
+    assertEquals( JsonValue.FALSE, result.get( 1 ).value );
   }
 
   // TODO check for illegal names
@@ -96,16 +98,23 @@ public void parseWhitespaceInName() {
 
     assertEquals( 1, result.size() );
     assertEquals( "foo bar", result.get( 0 ).name );
-    assertTrue( result.get( 0 ).value );
+    assertEquals( JsonValue.TRUE, result.get( 0 ).value );
   }
 
   @Test
-  public void parseNonBooleanValue() {
-    List<Entry> result = OptionParserUtil.parseOptionString( "foo: bar" );
+  public void parseNumericValue() {
+    List<Entry> result = OptionParserUtil.parseOptionString( "foo: 23" );
 
     assertEquals( 1, result.size() );
     assertEquals( "foo", result.get( 0 ).name );
-    assertFalse( result.get( 0 ).value );
+    assertEquals( JsonValue.valueOf( 23 ), result.get( 0 ).value );
+  }
+
+  @Test
+  public void parseIllegalValue() {
+    List<Entry> result = OptionParserUtil.parseOptionString( "foo: (invalidJSON)" );
+
+    assertEquals( 0, result.size() );
   }
 
 }