Disable code block highlighting when no language is specified

Author: TheElectronWill

doc-tool/src/dotty/tools/dottydoc/staticsite/Site.scala

@@ -10,15 +10,15 @@ import java.nio.file.Path
 import java.nio.charset.StandardCharsets
 import java.io.File.{ separator => sep }
 
-import com.vladsch.flexmark.parser.ParserEmulationProfile
-import com.vladsch.flexmark.parser.Parser
+import com.vladsch.flexmark.parser.{ Parser, ParserEmulationProfile }
 import com.vladsch.flexmark.ext.gfm.tables.TablesExtension
 import com.vladsch.flexmark.ext.gfm.strikethrough.StrikethroughExtension
 import com.vladsch.flexmark.ext.gfm.tasklist.TaskListExtension
 import com.vladsch.flexmark.ext.emoji.EmojiExtension
 import com.vladsch.flexmark.ext.autolink.AutolinkExtension
 import com.vladsch.flexmark.ext.anchorlink.AnchorLinkExtension
 import com.vladsch.flexmark.ext.yaml.front.matter.YamlFrontMatterExtension
+import com.vladsch.flexmark.html.HtmlRenderer
 import com.vladsch.flexmark.util.options.{ DataHolder, MutableDataSet }
 
 import dotc.core.Contexts.Context
@@ -447,6 +447,8 @@ object Site {
     new MutableDataSet()
       .setFrom(ParserEmulationProfile.KRAMDOWN.getOptions)
       .set(Parser.INDENTED_CODE_BLOCK_PARSER, false)
+      .set(HtmlRenderer.FENCED_CODE_LANGUAGE_CLASS_PREFIX, "")
+      .set(HtmlRenderer.FENCED_CODE_NO_LANGUAGE_CLASS, "nohighlight")
       .set(AnchorLinkExtension.ANCHORLINKS_WRAP_TEXT, false)
       .set(AnchorLinkExtension.ANCHORLINKS_ANCHOR_CLASS, "anchor")
       .set(EmojiExtension.ROOT_IMAGE_PATH, "https://github.global.ssl.fastly.net/images/icons/emoji/")

doc-tool/test/dotty/tools/dottydoc/MarkdownTests.scala

@@ -211,7 +211,7 @@ class MarkdownTests extends DottyDocTest with CheckFromSource {
         .trim
 
       assertEquals(
-        """|<pre><code class="language-scala">val x = 1 + 5
+        """|<pre><code class="scala">val x = 1 + 5
             |</code></pre>""".stripMargin, traitCmt)
     }
   }
@@ -242,7 +242,7 @@ class MarkdownTests extends DottyDocTest with CheckFromSource {
         .trim
 
       assertEquals(
-        """|<pre><code class="language-scala">val x = 1 + 5
+        """|<pre><code class="scala">val x = 1 + 5
             |</code></pre>""".stripMargin, traitCmt)
     }
   }

docs/docs/internals/backend.md

@@ -6,7 +6,7 @@ title: "Backend Internals"
 The code for the backend is split up by functionality and assembled in the
 object `GenBCode`.
 
-```none
+```
 object GenBCode    --- [defines] -->        PlainClassBuilder       GenBCode also defines class BCodePhase, the compiler phase
      |                                              |
  [extends]                                      [extends]

docs/docs/internals/overall-structure.md

@@ -6,7 +6,7 @@ title: "Dotty Overall Structure"
 The compiler code is found in package [dotty.tools]. It spans the
 following three sub-packages:
 
-```none
+```
 backend     Compiler backends (currently for JVM and JS)
    dotc     The main compiler
      io     Helper modules for file access and classpath handling.
@@ -23,7 +23,7 @@ Package Structure
 Most functionality of `dotc` is implemented in subpackages of `dotc`. Here's a
 list of sub-packages and their focus.
 
-```none
+```
 .
 ├── ast                 // Abstract syntax trees
 ├── config              // Compiler configuration, settings, platform specific definitions.

docs/docs/internals/type-system.md

@@ -15,7 +15,7 @@ the `underlying` method, other types are called _ground_ types and inherit
 
 Here's a diagram, copied from [dotty/tools/dotc/core/Types.scala][1]:
 
-```none
+```
 Type -+- ProxyType --+- NamedType ----+--- TypeRef
       |              |                 \
       |              +- SingletonType-+-+- TermRef

docs/docs/reference/metaprogramming/macros-spec.md

