Merge pull request #1 from AtomLinter/master

Add option for linting inline JavaScript

README.md

@@ -13,9 +13,10 @@ $ apm install linter-jshint
 
 ## Settings
 You can configure linter-jshint by editing ~/.atom/config.cson (choose Open Your Config in Atom menu):
-```
+```coffee
 'linter-jshint':
-  'jshintExecutablePath': null #jshint path. run 'which jshint' to find the path
+  jshintExecutablePath: (default: null) 'jsHint path. Run `which jshint` to find the path'
+  lintInlineJavaScript: (default: false) 'Lint JavaScript inside `<script>` blocks in HTML or PHP files'
 ```
 
 ## Contributing
@@ -34,6 +35,3 @@ Please note that modifications should follow these coding guidelines:
 - Vertical whitespace helps readability, don’t be afraid to use it.
 
 Thank you for helping out!
-
-## Donation
-[![Share the love!](https://chewbacco-stuff.s3.amazonaws.com/donate.png)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=KXUYS4ARNHCN8)

lib/main.coffee

@@ -1,10 +1,30 @@
+{CompositeDisposable} = require 'atom'
 
 module.exports =
   config:
     jshintExecutablePath:
       default: ''
       type: 'string'
       description: 'Leave empty to use bundled'
+    lintInlineJavaScript:
+      type: 'boolean'
+      default: false
+      description: 'Lint JavaScript inside `<script>` blocks in HTML or PHP files'
+
+  activate: ->
+    scopeEmbedded = 'source.js.embedded.html'
+    @scopes = ['source.js', 'source.js.jsx']
+    @subscriptions = new CompositeDisposable
+    @subscriptions.add atom.config.observe 'linter-jshint.lintInlineJavaScript',
+      (lintInlineJavaScript) =>
+        if lintInlineJavaScript
+          @scopes.push(scopeEmbedded) unless scopeEmbedded in @scopes
+        else
+          @scopes.splice(@scopes.indexOf(scopeEmbedded), 1) if scopeEmbedded in @scopes
+
+  deactivate: ->
+    @subscriptions.dispose()
+
   provideLinter: ->
     if process.platform is 'win32'
       jshintPath = require('path').join(__dirname, '..', 'node_modules', '.bin', 'jshint.cmd')
@@ -13,14 +33,17 @@ module.exports =
     helpers = require('atom-linter')
     reporter = require('jshint-json') # a string path
     provider =
-      grammarScopes: ['source.js', 'source.js.jsx']
+      grammarScopes: @scopes
       scope: 'file'
       lintOnFly: true
-      lint: (textEditor) ->
+      lint: (textEditor) =>
         exePath = atom.config.get('linter-jshint.jshintExecutablePath') || jshintPath
         filePath = textEditor.getPath()
         text = textEditor.getText()
-        parameters = ['--reporter', reporter, '--extract', 'auto', '--filename', filePath, '-']
+        parameters = ['--reporter', reporter, '--filename', filePath]
+        if textEditor.getGrammar().scopeName.indexOf('text.html') isnt -1 and 'source.js.embedded.html' in @scopes
+          parameters.push('--extract', 'always')
+        parameters.push('-')
         return helpers.exec(exePath, parameters, {stdin: text}).then (output) ->
           try
             output = JSON.parse(output).result