Added cargo lint. See #5

Author: gmist

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.1.0
+* Remove linting "on the fly".
+* Support Cargo. See #5. Thanks @liigo for ideas.
+
 # 0.0.13
 Added linting on the fly (experimental).
 

README.md

@@ -1,10 +1,11 @@
 # linter-rust
 
-Linting your Rust-files on the fly using [rustc](http://www.rust-lang.org) with [Atom](https://atom.io).
+Linting your Rust-files in [Atom](https://atom.io), using [rustc](http://www.rust-lang.org) and [cargo](https://crates.io).
+Files will be checked when you open or save them.
 
 ## Installation
 
-* Install [Rust](http://www.rust-lang.org).
+* Install [Rust](http://www.rust-lang.org) and/or [Cargo](https://crates.io).
 * `$ apm install linter` (if you don't have [AtomLinter/Linter](https://github.com/AtomLinter/Linter) installed).
 * `$ apm install linter-rust`
 

lib/init.coffee

@@ -4,14 +4,27 @@ module.exports =
       type: 'string'
       default: 'rustc'
       description: 'Path to rust compiller'
+    cargoExecutablePath:
+      type: 'string'
+      default: 'cargo'
+      description: 'Path to Cargo package manager'
+    useCargo:
+      type: 'boolean'
+      default: true
+      description: 'Use Cargo if it\'s possible'
     cargoManifestFilename:
       type: 'string'
       default: 'Cargo.toml'
       description: 'Cargo manifest filename'
-    lintOnChange:
-      type: 'boolean'
-      default: true
-      description: 'Lint file on change (experimental)'
+    jobsNumber:
+      type: 'integer'
+      default: 2
+      description: 'Number of jobs to run Cargo in parallel'
+    executionTimeout:
+      type: 'integer'
+      default: 10000
+      description: 'Linting execution timeout'
+
 
   activate: ->
     console.log 'Linter-Rust: package loaded,

lib/linter-rust.coffee

@@ -5,91 +5,89 @@ Linter = require "#{linterPath}/lib/linter"
 {log, warn, findFile} = require "#{linterPath}/lib/utils"
 fs = require 'fs'
 path = require 'path'
-tmp = require('tmp')
 
 
 class LinterRust extends Linter
-  @enabled: false
+  regex: '(?<file>.+):(?<line>\\d+):(?<col>\\d+):\\s*(\\d+):(\\d+)\\s+((?<error>error|fatal error)|(?<warning>warning)|(?<info>note)):\\s+(?<message>.+)\n'
   @syntax: 'source.rust'
-  rustcPath: ''
   linterName: 'rust'
   errorStream: 'stderr'
-  regex: '(?<file>.+):(?<line>\\d+):(?<col>\\d+):\\s*(\\d+):(\\d+)\\s+((?<error>error|fatal error)|(?<warning>warning)|(?<info>note)):\\s+(?<message>.+)\n'
+
+  rustcPath: ''
+  cargoPath: ''
   cargoManifestFilename: ''
-  dependencyDir: "target/debug/deps"
-  tmpFile: null
-  lintOnChange: false
+  cargoDependencyDir: "target/debug/deps"
+  useCargo: true
+  jobsNumber: 2
+
+  baseOptions: []
+  executionTimeout: 10000
 
 
   constructor: (@editor) ->
     super @editor
     atom.config.observe 'linter-rust.executablePath', =>
-      rustcPath = atom.config.get 'linter-rust.executablePath'
-      if rustcPath != @rustcPath
-        @enabled = false
-        @rustcPath = rustcPath
-        exec "\"#{@rustcPath}\" --version", @executionCheckHandler
+      @rustcPath = atom.config.get 'linter-rust.executablePath'
+      exec "\"#{@rustcPath}\" --version", @executionCheckHandler
+    atom.config.observe 'linter-rust.cargoExecutablePath', =>
+      @cargoPath = atom.config.get 'linter-rust.cargoExecutablePath'
+      exec "\"#{@cargoPath}\" --version", @executionCheckHandler
     atom.config.observe 'linter-rust.cargoManifestFilename', =>
-      @cargoManifestFilename = atom.config.get 'linter-rust.cargoMainifestFilename'
-    atom.config.observe 'linter-rust.lintOnChange', =>
-      @lintOnChange = atom.config.get 'linter-rust.lintOnChange'
+      @cargoManifestFilename = atom.config.get 'linter-rust.cargoManifestFilename'
+    atom.config.observe 'linter-rust.useCargo', =>
+      @useCargo = atom.config.get 'linter-rust.useCargo'
+    atom.config.observe 'linter-rust.jobsNumber', =>
+      @jobsNumber = atom.config.get 'jobsNumber'
+    atom.config.observe 'linter-rust.executionTimeout', =>
+      @executionTimeout = atom.config.get 'linter-rust.executionTimeout'
 
 
   executionCheckHandler: (error, stdout, stderr) =>
-    versionRegEx = /rustc ([\d\.]+)/
-    if not versionRegEx.test(stdout)
+    executable = if /^rustc/.test stdout then ['rustc', @rustcPath] else ['cargo', @cargoPath]
+    versionRegEx = /(rustc|cargo) ([\d\.]+)/
+    if not versionRegEx.test stdout
       result = if error? then '#' + error.code + ': ' else ''
       result += 'stdout: ' + stdout if stdout.length > 0
       result += 'stderr: ' + stderr if stderr.length > 0
-      console.error "Linter-Rust: \"#{@rustcPath}\" was not executable: \
+      console.error "Linter-Rust: \"#{executable[1]}\" was not executable: \
       \"#{result}\". Please, check executable path in the linter settings."
+      if 'rustc' == executable[0] then @rustcPath='' else @cargoPath=''
     else
-      @enabled = true
-      log "Linter-Rust: found rust " + versionRegEx.exec(stdout)[1]
-      do @initCmd
+      log "Linter-Rust: found #{executable[0]}"
 
 
-  initCmd: =>
-    @cmd = [@rustcPath, '-Z', 'no-trans', '--color', 'never']
-    cargoPath = do @locateCargoManifest
-    if cargoPath
-      @cmd.push '-L'
-      @cmd.push path.join cargoPath, @dependencyDir
-    log 'Linter-Rust: initialization completed'
+  initCmd: (editingFile) =>
+    cargoManifestPath = do @locateCargoManifest
+    if not @cargoPath or not @useCargo or not cargoManifestPath
+      @cmd = [@rustcPath, '-Z', 'no-trans', '--color', 'never']
+      if cargoManifestPath
+        @cmd.push '-L'
+        @cmd.push path.join path.dirname(cargoManifestPath), @cargoDependencyDir
+      return editingFile
+    else
+      @cmd = [@cargoPath, 'build', '-j', 2, '--manifest-path']
+      return cargoManifestPath
 
 
   lintFile: (filePath, callback) =>
-    if @enabled
-      fileName = path.basename do @editor.getPath
-      if @lintOnChange
-        cur_dir = path.dirname do @editor.getPath
-        @tmpFile = tmp.fileSync {dir: cur_dir, postfix: "-#{fileName}"}
-        fs.writeFileSync @tmpFile.name, @editor.getText()
-        super @tmpFile.name, callback
-      else
-        super fileName, callback
+    editingFile = @initCmd path.basename do @editor.getPath
+    if @rustcPath or (@cargoPath and @useCargo)
+      super editingFile, callback
 
 
   locateCargoManifest: ->
     cur_dir = path.resolve path.dirname do @editor.getPath
-    return findFile(cur_dir, @cargoManifestFilename)
-
+    findFile(cur_dir, @cargoManifestFilename)
 
-  processMessage: (message, callback) ->
-    if @tmpFile
-      @tmpFile.removeCallback()
-      @tmpFile = null
-    super message, callback
 
-
-  formatMessage: (match) ->
-    fileName = path.basename do @editor.getPath
-    fileNameRE = RegExp "-#{fileName}$"
+  formatMessage: (match) =>
     type = if match.error then match.error else if match.warning then match.warning else match.info
-    if fileNameRE.test(match.file) or fileName == match.file
-      "#{type}: #{match.message}"
-    else
+    fileName = path.basename do @editor.getPath
+    if match.file isnt fileName
+      match.col = match.line = 0
       "#{type} in #{match.file}: #{match.message}"
+    else
+      "#{type}: #{match.message}"
 
 
 module.exports = LinterRust

package.json

@@ -3,13 +3,11 @@
   "linter-package": true,
   "main": "./lib/init",
   "version": "0.0.13",
-  "description": "Lint Rust on the fly, using rustc",
+  "description": "Lint Rust-files, using rustc and/or cargo",
   "repository": "https://github.com/AtomLinter/linter-rust",
   "license": "MIT",
   "engines": {
     "atom": ">0.50.0"
   },
-  "dependencies": {
-    "tmp": "0.0.26"
-  }
+  "dependencies": {}
 }