Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

docs: Add correct/incorrect containers #15998

Merged
merged 1 commit into from Jun 14, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 6 additions & 6 deletions docs/.eleventy.js
Expand Up @@ -6,6 +6,7 @@ const pluginRss = require("@11ty/eleventy-plugin-rss");
const pluginTOC = require("eleventy-plugin-nesting-toc");
const slugify = require("slugify");
const markdownItAnchor = require("markdown-it-anchor");
const markdownItContainer = require("markdown-it-container");
const Image = require("@11ty/eleventy-img");
const path = require("path");

Expand Down Expand Up @@ -141,12 +142,11 @@ module.exports = function(eleventyConfig) {
const markdownIt = require("markdown-it");

eleventyConfig.setLibrary("md",
markdownIt({
html: true,
linkify: true,
typographer: true

}).use(markdownItAnchor, {}).disable("code"));
markdownIt({ html: true, linkify: true, typographer: true })
.use(markdownItAnchor, {})
.use(markdownItContainer, "correct", {})
.use(markdownItContainer, "incorrect", {})
.disable("code"));

//------------------------------------------------------------------------------
// Shortcodes
Expand Down
1 change: 1 addition & 0 deletions docs/package.json
Expand Up @@ -33,6 +33,7 @@
"luxon": "^2.4.0",
"markdown-it": "^12.2.0",
"markdown-it-anchor": "^8.1.2",
"markdown-it-container": "^3.0.0",
"netlify-cli": "^10.3.1",
"npm-run-all": "^4.1.5",
"rimraf": "^3.0.2",
Expand Down
8 changes: 4 additions & 4 deletions docs/src/assets/scss/docs.scss
Expand Up @@ -102,8 +102,8 @@
margin: 3rem 0;
}

div[data-correct-code],
div[data-incorrect-code] {
div.correct,
div.incorrect {
position: relative;

&::after {
Expand All @@ -115,13 +115,13 @@ div[data-incorrect-code] {
}
}

div[data-correct-code] {
div.correct {
&::after {
content: url("data:image/svg+xml,%3Csvg width='45' height='44' viewBox='0 0 45 44' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Crect x='1.5' y='1' width='42' height='42' rx='21' fill='%23ECFDF3'/%3E%3Cpath d='M30.5 16L19.5 27L14.5 22' stroke='%2312B76A' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'/%3E%3Crect x='1.5' y='1' width='42' height='42' rx='21' stroke='white' stroke-width='2'/%3E%3C/svg%3E%0A");
}
}

div[data-incorrect-code] {
div.incorrect {
&::after {
content: url("data:image/svg+xml,%3Csvg width='45' height='44' viewBox='0 0 45 44' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Crect x='1.5' y='1' width='42' height='42' rx='21' fill='%23FFF1F3'/%3E%3Cpath d='M28.5 16L16.5 28M16.5 16L28.5 28' stroke='%23F63D68' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'/%3E%3Crect x='1.5' y='1' width='42' height='42' rx='21' stroke='white' stroke-width='2'/%3E%3C/svg%3E%0A");
}
Expand Down
20 changes: 10 additions & 10 deletions docs/src/library/code-blocks.md
Expand Up @@ -6,35 +6,35 @@ To indicate correct and incorrect code usage, some code blocks can have correct

## Usage

To indicate that a code block is correct or incorrect, wrap the code block in a `div` and provide the `data-correct-code` and `data-incorrect-code` attributes, repsectively.
To indicate that a code block is correct or incorrect, wrap the code block in a container labeled either `correct` or `incorrect`.

Make sure to leave space above and below the markdown code block to ensure it is rendered correctly.

```html
<div data-correct-code>
```text
::: correct
`` `js
function() {
const another = [];
}
`` `
</div>
:::
<div data-incorrect-code>
::: incorrect
`` `js
function() {
const another = [];
}
`` `
</div>
:::
```

## Examples

Correct usage:

<div data-correct-code>
::: correct

```js
const { ESLint } = require("eslint");
Expand All @@ -61,11 +61,11 @@ const { ESLint } = require("eslint");
});
```

</div>
:::

Incorrect usage:

<div data-incorrect-code>
::: incorrect

```js
const { ESLint } = require("eslint");
Expand All @@ -92,4 +92,4 @@ const { ESLint } = require("eslint");
});
```

</div>
:::
28 changes: 28 additions & 0 deletions docs/src/rules/semi.md
Expand Up @@ -98,6 +98,8 @@ Object option (when `"never"`):

Examples of **incorrect** code for this rule with the default `"always"` option:

::: incorrect

```js
/*eslint semi: ["error", "always"]*/

Expand All @@ -112,8 +114,12 @@ class Foo {
}
```

:::

Examples of **correct** code for this rule with the default `"always"` option:

::: correct

```js
/*eslint semi: "error"*/

Expand All @@ -128,10 +134,14 @@ class Foo {
}
```

:::

### never

Examples of **incorrect** code for this rule with the `"never"` option:

::: incorrect

```js
/*eslint semi: ["error", "never"]*/

Expand All @@ -146,8 +156,12 @@ class Foo {
}
```

:::

Examples of **correct** code for this rule with the `"never"` option:

::: correct

```js
/*eslint semi: ["error", "never"]*/

Expand Down Expand Up @@ -178,10 +192,14 @@ class Foo {
}
```

:::

#### omitLastInOneLineBlock

Examples of additional **correct** code for this rule with the `"always", { "omitLastInOneLineBlock": true }` options:

::: correct

```js
/*eslint semi: ["error", "always", { "omitLastInOneLineBlock": true}] */

Expand All @@ -198,10 +216,14 @@ class C {
}
```

:::

#### beforeStatementContinuationChars

Examples of additional **incorrect** code for this rule with the `"never", { "beforeStatementContinuationChars": "always" }` options:

::: incorrect

```js
/*eslint semi: ["error", "never", { "beforeStatementContinuationChars": "always"}] */
import a from "a"
Expand All @@ -211,8 +233,12 @@ import a from "a"
})()
```

:::

Examples of additional **incorrect** code for this rule with the `"never", { "beforeStatementContinuationChars": "never" }` options:

::: incorrect

```js
/*eslint semi: ["error", "never", { "beforeStatementContinuationChars": "never"}] */
import a from "a"
Expand All @@ -222,6 +248,8 @@ import a from "a"
})()
```

:::

## When Not To Use It

If you do not want to enforce semicolon usage (or omission) in any particular way, then you can turn this rule off.