Merge pull request #219 from peterdotjs/master

Add support for Marko templates.

.travis.yml

@@ -14,7 +14,7 @@ notifications:
 script: sh build-package.sh
 
 env:
-    - APM_TEST_PACKAGES="language-typescript language-csharp"
+    - APM_TEST_PACKAGES="language-typescript language-csharp language-marko"
 
 before_install:
   # Update Homebrew

README.md

@@ -28,6 +28,8 @@ Or Settings/Preferences ➔ Packages ➔ Search for `atom-beautify`
   - [x] [Embedded Ruby (ERB)](https://github.com/Glavin001/atom-beautify/issues/80)
     - Requires [htmlbeautifier](https://github.com/threedaymonk/htmlbeautifier)
   - [x] XML
+  - [x] [Marko](https://github.com/raptorjs/marko)
+    - Requires [language-marko](https://github.com/raptorjs/atom-language-marko)
 - [x] CSS, including
   - [Sass](http://sass-lang.com/)
   - [LESS](http://lesscss.org/)

examples/nested-jsbeautifyrc/marko/expected/test.marko

@@ -0,0 +1,8 @@
+<if test="data.items">
+  <for each="item in data.items">
+    <div>${item.name}</div>
+  </for>
+</if>
+<else>
+  content
+</else>

examples/nested-jsbeautifyrc/marko/original/test.marko

@@ -0,0 +1,8 @@
+<if test="data.items">
+<for each="item in data.items">
+ <div>${item.name}</div>
+</for>
+</if>
+<else>
+ content
+</else>

examples/simple-jsbeautifyrc/marko/expected/test.marko

@@ -0,0 +1,6 @@
+<if test="${data.items}">
+  content
+</if>
+<else>
+  content
+</else>

examples/simple-jsbeautifyrc/marko/original/test.marko

@@ -0,0 +1,6 @@
+<if test="${data.items}">
+content
+</if>
+<else>
+content
+</else>

lib/language-options.coffee

@@ -410,7 +410,7 @@ module.exports =
         beautifyHTML ?= require("js-beautify").html
         text = beautifyHTML(text, self.getOptions("html", allOptions))
         beautifyCompleted text
-      when "HTML (Liquid)", "HTML", "XML"
+      when "HTML (Liquid)", "HTML", "XML", "Marko"
         beautifyHTML ?= require("js-beautify").html
         text = beautifyHTML(text, self.getOptions("html", allOptions))
         beautifyCompleted text

package.json

@@ -117,6 +117,7 @@
     "editorconfig",
     "yaml",
     "front matter",
-    "jekyll"
+    "jekyll",
+    "marko"
   ]
 }

spec/beautify-languages-spec.coffee

@@ -21,7 +21,7 @@ describe "BeautifyLanguages", ->
     "java", "javascript", "json", "less",
     "mustache", "objective-c", "perl", "php",
     "python", "ruby", "sass", "sql",
-    "typescript", "xml", "csharp", "gfm"
+    "typescript", "xml", "csharp", "gfm", "marko"
     ]
 
   beforeEach ->