Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge commit '15882ae632db3ecb11bcd490f27b19ce40ccc823'

* commit '15882ae632db3ecb11bcd490f27b19ce40ccc823':
  Adding version information and documentation for v1.6.12.
  Updating nodeload Github url; scheme changed.
  Adjusting cpplint to check stdin (instead of a temporary file).
  Fixing key error with unicode linter names.
  Updating documentation for latest release (v1.6.10).
  Puppet 3.x introduced a syntax change to 'parser validate' output. This change supports both the old and the new format.
  Adding -p flag to the Lua syntax check; this will reduce output file noise.
  `undefined` is cool to pass as third argument to JSHINT()
  Added support for `globals` directive.  `predef` is an undocumented JSLint remnant that does not allow imported globals to be overridden.
  Fixing key name of the notes and annotations
  fix for issue #212; avoid sending code in communicate()

Conflicts:
	changelog.txt
	messages.json
	package_control.json
  • Loading branch information...
commit 7b8d38782f5d6a46ae49d13b9aed58f0cad1c5d7 2 parents 6b4e097 + 15882ae
Jacob Swartwood authored
View
4 SublimeLinter.py
@@ -361,7 +361,7 @@ def select_linter(view, ignore_disabled=False):
disabled = view.settings().get('sublimelinter_disable', [])
if language not in disabled:
- linter = LINTERS[language]
+ linter = LINTERS['' + language]
# If the enabled state is False, it must be checked.
# Enabled checking has to be deferred to first view use because
@@ -371,7 +371,7 @@ def select_linter(view, ignore_disabled=False):
print 'SublimeLinter: {0} {1} ({2})'.format(language, 'enabled' if enabled else 'disabled', message)
if not enabled:
- del LINTERS[language]
+ del LINTERS['' + language]
linter = None
return linter
View
11 changelog.txt
@@ -417,3 +417,14 @@ SublimeLinter 1.6.11 changelog
CHANGES/FIXES
- Github (nodeload) zip url scheme changed.
+
+
+SublimeLinter 1.6.12 changelog
+==============================
+
+CHANGES/FIXES
+
+- Cpplint no longer uses a temporary file - it leverages stdin instead.
+
+- Fixed issue #298: C linter throws "KeyError"
+
View
3  messages.json
@@ -18,5 +18,6 @@
"1.6.8": "messages/1.6.8.txt",
"1.6.9": "messages/1.6.9.txt",
"1.6.10": "messages/1.6.10.txt",
- "1.6.11": "messages/1.6.11.txt"
+ "1.6.11": "messages/1.6.11.txt",
+ "1.6.12": "messages/1.6.12.txt"
}
View
7 messages/1.6.12.txt
@@ -0,0 +1,7 @@
+SublimeLinter 1.6.12 changelog
+
+CHANGES/FIXES
+
+- cpplint no longer uses a temporary file - it leverages stdin instead.
+
+- Fixed issue #298: C linter throws "KeyError"
View
5 package_control.json
@@ -6,12 +6,11 @@
"description": "Inline lint highlighting for the Sublime Text 2 editor",
"author": "Kronuz, Aparajita Fishman, Jake Swartwood",
"homepage": "http://github.com/SublimeLinter/SublimeLinter",
- "last_modified": "2012-11-18 00:19:27",
"platforms": {
"*": [
{
- "version": "1.6.11",
- "url": "https://nodeload.github.com/SublimeLinter/SublimeLinter/zip/v1.6.11"
+ "version": "1.6.12",
+ "url": "https://nodeload.github.com/SublimeLinter/SublimeLinter/zip/v1.6.12"
}
]
}
View
5 sublimelinter/modules/c_cpplint.py
@@ -3,14 +3,13 @@
import re
-from base_linter import BaseLinter, INPUT_METHOD_TEMP_FILE
+from base_linter import BaseLinter
CONFIG = {
'language': 'c_cpplint',
'executable': 'cpplint.py',
'test_existence_args': ['--help'],
- 'lint_args': '{filename}',
- 'input_method': INPUT_METHOD_TEMP_FILE
+ 'lint_args': '-',
}
Please sign in to comment.
Something went wrong with that request. Please try again.