Permalink
Browse files

Update jsbeautify to 1.6.2 and six to 1.10.0

1 parent 9cf8e82 commit 08131e975f25d25b3ecab6cbf15f70fea2292615 @mathieug mathieug committed Mar 29, 2016
Showing with 1,744 additions and 3,559 deletions.
  1. +2 −16 js_formatter.py
  2. +0 −2 libs/jsbeautifier/MANIFEST.in
  3. +366 −182 libs/jsbeautifier/{jsbeautifier → }/__init__.py
  4. +1 −0 libs/jsbeautifier/__version__.py
  5. +0 −438 libs/jsbeautifier/cssbeautifier/__init__.py
  6. +0 −1 libs/jsbeautifier/cssbeautifier/__version__.py
  7. +0 −288 libs/jsbeautifier/cssbeautifier/tests/test.py
  8. +0 −7 libs/jsbeautifier/js-beautify
  9. +0 −16 libs/jsbeautifier/js-beautify-profile
  10. +0 −10 libs/jsbeautifier/js-beautify-test
  11. +0 −1 libs/jsbeautifier/jsbeautifier/__version__.py
  12. +0 −137 libs/jsbeautifier/jsbeautifier/tests/shell-smoke-test.sh
  13. +0 −19 libs/jsbeautifier/setup.py
  14. 0 libs/jsbeautifier/{jsbeautifier → }/tests/__init__.py
  15. 0 libs/jsbeautifier/{cssbeautifier/tests → tests/generated}/__init__.py
  16. +932 −136 libs/jsbeautifier/{jsbeautifier/tests/testjsbeautifier.py → tests/generated/tests.py}
  17. +191 −0 libs/jsbeautifier/tests/shell-smoke-test.sh
  18. 0 libs/jsbeautifier/{jsbeautifier → }/tests/test-perf-jsbeautifier.py
  19. 0 libs/jsbeautifier/{jsbeautifier → }/tests/testindentation.py
  20. 0 libs/jsbeautifier/{jsbeautifier → }/unpackers/README.specs.mkd
  21. 0 libs/jsbeautifier/{jsbeautifier → }/unpackers/__init__.py
  22. 0 libs/jsbeautifier/{jsbeautifier → }/unpackers/evalbased.py
  23. 0 libs/jsbeautifier/{jsbeautifier → }/unpackers/javascriptobfuscator.py
  24. 0 libs/jsbeautifier/{jsbeautifier → }/unpackers/myobfuscate.py
  25. 0 libs/jsbeautifier/{jsbeautifier → }/unpackers/packer.py
  26. 0 libs/jsbeautifier/{jsbeautifier → }/unpackers/tests/__init__.py
  27. 0 libs/jsbeautifier/{jsbeautifier → }/unpackers/tests/test-myobfuscate-input.js
  28. 0 libs/jsbeautifier/{jsbeautifier → }/unpackers/tests/test-myobfuscate-output.js
  29. 0 libs/jsbeautifier/{jsbeautifier → }/unpackers/tests/test-packer-62-input.js
  30. 0 libs/jsbeautifier/{jsbeautifier → }/unpackers/tests/test-packer-non62-input.js
  31. 0 libs/jsbeautifier/{jsbeautifier → }/unpackers/tests/testjavascriptobfuscator.py
  32. 0 libs/jsbeautifier/{jsbeautifier → }/unpackers/tests/testmyobfuscate.py
  33. 0 libs/jsbeautifier/{jsbeautifier → }/unpackers/tests/testpacker.py
  34. 0 libs/jsbeautifier/{jsbeautifier → }/unpackers/tests/testurlencode.py
  35. 0 libs/jsbeautifier/{jsbeautifier → }/unpackers/urlencode.py
  36. +0 −231 libs/six-1.8.0/CHANGES
  37. +0 −21 libs/six-1.8.0/CONTRIBUTORS
  38. +0 −6 libs/six-1.8.0/MANIFEST.in
  39. +0 −16 libs/six-1.8.0/README
  40. +0 −130 libs/six-1.8.0/documentation/Makefile
  41. +0 −217 libs/six-1.8.0/documentation/conf.py
  42. +0 −757 libs/six-1.8.0/documentation/index.rst
  43. +0 −2 libs/six-1.8.0/setup.cfg
  44. +0 −32 libs/six-1.8.0/setup.py
  45. +0 −736 libs/six-1.8.0/test_six.py
  46. +0 −12 libs/six-1.8.0/tox.ini
  47. +1 −1 libs/{six-1.8.0 → six}/LICENSE
  48. +132 −26 libs/{six-1.8.0/six.py → six/__init__.py}
  49. +71 −71 src/jsf.py
  50. +10 −10 src/jsf_activation.py
  51. +38 −38 src/jsf_rc.py
View
@@ -12,8 +12,6 @@
# Python 2.x on Windows can't properly import from non-ASCII paths, so
# this code added the DOC 8.3 version of the lib folder to the path in
# case the user's username includes non-ASCII characters
-
-
def add_lib_path(lib_path):
def _try_get_short_path(path):
path = os.path.normpath(path)
@@ -34,32 +32,22 @@ def _try_get_short_path(path):
# crazyness to get jsbeautifier.unpackers to actually import
# with sublime's weird hackery of the path and module loading
add_lib_path(libs_path)
-add_lib_path(os.path.join(libs_path, "six-1.8.0"))
-add_lib_path(os.path.join(libs_path, "jsbeautifier"))
-add_lib_path(os.path.join(libs_path, "jsbeautifier", "jsbeautifier"))
add_lib_path(src_path)
-import jsbeautifier
-import jsbeautifier.unpackers
-import jsf
-import jsf_activation
-import jsf_rc
+import jsbeautifier, jsbeautifier.unpackers
+import jsf, jsf_activation, jsf_rc
s = None
-
def plugin_loaded():
global s
s = sublime.load_settings("JsFormat.sublime-settings")
if is_py2k:
plugin_loaded()
-
class PreSaveFormatListner(sublime_plugin.EventListener):
-
"""Event listener to run JsFormat during the presave event"""
-
def on_pre_save(self, view):
extOrClause = "|".join(s.get("format_on_save_extensions"))
extRegex = "\\.(" + extOrClause + ")$"
@@ -72,9 +60,7 @@ def on_pre_save(self, view):
return
view.run_command("js_format")
-
class JsFormatCommand(sublime_plugin.TextCommand):
-
def run(self, edit):
settings = self.view.settings()
file_name = self.view.file_name()
@@ -1,2 +0,0 @@
-include js-beautify
-include js-beautify-test
Oops, something went wrong.
@@ -0,0 +1 @@
+__version__ = '1.6.2'
Oops, something went wrong.

0 comments on commit 08131e9

Please sign in to comment.