From d4312a7b6c1aa97e301df00ca5f2d8bd17630b18 Mon Sep 17 00:00:00 2001 From: Noam Honig Date: Thu, 7 Nov 2024 09:31:27 +0200 Subject: [PATCH 1/7] fixed syntax highlighting of marking text examples --- .../src/content/docs/guides/creating-content.mdx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/tutorialkit.dev/src/content/docs/guides/creating-content.mdx b/docs/tutorialkit.dev/src/content/docs/guides/creating-content.mdx index 958c3feed..ab3aa0028 100644 --- a/docs/tutorialkit.dev/src/content/docs/guides/creating-content.mdx +++ b/docs/tutorialkit.dev/src/content/docs/guides/creating-content.mdx @@ -213,12 +213,16 @@ You can highlight text using strings or regular expressions. For example: ````md ```jsx "hello" /ye[sp]/ add=/add[12]/ del=/remove[12]/ +```` +```jsx "hello" /ye[sp]/ add=/add[12]/ del=/remove[12]/ console.log( 'Hello, the words yes and yep will be marked. Also add1, add2, remove1, remove2', ) ``` -```` +````md +```jsx "hello" /ye[sp]/ add=/add[12]/ del=/remove[12]/ +```` ```jsx "hello" /ye[sp]/ add=/add[12]/ del=/remove[12]/ console.log( 'Hello, the words yes and yep will be marked. Also add1, add2, remove1, remove2', From b74f890d66d3b7a7142ecafccf68716a5dfba453 Mon Sep 17 00:00:00 2001 From: Noam Honig Date: Thu, 7 Nov 2024 12:27:04 +0200 Subject: [PATCH 2/7] Update creating-content.mdx --- .../src/content/docs/guides/creating-content.mdx | 8 -------- 1 file changed, 8 deletions(-) diff --git a/docs/tutorialkit.dev/src/content/docs/guides/creating-content.mdx b/docs/tutorialkit.dev/src/content/docs/guides/creating-content.mdx index ab3aa0028..4427f0582 100644 --- a/docs/tutorialkit.dev/src/content/docs/guides/creating-content.mdx +++ b/docs/tutorialkit.dev/src/content/docs/guides/creating-content.mdx @@ -220,14 +220,6 @@ console.log( ) ``` -````md -```jsx "hello" /ye[sp]/ add=/add[12]/ del=/remove[12]/ -```` -```jsx "hello" /ye[sp]/ add=/add[12]/ del=/remove[12]/ -console.log( - 'Hello, the words yes and yep will be marked. Also add1, add2, remove1, remove2', -) -``` #### Importing files From 8547af7665439aeaf20c4cb5722a3a04fd6f7cf9 Mon Sep 17 00:00:00 2001 From: Noam Honig Date: Thu, 7 Nov 2024 12:30:05 +0200 Subject: [PATCH 3/7] Update creating-content.mdx --- .../src/content/docs/guides/creating-content.mdx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/tutorialkit.dev/src/content/docs/guides/creating-content.mdx b/docs/tutorialkit.dev/src/content/docs/guides/creating-content.mdx index 4427f0582..c44964c9e 100644 --- a/docs/tutorialkit.dev/src/content/docs/guides/creating-content.mdx +++ b/docs/tutorialkit.dev/src/content/docs/guides/creating-content.mdx @@ -211,10 +211,10 @@ const highlighted = 'This line is highlighted'; You can highlight text using strings or regular expressions. For example: -````md -```jsx "hello" /ye[sp]/ add=/add[12]/ del=/remove[12]/ +````md title="content.md" +```jsx title="code.js" "hello" /ye[sp]/ add=/add[12]/ del=/remove[12]/ ```` -```jsx "hello" /ye[sp]/ add=/add[12]/ del=/remove[12]/ +```jsx title="code.js" "hello" /ye[sp]/ add=/add[12]/ del=/remove[12]/ console.log( 'Hello, the words yes and yep will be marked. Also add1, add2, remove1, remove2', ) From 0196548ad25fc2a3775a22ec2215e5da2cab4f81 Mon Sep 17 00:00:00 2001 From: Noam Honig Date: Thu, 7 Nov 2024 23:10:07 +0200 Subject: [PATCH 4/7] Update creating-content.mdx --- .../src/content/docs/guides/creating-content.mdx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/tutorialkit.dev/src/content/docs/guides/creating-content.mdx b/docs/tutorialkit.dev/src/content/docs/guides/creating-content.mdx index c44964c9e..4f00aa8a9 100644 --- a/docs/tutorialkit.dev/src/content/docs/guides/creating-content.mdx +++ b/docs/tutorialkit.dev/src/content/docs/guides/creating-content.mdx @@ -213,6 +213,9 @@ You can highlight text using strings or regular expressions. For example: ````md title="content.md" ```jsx title="code.js" "hello" /ye[sp]/ add=/add[12]/ del=/remove[12]/ +console.log( + 'Hello, the words yes and yep will be marked. Also add1, add2, remove1, remove2', +) ```` ```jsx title="code.js" "hello" /ye[sp]/ add=/add[12]/ del=/remove[12]/ console.log( From a53b0747963e6a10077fd865dc3b3715fa9bb524 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ari=20Perkki=C3=B6?= Date: Fri, 8 Nov 2024 11:08:17 +0200 Subject: [PATCH 5/7] docs: restore newline changes --- .../tutorialkit.dev/src/content/docs/guides/creating-content.mdx | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/tutorialkit.dev/src/content/docs/guides/creating-content.mdx b/docs/tutorialkit.dev/src/content/docs/guides/creating-content.mdx index 4f00aa8a9..556ca3b59 100644 --- a/docs/tutorialkit.dev/src/content/docs/guides/creating-content.mdx +++ b/docs/tutorialkit.dev/src/content/docs/guides/creating-content.mdx @@ -223,7 +223,6 @@ console.log( ) ``` - #### Importing files In addition to Expressive Code features, you can import files from your code template `_files` and `_solution` folders using the file or solution shortcodes. These shortcodes insert the content of the specified file directly into your lesson content. From ccfdb8c78716e41b73713a6870e1bc5d6b268445 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ari=20Perkki=C3=B6?= Date: Fri, 8 Nov 2024 11:08:41 +0200 Subject: [PATCH 6/7] docs: restore newline changes --- .../tutorialkit.dev/src/content/docs/guides/creating-content.mdx | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/tutorialkit.dev/src/content/docs/guides/creating-content.mdx b/docs/tutorialkit.dev/src/content/docs/guides/creating-content.mdx index 556ca3b59..ae720abd5 100644 --- a/docs/tutorialkit.dev/src/content/docs/guides/creating-content.mdx +++ b/docs/tutorialkit.dev/src/content/docs/guides/creating-content.mdx @@ -217,6 +217,7 @@ console.log( 'Hello, the words yes and yep will be marked. Also add1, add2, remove1, remove2', ) ```` + ```jsx title="code.js" "hello" /ye[sp]/ add=/add[12]/ del=/remove[12]/ console.log( 'Hello, the words yes and yep will be marked. Also add1, add2, remove1, remove2', From 0171fd2d179aa5ecedb4b250fee5f4a21cd9d10c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ari=20Perkki=C3=B6?= Date: Fri, 8 Nov 2024 11:11:14 +0200 Subject: [PATCH 7/7] docs: restore markdown tags --- .../tutorialkit.dev/src/content/docs/guides/creating-content.mdx | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/tutorialkit.dev/src/content/docs/guides/creating-content.mdx b/docs/tutorialkit.dev/src/content/docs/guides/creating-content.mdx index ae720abd5..09f20c134 100644 --- a/docs/tutorialkit.dev/src/content/docs/guides/creating-content.mdx +++ b/docs/tutorialkit.dev/src/content/docs/guides/creating-content.mdx @@ -216,6 +216,7 @@ You can highlight text using strings or regular expressions. For example: console.log( 'Hello, the words yes and yep will be marked. Also add1, add2, remove1, remove2', ) +``` ```` ```jsx title="code.js" "hello" /ye[sp]/ add=/add[12]/ del=/remove[12]/