Update to Rhino 1.7.4, JSHint 1.1.0

Rhino 1.7.2 and 1.7.3 fail to parse the JSHint 1.1.0 JavaScript.

Include Rhino 1.7.4 from Orbit, update minimal requirement to 1.7.4.
Due to the new structure of the jshint library, minifying is not
effective anymore, so use the original library.

Fixes #40

Author: ralfstx

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

@@ -9,4 +9,4 @@ Bundle-ActivationPolicy: lazy
 Export-Package: com.eclipsesource.jshint;version="0.9.5",
  com.eclipsesource.jshint.internal;version="0.9.5";x-friends:="com.eclipsesource.jshint.test",
  com.eclipsesource.json;version="0.9.0"
-Require-Bundle: org.mozilla.javascript;bundle-version="1.7.2"
+Require-Bundle: org.mozilla.javascript;bundle-version="1.7.4"

bundles/com.eclipsesource.jshint/src/com/eclipsesource/jshint/JSHint.java

@@ -45,7 +45,7 @@
  */
 public class JSHint {
 
-  private static final String DEFAULT_JSHINT_VERSION = "r12";
+  private static final String DEFAULT_JSHINT_VERSION = "1.1.0";
   private static final int DEFAULT_JSHINT_INDENT = 4;
   private Function jshint;
   private Object opts;
@@ -273,7 +273,7 @@ private static int getPropertyAsInt( ScriptableObject object, String name, int d
   private static BufferedReader getJsHintReader() throws UnsupportedEncodingException {
     ClassLoader classLoader = JSHint.class.getClassLoader();
     // Include DEFAULT_JSHINT_VERSION in name to ensure the constant matches the actual version
-    String name = "com/jshint/jshint-" + DEFAULT_JSHINT_VERSION + ".min.js";
+    String name = "com/jshint/jshint-" + DEFAULT_JSHINT_VERSION + ".js";
     InputStream inputStream = classLoader.getResourceAsStream( name );
     return new BufferedReader( new InputStreamReader( inputStream, "UTF-8" ) );
   }

bundles/com.eclipsesource.jshint/src/com/eclipsesource/jshint/internal/JSHintRunner.java

@@ -132,7 +132,9 @@ private void processFiles() throws IOException {
   }
 
   private void configureJSHint() {
-    jshint.configure( new Configuration() );
+    Configuration configuration = new Configuration();
+    configuration.addOption( "undef", true );
+    jshint.configure( configuration );
   }
 
   private String readFileContents( File file ) throws FileNotFoundException, IOException {

bundles/com.eclipsesource.jshint/src/com/jshint/jshint-1.1.0.js

@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
 
-<target name="Running Platform + Rhino" sequenceNumber="15">
+<target name="Running Platform + Rhino" sequenceNumber="21">
 <locations>
 <location path="${eclipse_home}" type="Profile"/>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.mozilla.javascript" version="1.7.2.v201005080400"/>
-<unit id="org.mozilla.javascript.source" version="1.7.2.v201005080400"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20120526062928/repository/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
 <unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
 <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20120526062928/repository/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.mozilla.javascript" version="1.7.4.v201209142200"/>
+<unit id="org.mozilla.javascript.source" version="1.7.4.v201209142200"/>
+<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20130308121626/repository/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.swtbot.forms.feature.group" version="2.0.5.20111003_1754-3676ac8-dev-e36"/>
 <unit id="org.eclipse.swtbot.feature.group" version="2.0.5.20111003_1754-3676ac8-dev-e36"/>
 <repository location="http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site"/>

bundles/com.eclipsesource.jshint/src/com/jshint/jshint-r12.min.js

@@ -37,9 +37,10 @@
       <url>http://download.eclipse.org/releases/indigo/</url>
     </repository>
     <repository>
-      <id>orbit-repo</id>
+      <!-- need stable orbit repository, since latest release does not contain rhino 1.7.4 -->
+      <id>orbit-stable-repo</id>
       <layout>p2</layout>
-      <url>http://download.eclipse.org/tools/orbit/downloads/drops/R20120526062928/repository/</url>
+      <url>http://download.eclipse.org/tools/orbit/downloads/drops/S20130308121626/repository/</url>
     </repository>
     <repository>
       <id>swtbot-repo</id>

releng/com.eclipsesource.jshint.build/jshint.target

@@ -48,6 +48,7 @@ public static Collection<Object[]> getParameters() {
     parameters.add( new Object[] { "com/jshint/jshint-r10.js" } );
     parameters.add( new Object[] { "com/jshint/jshint-r11.js" } );
     parameters.add( new Object[] { "com/jshint/jshint-r12.js" } );
+    parameters.add( new Object[] { "com/jshint/jshint-1.1.0.js" } );
     return parameters;
   }
 

releng/com.eclipsesource.jshint.build/pom.xml

@@ -44,7 +44,7 @@ public void setUp() throws IOException {
   public void getDefaultVersion() {
     String version = JSHint.getDefaultLibraryVersion();
 
-    assertTrue( version.matches( "r\\d+" ) );
+    assertTrue( version.matches( "\\d+\\.\\d+\\.\\d+" ) );
   }
 
   @Test( expected = NullPointerException.class )

tests/com.eclipsesource.jshint.test/src/com/eclipsesource/jshint/JSHint_Compatibility_Test.java

@@ -116,7 +116,7 @@ public void missingFile() throws Exception {
   @Test
   public void charsetDefaultsToUtf8() throws Exception {
     JSHintRunner runner = new JSHintRunner();
-    File file = createTmpFile( "var föhn = 23;", "UTF-8" );
+    File file = createTmpFile( "föhn.foo = 23;", "UTF-8" );
 
     runner.run( file.getAbsolutePath() );
 
@@ -126,7 +126,7 @@ public void charsetDefaultsToUtf8() throws Exception {
   @Test
   public void customCharset() throws Exception {
     JSHintRunner runner = new JSHintRunner();
-    File file = createTmpFile( "var föhn = 23;", "ISO-8859-1" );
+    File file = createTmpFile( "föhn.foo = 23;", "ISO-8859-1" );
 
     runner.run( "--charset", "ISO-8859-1", file.getAbsolutePath() );
 
@@ -136,7 +136,7 @@ public void customCharset() throws Exception {
   @Test
   public void illegalCharset() throws Exception {
     JSHintRunner runner = new JSHintRunner();
-    File file = createTmpFile( "var föhn = 23;", "ISO-8859-1" );
+    File file = createTmpFile( "föhn.foo = 23;", "ISO-8859-1" );
 
     runner.run( "--charset", "HMPF!", file.getAbsolutePath() );