Version 0.0.3

FIameCaster · Aug 8, 2023 · 6577c76 · 6577c76
1 parent 08e05ad
commit 6577c76
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/package/package.json b/package/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prism-code-editor",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "type": "module",
   "description": "Lightweight, extensible code editor for the web using Prism",
   "main": "./dist/index.js",

diff --git a/package/src/extensions/commands.ts b/package/src/extensions/commands.ts
@@ -14,12 +14,12 @@ const clipboard = navigator.clipboard
  * Defaults to `['""', "''", '``', '()', '[]', '{}']`.
  * @param selfCloseRegex Regexp controlling whether or not a bracket/quote should
  * automatically close based on the character before and after the cursor.
- * Defaults to ``/([^\w$'"`]["'`]|.[[({])[,.\])}>\s]|.[[({]`/s``.
+ * Defaults to ``/([^\w$'"`]["'`]|.[[({])[;:,.\])}>\s]|.[[({]`/s``.
  */
 export const defaultCommands = (
 	cursor?: Cursor,
 	selfClosePairs = ['""', "''", "``", "()", "[]", "{}"],
-	selfCloseRegex = /([^\w$'"`]["'`]|.[[({])[,.\])}>\s]|.[[({]`/s,
+	selfCloseRegex = /([^\w$'"`]["'`]|.[[({])[;:,.\])}>\s]|.[[({]`/s,
 ): Extension => {
 	let initialized: boolean, prevCopy: string
 

diff --git a/package/src/extensions/matchBrackets.ts b/package/src/extensions/matchBrackets.ts
@@ -86,7 +86,6 @@ export const matchBrackets = (
 	let pairs: number[][] = [],
 		secondOrder: number[][],
 		activeID: number,
-		prevPair: number[],
 		currentEditor: PrismEditor,
 		openingBrackets: HTMLCollectionOf<HTMLSpanElement>,
 		closingBrackets: HTMLCollectionOf<HTMLSpanElement>
@@ -104,7 +103,7 @@ export const matchBrackets = (
 		selectionChange = () => {
 			const [start, end] = currentEditor.getSelection()
 			const newID = start == end && currentEditor.focused ? getClosest(start) : -1
-			if (prevPair != (prevPair = pairs[newID])) {
+			if (activeID != newID) {
 				toggleBrackets(activeID, false)
 				toggleBrackets((activeID = newID), true)
 			}
@@ -129,6 +128,8 @@ export const matchBrackets = (
 				addListener("selectionChange", selectionChange)
 				addListener("tokenize", (env: TokenizeEnv) => {
 					if (env.language != "regex") {
+						toggleBrackets(activeID, false)
+						activeID = -1
 						pairs = pairBrackets(env.tokens, openingRegex, closingRegex, pairRegex)
 						secondOrder = pairs.slice().sort((a, b) => a[0] - b[0])
 					}