Closes #172, #146. Update to new Atom Config API.

What's new: - Add settings descriptions - Update options for js-beautify (JS, CSS, HTML) - Update Spec to support new changes
Glavin001 · Jan 3, 2015 · eb1471d · eb1471d
1 parent a229220
commit eb1471d
Show file tree

Hide file tree

Showing 32 changed files with 371 additions and 89 deletions.
diff --git a/examples/nested-jsbeautifyrc/cpp/expected/test.h b/examples/nested-jsbeautifyrc/cpp/expected/test.h
@@ -1,11 +1,10 @@
 class Example
 {
 
-Example()
-        : member(0)
-{
-}
+    Example()
+    : member(0)
+{}
 
-int member;
+    int member;
 
 };
diff --git a/...utifyrc/css/expected/indent_char_test.css → ...utifyrc/css/expected/indent_char_test.css b/...utifyrc/css/expected/indent_char_test.css → ...utifyrc/css/expected/indent_char_test.css
diff --git a/...utifyrc/css/original/indent_char_test.css → ...utifyrc/css/original/indent_char_test.css b/...utifyrc/css/original/indent_char_test.css → ...utifyrc/css/original/indent_char_test.css
diff --git a/...jsbeautifyrc/handlebars/expected/test.hbs → ...jsbeautifyrc/handlebars/expected/test.hbs b/...jsbeautifyrc/handlebars/expected/test.hbs → ...jsbeautifyrc/handlebars/expected/test.hbs
diff --git a/...jsbeautifyrc/handlebars/original/test.hbs → ...jsbeautifyrc/handlebars/original/test.hbs b/...jsbeautifyrc/handlebars/original/test.hbs → ...jsbeautifyrc/handlebars/original/test.hbs
diff --git a/...mple-jsbeautifyrc/less/expected/test.less → ...sted-jsbeautifyrc/less/expected/test.less b/...mple-jsbeautifyrc/less/expected/test.less → ...sted-jsbeautifyrc/less/expected/test.less
diff --git a/...ple-jsbeautifyrc/less/expected/test2.less → ...ted-jsbeautifyrc/less/expected/test2.less b/...ple-jsbeautifyrc/less/expected/test2.less → ...ted-jsbeautifyrc/less/expected/test2.less
diff --git a/...ple-jsbeautifyrc/less/expected/test3.less → ...ted-jsbeautifyrc/less/expected/test3.less b/...ple-jsbeautifyrc/less/expected/test3.less → ...ted-jsbeautifyrc/less/expected/test3.less
diff --git a/...ple-jsbeautifyrc/less/expected/test4.less → ...ted-jsbeautifyrc/less/expected/test4.less b/...ple-jsbeautifyrc/less/expected/test4.less → ...ted-jsbeautifyrc/less/expected/test4.less
diff --git a/...ple-jsbeautifyrc/less/expected/test5.less → ...ted-jsbeautifyrc/less/expected/test5.less b/...ple-jsbeautifyrc/less/expected/test5.less → ...ted-jsbeautifyrc/less/expected/test5.less
diff --git a/...mple-jsbeautifyrc/less/original/test.less → ...sted-jsbeautifyrc/less/original/test.less b/...mple-jsbeautifyrc/less/original/test.less → ...sted-jsbeautifyrc/less/original/test.less
diff --git a/...ple-jsbeautifyrc/less/original/test2.less → ...ted-jsbeautifyrc/less/original/test2.less b/...ple-jsbeautifyrc/less/original/test2.less → ...ted-jsbeautifyrc/less/original/test2.less
diff --git a/...ple-jsbeautifyrc/less/original/test3.less → ...ted-jsbeautifyrc/less/original/test3.less b/...ple-jsbeautifyrc/less/original/test3.less → ...ted-jsbeautifyrc/less/original/test3.less
diff --git a/...ple-jsbeautifyrc/less/original/test4.less → ...ted-jsbeautifyrc/less/original/test4.less b/...ple-jsbeautifyrc/less/original/test4.less → ...ted-jsbeautifyrc/less/original/test4.less
diff --git a/...ple-jsbeautifyrc/less/original/test5.less → ...ted-jsbeautifyrc/less/original/test5.less b/...ple-jsbeautifyrc/less/original/test5.less → ...ted-jsbeautifyrc/less/original/test5.less
diff --git a/...eautifyrc/mustache/expected/test.mustache → ...eautifyrc/mustache/expected/test.mustache b/...eautifyrc/mustache/expected/test.mustache → ...eautifyrc/mustache/expected/test.mustache
@@ -4,7 +4,8 @@
 
 {{#items}}
   {{#first}}
-    <li><strong>{{name}}</strong>
+    <li>
+      <strong>{{name}}</strong>
     </li>
   {{/first}}
   {{#link}}

diff --git a/...eautifyrc/mustache/original/test.mustache → ...eautifyrc/mustache/original/test.mustache b/...eautifyrc/mustache/original/test.mustache → ...eautifyrc/mustache/original/test.mustache
diff --git a/...sbeautifyrc/sass/expected/alphasort1.scss → ...sbeautifyrc/sass/expected/alphasort1.scss b/...sbeautifyrc/sass/expected/alphasort1.scss → ...sbeautifyrc/sass/expected/alphasort1.scss
diff --git a/...sass/expected/interpolated-text-vars.scss → ...sass/expected/interpolated-text-vars.scss b/...sass/expected/interpolated-text-vars.scss → ...sass/expected/interpolated-text-vars.scss
diff --git a/...mple-jsbeautifyrc/sass/expected/test.sass → ...sted-jsbeautifyrc/sass/expected/test.sass b/...mple-jsbeautifyrc/sass/expected/test.sass → ...sted-jsbeautifyrc/sass/expected/test.sass
diff --git a/...mple-jsbeautifyrc/sass/expected/test.scss → ...sted-jsbeautifyrc/sass/expected/test.scss b/...mple-jsbeautifyrc/sass/expected/test.scss → ...sted-jsbeautifyrc/sass/expected/test.scss
diff --git a/...sbeautifyrc/sass/original/alphasort1.scss → ...sbeautifyrc/sass/original/alphasort1.scss b/...sbeautifyrc/sass/original/alphasort1.scss → ...sbeautifyrc/sass/original/alphasort1.scss
diff --git a/...sass/original/interpolated-text-vars.scss → ...sass/original/interpolated-text-vars.scss b/...sass/original/interpolated-text-vars.scss → ...sass/original/interpolated-text-vars.scss
diff --git a/...mple-jsbeautifyrc/sass/original/test.sass → ...sted-jsbeautifyrc/sass/original/test.sass b/...mple-jsbeautifyrc/sass/original/test.sass → ...sted-jsbeautifyrc/sass/original/test.sass
diff --git a/...mple-jsbeautifyrc/sass/original/test.scss → ...sted-jsbeautifyrc/sass/original/test.scss b/...mple-jsbeautifyrc/sass/original/test.scss → ...sted-jsbeautifyrc/sass/original/test.scss
diff --git a/examples/simple-jsbeautifyrc/markdown/expected/yaml-front-matter-2.md b/examples/simple-jsbeautifyrc/markdown/expected/yaml-front-matter-2.md
@@ -5,3 +5,4 @@ title: "This is a title!"
 stuff
 
 more stuff
+
diff --git a/lib/beautify.coffee b/lib/beautify.coffee
@@ -222,13 +222,37 @@ handleSaveEvent = =>
 
 {Subscriber} = require path.join(atom.packages.resourcePath, 'node_modules', 'emissary')
 Subscriber.extend plugin
-plugin.configDefaults = _.merge(
-  analytics: true
-  beautifyOnSave: false
-  beautifyEntireFileOnSave: true
-  muteUnsupportedLanguageErrors: false
-  muteAllErrors: false
-  disabledLanguages: []
+plugin.config = _.merge(
+  analytics:
+    type: 'boolean'
+    default: true
+    description: "Automatically send usage information (NEVER CODE) to Google Analytics"
+  _analyticsUserId:
+    type: 'string'
+    default: ""
+    description: "Unique identifier for this user for tracking usage analytics"
+  beautifyOnSave:
+    type: 'boolean'
+    default: false
+    description: "Beautify active editor on save"
+  beautifyEntireFileOnSave:
+    type: 'boolean'
+    default: true
+    description: "When beautifying on save, use the entire file, even if there is selected text in the editor"
+  muteUnsupportedLanguageErrors:
+    type: 'boolean'
+    default: false
+    description: "Do not show \"Unsupported Language\" errors when they occur"
+  muteAllErrors:
+    type: 'boolean'
+    default: false
+    description: "Do not show any/all errors when they occur"
+  disabledLanguages:
+    type: 'array'
+    default: []
+    items:
+      type: 'string'
+    description: "An array of languages/grammars to disable Beautification for"
 , defaultLanguageOptions)
 plugin.activate = ->
   handleSaveEvent()

diff --git a/lib/langs/uncrustify/index.coffee b/lib/langs/uncrustify/index.coffee
@@ -30,9 +30,12 @@ getCmd = (inputPath, outputPath, options, cb) ->
   else
     # Has custom config path
     editor = atom.workspace.getActiveEditor()
-    basePath = path.dirname(editor.getPath())
-    # console.log(basePath);
-    configPath = path.resolve(basePath, configPath)
-    done configPath
+    if editor?
+        basePath = path.dirname(editor.getPath())
+        # console.log(basePath);
+        configPath = path.resolve(basePath, configPath)
+        done configPath
+    else
+        cb(new Error("No Uncrustify Config Path set! Please configure Uncrustify with Atom Beautify."))
   return
 module.exports = cliBeautify(getCmd)