Skip to content

Commit 72e2678

Browse files
committed
Merge branch 'pr-nodelinter' of https://github.com/gbouthenot/SublimeLinter-coffeelint into gbouthenot-pr-nodelinter
# Conflicts: # linter.py
2 parents 69c6855 + cd37074 commit 72e2678

3 files changed

Lines changed: 11 additions & 5 deletions

File tree

linter.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,15 @@
1212
"""This module exports the Coffeelint plugin class."""
1313

1414
import SublimeLinter.lint
15-
from SublimeLinter.lint import Linter, persist, util
15+
from SublimeLinter.lint import NodeLinter, persist, util
1616

1717

18-
class Coffeelint(Linter):
18+
class Coffeelint(NodeLinter):
1919
"""Provides an interface to coffeelint."""
2020

2121
syntax = ('coffeescript', 'coffeescript_literate')
2222
executable = 'coffeelint'
23+
npm_name = 'coffeelint'
2324
version_args = '--version'
2425
version_re = r'(?P<version>\d+\.\d+\.\d+)'
2526
version_requirement = '>= 1.4.0'
@@ -37,9 +38,8 @@ class Coffeelint(Linter):
3738
def cmd(self):
3839
"""Return a tuple with the command line to execute."""
3940

40-
command = [self.executable_path, '--reporter', 'jslint', '--stdin']
41+
command = [self.executable, '--reporter', 'jslint', '--stdin']
4142
api_version = getattr(SublimeLinter.lint, 'VERSION', 3)
42-
4343
if api_version > 3:
4444
current_syntax = util.get_syntax(self.view)
4545
else:

messages.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
22
"install": "messages/install.txt",
3-
"1.0.3": "messages/1.0.3.txt"
3+
"1.0.3": "messages/1.0.3.txt",
4+
"2.0.0": "messages/2.0.0.txt"
45
}

messages/2.0.0.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
SublimeLinter-coffeelint 2.0.0
2+
-------------------------------
3+
4+
The linter plugin is now based on the NodeJS base linter.
5+
This should enable it to use a project's local coffeelint binary.

0 commit comments

Comments
 (0)