scala · julienrf · Dec 21, 2020 · Sep 23, 2020 · Sep 25, 2020 · Sep 25, 2020
diff --git a/_config.yml b/_config.yml
@@ -17,6 +17,8 @@ keywords:
 
 scala-version: 2.13.3
 scala-212-version: 2.12.12
+scala-3-version: 3.0.0-M3
+scala-3-plugin-version: 0.5.1
 
 collections:
   style:
@@ -90,10 +92,37 @@ defaults:
       type: "tour"
     values:
       overview-name: "Tour of Scala"
+  -
+    scope:
+      path: "_overviews/scala3-book"
+    values:
+      scala3: true
+      # num: 99 # to list them in the TOC, should be overwritten individually
+      partof: scala3-book
+      type: section
+      overview-name: "Scala 3 — Book"
+      layout: multipage-overview
+      permalink: "/scala3/book/:title.html"
+  -
+    scope:
+      path: "_overviews/scala3-macros"
+    values:
+      scala3: true
+      partof: scala3-macros
+      overview-name: "Macros in Scala 3"
+      layout: multipage-overview
+      permalink: "/scala3/guides/macros/:title.html"
+  -
+    scope:
+      path: "scala3"
+    values:
+      scala3: true
+
 
 highlighter: rouge
 permalink: /:categories/:title.html:output_ext
 baseurl:
+scala3ref: "https://dotty.epfl.ch/docs/reference"
 exclude: ["vendor"]
 plugins:
   - jekyll-redirect-from

diff --git a/_data/scala3-doc-nav-header.yml b/_data/scala3-doc-nav-header.yml
@@ -0,0 +1,17 @@
+- title: Learn
+  url: "#"
+  submenu:
+    - title: New in Scala 3
+      url: "/scala3/new-in-scala3.html"
+    - title: Getting Started
+      url: "/scala3/getting-started.html"
+    - title: Scala 3 Book
+      url: "/scala3/book/introduction.html"
+    - title: Macro Tutorial
+      url: "/scala3/guides/macros/index.html"
+- title: Migrate
+  url: "https://scalacenter.github.io/scala-3-migration-guide"
+- title: Reference
+  url: "https://dotty.epfl.ch/docs/reference/overview.html"
+- title: API
+  url: "https://dotty.epfl.ch/api/index.html"
diff --git a/_includes/documentation-sections.html b/_includes/documentation-sections.html
@@ -0,0 +1,28 @@
+<div class="documentation">
+  {% for section in include.sections %}
+    <div class="section">
+      <h2 class="frontpage">{{ section.title }}</h2>
+      {% for link in section.links %}
+      <a href="{% if link.link contains '://' %}{{link.link}}{% else %}{{site.baseurl}}{{link.link}}{% endif %}" class="doc-item">
+        <div class="doc-item-header">
+          <i class="{{link.icon}}"></i>
+          <h5>{{link.title}}</h5>
+        </div>
+        <div class="doc-item-main">
+          <p>{{link.description}}</p>
+        </div>
+      </a>
+      {% endfor %}
+    </div>
+    <div class="more-resources">&nbsp;
+      {% if section.more-resources %}
+        <span class="heading">{{ page.more-resources-label }}: </span>
+        <ul>
+        {% for resource in section.more-resources %}
+          <li><a href="{{ site.baseurl }}{{ resource.url }}">{{ resource.title }}</a></li>
+        {% endfor %}
+        </ul>
+      {% endif %}
+    </div>
+  {% endfor %}
+</div>
diff --git a/_includes/headertop.html b/_includes/headertop.html
@@ -1,5 +1,9 @@
 <!DOCTYPE html>
+{% if page.scala3 %}
+<html class="scala3">
+{% else %}
 <html>
+{% endif %}
   <head>
     <title>
       {% if page.title %}{{ page.title }} | {% endif %}

diff --git a/_includes/masthead-documentation.html b/_includes/masthead-documentation.html
@@ -29,34 +29,7 @@
 				{% endif %}
 			</ul>
 
-			<div class="documentation">
-				{% for section in page.sections %}
-          <div class="section">
-            <h2 class="frontpage">{{ section.title }}</h2>
-            {% for link in section.links %}
-  					<a href="{% if link.link contains '://' %}{{link.link}}{% else %}{{site.baseurl}}{{link.link}}{% endif %}" class="doc-item">
-  						<div class="doc-item-header">
-  							<i class="{{link.icon}}"></i>
-  							<h5>{{link.title}}</h5>
-  						</div>
-  						<div class="doc-item-main">
-  							<p>{{link.description}}</p>
-  						</div>
-  					</a>
-            {% endfor %}
-          </div>
-          <div class="more-resources">&nbsp;
-            {% if section.more-resources %}
-              <span class="heading">{{ page.more-resources-label }}: </span>
-              <ul>
-              {% for resource in section.more-resources %}
-                <li><a href="{{ site.baseurl }}{{ resource.url }}">{{ resource.title }}</a></li>
-              {% endfor %}
-              </ul>
-            {% endif %}
-          </div>
-				{% endfor %}
-			</div>
+			{% include documentation-sections.html sections=page.sections %}
 		</div>
 	</div>
 </section>
