Merge branch 'release/3.82.1'

Author: purocean

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,28 @@
+---
+name: Feature Request
+about: Suggest a new feature or improvement
+title: "[Feature]:Feature Name"
+labels: 'Feature'
+assignees: ''
+
+---
+
+**Feature Description**
+Briefly describe the feature and its purpose.
+
+**Background**
+Why is this feature needed? Provide some context or business scenario that helps understand the need for this feature.
+
+**Expected Behavior**
+Describe how the feature should behave once implemented
+
+**Proposed Solution (Optional)**
+If you have a solution or suggestion, briefly explain it here
+
+**Additional Information (Optional)**
+Any dependencies or potential impact on other features
+
+**Priority (Optional)** 
+- [ ] High
+- [ ] Medium
+- [ ] Low

README.md

@@ -76,11 +76,14 @@ For more information on how to use the following functions, please see [characte
 
 ## Changelogs
 
-### [v3.81.3](https://github.com/purocean/yn/releases/tag/v3.81.3) 2025-01-27
+### [v3.82.1](https://github.com/purocean/yn/releases/tag/v3.82.1) 2025-03-30
 
-[Windows](https://github.com/purocean/yn/releases/download/v3.81.3/Yank-Note-win-x64-3.81.3.exe) | [macOS arm64](https://github.com/purocean/yn/releases/download/v3.81.3/Yank-Note-mac-arm64-3.81.3.dmg) | [macOS x64](https://github.com/purocean/yn/releases/download/v3.81.3/Yank-Note-mac-x64-3.81.3.dmg) | [Linux AppImage](https://github.com/purocean/yn/releases/download/v3.81.3/Yank-Note-linux-x86_64-3.81.3.AppImage) | [Linux deb](https://github.com/purocean/yn/releases/download/v3.81.3/Yank-Note-linux-amd64-3.81.3.deb)
+[Windows](https://github.com/purocean/yn/releases/download/v3.82.1/Yank-Note-win-x64-3.82.1.exe) | [macOS arm64](https://github.com/purocean/yn/releases/download/v3.82.1/Yank-Note-mac-arm64-3.82.1.dmg) | [macOS x64](https://github.com/purocean/yn/releases/download/v3.82.1/Yank-Note-mac-x64-3.82.1.dmg) | [Linux AppImage](https://github.com/purocean/yn/releases/download/v3.82.1/Yank-Note-linux-x86_64-3.82.1.AppImage) | [Linux deb](https://github.com/purocean/yn/releases/download/v3.82.1/Yank-Note-linux-amd64-3.82.1.deb)
 
-1. fix: Fix the issue where directories might fail to be deleted on Windows
+1. feat: Added font configuration for the preview area
+2. feat: Restrict Markdown syntax suggestions in the editor from displaying within code fences
+3. fix: Fixed the issue where exported HTML headings were not highlighted correctly in some cases
+4. feat(plugin): Added the `ctx.editor.getLineLanguageId` method to retrieve the language ID of a specific line
 
 [More release notes](https://github.com/purocean/yn/releases)
 

README_ZH-CN.md

@@ -76,11 +76,14 @@
 
 ## 更新日志
 
-### [v3.81.3](https://github.com/purocean/yn/releases/tag/v3.81.3) 2025-01-27
+### [v3.82.1](https://github.com/purocean/yn/releases/tag/v3.82.1) 2025-03-30
 
-[Windows](https://github.com/purocean/yn/releases/download/v3.81.3/Yank-Note-win-x64-3.81.3.exe) | [macOS arm64](https://github.com/purocean/yn/releases/download/v3.81.3/Yank-Note-mac-arm64-3.81.3.dmg) | [macOS x64](https://github.com/purocean/yn/releases/download/v3.81.3/Yank-Note-mac-x64-3.81.3.dmg) | [Linux AppImage](https://github.com/purocean/yn/releases/download/v3.81.3/Yank-Note-linux-x86_64-3.81.3.AppImage) | [Linux deb](https://github.com/purocean/yn/releases/download/v3.81.3/Yank-Note-linux-amd64-3.81.3.deb)
+[Windows](https://github.com/purocean/yn/releases/download/v3.82.1/Yank-Note-win-x64-3.82.1.exe) | [macOS arm64](https://github.com/purocean/yn/releases/download/v3.82.1/Yank-Note-mac-arm64-3.82.1.dmg) | [macOS x64](https://github.com/purocean/yn/releases/download/v3.82.1/Yank-Note-mac-x64-3.82.1.dmg) | [Linux AppImage](https://github.com/purocean/yn/releases/download/v3.82.1/Yank-Note-linux-x86_64-3.82.1.AppImage) | [Linux deb](https://github.com/purocean/yn/releases/download/v3.82.1/Yank-Note-linux-amd64-3.82.1.deb)
 
-1. fix: 修复 Windows 上可能删除目录失败问题
+1. feat: 新增预览区字体配置
+2. feat: 限制编辑器的 Markdown 语法建议在代码围栏中不显示
+3. fix: 修复某些情况下导出的 HTML 标题高亮不正确问题
+4. feat(plugin): 增加 `ctx.editor.getLineLanguageId` 方法获取某行的语言ID
 
 [更多发布说明](https://github.com/purocean/yn/releases)
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "yank.note",
-  "version": "3.81.3",
+  "version": "3.82.1",
   "description": "Yank Note: A highly extensible Markdown editor, designed for productivity.",
   "main": "dist/main/app.js",
   "license": "AGPL-3.0",
@@ -137,7 +137,7 @@
     "normalize.css": "^8.0.1",
     "parse-author": "^2.0.0",
     "path-browserify": "^1.0.1",
-    "prismjs": "^1.29.0",
+    "prismjs": "^1.30.0",
     "sass": "^1.83.0",
     "socket.io-client": "^4.7.2",
     "sortablejs": "^1.13.0",
@@ -148,7 +148,7 @@
     "typescript": "^5.5.4",
     "utility-types": "^3.10.0",
     "viewerjs": "^1.11.6",
-    "vite": "^6.0.9",
+    "vite": "^6.0.12",
     "vue": "^3.5.13",
     "vue-tsc": "^2.2.0",
     "xterm": "^4.18.0",

scripts/download-plantuml.js

@@ -3,7 +3,7 @@ const path = require('path')
 const request = require('request')
 
 const filename = 'plantuml.jar'
-const downloadUrl = 'https://github.com/plantuml/plantuml/releases/download/v1.2023.10/plantuml-1.2023.10.jar'
+const downloadUrl = 'https://github.com/plantuml/plantuml/releases/download/v1.2025.0/plantuml.jar'
 
 console.info('Download plantuml', downloadUrl, filename)
 

src/renderer/components/TitleBar.vue

@@ -165,7 +165,7 @@ export default defineComponent({
 
       if (file) {
         if (file.repo === HELP_REPO_NAME) {
-          return file.title
+          return file.name
         }
 
         if (!isSaved.value) {
@@ -210,7 +210,7 @@ export default defineComponent({
     })
 
     watch(statusText, () => {
-      document.title = currentFile.value ? (currentFile.value.name || currentFile.value.title || 'Yank Note') : t('file-status.no-file')
+      document.title = currentFile.value ? (currentFile.value.name || 'Yank Note') : t('file-status.no-file')
     }, { immediate: true })
 
     watch(isSaved, (val: boolean) => {

src/renderer/others/setting-schema.ts

@@ -88,6 +88,15 @@ const schema: SettingSchema = ({
       minimum: 10,
       maximum: Number.MAX_SAFE_INTEGER,
     },
+    'view.default-previewer-font-family': {
+      defaultValue: '',
+      title: 'T_setting-panel.schema.view.default-previewer-font-family',
+      type: 'string',
+      group: 'appearance',
+      options: {
+        inputAttributes: { placeholder: 'e.g., \'Courier New\', monospace' }
+      },
+    },
     'updater.source': {
       defaultValue: 'auto',
       title: 'T_setting-panel.schema.updater.source',

src/renderer/plugins.ts

@@ -70,7 +70,7 @@ import copyContent from '@fe/plugins/copy-content'
 import sharePreview from '@fe/plugins/share-preview'
 import codeRunners from '@fe/plugins/code-runners'
 import watchFileRefresh from '@fe/plugins/watch-file-refresh'
-import previewFontSize from '@fe/plugins/preview-font-size'
+import previewFont from '@fe/plugins/preview-font'
 import dropToOpenFile from '@fe/plugins/drop-to-open-file'
 import recordRecentDocument from '@fe/plugins/record-recent-document'
 import aiCopilot from '@fe/plugins/ai-copilot'
@@ -150,7 +150,7 @@ export default [
   sharePreview,
   codeRunners,
   watchFileRefresh,
-  previewFontSize,
+  previewFont,
   dropToOpenFile,
   recordRecentDocument,
   markdownGithubAlerts,

src/renderer/plugins/code-runners.tsx

@@ -256,10 +256,10 @@ export default {
       /* eslint-disable no-template-curly-in-string */
 
       items.push(
-        { label: '/ ``` Run Code (JavaScript)', insertText: '```js\n// --run--\n${1:await new Promise(r => setTimeout(r, 500))\nconsole.log("hello world!")}\n```\n', block: true },
-        { label: '/ ``` Run Code (JavaScript - No Worker)', insertText: '```js\n// --run-- --no-worker--\n${1:await new Promise(r => setTimeout(r, 500))\nctx.ui.useToast().show("info", "HELLOWORLD!")\nconsole.log("hello world!")}\n```\n', block: true },
-        { label: '/ ``` Run Code (Bash)', insertText: '```bash\n# --run--\n${1:echo HELLOWORLD}\n```\n', block: true },
-        { label: '/ ``` Run Code (C)', insertText: '```c\n// --run-- gcc \\$tmpFile.c -o \\$tmpFile.out && \\$tmpFile.out\n${1:#include <stdio.h>\n \nint main () {\n    printf("Hello, World!");\n    return 0;\n}}\n```\n', block: true },
+        { language: 'markdown', label: '/ ``` Run Code (JavaScript)', insertText: '```js\n// --run--\n${1:await new Promise(r => setTimeout(r, 500))\nconsole.log("hello world!")}\n```\n', block: true },
+        { language: 'markdown', label: '/ ``` Run Code (JavaScript - No Worker)', insertText: '```js\n// --run-- --no-worker--\n${1:await new Promise(r => setTimeout(r, 500))\nctx.ui.useToast().show("info", "HELLOWORLD!")\nconsole.log("hello world!")}\n```\n', block: true },
+        { language: 'markdown', label: '/ ``` Run Code (Bash)', insertText: '```bash\n# --run--\n${1:echo HELLOWORLD}\n```\n', block: true },
+        { language: 'markdown', label: '/ ``` Run Code (C)', insertText: '```c\n// --run-- gcc \\$tmpFile.c -o \\$tmpFile.out && \\$tmpFile.out\n${1:#include <stdio.h>\n \nint main () {\n    printf("Hello, World!");\n    return 0;\n}}\n```\n', block: true },
       )
     })
   }

src/renderer/plugins/editor-md-syntax.ts

@@ -76,9 +76,13 @@ class MdSyntaxCompletionProvider implements Monaco.languages.CompletionItemProvi
     return 0
   }
 
-  private async provideSelectionCompletionItems (model: Monaco.editor.IModel, selection: Monaco.Selection): Promise<Monaco.languages.CompletionList | undefined> {
+  private async provideSelectionCompletionItems (model: Monaco.editor.IModel, selection: Monaco.Selection, languageId: string): Promise<Monaco.languages.CompletionList | undefined> {
     const selectionEndLineMaxColumn = model.getLineMaxColumn(selection.endLineNumber)
     const items = this.ctx.editor.getSimpleCompletionItems().filter(item => {
+      if (item.language && item.language !== languageId) {
+        return false
+      }
+
       if (item.insertText.includes('${TM_SELECTED_TEXT}')) {
         return true
       }
@@ -126,9 +130,11 @@ class MdSyntaxCompletionProvider implements Monaco.languages.CompletionItemProvi
   }
 
   public async provideCompletionItems (model: Monaco.editor.IModel, position: Monaco.Position): Promise<Monaco.languages.CompletionList | undefined> {
+    const languageId = this.ctx.editor.getLineLanguageId(position.lineNumber, model)
+
     const selection = this.ctx.editor.getEditor().getSelection()!
     if (!selection.isEmpty()) {
-      return this.provideSelectionCompletionItems(model, selection)
+      return this.provideSelectionCompletionItems(model, selection, languageId)
     }
 
     const line = model.getLineContent(position.lineNumber)
@@ -142,6 +148,10 @@ class MdSyntaxCompletionProvider implements Monaco.languages.CompletionItemProvi
     }
 
     const items = this.ctx.editor.getSimpleCompletionItems().filter((item) => {
+      if (item.language && item.language !== languageId) {
+        return false
+      }
+
       return !item.block || startColumn === 1
     })
 
@@ -228,30 +238,30 @@ export default {
 
     ctx.editor.tapSimpleCompletionItems(items => {
       items.unshift(
-        { label: '/ ![]() Image', insertText: '![${2:Img}]($1)' },
-        { label: '/ []() Link', insertText: '[${2:Link}]($1)' },
-        { label: '/ # Head 1', insertText: '# $1', block: true },
-        { label: '/ ## Head 2', insertText: '## $1', block: true },
-        { label: '/ ### Head 3', insertText: '### $1', block: true },
-        { label: '/ #### Head 4', insertText: '#### $1', block: true },
-        { label: '/ ##### Head 5', insertText: '##### $1', block: true },
-        { label: '/ ###### Head 6', insertText: '###### $1', block: true },
-        { label: '/ + List', insertText: '+ ' },
-        { label: '/ - List', insertText: '- ' },
-        { label: '/ > Blockquote', insertText: '> ' },
-        { label: '/ ` Code', insertText: '`$1`', surroundSelection: '$1', },
-        { label: '/ * Italic', insertText: '*$1*', surroundSelection: '$1', },
-        { label: '/ _ Italic', insertText: '_$1_', surroundSelection: '$1', },
-        { label: '/ ~ Sub', insertText: '~$1~', surroundSelection: '$1', },
-        { label: '/ ^ Sup', insertText: '^$1^', surroundSelection: '$1', },
-        { label: '/ ** Bold', insertText: '**$1**', surroundSelection: '$1', },
-        { label: '/ __ Bold', insertText: '__$1__', surroundSelection: '$1', },
-        { label: '/ ~~ Delete', insertText: '~~$1~~', surroundSelection: '$1', },
-        { label: '/ == Mark', insertText: '==$1==', surroundSelection: '$1', },
-        { label: '/ ``` Fence', insertText: '```$1\n$2\n```\n', block: true, surroundSelection: '$2', },
-        { label: '/ --- Horizontal Line', insertText: '---\n', block: true },
-        { label: '/ + [ ] TODO List', insertText: '+ [ ] ' },
-        { label: '/ - [ ] TODO List', insertText: '- [ ] ' },
+        { language: 'markdown', label: '/ ![]() Image', insertText: '![${2:Img}]($1)' },
+        { language: 'markdown', label: '/ []() Link', insertText: '[${2:Link}]($1)' },
+        { language: 'markdown', label: '/ # Head 1', insertText: '# $1', block: true },
+        { language: 'markdown', label: '/ ## Head 2', insertText: '## $1', block: true },
+        { language: 'markdown', label: '/ ### Head 3', insertText: '### $1', block: true },
+        { language: 'markdown', label: '/ #### Head 4', insertText: '#### $1', block: true },
+        { language: 'markdown', label: '/ ##### Head 5', insertText: '##### $1', block: true },
+        { language: 'markdown', label: '/ ###### Head 6', insertText: '###### $1', block: true },
+        { language: 'markdown', label: '/ + List', insertText: '+ ' },
+        { language: 'markdown', label: '/ - List', insertText: '- ' },
+        { language: 'markdown', label: '/ > Blockquote', insertText: '> ' },
+        { language: 'markdown', label: '/ ` Code', insertText: '`$1`', surroundSelection: '$1', },
+        { language: 'markdown', label: '/ * Italic', insertText: '*$1*', surroundSelection: '$1', },
+        { language: 'markdown', label: '/ _ Italic', insertText: '_$1_', surroundSelection: '$1', },
+        { language: 'markdown', label: '/ ~ Sub', insertText: '~$1~', surroundSelection: '$1', },
+        { language: 'markdown', label: '/ ^ Sup', insertText: '^$1^', surroundSelection: '$1', },
+        { language: 'markdown', label: '/ ** Bold', insertText: '**$1**', surroundSelection: '$1', },
+        { language: 'markdown', label: '/ __ Bold', insertText: '__$1__', surroundSelection: '$1', },
+        { language: 'markdown', label: '/ ~~ Delete', insertText: '~~$1~~', surroundSelection: '$1', },
+        { language: 'markdown', label: '/ == Mark', insertText: '==$1==', surroundSelection: '$1', },
+        { language: 'markdown', label: '/ ``` Fence', insertText: '```$1\n$2\n```\n', block: true, surroundSelection: '$2', },
+        { language: 'markdown', label: '/ --- Horizontal Line', insertText: '---\n', block: true },
+        { language: 'markdown', label: '/ + [ ] TODO List', insertText: '+ [ ] ' },
+        { language: 'markdown', label: '/ - [ ] TODO List', insertText: '- [ ] ' },
       )
     })