Merge branch 'master' of https://github.com/Glavin001/atom-beautify

package.json

@@ -1,7 +1,7 @@
 {
   "name": "atom-beautify",
   "main": "./src/beautify",
-  "version": "0.28.18",
+  "version": "0.28.19",
   "private": true,
   "description": "Beautify HTML, CSS, JavaScript, PHP, Python, Ruby, Java, C, C++, C#, Objective-C, CoffeeScript, TypeScript, and SQL in Atom",
   "repository": {

src/beautifiers/index.coffee

@@ -383,7 +383,7 @@ module.exports = class Beautifiers extends EventEmitter
           beautifiers = @getBeautifiers(language.name, options)
 
           logger.verbose('options', options)
-          logger.verbose('beautifiers', beautifiers)
+          logger.verbose('beautifiers', _.map(beautifiers, 'name'))
 
           logger.verbose(language.name, filePath, options, allOptions)
 
@@ -396,7 +396,7 @@ module.exports = class Beautifiers extends EventEmitter
             beautifier = _.find(beautifiers, (beautifier) ->
               beautifier.name is preferredBeautifierName
             ) or beautifiers[0]
-            logger.verbose('beautifier', beautifier.name, beautifiers)
+            logger.verbose('beautifier', beautifier.name)
             transformOptions = (beautifier, languageName, options) ->
 
               # Transform options, if applicable
@@ -610,10 +610,10 @@ module.exports = class Beautifiers extends EventEmitter
         options[lang] = options[lang] or {}
         options[lang][opt] = config[k]
 
-      # logger.verbose(lang, opt);
+      # logger.verbose(lang, opt)
       true
 
-    # logger.verbose(options);
+    # logger.verbose(options)
     options
 
   # Look for .jsbeautifierrc in file and home path, check env variables

src/beautify.coffee

@@ -323,14 +323,13 @@ debug = () ->
 
   # Language
   language = beautifier.getLanguage(grammarName, filePath)
-
   addInfo('Original File Language', language?.name)
 
   # Get current editor's text
   text = editor.getText()
 
   # Contents
-  codeBlockSyntax = grammarName.toLowerCase().split(' ')[0]
+  codeBlockSyntax = (language?.name ? grammarName).toLowerCase().split(' ')[0]
   addInfo('Original File Contents', "\n```#{codeBlockSyntax}\n#{text}\n```")
   addHeader(2, "Beautification options")
 
@@ -377,9 +376,17 @@ debug = () ->
 
     #
     logs = ""
+    logFilePathRegex = new RegExp('\\: \\[(.*)\\]')
     subscription = logger.onLogging((msg) ->
       # console.log('logging', msg)
-      logs += msg
+      sep = path.sep
+      logs += msg.replace(logFilePathRegex, (a,b) ->
+        s = b.split(sep)
+        i = s.indexOf('atom-beautify')
+        p = s.slice(i+2).join(sep)
+        # console.log('logging', arguments, s, i, p)
+        return ': ['+p+']'
+      )
     )
     cb = (result) ->
       subscription.dispose()
@@ -387,6 +394,12 @@ debug = () ->
 
       # Logs
       addInfo('Beautified File Contents', "\n```#{codeBlockSyntax}\n#{result}\n```")
+      # Diff
+      JsDiff = require('diff')
+      diff = JsDiff.createPatch(filePath, text, \
+        result, "original", "beautified")
+      addInfo('Original vs. Beautified Diff', "\n```#{codeBlockSyntax}\n#{diff}\n```")
+
       addInfo('Logs', "\n```\n#{logs}\n```")
 
       # Save to clipboard
@@ -394,8 +407,10 @@ debug = () ->
       confirm('Atom Beautify debugging information is now in your clipboard.\n' +
       'You can now paste this into an Issue you are reporting here\n' +
       'https://github.com/Glavin001/atom-beautify/issues/\n\n' +
-      'Warning: Be sure to look over the debug info before you send it,
-      to ensure you are not sharing undesirable private information.'
+      'Please follow the contribution guidelines found at\n' +
+      'https://github.com/Glavin001/atom-beautify/blob/master/CONTRIBUTING.md\n\n' +
+      'Warning: Be sure to look over the debug info before you send it, '+
+      'to ensure you are not sharing undesirable private information.'
       )
     try
       beautifier.beautify(text, allOptions, grammarName, filePath)