Skip to content

Commit

Permalink
Fix: Rename class name to not conflict with the JSCS-Formatter package
Browse files Browse the repository at this point in the history
  • Loading branch information
TheSavior committed Apr 29, 2016
1 parent 195754d commit b51a9c6
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Context.sublime-menu
Expand Up @@ -2,6 +2,6 @@
"caption": "ESLint Formatter",
"children": [{
"caption": "Format This File",
"command": "format_javascript"

This comment has been minimized.

Copy link
@Aryaman77

Aryaman77 Sep 3, 2019

Hmm what command?

"command": "format_eslint"

This comment has been minimized.

Copy link
@Aryaman77

Aryaman77 Sep 3, 2019

Hmm what command?

}]
}]
2 changes: 1 addition & 1 deletion Default (Linux).sublime-keymap
@@ -1,4 +1,4 @@
[{
"keys": ["ctrl+shift+h"],
"command": "format_javascript"
"command": "format_eslint"
}]
2 changes: 1 addition & 1 deletion Default (OSX).sublime-keymap
@@ -1,4 +1,4 @@
[{
"keys": ["super+shift+h"],
"command": "format_javascript"
"command": "format_eslint"
}]
2 changes: 1 addition & 1 deletion Default (Windows).sublime-keymap
@@ -1,4 +1,4 @@
[{
"keys": ["ctrl+shift+h"],
"command": "format_javascript"
"command": "format_eslint"
}]
4 changes: 2 additions & 2 deletions ESLint-Formatter.py
Expand Up @@ -18,7 +18,7 @@

IS_WINDOWS = platform.system() == 'Windows'

class FormatJavascriptCommand(sublime_plugin.TextCommand):
class FormatEslintCommand(sublime_plugin.TextCommand):
def run(self, edit):
# Save the current viewport position to scroll to it after formatting.
previous_selection = list(self.view.sel()) # Copy.
Expand Down Expand Up @@ -107,7 +107,7 @@ class ESLintFormatterEventListeners(sublime_plugin.EventListener):
@staticmethod
def on_pre_save(view):
if PluginUtils.get_pref("format_on_save"):
view.run_command("format_javascript")
view.run_command("format_eslint")

class PluginUtils:
@staticmethod
Expand Down
2 changes: 1 addition & 1 deletion ESLint-Formatter.sublime-commands
@@ -1,4 +1,4 @@
[{
"caption": "ESLint Formatter: Format this file",
"command": "format_javascript"
"command": "format_eslint"
}]
2 changes: 1 addition & 1 deletion Main.sublime-menu
Expand Up @@ -5,7 +5,7 @@
"caption": "ESLint Formatter",
"children": [{
"caption": "Format This File",
"command": "format_javascript"
"command": "format_eslint"
}]
}]
}, {
Expand Down

0 comments on commit b51a9c6

Please sign in to comment.