fix: beautify only code-samples

KamiKillertO · KamiKillertO · commit ffecfbf9dcfd · 2020-10-02T16:01:15.000+02:00
diff --git a/index.js b/index.js
@@ -67,7 +67,12 @@ class Styledown {
 
       html = $.html()
     }
-    return this.prettyprint(html, { wrap_line_length: 0, ...config })
+    html = html.trim()
+
+    // cheerio output tends to have a bunch of extra newlines. kill them.
+    html = html.replace(/\n\n+/g, "\n\n")
+
+    return html
   }
 
   /**
@@ -139,11 +144,12 @@ class Styledown {
   process(raws, options) {
     return raws.map((raw) => {
       let $ = Cheerio.load(raw.html)
+      let config = processConfig(raw.src, options)
+      removeConfig($)
+
       let highlightHTML = this.highlightHTML.bind(this)
       let p = this.prefix.bind(this)
 
-      let config = processConfig(raw.src, options)
-      removeConfig($)
 
       // let pre = this.options.prefix
 
@@ -165,33 +171,32 @@ class Styledown {
     })
   }
 
-  /**
-   * prettyprint() : doc.prettyprint(html)
-   * (private) Reindents given `html` based on the indent size option.
-   *
-   *     doc.prettyprint('<div><a>hello</a></div>')
-   *     => "<div>\n  <a>hello</a>\n</div>"
-   */
-
-  prettyprint(html, options) {
+  // no use at the moment
+  // /**
+  //  * prettyprint() : doc.prettyprint(html)
+  //  * (private) Reindents given `html` based on the indent size option.
+  //  *
+  //  *     doc.prettyprint('<div><a>hello</a></div>')
+  //  *     => "<div>\n  <a>hello</a>\n</div>"
+  //  */
 
-    let output = html.trim()
+  // prettyprint() {
+  //   let html = this.toHTML()
 
-    output = beautifyHTML(html, options)
+  //   let config = this.raws.reduce((finalConfig, raw) => {
+  //     return extend(finalConfig, raw.config)
+  //   }, this.options)
 
-    // cheerio output tends to have a bunch of extra newlines. kill them.
-    output = output.replace(/\n\n+/g, "\n\n")
-
-    return output
-  }
+  //   return beautifyHTML(html, { config })
+  // }
 
   /**
    * highlightHTML():
    * (private) Syntax highlighting helper
    */
 
   highlightHTML(html) {
-    html = this.prettyprint(html)
+    html = beautifyHTML(html)
     return hljs.highlight('html', html).value
   }
 
@@ -248,6 +253,7 @@ Styledown.parse = function (source, options) {
   return new Styledown(source, options).toHTML()
 }
 
+
 /**
  * Styledown.version:
  * The version number in semver format.
diff --git a/lib/utils.js b/lib/utils.js
@@ -87,11 +87,10 @@ function htmlize(src, filePath = '.') {
   if (src.substr(0, 1) === '<') {
     return src
   } else {
-    let html = Pug.render(src, {
+    return Pug.render(src, {
       filename: filePath,
       doctype: 'html'
     })
-    return beautifyHTML(html)
   }
 }
 
diff --git a/test/markdown.js b/test/markdown.js
@@ -23,7 +23,7 @@ describe('Markdown', function() {
       expect(this.$).have.selector('p.sg')
     })
     it('html template', function() {
-      expect(this.html).match(/!DOCTYPE html/)
+      expect(this.html).match(/!doctype html/)
       expect(this.html).match(/body/)
       expect(this.html).match(/head/)
       expect(this.$).have.selector('meta[charset="utf-8"]')
diff --git a/test/pretty_print.js b/test/pretty_print.js
@@ -11,32 +11,17 @@ describe('Pretty Print', function() {
       })
     })
 
-    it('indent <head>', function() {
-      expect(this.html).match(/\n {2}<head/)
+    it('no indent for <head>', function() {
+      expect(this.html).match(/\n<head/)
     })
-    it('indent <body>', function() {
-      expect(this.html).match(/\n {2}<body/)
+    it('no indent for <body>', function() {
+      expect(this.html).match(/\n<body/)
     })
-    it('indent .sg-section-hello', function() {
-      expect(this.html).match(/\n {6}<section class="sg-block sg-section-hello/)
-    })
-    it('indent .sg-canvas', function() {
-      expect(this.html).match(/\n {10}<div class="sg-canvas/)
-    })
-  })
-
-  describe('custom indentSize', function() {
-    beforeEach(function() {
-      this.load("### Hello\n\n    @example\n    div", {
-        tabWidth: 4
-      })
-    })
-
     it('indent .sg-section-hello', function() {
       expect(this.html).match(/<section class="sg-block sg-section-hello/)
     })
     it('indent .sg-canvas', function() {
-      expect(this.html).match(/\n {8}<div class="sg-canvas/)
+      expect(this.html).match(/<div class="sg-canvas/)
     })
   })
 })

Original file line number	Diff line number	Diff line change
`@@ -87,11 +87,10 @@ function htmlize(src, filePath = '.') {`
`87`	`87`	`if (src.substr(0, 1) === '<') {`
`88`	`88`	`return src`
`89`	`89`	`} else {`
`90`		`- let html = Pug.render(src, {`
	`90`	`+ return Pug.render(src, {`
`91`	`91`	`filename: filePath,`
`92`	`92`	`doctype: 'html'`
`93`	`93`	`})`
`94`		`- return beautifyHTML(html)`
`95`	`94`	`}`
`96`	`95`	`}`
`97`	`96`