Index: src/test/java/org/codehaus/mojo/jslint/JSLintMojoTest.java =================================================================== --- src/test/java/org/codehaus/mojo/jslint/JSLintMojoTest.java (Revision 14096) +++ src/test/java/org/codehaus/mojo/jslint/JSLintMojoTest.java (Arbeitskopie) @@ -109,22 +109,20 @@ jsLintMojo.setAssumeWindows( false ); jsLintMojo.setDisallowBitwiseOperators( false ); jsLintMojo.setDisallowDanglingUnderbarInIdentifiers( false ); - jsLintMojo.setDisallowEQNE( false ); jsLintMojo.setDisallowIncrAndDecr( false ); jsLintMojo.setDisallowInsecureCharsInRegExp( false ); jsLintMojo.setDisallowUndefinedVariables( true ); jsLintMojo.setFailOnIssues( false ); - final int maxErrors = 50; - jsLintMojo.setMaximumNumberOfErrors( maxErrors ); + jsLintMojo.setMaximumNumberOfErrors( 50 ); jsLintMojo.setPredefinedVars( "" ); jsLintMojo.setRequireInitialCapsForConstructors( false ); - jsLintMojo.setRequireParensAroundImmediateInvocations( false ); jsLintMojo.setRequireUseStrict( false ); jsLintMojo.setSafeSubset( false ); jsLintMojo.setStopOnFirstError( false ); jsLintMojo.setStrictWhiteSpace( false ); jsLintMojo.setStrictWhiteSpaceIndentation( 4 ); jsLintMojo.setTolerateCSSWorkarounds( false ); + jsLintMojo.setTolerateContinuation( false ); jsLintMojo.setTolerateDebuggerStatements( false ); jsLintMojo.setTolerateES5Syntax( false ); jsLintMojo.setTolerateEval( false ); @@ -132,7 +130,6 @@ jsLintMojo.setTolerateHTMLEventHandlers( false ); jsLintMojo.setTolerateHTMLFragments( false ); jsLintMojo.setTolerateInefficientSubscripting( false ); - jsLintMojo.setTolerateSloppyLineBreaking( false ); jsLintMojo.setTolerateUnfilteredForIn( false ); } @@ -155,7 +152,7 @@ Log log = jsLintMojo.getLog(); verify( log ).info( "Parsing: badTest.js" ); verify( log ).info( "Parsing: test.js" ); - verify( log ).warn( "badTest.js:2:1:'a' is not defined." ); + verify( log ).warn( "badTest.js:2:1:'a' has not been fully defined yet." ); } /** @@ -183,7 +180,7 @@ Log log = jsLintMojo.getLog(); verify( log ).info( "Parsing: badTest.js" ); verify( log ).info( "Parsing: test.js" ); - verify( log ).error( "badTest.js:2:1:'a' is not defined." ); + verify( log ).error( "badTest.js:2:1:'a' has not been fully defined yet." ); } } @@ -206,21 +203,21 @@ jsLintMojo.setAssumeWindows( true ); jsLintMojo.setDisallowBitwiseOperators( true ); jsLintMojo.setDisallowDanglingUnderbarInIdentifiers( true ); - jsLintMojo.setDisallowEQNE( true ); jsLintMojo.setDisallowIncrAndDecr( true ); jsLintMojo.setDisallowInsecureCharsInRegExp( true ); jsLintMojo.setDisallowUndefinedVariables( true ); jsLintMojo.setFailOnIssues( true ); + jsLintMojo.setMaximumLengthOfLine( 80 ); jsLintMojo.setMaximumNumberOfErrors( 1 ); jsLintMojo.setPredefinedVars( "a,b" ); jsLintMojo.setRequireInitialCapsForConstructors( true ); - jsLintMojo.setRequireParensAroundImmediateInvocations( true ); jsLintMojo.setRequireUseStrict( true ); jsLintMojo.setSafeSubset( true ); jsLintMojo.setStopOnFirstError( true ); jsLintMojo.setStrictWhiteSpace( true ); jsLintMojo.setStrictWhiteSpaceIndentation( 4 ); jsLintMojo.setTolerateCSSWorkarounds( true ); + jsLintMojo.setTolerateContinuation( true ); jsLintMojo.setTolerateDebuggerStatements( true ); jsLintMojo.setTolerateES5Syntax( true ); jsLintMojo.setTolerateEval( true ); @@ -228,7 +225,6 @@ jsLintMojo.setTolerateHTMLEventHandlers( true ); jsLintMojo.setTolerateHTMLFragments( true ); jsLintMojo.setTolerateInefficientSubscripting( true ); - jsLintMojo.setTolerateSloppyLineBreaking( true ); jsLintMojo.setTolerateUnfilteredForIn( true ); // The method we want to exercise. @@ -243,7 +239,7 @@ JSLintResult result = jsLint.lint( "", "" ); List issues = result.getIssues(); assertEquals( 2, issues.size() ); - assertEquals( ":1:1:Expected '
' and instead saw ''.", issues.get( 0 ).toString() ); - assertEquals( ":1:1:Stopping. (0% scanned).", issues.get( 1 ).toString() ); + assertEquals( ":1:1:Expected '
' and instead saw '(end)'.", issues.get( 0 ).toString() ); + assertEquals( ":1:1:Stopping. (100% scanned).", issues.get( 1 ).toString() ); } } Index: src/main/java/org/codehaus/mojo/jslint/AbstractJSLintMojo.java =================================================================== --- src/main/java/org/codehaus/mojo/jslint/AbstractJSLintMojo.java (Revision 14096) +++ src/main/java/org/codehaus/mojo/jslint/AbstractJSLintMojo.java (Arbeitskopie) @@ -129,12 +129,12 @@ private boolean assumeConsoleAlertEtc; /** - * true if === and !== should be required. @see http://www.jslint.com/lint.html#equal + * true if the continuation statement should be tolerated. * - * @parameter default-value="true" + * @parameter default-value="false" * @required */ - private boolean disallowEQNE; + private boolean tolerateContinuation; /** * true if ES5 syntax should be allowed. @@ -169,14 +169,6 @@ private boolean tolerateHTMLFragments; /** - * true if immediate function invocations must be wrapped in parens. - * - * @parameter default-value="true" - * @required - */ - private boolean requireParensAroundImmediateInvocations; - - /** * true if the ES5 "use strict"; pragma is required. Do not use this option carelessly. * * @parameter default-value="false" @@ -193,12 +185,11 @@ private Integer strictWhiteSpaceIndentation; /** - * true if statement breaks should not be checked. @see http://www.jslint.com/lint.html#breaking + * The maximum length of a source line. * - * @parameter default-value="false" - * @required + * @parameter */ - private boolean tolerateSloppyLineBreaking; + private Integer maximumLengthOfLine; /** * The maximum number of warnings reported. @@ -437,6 +428,14 @@ /** * @return property. */ + public Integer getMaximumLengthOfLine() + { + return maximumLengthOfLine; + } + + /** + * @return property. + */ public Integer getMaximumNumberOfErrors() { return maximumNumberOfErrors; @@ -466,135 +465,124 @@ protected void initJSLint() throws MojoExecutionException { - try - { - jsLint = new JSLintBuilder().fromDefault(); + jsLint = new JSLintBuilder().fromDefault(); - // Set up options. - if ( adsafe ) - { - jsLint.addOption( Option.ADSAFE ); - } - if ( disallowBitwiseOperators ) - { - jsLint.addOption( Option.BITWISE ); - } - if ( assumeABrowser ) - { - jsLint.addOption( Option.BROWSER ); - } - if ( tolerateHTMLCase ) - { - jsLint.addOption( Option.CAP ); - } - if ( tolerateCSSWorkarounds ) - { - jsLint.addOption( Option.CSS ); - } - if ( tolerateDebuggerStatements ) - { - jsLint.addOption( Option.DEBUG ); - } - if ( assumeConsoleAlertEtc ) - { - jsLint.addOption( Option.DEVEL ); - } - if ( disallowEQNE ) - { - jsLint.addOption( Option.EQEQEQ ); - } - if ( tolerateES5Syntax ) - { - jsLint.addOption( Option.ES5 ); - } - if ( tolerateEval ) - { - jsLint.addOption( Option.EVIL ); - } - if ( tolerateUnfilteredForIn ) - { - jsLint.addOption( Option.FORIN ); - } - if ( tolerateHTMLFragments ) - { - jsLint.addOption( Option.FRAGMENT ); - } - if ( requireParensAroundImmediateInvocations ) - { - jsLint.addOption( Option.IMMED ); - } - if ( tolerateSloppyLineBreaking ) - { - jsLint.addOption( Option.LAXBREAK ); - } - jsLint.addOption( Option.MAXERR, maximumNumberOfErrors.toString() ); - if ( requireInitialCapsForConstructors ) - { - jsLint.addOption( Option.NEWCAP ); - } - if ( disallowDanglingUnderbarInIdentifiers ) - { - jsLint.addOption( Option.NOMEN ); - } - if ( tolerateHTMLEventHandlers ) - { - jsLint.addOption( Option.ON ); - } - if ( allowOneVarStatementPerFunction ) - { - jsLint.addOption( Option.ONEVAR ); - } - if ( stopOnFirstError ) - { - jsLint.addOption( Option.PASSFAIL ); - } - if ( disallowIncrAndDecr ) - { - jsLint.addOption( Option.PLUSPLUS ); - } - jsLint.addOption( Option.PREDEF, predefinedVars ); - if ( disallowInsecureCharsInRegExp ) - { - jsLint.addOption( Option.REGEXP ); - } - if ( assumeRhino ) - { - jsLint.addOption( Option.RHINO ); - } - if ( safeSubset ) - { - jsLint.addOption( Option.SAFE ); - } - if ( requireUseStrict ) - { - jsLint.addOption( Option.STRICT ); - } - if ( tolerateInefficientSubscripting ) - { - jsLint.addOption( Option.SUB ); - } - if ( disallowUndefinedVariables ) - { - jsLint.addOption( Option.UNDEF ); - } - if ( strictWhiteSpace ) - { - jsLint.addOption( Option.WHITE ); - jsLint.addOption( Option.INDENT, strictWhiteSpaceIndentation.toString() ); - } - if ( assumeAYahooWidget ) - { - jsLint.addOption( Option.WIDGET ); - } - if ( assumeWindows ) - { - jsLint.addOption( Option.WINDOWS ); - } + // Set up options. + if ( adsafe ) + { + jsLint.addOption( Option.ADSAFE ); } - catch ( IOException e ) + if ( disallowBitwiseOperators ) { - throw new MojoExecutionException( "Problem while initialising JSLint", e ); + jsLint.addOption( Option.BITWISE ); } + if ( assumeABrowser ) + { + jsLint.addOption( Option.BROWSER ); + } + if ( tolerateHTMLCase ) + { + jsLint.addOption( Option.CAP ); + } + if ( tolerateContinuation ) + { + jsLint.addOption( Option.CONTINUE ); + } + if ( tolerateCSSWorkarounds ) + { + jsLint.addOption( Option.CSS ); + } + if ( tolerateDebuggerStatements ) + { + jsLint.addOption( Option.DEBUG ); + } + if ( assumeConsoleAlertEtc ) + { + jsLint.addOption( Option.DEVEL ); + } + if ( tolerateES5Syntax ) + { + jsLint.addOption( Option.ES5 ); + } + if ( tolerateEval ) + { + jsLint.addOption( Option.EVIL ); + } + if ( tolerateUnfilteredForIn ) + { + jsLint.addOption( Option.FORIN ); + } + if ( tolerateHTMLFragments ) + { + jsLint.addOption( Option.FRAGMENT ); + } + jsLint.addOption( Option.MAXERR, maximumNumberOfErrors.toString() ); + if ( maximumLengthOfLine != null ) + { + jsLint.addOption( Option.MAXLEN, maximumLengthOfLine.toString() ); + } + if ( requireInitialCapsForConstructors ) + { + jsLint.addOption( Option.NEWCAP ); + } + if ( disallowDanglingUnderbarInIdentifiers ) + { + jsLint.addOption( Option.NOMEN ); + } + if ( tolerateHTMLEventHandlers ) + { + jsLint.addOption( Option.ON ); + } + if ( allowOneVarStatementPerFunction ) + { + jsLint.addOption( Option.ONEVAR ); + } + if ( stopOnFirstError ) + { + jsLint.addOption( Option.PASSFAIL ); + } + if ( disallowIncrAndDecr ) + { + jsLint.addOption( Option.PLUSPLUS ); + } + jsLint.addOption( Option.PREDEF, predefinedVars ); + if ( disallowInsecureCharsInRegExp ) + { + jsLint.addOption( Option.REGEXP ); + } + if ( assumeRhino ) + { + jsLint.addOption( Option.RHINO ); + } + if ( safeSubset ) + { + jsLint.addOption( Option.SAFE ); + } + if ( requireUseStrict ) + { + jsLint.addOption( Option.STRICT ); + } + if ( tolerateInefficientSubscripting ) + { + jsLint.addOption( Option.SUB ); + } + if ( disallowUndefinedVariables ) + { + jsLint.addOption( Option.UNDEF ); + } + if ( strictWhiteSpace ) + { + jsLint.addOption( Option.WHITE ); + jsLint.addOption( Option.INDENT, strictWhiteSpaceIndentation.toString() ); + } + if ( assumeAYahooWidget ) + { + jsLint.addOption( Option.WIDGET ); + } + if ( assumeWindows ) + { + jsLint.addOption( Option.WINDOWS ); + } } /** @@ -672,14 +660,6 @@ /** * @return property. */ - public boolean isDisallowEQNE() - { - return disallowEQNE; - } - - /** - * @return property. - */ public boolean isDisallowIncrAndDecr() { return disallowIncrAndDecr; @@ -720,14 +700,6 @@ /** * @return property. */ - public boolean isRequireParensAroundImmediateInvocations() - { - return requireParensAroundImmediateInvocations; - } - - /** - * @return property. - */ public boolean isRequireUseStrict() { return requireUseStrict; @@ -768,6 +740,14 @@ /** * @return property. */ + public boolean isTolerateContinuation() + { + return tolerateContinuation; + } + + /** + * @return property. + */ public boolean isTolerateDebuggerStatements() { return tolerateDebuggerStatements; @@ -824,14 +804,6 @@ /** * @return property. */ - public boolean isTolerateSloppyLineBreaking() - { - return tolerateSloppyLineBreaking; - } - - /** - * @return property. - */ public boolean isTolerateUnfilteredForIn() { return tolerateUnfilteredForIn; @@ -918,14 +890,6 @@ } /** - * @param disallowEQNE set property. - */ - public void setDisallowEQNE( boolean disallowEQNE ) - { - this.disallowEQNE = disallowEQNE; - } - - /** * @param disallowIncrAndDecr set property. */ public void setDisallowIncrAndDecr( boolean disallowIncrAndDecr ) @@ -966,6 +930,14 @@ } /** + * @param maximumLengthOfLine set property. + */ + public void setMaximumLengthOfLine( Integer maximumLengthOfLine ) + { + this.maximumLengthOfLine = maximumLengthOfLine; + } + + /** * @param maximumNumberOfErrors set property. */ public void setMaximumNumberOfErrors( Integer maximumNumberOfErrors ) @@ -990,14 +962,6 @@ } /** - * @param requireParensAroundImmediateInvocations set property. - */ - public void setRequireParensAroundImmediateInvocations( boolean requireParensAroundImmediateInvocations ) - { - this.requireParensAroundImmediateInvocations = requireParensAroundImmediateInvocations; - } - - /** * @param requireUseStrict set property. */ public void setRequireUseStrict( boolean requireUseStrict ) @@ -1046,6 +1010,14 @@ } /** + * @param tolerateContinuation set property. + */ + public void setTolerateContinuation( boolean tolerateContinuation ) + { + this.tolerateContinuation = tolerateContinuation; + } + + /** * @param tolerateDebuggerStatements set property. */ public void setTolerateDebuggerStatements( boolean tolerateDebuggerStatements ) @@ -1102,14 +1074,6 @@ } /** - * @param tolerateSloppyLineBreaking set property. - */ - public void setTolerateSloppyLineBreaking( boolean tolerateSloppyLineBreaking ) - { - this.tolerateSloppyLineBreaking = tolerateSloppyLineBreaking; - } - - /** * @param tolerateUnfilteredForIn set property. */ public void setTolerateUnfilteredForIn( boolean tolerateUnfilteredForIn ) Index: pom.xml =================================================================== --- pom.xml (Revision 14096) +++ pom.xml (Arbeitskopie) @@ -58,7 +58,7 @@ com.googlecode.jslint4java jslint4java - 1.4.2 + 1.4.7 commons-io