diff --git a/_includes/navbar-inner.html b/_includes/navbar-inner.html
@@ -1,34 +1,32 @@
-<header id="site-header">
-  <div class="wrap">
-    <nav class="navigation" role="menu">
-      <a href="http://scala-lang.org" class="navigation-bdand">
-        <img src="{{ site.baseurl }}/resources/img/frontpage/[email protected]" alt="">
-      </a>
-      <div class="navigation-panel-button">
-        <i class="fa fa-bars"></i>
-      </div>
-      <ul class="navigation-menu">
-        {% for navItem in site.data.nav-header %}
-            <li class="navigation-menu-item">
-              <a href="{% if navItem.url contains '://' %}{{navItem.url}}{% else %}{{site.baseurl}}{{navItem.url}}{% endif %}" {% if page.url contains navItem.url %}class="active"{% endif %}>{{navItem.title}}</a>
-            </li>
-        {% endfor %}
-      </ul>
-    </nav>
-  </div>
-</header>
+{% if page.scala3 %}
+  {% assign navdata = site.data.scala3-doc-nav-header %}
+{% else %}
+  {% assign navdata = site.data.doc-nav-header %}
+{% endif %}
+
+{% include site-header.html %}
+
+{% if page.scala3 %}
+<header id="doc-header" class="scala3">
+{% else %}
 <header id="doc-header">
+{% endif %}
   <div class="wrap" style="padding: 0px;">
     <nav class="doc-navigation" role="menu">
       {% assign docsRootTranslated = site[page.language] | where: 'partof', 'documentation' | first %}
-      <a href="{{ site.baseurl }}/{{ docsRootTranslated.language }}" class="navigation-bdand" >
-        <img src="{{ site.baseurl }}/resources/img/[email protected]" alt="">
+      <div class="navigation-bdand">
+      <a href="{{ site.baseurl }}/{{ docsRootTranslated.language }}">
+        <img src="{{ site.baseurl }}/resources/img/[email protected]" alt="docs">
       </a>
+      <span class="doc-language-version">
+        — Scala {% if page.scala3 %} 3 {% else %} 2 {% endif %}
+      </span>
+      </div>
       <div class="navigation-ellipsis">
         <i class="fa fa-ellipsis-v"></i>
       </div>
       <ul class="navigation-menu">
-        {% for navItem in site.data.doc-nav-header %}
+        {% for navItem in navdata %}
             <li class="navigation-menu-item">
               {% capture translatedPageId %}/{{page.language}}{{navItem.url | remove_first: '.html' }}{% endcapture %}
               {% assign navItemTranslated = site.documents | where: 'id', translatedPageId | first %}
@@ -49,7 +47,7 @@
       </ul>
     </nav>
     <nav class="doc-navigation-submenus">
-      {% for navItem in site.data.doc-nav-header %}
+      {% for navItem in navdata %}
         {% if navItem.submenu %}
           <ul class="navigation-submenu" id="{{ navItem.title | downcase | strip }}" style="display: none;">
             {% for subItem in navItem.submenu %}
@@ -61,7 +59,7 @@
         {% endif %}
       {% endfor %}
       <ul class="navigation-submenu ellipsis-menu" style="display: none;">
-        {% for navItem in site.data.doc-nav-header %}
+        {% for navItem in navdata %}
           {% if forloop.index > 3 %}
             <li><a href="{% if navItem.url contains '://' %}{{navItem.url}}{% else %}{{site.baseurl}}{{navItem.url}}{% endif %}">{{ navItem.title }}</a></li>
           {% endif %}

diff --git a/_includes/sidebar-toc-multipage-overview.html b/_includes/sidebar-toc-multipage-overview.html
@@ -11,25 +11,30 @@ <h5 class="contents">Contents</h5>
       <ul>
         {% assign sorted = site.overviews | sort: 'num' %}
         {% for pg in sorted %}
+					{% if pg.num == page.num %}
+						{% capture toc %}
+						<div id="toc"></div>
+						{% endcapture %}
+					{% endif %}
+
           {% if pg.num and (page.partof == pg.partof) %}
             {% if page.language %} <!-- if page is a translation, get the translated title -->
               {% assign prefix = page.language | prepend: '/' %}
               {% assign localizedId = pg.id | prepend: prefix %}
               {% for lpg in site.[page.language] %}
                 {% if lpg.id == localizedId %}
-                  <li><a {% if page.title == lpg.title %}class="active"{% endif %} href="/{{ site.baseurl }}{{ page.language }}{{ pg.url }}">{{ lpg.title }}</a></li>
+                  <li><a {% if page.title == lpg.title %}class="active"{% endif %} href="/{{ site.baseurl }}{{ page.language }}{{ pg.url }}">{{ lpg.title }}</a>
+									{{ toc }}</li>
                 {% endif %}
               {% endfor %}
             {% else %} <!-- this must be English, so get the other documents' titles -->
 
               {% if pg.type %} <!-- if a type is set in a document, we add it as a class. Used in Scala book to diff between chapter and section -->
