diff --git a/package.json b/package.json index 0c7f428..c3b989d 100644 --- a/package.json +++ b/package.json @@ -484,4 +484,4 @@ "prettydiff2" ] } -} \ No newline at end of file +} diff --git a/src/beautifiers/executable.coffee b/src/beautifiers/executable.coffee index d2f876b..a401860 100644 --- a/src/beautifiers/executable.coffee +++ b/src/beautifiers/executable.coffee @@ -418,7 +418,7 @@ class HybridExecutable extends Executable rootPath = '/mountedRoot' newArgs = args.map((arg) -> if (typeof arg is 'string' and not arg.includes(':') \ - and path.isAbsolute(arg) and not path.dirname(arg).startsWith(tmpDir)) + and path.isAbsolute(arg) and not path.dirname(arg).startsWith(tmpDir)) \ then path.join(rootPath, arg) else arg ) diff --git a/src/beautifiers/lua-beautifier/index.coffee b/src/beautifiers/lua-beautifier/index.coffee index a6be501..27f217e 100644 --- a/src/beautifiers/lua-beautifier/index.coffee +++ b/src/beautifiers/lua-beautifier/index.coffee @@ -25,6 +25,6 @@ module.exports = class Lua extends Beautifier indent = indentChar.repeat(indentSize) new @Promise (resolve, reject) -> try - resolve(format(text, indent, @warn, options)); + resolve(format(text, indent, @warn, options)) catch error reject error diff --git a/src/views/message-view.coffee b/src/views/message-view.coffee deleted file mode 100644 index 3a10184..0000000 --- a/src/views/message-view.coffee +++ /dev/null @@ -1,81 +0,0 @@ -{$, $$, $$$, View} = require "atom-space-pen-views" - -module.exports = -class MessageView extends View - messages: [] - @content: -> - @div - class: 'atom-beautify message-panel', => - @div - class: 'overlay from-top', => - @div class: "tool-panel panel-bottom", => - @div class: "inset-panel", => - @div class: "panel-heading", => - @div class: 'btn-toolbar pull-right', => - @button - class: 'btn' - click: 'clearMessages' - 'Clear' - @span - class: '' - outlet: 'title' - 'Atom Beautify Message' - @div - class: "panel-body padded select-list" - outlet: 'body' - => - @ol - class: 'list-group', - outlet: 'messageItems' - => - @li class: 'two-lines', => - @div class: 'status status-removed icon icon-diff-added', '' - @div class: 'primary-line icon icon-alert', 'This is the title' - @div class: 'secondary-line no-icon', 'Secondary line' - @li class: 'two-lines', => - @div class: 'status status-removed icon icon-diff-added', '' - @div class: 'primary-line icon icon-alert', 'This is the title Currently there is no way to display a message to the user, such as errors or warnings or deprecation notices (see #40). Let\'s put a little overlay on the top for displaying such information.' - @div class: 'secondary-line no-icon', 'This is the title Currently there is no way to display a message to the user, such as errors or warnings or deprecation notices (see #40). Let\'s put a little overlay on the top for displaying such information.' - @li class: 'two-lines', => - @div class: 'status status-removed icon icon-diff-added', '' - @div class: 'primary-line icon icon-alert', 'test' - @div class: 'secondary-line no-icon', 'Secondary line' - @li class: 'two-lines', => - @div class: 'status status-removed icon icon-diff-added', '' - @div class: 'primary-line icon icon-alert', 'This is the title' - @div class: 'secondary-line no-icon', 'Secondary line' - @li class: 'two-lines', => - @div class: 'status status-removed icon icon-diff-added', '' - @div class: 'primary-line icon icon-alert', 'This is the title' - @div class: 'secondary-line no-icon', 'Secondary line' - @li class: 'two-lines', => - @div class: 'status status-added icon icon-diff-added', '' - @div class: 'primary-line icon icon-file-text', 'Primary line' - @div class: 'secondary-line no-icon', 'Secondary line' - - constructor: -> - super - - destroy: -> - - addMessage: (message) => - @messages.push(message) - @refresh() - - clearMessages: => - @messages = [] - @refresh() - - close: (event, element) => - @detach() - - show: => - if not @.hasParent() - atom.workspaceView.appendToTop @ - - refresh: => - # If the messages list is empty, view should be closed. - if @messages.length is 0 - @close() - else - @show()