From 8d4238bf5033a1ae194c4259a0cade6b1dc8dfce Mon Sep 17 00:00:00 2001 From: RuslanGabbasov Date: Fri, 26 Nov 2021 20:06:58 +0500 Subject: [PATCH 1/4] fix: prevent unwanted emoji menu in non Latin cultures (#591) Co-authored-by: Ruslan Gabbasov --- src/plugins/EmojiTrigger.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/EmojiTrigger.tsx b/src/plugins/EmojiTrigger.tsx index e920c1787..99859e140 100644 --- a/src/plugins/EmojiTrigger.tsx +++ b/src/plugins/EmojiTrigger.tsx @@ -4,8 +4,8 @@ import Extension from "../lib/Extension"; import isInCode from "../queries/isInCode"; import { run } from "./BlockMenuTrigger"; -const OPEN_REGEX = /(?:^|[^a-zA-Z0-9_!#$%&*@＠]):([0-9a-zA-Z_+-]+)?$/; -const CLOSE_REGEX = /(?:^|[^a-zA-Z0-9_!#$%&*@＠]):(([0-9a-zA-Z_+-]*\s+)|(\s+[0-9a-zA-Z_+-]+)|[^0-9a-zA-Z_+-]+)$/; +const OPEN_REGEX = /(?:^|\s):([0-9a-zA-Z_+-]+)?$/; +const CLOSE_REGEX = /(?:^|\s):(([0-9a-zA-Z_+-]*\s+)|(\s+[0-9a-zA-Z_+-]+)|[^0-9a-zA-Z_+-]+)$/; export default class EmojiTrigger extends Extension { get name() { From 680ba7f851a24e71830f700cba71a23b8431ae98 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 26 Nov 2021 07:15:05 -0800 Subject: [PATCH 2/4] chore(deps): bump ssri from 6.0.1 to 6.0.2 (#585) Bumps [ssri](https://github.com/npm/ssri) from 6.0.1 to 6.0.2. - [Release notes](https://github.com/npm/ssri/releases) - [Changelog](https://github.com/npm/ssri/blob/v6.0.2/CHANGELOG.md) - [Commits](https://github.com/npm/ssri/compare/v6.0.1...v6.0.2) --- updated-dependencies: - dependency-name: ssri dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 207480c1a..170149a73 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10706,9 +10706,9 @@ sshpk@^1.7.0: tweetnacl "~0.14.0" ssri@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8" - integrity sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA== + version "6.0.2" + resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.2.tgz#157939134f20464e7301ddba3e90ffa8f7728ac5" + integrity sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q== dependencies: figgy-pudding "^3.5.1" From 1ed9ae304f41367af4e57794921a1f335e060aaf Mon Sep 17 00:00:00 2001 From: Long Tran Date: Fri, 26 Nov 2021 07:58:46 -0800 Subject: [PATCH 3/4] feat: added syntax highlighting support for Objective-C (#590) * added syntax highlighting support for Objective-C * Update src/plugins/Prism.ts Co-authored-by: Long Tran Co-authored-by: Tom Moor --- src/nodes/CodeFence.ts | 2 ++ src/plugins/Prism.ts | 1 + 2 files changed, 3 insertions(+) diff --git a/src/nodes/CodeFence.ts b/src/nodes/CodeFence.ts index ed842d9a3..bcbb5bd72 100644 --- a/src/nodes/CodeFence.ts +++ b/src/nodes/CodeFence.ts @@ -8,6 +8,7 @@ import java from "refractor/lang/java"; import javascript from "refractor/lang/javascript"; import json from "refractor/lang/json"; import markup from "refractor/lang/markup"; +import objectivec from "refractor/lang/objectivec"; import perl from "refractor/lang/perl"; import php from "refractor/lang/php"; import python from "refractor/lang/python"; @@ -39,6 +40,7 @@ const DEFAULT_LANGUAGE = "javascript"; javascript, json, markup, + objectivec, perl, php, python, diff --git a/src/plugins/Prism.ts b/src/plugins/Prism.ts index b40982736..e2fbdc087 100644 --- a/src/plugins/Prism.ts +++ b/src/plugins/Prism.ts @@ -13,6 +13,7 @@ export const LANGUAGES = { csharp: "C#", go: "Go", markup: "HTML", + objectivec: "Objective-C", java: "Java", javascript: "JavaScript", json: "JSON", From 0f3646456ca8a0a16e910581503da8e4d1ecb655 Mon Sep 17 00:00:00 2001 From: Saumya Pandey Date: Fri, 26 Nov 2021 21:38:28 +0530 Subject: [PATCH 4/4] fix: update close_regex of block menu (#576) --- src/plugins/BlockMenuTrigger.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/BlockMenuTrigger.tsx b/src/plugins/BlockMenuTrigger.tsx index 1bc00489b..a02eca340 100644 --- a/src/plugins/BlockMenuTrigger.tsx +++ b/src/plugins/BlockMenuTrigger.tsx @@ -10,7 +10,7 @@ import Extension from "../lib/Extension"; const MAX_MATCH = 500; const OPEN_REGEX = /^\/(\w+)?$/; -const CLOSE_REGEX = /(^(?!\/(\w+)?)(.*)$|^\/((\w+)\s.*|\s)$)/; +const CLOSE_REGEX = /(^(?!\/(\w+)?)(.*)$|^\/(([\w\W]+)\s.*|\s)$|^\/((\W)+)$)/; // based on the input rules code in Prosemirror, here: // https://github.com/ProseMirror/prosemirror-inputrules/blob/master/src/inputrules.js