Merge changes with latest master branch

Glavin001 · Feb 4, 2018 · 40d2113 · 40d2113
2 parents 2b91422 + 328e21b
commit 40d2113
Show file tree

Hide file tree

Showing 4 changed files with 80 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Next
-- Add "Reindent" option for sqlformat. See #1926.
+- Fix [#1862](https://github.com/Glavin001/atom-beautify/issues/1862) Add support for ocp-indent as an executable
+- Add "Reindent" option for sqlformat. See [#1926](https://github.com/Glavin001/atom-beautify/pull/1926).
+
+# v0.30.9 (2017-11-22)
+- Fix [#1949](https://github.com/Glavin001/atom-beautify/issues/1949): Fix beautify on save when text has not changed.
+
+# v0.30.8 (2017-11-22)
+- Fix [#1949](https://github.com/Glavin001/atom-beautify/issues/1949): Fix beautify on save when text has not changed.
+
+# v0.30.7 (2017-11-21)
+- Refactor handleSaveEvent to use onWillSave async ([#1924](https://github.com/Glavin001/atom-beautify/pull/1924), [#1895](https://github.com/Glavin001/atom-beautify/issues/1895))
 
 # v0.30.6 (2017-10-30)
 - See [#645](https://github.com/Glavin001/atom-beautify/issues/645). Add support for Terraform fmt.

diff --git a/docs/options.md b/docs/options.md
@@ -283,6 +283,23 @@ Options for isort executable.
 2. Go into *Packages* and search for "*Atom Beautify*" package.
 3. Find the option "*isort*" and change it to your desired configuration.
 
+#####  [ocp-indent](#ocp-indent) 
+
+**Important**: This option is only configurable from within Atom Beautify's setting panel.
+
+**Type**: `object`
+
+**Description**:
+
+Options for ocp-indent executable.
+
+**How to Configure**
+
+1. You can open the [Settings View](https://github.com/atom/settings-view) by navigating to
+*Edit > Preferences (Linux)*, *Atom > Preferences (OS X)*, or *File > Preferences (Windows)*.
+2. Go into *Packages* and search for "*Atom Beautify*" package.
+3. Find the option "*ocp-indent*" and change it to your desired configuration.
+
 #####  [PHP](#php) 
 
 **Important**: This option is only configurable from within Atom Beautify's setting panel.
@@ -334,6 +351,23 @@ Options for PHPCBF executable.
 2. Go into *Packages* and search for "*Atom Beautify*" package.
 3. Find the option "*PHPCBF*" and change it to your desired configuration.
 
+#####  [puppet-lint](#puppet-lint) 
+
+**Important**: This option is only configurable from within Atom Beautify's setting panel.
+
+**Type**: `object`
+
+**Description**:
+
+Options for puppet-lint executable.
+
+**How to Configure**
+
+1. You can open the [Settings View](https://github.com/atom/settings-view) by navigating to
+*Edit > Preferences (Linux)*, *Atom > Preferences (OS X)*, or *File > Preferences (Windows)*.
+2. Go into *Packages* and search for "*Atom Beautify*" package.
+3. Find the option "*puppet-lint*" and change it to your desired configuration.
+
 #####  [Rscript](#rscript) 
 
 **Important**: This option is only configurable from within Atom Beautify's setting panel.

diff --git a/package.json b/package.json
@@ -1,12 +1,12 @@
 {
   "name": "atom-beautify",
   "main": "./src/beautify",
-  "version": "0.30.6",
+  "version": "0.30.9",
   "private": true,
   "description": "Beautify HTML, CSS, JavaScript, PHP, Python, Ruby, Java, C, C++, C#, Objective-C, CoffeeScript, TypeScript, Coldfusion, SQL, and more in Atom",
   "repository": {
     "type": "git",
-    "url": "https://github.com/Glavin001/atom-beautify"
+    "url": "git@github.com:Glavin001/atom-beautify.git"
   },
   "bugs": {
     "url": "https://github.com/Glavin001/atom-beautify/issues"
@@ -157,7 +157,7 @@
     }
   ],
   "engines": {
-    "atom": ">=1.6.0 <2.0.0"
+    "atom": ">=1.21.0 <2.0.0"
   },
   "dependencies": {
     "align-yaml": "^0.1.8",

diff --git a/src/options.json b/src/options.json
@@ -9334,6 +9334,22 @@
           }
         }
       },
+      "ocp-indent": {
+        "key": "ocp-indent",
+        "title": "ocp-indent",
+        "type": "object",
+        "collapsed": true,
+        "description": "Options for ocp-indent executable.",
+        "properties": {
+          "path": {
+            "key": "path",
+            "title": "Binary/Script Path",
+            "type": "string",
+            "default": "",
+            "description": "Absolute path to the \"ocp-indent\" executable's binary/script."
+          }
+        }
+      },
       "php": {
         "key": "php",
         "title": "PHP",
@@ -9382,6 +9398,22 @@
           }
         }
       },
+      "puppet-lint": {
+        "key": "puppet-lint",
+        "title": "puppet-lint",
+        "type": "object",
+        "collapsed": true,
+        "description": "Options for puppet-lint executable.",
+        "properties": {
+          "path": {
+            "key": "path",
+            "title": "Binary/Script Path",
+            "type": "string",
+            "default": "",
+            "description": "Absolute path to the \"puppet-lint\" executable's binary/script."
+          }
+        }
+      },
       "sass-convert": {
         "key": "sass-convert",
         "title": "SassConvert",