fix: Removed text as the default language selector for code blocks (#355

)

.github/workflows/release.yml

@@ -10,10 +10,10 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2
-      - name: 'Install nodejs 18'
+      - name: 'Install nodejs 20'
         uses: actions/setup-node@v3
         with:
-          node-version: '18'
+          node-version: '20'
           registry-url: 'https://registry.npmjs.org'
       - name: Install dependencies
         run: |

.github/workflows/test.yml

@@ -18,10 +18,10 @@ jobs:
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
-      - name: 'Install nodejs 18'
+      - name: 'Install nodejs 20'
         uses: actions/setup-node@v2
         with:
-          node-version: '18'
+          node-version: '20'
       - name: 'Build and test'
         run: |
           corepack enable

.github/workflows/typedoc.yml

@@ -15,10 +15,10 @@ jobs:
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
-      - name: 'Install nodejs 18'
+      - name: 'Install nodejs 20'
         uses: actions/setup-node@v2
         with:
-          node-version: '18'
+          node-version: '20'
       - name: 'Build and test'
         run: |
           corepack enable

CHANGELOG.md

@@ -4,6 +4,17 @@ Please visit https://github.com/shd101wyy/vscode-markdown-preview-enhanced/relea
 
 ## [Unreleased]
 
+## [0.9.9] - 2024-03-11
+
+### Bug fixes
+
+- Fixed [Long sidebarToc does not display completely](https://github.com/shd101wyy/crossnote/pull/354) by @moonlitusun
+- Removed the `text` as the default language selector for code block.
+
+### Chore
+
+- Updated [flake.nix](./flake.nix) and node.js to 20.
+
 ## [0.9.8] - 2024-03-10
 
 ### New features

flake.nix

@@ -3,7 +3,7 @@
 
   inputs = {
     nixpkgs = {
-      url = "github:NixOS/nixpkgs/nixos-23.05";
+      url = "github:NixOS/nixpkgs/nixos-23.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     flake-utils = { url = "github:numtide/flake-utils"; };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "crossnote",
-  "version": "0.9.8",
+  "version": "0.9.9",
   "description": "A powerful markdown notebook tool",
   "keywords": [
     "markdown"

shell.nix

@@ -1,7 +1,7 @@
 { pkgs ? import <nixpkgs> { } }:
 with pkgs;
 mkShell {
-  buildInputs = [ nodejs_18 yarn ];
+  buildInputs = [ nodejs_20 yarn ];
   shellHook = ''
     # ...
   '';

src/lib/block-info/parse-block-info.ts

@@ -33,7 +33,7 @@ export const parseBlockInfo = (raw = ''): BlockInfo => {
 
   const classNames = attributes.class ? attributes.class.split(/\s+/) : [];
   if (!language) {
-    language = classNames[0] || 'text';
+    language = classNames[0] || '';
   }
   if (!classNames.includes(language)) {
     attributes.class = [language, ...classNames].join(' ');

src/render-enhancers/code-block-styling.ts

@@ -61,7 +61,7 @@ export default async function enhance($: CheerioStatic): Promise<void> {
       $container.empty().append($(`<code></code>`).text(code));
     }
 
-    $container.addClass(`language-${language}`);
+    $container.addClass(`language-${language || 'text'}`);
     if (info.attributes['class']) {
       $container.addClass(info.attributes['class']);
       addLineNumbersIfNecessary($container, code);

test/lib/block-info.test.ts

@@ -10,15 +10,15 @@ const testCasesForParseBlockInfo: {
 }[] = [
   {
     input: '',
-    expect: { language: 'text', attributes: { class: 'text' } },
+    expect: { language: '', attributes: { class: '' } },
   },
   {
     input: '{}',
-    expect: { language: 'text', attributes: { class: 'text' } },
+    expect: { language: '', attributes: { class: '' } },
   },
   {
     input: '{#id}',
-    expect: { language: 'text', attributes: { id: 'id', class: 'text' } },
+    expect: { language: '', attributes: { id: 'id', class: '' } },
   },
   {
     input: 'js cmd=true',
@@ -78,8 +78,8 @@ const testCasesForParseBlockInfo: {
   {
     input: ' {just=attribute}',
     expect: {
-      language: 'text',
-      attributes: { just: 'attribute', class: 'text' },
+      language: '',
+      attributes: { just: 'attribute', class: '' },
     },
   },
   {

test/markdown/test-files/test8.expect.md

@@ -0,0 +1,19 @@
+# Code blocks {#code-blocks  data-source-line="1"}
+
+``` {data-source-line="3"}
+This is code block without language selector
+```
+
+```text {data-source-line="7"}
+This is another text code block
+```
+
+``` {.python data-source-line="11"}
+def hello():
+    println("Hello, world")
+```
+
+```python {data-source-line="16"}
+def hello():
+    println("Hello, world")
+```

test/markdown/test-files/test8.md

@@ -0,0 +1,19 @@
+# Code blocks
+
+```
+This is code block without language selector
+```
+
+```text
+This is another text code block
+```
+
+```{.python}
+def hello():
+    println("Hello, world")
+```
+
+```python
+def hello():
+    println("Hello, world")
+```