@@ -9,7 +9,7 @@ title: "Macros Spec"
 
 Compared to the [Dotty reference grammar](../../internals/syntax.md)
 there are the following syntax changes:
-```none
+```
 SimpleExpr      ::=  ...
                   |  ‘'’ ‘{’ Block ‘}’
                   |  ‘'’ ‘[’ Type ‘]’
@@ -56,7 +56,7 @@ extends simply-typed lambda calculus with quotes and splices.
 ### Syntax
 
 The syntax of terms, values, and types is given as follows:
-```none
+```
 Terms         t  ::=  x                 variable
                       (x: T) => t       lambda
                       t t               application
@@ -76,7 +76,7 @@ Typing rules are formulated using a stack of environments
 `Es`. Individual environments `E` consist as usual of variable
 bindings `x: T`. Environments can be combined using the two
 combinators `'` and `$`.
-```none
+```
 Environment   E  ::=  ()                empty
                       E, x: T
 
@@ -93,7 +93,7 @@ right identity `()`.
 ### Operational semantics:
 
 We define a small step reduction relation `-->` with the following rules:
-```none
+```
           ((x: T) => t) v  -->  [x := v]t
 
                     ${'u}  -->  u
@@ -107,7 +107,7 @@ rule says that splice and quotes cancel each other out. The third rule
 is a context rule; it says that reduction is allowed in the hole `[ ]`
 position of an evaluation context.  Evaluation contexts `e` and
 splice evaluation context `e_s` are defined syntactically as follows:
-```none
+```
 Eval context    e    ::=  [ ]  |  e t  |  v e  |  'e_s[${e}]
 Splice context  e_s  ::=  [ ]  |  (x: T) => e_s  |  e_s t  |  u e_s
 ```
@@ -116,7 +116,7 @@ Splice context  e_s  ::=  [ ]  |  (x: T) => e_s  |  e_s t  |  u e_s
 Typing judgments are of the form `Es |- t: T`. There are two
 substructural rules which express the fact that quotes and splices
 cancel each other out:
-```none
+```
                     Es1 * Es2 |- t: T
                ---------------------------
                Es1 $ E1 ' E2 * Es2 |- t: T
@@ -129,7 +129,7 @@ cancel each other out:
 The lambda calculus fragment of the rules is standard, except that we
 use a stack of environments. The rules only interact with the topmost
 environment of the stack.
-```none
+```
                           x: T in E
                         --------------
                         Es * E |- x: T
@@ -146,7 +146,7 @@ environment of the stack.
 ```
 The rules for quotes and splices map between `expr T` and `T` by trading `'` and `$` between
 environments and terms.
-```none
+```
                      Es $ () |- t: expr T
                      --------------------
                          Es |- $t: T

docs/docs/usage/dottydoc.md

@@ -24,15 +24,15 @@ and will from here on be referred to as "template files" or "templates".
 
 A simple "hello world" site could look something like this:
 
-```none
+```
 ├── docs
 │   └── getting-started.md
 └── index.html
 ```
 
 This will give you a site with the following endpoints:
 
-```none
+```
 _site/index.html
 _site/docs/getting-started.html
 ```
@@ -79,7 +79,7 @@ the `index.html` file.
 
 Layouts must be placed in a `_layouts` directory in the site root:
 
-```none
+```
 ├── _layouts
 │   └── main.html
 ├── docs
@@ -97,7 +97,7 @@ the form `year-month-day-title.{md,html}`.
 
 An example of this would be:
 
-```none
+```
 ├── blog
 │   └── _posts
 │       └── 2016-12-05-implicit-function-types.md
@@ -130,7 +130,7 @@ includes may override these.
 
 An example structure with an include file "sidebar.html":
 
-```none
+```
 ├── _includes
 │   └── sidebar.html
 ├── blog
@@ -167,7 +167,7 @@ depth limit is 2 - we'd love to see this change, contributions welcome!
 The items which have the `subsection` key, may not have a `url` key in the
 current scheme. A site root example with this could be:
 
-```none
+```
 ├── blog
 │   └── _posts
 │       └── 2016-12-05-implicit-function-types.md

docs/docs/usage/getting-started.md

@@ -40,7 +40,7 @@ Releases are available for download on the [Releases Section](https://github.com
 of the Dotty repository. Releases include three executables: `dotc` the Dotty compiler,
 `dotd` the [Dotty Documentation tool](./dottydoc.md) and `dotr` the Dotty REPL.
 
-```none
+```
 .
 └── bin
     ├── dotc