-                <li class="type-{{ pg.type }}"><a {% if page.title == pg.title %}class="active"{% endif %} href="{{ site.baseurl }}{{ pg.url }}">{{ pg.title }}</a></li>
+                <li class="type-{{ pg.type }}"><a {% if page.num == pg.num %}class="active"{% endif %} href="{{ site.baseurl }}{{ pg.url }}">{{ pg.title }}</a>{{toc}}</li>
               {% else %}
-                <li><a {% if page.title == pg.title %}class="active"{% endif %} href="{{ site.baseurl }}{{ pg.url }}">{{ pg.title }}</a></li>
+                <li><a {% if page.num == pg.num %}class="active"{% endif %} href="{{ site.baseurl }}{{ pg.url }}">{{ pg.title }}</a>{{toc}}</li>
               {% endif %}
-
             {% endif %}
-            {% if pg.num == page.num %}<div id="toc"></div>{% endif %}
           {% endif %}
         {% endfor %}
       </ul>

diff --git a/_includes/site-header.html b/_includes/site-header.html
@@ -0,0 +1,19 @@
+<header id="site-header">
+  <div class="wrap">
+    <nav class="navigation" role="menu">
+      <a href="http://scala-lang.org" class="navigation-bdand">
+        <img src="{{ site.baseurl }}/resources/img/frontpage/[email protected]" alt="">
+      </a>
+      <div class="navigation-panel-button">
+        <i class="fa fa-bars"></i>
+      </div>
+      <ul class="navigation-menu">
+        {% for navItem in site.data.nav-header %}
+            <li class="navigation-menu-item">
+              <a href="{% if navItem.url contains '://' %}{{navItem.url}}{% else %}{{site.baseurl}}{{navItem.url}}{% endif %}" {% if page.url contains navItem.url %}class="active"{% endif %}>{{navItem.title}}</a>
+            </li>
+        {% endfor %}
+      </ul>
+    </nav>
+  </div>
+</header>
diff --git a/_layouts/documentation.html b/_layouts/documentation.html
@@ -0,0 +1,56 @@
+---
+---
+{% include headertop.html %} {% include headerbottom.html %}
+{% if page.new-version %}<a class="new-version-notice" href="{{ page.new-version }}">This page has a new version.</a>{% endif %}
+
+<div class="navigation-fade-screen"></div>
+
+{% include site-header.html %}
+
+<main id="inner-main" class="landing-page">
+
+ <section class="title-page">
+   <div class="wrap">
+     <div class="content-title-documentation">
+
+       <h1>{{page.title}}</h1>
+       <div class="search-container">
+         <div class="icon-search">
+           <i class="fa fa-search"></i>
+         </div>
+         <input type="text" class="doc-search" id="doc-search-bar" placeholder="Search in doc...">
+         <ul class="result-container" id="result-container" style="display: none;"></ul>
+       </div>
+     </div>
+   </div>
+ </section>
+
+  <section class="table-of-content content-primary">
+    <div class="wrap scala2">
+      <div class="language-header">
+        <h1>Scala 2</h1>
+      </div>
+       <div class="inner-box">
+        {% include documentation-sections.html sections=page.scala2-sections %}
+      </div>
+    </div>
+
+    <div class="wrap scala3">
+      <div class="language-header">
+        <h1>Scala 3 (Preview)</h1>
+      </div>
+ 		  <div class="inner-box">
+        <blockquote>
+          Scala 3 has not been released, yet. We are still in the process of writing the documentation for Scala 3.<br/>
+          You can <a href="/scala3/contribute-to-docs.html">help us to improve the documentation</a>.
+        </blockquote>
+        {% include documentation-sections.html sections=page.scala3-sections %}
+      </div>
+    </div>
+  </section>
+
+  {{content}}
+
+</main>
+
+{% include footer.html %}
diff --git a/_layouts/inner-page-parent-dropdown.html b/_layouts/inner-page-parent-dropdown.html
@@ -2,16 +2,29 @@
 {% include headerbottom.html %}
 {% if page.new-version %}<a class="new-version-notice" href="{{ page.new-version }}">This page has a new version.</a>{% endif %}
 
+
+
 <div class="navigation-fade-screen"></div>
 
 {% include navbar-inner.html %}
 
 <main id="inner-main">
-
   <!-- Title -->
   <section class="title-page">
     <div class="wrap">
       <div class="content-title-documentation">
+        {% if page.scala3 %}
+          <div class="wip-notice">
+            <h4>Work in Progress</h4>
+            <p>
+              Scala 3 has not been released, yet.
+              We are still in the process of writing the documentation for Scala 3.
+              You can <a  href="/scala3/contribute-to-docs.html">help us</a> to improve the documentation.
+            </p>
+            <p>Are you searching for the <a href="/">Scala 2 documentation</a>?</p>
+          </div>
+        {% endif %}
+
         <div class="titles">
           {% if page.overview-name %}
             <div class="supertitle">{{ page.overview-name }}</div>